summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@krebs>2011-08-07 18:08:07 +0200
committerroot <root@krebs>2011-08-07 18:08:07 +0200
commitb993079a7c25473e1f9158bb46aa74487aaf273a (patch)
treecf227fc3877b3c1ee059e9c9c6bf19c3d561a599
parentf39e274bede1cfb720a35555385679d9332baa3f (diff)
parentf2677886d252ceec0eeea54d44b74f60683f8282 (diff)
Merge branch 'master' of github.com:/krebscode/painload
-rwxr-xr-xkachelmann/conditions7
-rw-r--r--streams/stream.db1
2 files changed, 4 insertions, 4 deletions
diff --git a/kachelmann/conditions b/kachelmann/conditions
index 1a798e42..ea4ba5ca 100755
--- a/kachelmann/conditions
+++ b/kachelmann/conditions
@@ -1,7 +1,6 @@
#!/usr/bin/perl
use XML::Simple;
-system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml");
+my $result = `w3m -dump "http://www.google.com/ig/api?weather=70327-stuttgart&hl=de"`;
my $xml = new XML::Simple;
-my $data = $xml->XMLin("/tmp/kachelmann/weather.xml");
-my $sentence = "Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n";
-system("espeak -v de \"$sentence\"");
+my $data = $xml->XMLin($result);
+print ("Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n");
diff --git a/streams/stream.db b/streams/stream.db
index 6ca9a627..e97a202e 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -3,3 +3,4 @@ http://deepmix.ru/deepmix128.pls deepmix
http://streams.xenim.de/radiotux.ogg radiotux
http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
http://somafm.com/illstreet.pls illstreet
+http://localhost:8000/stream.ogg icecast