diff options
| author | root <root@krebs> | 2011-08-07 18:08:07 +0200 |
|---|---|---|
| committer | root <root@krebs> | 2011-08-07 18:08:07 +0200 |
| commit | 7a169204102f350b40d3b02db26c05c6e4ccb5d5 (patch) | |
| tree | 7d80e08abf4e219e28d5ec7077e9740b3ff1b216 | |
| parent | 8abe4c88585a25c5b14e672a8ae9773e19f695c4 (diff) | |
| parent | 4a540ca80b6288d8f2ae9af13c4efde95b0a01e7 (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
| -rwxr-xr-x | kachelmann/conditions | 7 | ||||
| -rw-r--r-- | streams/stream.db | 1 |
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 |