don't queue same path if already queued

Author: djay

plugin.program.autowidget/resources/lib/common/cache.py

@@ -65,7 +65,6 @@ def read_history(path, create_if_missing=True):
 
 def push_cache_queue(path, widget_id=None):
     hash = path2hash(path)
-    queue_path = os.path.join(_addon_data, "{}.queue".format(hash))
     history = read_history(path, create_if_missing=True)  # Ensure its created
     changed = False
     if widget_id is not None and widget_id not in history["widgets"]:
@@ -81,7 +80,7 @@ def push_cache_queue(path, widget_id=None):
     command = {'jsonrpc': '2.0', 'method': 'JSONRPC.NotifyAll',
                 'params': {'sender': "AutoWidget",
                     'message': "queue",
-                    'data': {"hash": hash, "path": path, "widget_id": widget_id},
+                    'data': (hash, path, widget_id),
                 },
                 'id': 1,}
     def send():
@@ -458,7 +457,7 @@ def chance_playback_updates_widget(cache_data, plays, cutoff_time=60 * 60):
     return prob
 
 
-def save_playback_history(media_type, playback_percentage):
+def save_playback_history(media_type, playback_percentage, path):
     # Record in json when things got played to help predict which widgets will change after playback
     # if playback_percentage < 0.7:
     #    return

plugin.program.autowidget/resources/lib/refresh.py

@@ -34,7 +34,7 @@ def __init__(self):
         utils.ensure_addon_data()
         self._update_properties()
         self._clean_widgets()
-        self.queue = queue.Queue()
+        self.queue = OrderedSetQueue()
         for _ in range(1 if self.low_end else 4):
             thread = threading.Thread(target=self._processQueue)
             thread.start()
@@ -84,7 +84,7 @@ def tick(self, step, max, abort_check=lambda: False):
 
     def _update_widgets(self):
         if self.low_end:
-            self.waitForAbort(120)
+            self.waitForAbort(30)
 
         startup = True
         while not self.abortRequested():
@@ -101,26 +101,26 @@ def _update_widgets(self):
     def onNotification(self, sender, method, data):     
         if sender == "AutoWidget":
             data = json.loads(data)
-            # TODO: ensure we don't queue same one twice
-            utils.log("Added to queue: {} {}".format(data['hash'][:5], data['path']), "notice")
-            self.queue.put(data)
+            utils.log("Added to queue: {} {} {}".format(*data), "notice")
+            # special queue ensures we don't queue same one twice at the same time
+            self.queue.put(tuple(data))
             return True
 
 
     def _processQueue(self):
         if self.low_end:
-            self.waitForAbort(170)  # TODO: wait until no more added to queue?
+            self.waitForAbort(70)  # TODO: wait until no more added to queue?
         utils.log("Starting processing queue", "notice")
 
         while not self.abortRequested():
             if self.player.isPlayingVideo():
                 xbmc.sleep(1000)
                 continue
             try:
-                res = self.queue.get(timeout=5)
+                hash, path, widget_id = self.queue.get(timeout=5)
             except queue.Empty:
+                # TODO: first run of queue. first refresh now?
                 continue
-            path, hash, widget_id = res['path'], res['hash'], res['widget_id']
             history_path = os.path.join(_addon_data, "{}.history".format(hash))
             cache_data = utils.read_json(history_path) if xbmcvfs.exists(history_path) else None
             # class Progress(object):
@@ -433,6 +433,7 @@ def __init__(self):
         self.totalTime = -1
         self.playingTime = 0
         self.info = {}
+        self.path = None
 
     def playing_type(self):
         """
@@ -488,6 +489,7 @@ def onPlayBackStarted(self):
                 self.totalTime = -1
         # self.recordPlay()
         self.type = self.playing_type()
+        self.path = self.getPlayingFile()
 
         def update_playback_time(self=self):
             while self.isPlaying():
@@ -515,9 +517,11 @@ def onPlayBackEnded(self):
         self.totalTime = -1.0
         self.playingTime = 0.0
         self.info = {}
-        cache.save_playback_history(self.type, pp)
+        cache.save_playback_history(self.type, pp, self.path)
         utils.log("recorded playback of {}% {}".format(pp, self.type), "notice")
 
+        # TODO: find which cache file has self.path in it. This probably would have changed
+
         # wait for a bit so scrobing can happen
         # time.sleep(5)
         for hash, path in cache.widgets_changed_by_watching(self.type):
@@ -547,3 +551,13 @@ def onPlayBackSpeedChanged(self, speed):
 
     def onQueueNextItem(self):
         pass
+
+class OrderedSetQueue(queue.Queue):
+    def _init(self, maxsize):
+        self.queue = {}  # Python 3 dict is ordered
+    def _put(self, item):
+        self.queue[item] = None
+    def _get(self):
+        val = next(iter(self.queue.keys()))
+        del self.queue[val]
+        return val