diff --git a/Contents/Code/interface/menu.py b/Contents/Code/interface/menu.py index 1d95d322..2abc0c9e 100644 --- a/Contents/Code/interface/menu.py +++ b/Contents/Code/interface/menu.py @@ -658,7 +658,7 @@ def RefreshItem(rating_key=None, came_from="/recent", item_title=None, force=Fal @route(PREFIX + '/missing/refresh') @debounce def RefreshMissing(randomize=None): - Thread.CreateTimer(1.0, lambda: scheduler.run_task("SearchAllRecentlyAddedMissing")) + scheduler.dispatch_task("SearchAllRecentlyAddedMissing") header = "Refresh of recently added items with missing subtitles triggered" return fatality(header=header, replace_parent=True) diff --git a/Contents/Code/support/background.py b/Contents/Code/support/background.py index 9ffedd4c..0a772c74 100755 --- a/Contents/Code/support/background.py +++ b/Contents/Code/support/background.py @@ -27,7 +27,7 @@ class DefaultScheduler(object): def init_storage(self): if "tasks" not in Dict: - Dict["tasks"] = {} + Dict["tasks"] = {"queue": []} Dict.Save() def get_task_data(self, name): @@ -114,8 +114,10 @@ class DefaultScheduler(object): task.post_run(Dict["tasks"][name]["data"]) def dispatch_task(self, *args, **kwargs): - Thread.Create(self.run_task, True, *args, **kwargs) - Log.Debug("Dispatching single task: %s, %s", args, kwargs) + if "queue" not in Dict["tasks"]: + Dict["tasks"]["queue"] = [] + + Dict["tasks"]["queue"].append((args, kwargs)) def signal(self, name, *args, **kwargs): for task_name, info in self.tasks.iteritems(): @@ -139,6 +141,16 @@ class DefaultScheduler(object): if not self.running: break + # single dispatch requested? + if Dict["tasks"]["queue"]: + # work queue off + queue = Dict["tasks"]["queue"][:] + Dict["tasks"]["queue"] = [] + for args, kwargs in queue: + Log.Debug("Dispatching single task: %s, %s", args, kwargs) + Thread.Create(self.run_task, True, *args, **kwargs) + + # scheduled tasks for name, info in self.tasks.iteritems(): now = datetime.datetime.now() task = info["task"] @@ -156,7 +168,7 @@ class DefaultScheduler(object): if not task.last_run or task.last_run + datetime.timedelta(**{frequency_key: frequency_num}) <= now: self.run_task(name) - Thread.Sleep(10.0) + Thread.Sleep(5.0) scheduler = DefaultScheduler()