From 45f9de4c5c57620c224cea83d24b71a11560feeb Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 20 Apr 2009 00:42:57 +0000 Subject: [PATCH] file URLs only if rss_enclosure is true --- deefuzz.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/deefuzz.py b/deefuzz.py index 3f1bebf..ae78f4e 100755 --- a/deefuzz.py +++ b/deefuzz.py @@ -264,8 +264,6 @@ class Station(Thread): channel_subtitle = self.channel.name + ' ' + sub_title for media in media_list: - media_link = self.channel.url + self.media_url_dir + media.file_name - media_link = media_link.decode('utf-8') media_description = '' for key in media.metadata.keys(): if media.metadata[key] != '': @@ -284,8 +282,9 @@ class Station(Thread): else: song = artist + ' : ' + title - if self.rss_enclosure == '1': + media_link = self.channel.url + self.media_url_dir + media.file_name + media_link = media_link.decode('utf-8') rss_item_list.append(PyRSS2Gen.RSSItem( title = song, link = media_link, @@ -295,6 +294,7 @@ class Station(Thread): pubDate = media_date,) ) else: + media_link = self.channel.url rss_item_list.append(PyRSS2Gen.RSSItem( title = song, link = media_link, @@ -308,6 +308,7 @@ class Station(Thread): description = self.channel.description.decode('utf-8'), lastBuildDate = date_now, items = rss_item_list,) + f = open(rss_file, 'w') rss.write_xml(f, 'utf-8') f.close() @@ -433,7 +434,7 @@ class Station(Thread): self.channel.sync() # self.logger.write('Station delay (ms) ' + self.short_name + ' : ' + str(self.channel.delay())) except: - self.logger.write('ERROR : Station ' + self.short_name + ' : could not send the buffer... ') + self.logger.write('ERROR : Station %s : could not send the buffer... ') % self.short_name q.task_done() stream.close() -- 2.39.5