add <rss><media_url> parameter to change media URLs included in RSS enclosures

diff --git a/deefuzzer/tools/station.py b/deefuzzer/tools/station.py
index 5ba8bd6f7d0978dbc45bd5746bffbd79463ce369..5cb7450d4a01f2bee249973d4c6bd6efcad9ce75 100644 (file)
--- a/deefuzzer/tools/station.py
+++ b/deefuzzer/tools/station.py
@@ -76,6 +76,10 @@ class Station(Thread):
         # RSS
         self.rss_dir = self.station['rss']['dir']
         self.rss_enclosure = self.station['rss']['enclosure']
+        if self.station['rss']['media_url']:
+            self.rss_media_url = self.station['rss']['media_url']
+            if self.rss_media_url[-1] != '/':
+                self.rss_media_url = self.rss_media_url + '/'
 
         # Infos
         self.channel.url = self.station['infos']['url']
@@ -402,7 +406,10 @@ class Station(Thread):
             media_absolute_playtime += media.length
 
             if self.rss_enclosure == '1':
-                media_link = self.channel.url + '/media/' + media.file_name
+                if self.rss_media_url:
+                    media_link = self.rss_media_url + media.file_name
+                else:
+                    media_link = self.channel.url + '/media/' + media.file_name
                 media_link = media_link.decode('utf-8')
                 rss_item_list.append(RSSItem(
                     title = song,

diff --git a/example/deefuzzer.xml b/example/deefuzzer.xml
index 4fb995c6f42ef93e077665b54355c749cbb1f871..02dab9683fc68ab899806301fc4e8a68fcd04fd3 100644 (file)
--- a/example/deefuzzer.xml
+++ b/example/deefuzzer.xml
@@ -28,6 +28,7 @@
         <rss>
             <dir>/path/to/rss/</dir>
             <enclosure>1</enclosure>
+            <media_url>http://my.domain.com/media/</media_url>
         </rss>
         <twitter>
             <mode>0</mode>

diff --git a/example/deefuzzer_doc.xml b/example/deefuzzer_doc.xml
index ca32342105ea3fe747183a50820605b9f24a295d..02d21ebeab27f4a6d31eab82bb2d20fee409d49c 100644 (file)
--- a/example/deefuzzer_doc.xml
+++ b/example/deefuzzer_doc.xml
@@ -55,6 +55,9 @@
             <!-- If '1', the RSS feeds will contain an enclosure to become a podcast feed.
                 '0' for simple RSS feed without enclosure -->
             <enclosure>1</enclosure>
+            <!-- the base URL of all media items (optional).
+                 Default is station url /media -->
+            <media_url>http://my.domain.com/media/</media_url>
         </rss>
         <twitter>
             <!-- If '1', deefuzzer will tweet #nowplaying, new tracks and other things to Twitter. 'O' does nothing. -->