icecast is only remcommended, fix M3U tags

diff --git a/INSTALL b/INSTALL
index a33519013f6a917238d5671bd01c9634f0b719b0..3341d5539a0c0e7a14e60466fbbcf75b18f52103 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -10,12 +10,14 @@
 # Author: Guillaume Pellerin <pellerin@parisson.com>
 
  depends:  python, python-dev, python-xml, python-shout | shout-python, libshout3,
-           libshout3-dev, icecast2, python-mutagen
-
- recommends: python-twitter, python-tinyurl, python-liblo | pyliblo (>= 0.26)
+           libshout3-dev, python-mutagen
 
  provides:  shout-python
 
+ optional: python-twitter, python-tinyurl, python-liblo | pyliblo (>= 0.26)
+
+ recommends: icecast2
+
 python-shout is included in the DeeFuzzer but needs to be compiled and installed
 if you don't install deefuzzer from its debian package with aptitude.
 As explained in shout-python/INSTALL, you just have to run this command :

diff --git a/deefuzzer.py b/deefuzzer.py
index 96576a536573797a2163d537c86e5c0b3748dab9..9ca08020b205ea55819fcbc5d190443fd3d09b63 100755 (executable)
--- a/deefuzzer.py
+++ b/deefuzzer.py
@@ -120,14 +120,12 @@ class DeeFuzzer(Thread):
         if not os.path.exists(m3u_dir):
             os.makedirs(m3u_dir)
         m3u = open(self.m3u, 'w')
-        i = 1
         m3u.write('#EXTM3U\n')
         for s in self.stations:
-            info = '#EXTINF:%s,%s' % (str(i), s.channel.name + ' (' + s.short_name + ')\n')
+            info = '#EXTINF:%s,%s - %s\n' % ('-1',s.short_name, s.channel.name)
             url =  s.channel.protocol + '://' + s.channel.host + ':' + str(s.channel.port) + s.channel.mount + '\n'
             m3u.write(info)
             m3u.write(url)
-            i += 1
         m3u.close()
         self.logger.write('Writing M3U file to : ' + self.m3u)
 

diff --git a/tools/station.py b/tools/station.py
index eb7862e63f07afb7491c177202bfc83ce4327427..5d2e59859a2212cf52fe12b42f49baf5d8cf17f9 100644 (file)
--- a/tools/station.py
+++ b/tools/station.py
@@ -76,7 +76,7 @@ class Station(Thread):
         # Infos
         self.channel.url = self.station['infos']['url']
         self.short_name = self.station['infos']['short_name']
-        self.channel.name = self.station['infos']['name'] + ' ' + self.channel.url
+        self.channel.name = self.station['infos']['name'] + ' : ' + self.channel.url
         self.channel.genre = self.station['infos']['genre']
         self.channel.description = self.station['infos']['description']
         self.base_name = self.rss_dir + os.sep + self.short_name + '_' + self.channel.format
@@ -235,7 +235,7 @@ class Station(Thread):
         self.player_mode = value
         message = "Received OSC message '%s' with arguments '%d'" % (path, value)
         self.logger.write(message)
-        
+
     def get_playlist(self):
         file_list = []
         for root, dirs, files in os.walk(self.media_dir):
@@ -449,7 +449,7 @@ class Station(Thread):
                     break
                 self.set_read_mode()
             self.q.task_done()
-            
+
             self.q.get(1)
             if (not (self.jingles_mode == 1 and (self.counter % 2) == 1) or self.relay_mode == 1) and self.twitter_mode == 1:
                 self.update_twitter()