From: achbed <github@achbed.org>
Date: Sat, 24 Jan 2015 18:57:25 +0000 (-0600)
Subject: Playlist feeds now recreated at track change time
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ef20d2e35a656e21376ba3942aaf2468b151296b;p=deefuzzer.git

Playlist feeds now recreated at track change time

Fix for #52
---

diff --git a/deefuzzer/station.py b/deefuzzer/station.py
index 8f67229..9ab3ab6 100644
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@ -492,9 +492,6 @@ class Station(Thread):
 
                 self._info('Generating new playlist (' + str(self.lp) + ' tracks)')
 
-                if self.feeds_playlist:
-                    self.update_feeds(self.media_to_objs(self.playlist), self.feeds_playlist_file, '(playlist)')
-
             elif lp_new != self.lp:
                 self.id += 1
                 if self.id >= lp_new:
@@ -521,10 +518,8 @@ class Station(Thread):
 
                 self.playlist = playlist
 
-                self._info('generating new playlist (' + str(self.lp) + ' tracks)')
+                self._info('Generating new playlist (' + str(self.lp) + ' tracks)')
 
-                if self.feeds_playlist:
-                    self.update_feeds(self.media_to_objs(self.playlist), self.feeds_playlist_file, '(playlist)')
 
             if self.jingles_mode and not (self.counter % self.jingles_frequency) and self.jingles_length:
                 media = self.jingles_list[self.jingle_id]
@@ -538,6 +533,8 @@ class Station(Thread):
                 f = open(self.statusfile, 'w')
                 f.write(str(self.id))
                 f.close()
+                if self.feeds_playlist:
+                    self.update_feeds(self.media_to_objs(self.playlist), self.feeds_playlist_file, '(playlist)')
             except:
                 pass
             self.q.task_done()