fix ogg

diff --git a/README b/README
index a05230ac20b7b4be30b748f9922325f55dec1746..4608c195e950d14a0be1aa0c2596b22ea667046e 100644 (file)
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ DeeFuzz Tools are new light and easy tools to stream audio and video over intern
 
 Here are the main features of the DeeFuzz Tools:
 
- * MP3 and OGG (audio & video) streaming over internet
+ * MP3 and OGG (audio & video) file streaming over internet
  * Full metadata encapsulation and management
  * RSS podcast feeding (current tracks and playlists)
  * M3U playlist feefing

diff --git a/debian/control b/debian/control
index 539a26b1a22d85f06601b20bf799d2c0a1f075ae..43c6d57c9a7909cc4bf62f904d06b2c057671c09 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, icecast2, python-xml, python-shout, libshout3, python-mutagen
 Description: easy and light media streaming tool
  DeeFuzz Tools are new light and easy tools to stream audio and video over internet. It is dedicated to people who wants to create playlisted webradios or webTVs with rich media contents. Here are the main features of the DeeFuzz Tools:
- * MP3 and OGG (audio & video) streaming over internet
+ * MP3 and OGG (audio & video) file streaming over internet
  * Full metadata encapsulation and management
  * RSS podcast feeding (current tracks and playlists)
  * M3U playlist feefing

diff --git a/deefuzz.py b/deefuzz.py
index 17c8eae7f2859cb7e901e73c1cb35cff347b8795..280963f2cfd5771d466b723772a1fde62651da76 100755 (executable)
--- a/deefuzz.py
+++ b/deefuzz.py
@@ -57,15 +57,15 @@ def prog_info():
         ver = ' version : %s \n\n' % (version)
         info = """ Copyright (c) 2007-%s Guillaume Pellerin <yomguy@parisson.com>
  All rights reserved.
-        
+
  This software is licensed as described in the file COPYING, which
  you should have received as part of this distribution. The terms
  are also available at http://svn.parisson.org/d-fuzz/DeeFuzzLicense
-        
+
  depends : python, python-xml, python-shout, libshout3, icecast2
  recommends : python-mutagen
  provides : python-shout
-       
+
  Usage : deefuzz $1
   where $1 is the path for a XML config file
   ex: deefuzz example/myfuzz.xml
@@ -224,8 +224,8 @@ class Station(Thread):
         self.channel.genre = self.station['infos']['genre']
         self.channel.description = self.station['infos']['description']
         self.channel.url = self.station['infos']['url']
-        self.rss_current_file = self.rss_dir + os.sep + self.short_name + '_current.xml'
-        self.rss_playlist_file = self.rss_dir + os.sep + self.short_name + '_playlist.xml'
+        self.rss_current_file = self.rss_dir + os.sep + self.short_name + '_' + self.channel.format + '_current.xml'
+        self.rss_playlist_file = self.rss_dir + os.sep + self.short_name + '_' + self.channel.format + '_playlist.xml'
         self.m3u_playlist_file = self.rss_dir + os.sep + self.short_name + '.m3u'
         self.media_url_dir = '/media/'
         # Server
@@ -273,7 +273,7 @@ class Station(Thread):
             media_date = time.localtime(media_stats[8])
             media_date = time.strftime("%a, %d %b %Y %H:%M:%S +0000", media_date)
             date_now = str(datetime.datetime.now())
-            
+
             title = media.metadata['title']
             artist = media.metadata['artist']
             if not (title or artist):

diff --git a/tools/ogg.py b/tools/ogg.py
index 64b26e7cc8a2bfafdbd106f4770fa725b398aef6..19ddbe3ac4c5667699d223c3842a8400dbedc00b 100644 (file)
--- a/tools/ogg.py
+++ b/tools/ogg.py
@@ -39,6 +39,8 @@
 import os
 import string
 from mutagen.oggvorbis import OggVorbis
+from tools import *
+
 
 class Ogg:
     """An OGG file object"""