Entry history output and stream source attribute.

modules/core/state.py

@@ -66,7 +66,11 @@ class PlayerStateService:
         self.entry_history.pop() 
         self.entry_history.appendleft(entry) 
 
-        self.logger.info("Active entry history:\n"+str(self.entry_history))
+        msg = "Active entry history:\n"
+        msg += "\n" + str(self.entry_history[0])
+        msg += "\n" + str(self.entry_history[1])
+        msg += "\n" + str(self.entry_history[2])
+        self.logger.info(msg)
 
 
 
@@ -93,7 +97,7 @@ class PlayerStateService:
         if not active_entry:
             raise NoActiveEntryException
 
-        if active_entry.filename == source:
+        if active_entry.source == source:
             trackservice = TrackService(active_entry)
             trackservice.store(add=True, commit=True)
 
@@ -102,13 +106,13 @@ class PlayerStateService:
 
             self.logger.info("Stored active entry '%s' to TrackService as '%s'" % (active_entry, trackservice))
         else:
-            msg = "Active entry source '%s' != '%s' activated source." % (active_entry.filename, source)
+            msg = "Active entry source '%s' != '%s' activated source." % (active_entry.source, source)
             self.logger.critical(SimpleUtil.red(msg))
 
 
 
 
-    # def adapt_trackservice_title(self, filename):
+    # def adapt_trackservice_title(self, source):
     #     """
     #     Updates the track-service entry with the info from a fallback track/playlist.
     #     """
@@ -123,8 +127,8 @@ class PlayerStateService:
     #     #     title = self.config.get("fallback_title_not_available")
 
     #     # Create Entry
-    #     entry.filename = filename
-    #     entry.duration = self.fallback_manager.get_track_duration(filename)
+    #     entry.source = source
+    #     entry.duration = self.fallback_manager.get_track_duration(source)
     #     if not entry.duration:
     #         self.logger.critical("Entry %s has no duration! This may cause malfunction of some engine services." % (str(entry)))