add XML templates, RSS file enclosure and RSS dir as options

diff --git a/deefuzz.py b/deefuzz.py
index 47c4237bb44f836a2a73eeeeab41f34e27f6b507..3ff61c0ef76598665d01e7e6060d586b79ccd173 100755 (executable)
--- a/deefuzz.py
+++ b/deefuzz.py
@@ -188,13 +188,15 @@ class Station(Thread):
         self.ogg_quality = self.station['media']['ogg_quality']
         self.samplerate = self.station['media']['samplerate']
         self.voices = self.station['media']['voices']
+        self.rss_dir = self.station['media']['rss_dir']
+        self.rss_enclosure = self.station['media']['rss_enclosure']
         # Infos
         self.short_name = self.station['infos']['short_name']
         self.channel.name = self.station['infos']['name']
         self.channel.genre = self.station['infos']['genre']
         self.channel.description = self.station['infos']['description']
         self.channel.url = self.station['infos']['url']
-        self.rss_dir = os.sep + 'tmp' + os.sep + 'rss'
+        
         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.media_url_dir = '/media/'
@@ -240,15 +242,24 @@ class Station(Thread):
             media_stats = os.stat(media.media)
             media_date = time.localtime(media_stats[8])
             media_date = time.strftime("%a, %d %b %Y %H:%M:%S +0000", media_date)
-            
-            rss_item_list.append(PyRSS2Gen.RSSItem(
-                title = media.metadata['artist'] + ' : ' + media.metadata['title'],
-                link = media_link,
-                description = media_description,
-                enclosure = PyRSS2Gen.Enclosure(media_link, str(media.size), 'audio/mpeg'),
-                guid = PyRSS2Gen.Guid(media_link),
-                pubDate = media_date,)
-                )
+
+            if self.rss_enclosure == '1':
+                rss_item_list.append(PyRSS2Gen.RSSItem(
+                    title = media.metadata['artist'] + ' : ' + media.metadata['title'],
+                    link = media_link,
+                    description = media_description,
+                    enclosure = PyRSS2Gen.Enclosure(media_link, str(media.size), 'audio/mpeg'),
+                    guid = PyRSS2Gen.Guid(media_link),
+                    pubDate = media_date,)
+                    )
+            else:
+                rss_item_list.append(PyRSS2Gen.RSSItem(
+                    title = media.metadata['artist'] + ' : ' + media.metadata['title'],
+                    link = media_link,
+                    description = media_description,
+                    guid = PyRSS2Gen.Guid(media_link),
+                    pubDate = media_date,)
+                    )
 
         rss = PyRSS2Gen.RSS2(title = self.channel.name + ' ' + sub_title,
                             link = self.channel.url,
@@ -372,7 +383,8 @@ class Station(Thread):
                 it = q.get(1)
                 self.current_media_obj = self.media_to_objs([media])
                 title = self.current_media_obj[0].metadata['title']
-                self.channel.set_metadata({'song': str(title)})
+                artist = self.current_media_obj[0].metadata['artist']
+                self.channel.set_metadata({'song': str(artist) + ' : ' + str(title)})
                 self.update_rss(self.current_media_obj, self.rss_current_file)
                 file_name, file_title, file_ext = self.get_file_info(media)
                 self.logger.write('DeeFuzzing this file on %s :  id = %s, name = %s' \

diff --git a/example/deefuzz_test_mp3_station.xml b/example/deefuzz_test_mp3_station.xml
new file mode 100644 (file)
index 0000000..64d5513
--- /dev/null
+++ b/example/deefuzz_test_mp3_station.xml
@@ -0,0 +1,26 @@
+    <station>
+        <infos>
+            <short_name>deefuzz$number</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>

diff --git a/example/test_mp3_8.xml b/example/test_mp3_8.xml
new file mode 100644 (file)
index 0000000..cbfe601
--- /dev/null
+++ b/example/test_mp3_8.xml
@@ -0,0 +1,211 @@
+<deefuzz>
+    <log>/tmp/deefuzz.log</log>
+    <station>
+        <infos>
+            <short_name>deefuzz_1</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+    <station>
+        <infos>
+            <short_name>deefuzz_2</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+    <station>
+        <infos>
+            <short_name>deefuzz_3</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+    <station>
+        <infos>
+            <short_name>deefuzz_4</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+    <station>
+        <infos>
+            <short_name>deefuzz_5</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+    <station>
+        <infos>
+            <short_name>deefuzz_6</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+    <station>
+        <infos>
+            <short_name>deefuzz_7</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+    <station>
+        <infos>
+            <short_name>deefuzz_8</short_name>
+            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
+            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
+            <url>http://studio.parisson.com</url>
+            <genre>Techno House Dance Electronic Trance Mix Live</genre>
+        </infos>
+        <server>
+            <host>localhost</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/momo/music/music4/mp3/janob/80s</dir>
+            <format>mp3</format>
+            <bitrate>192</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+            <rss_dir>/tmp/rss/</rss_dir>
+            <rss_enclosure>0</rss_enclosure>
+        </media>
+    </station>
+</deefuzz>