From ae7d1079a3aeb85cfee315a43a641f6ac7e7d58e Mon Sep 17 00:00:00 2001 From: David Maisonave <47364845+David-Maisonave@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:48:24 -0400 Subject: [PATCH] Fixed bug with starting FM as a plugin --- plugins/FileMonitor/filemonitor.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/FileMonitor/filemonitor.py b/plugins/FileMonitor/filemonitor.py index a93963e..183d1bd 100644 --- a/plugins/FileMonitor/filemonitor.py +++ b/plugins/FileMonitor/filemonitor.py @@ -77,6 +77,8 @@ if plugin.DRY_RUN: plugin.Log("Dry run mode is enabled.") plugin.Trace(f"(SCAN_MODIFIED={SCAN_MODIFIED}) (SCAN_ON_ANY_EVENT={SCAN_ON_ANY_EVENT}) (RECURSIVE={RECURSIVE})") +StartFileMonitorAsAPluginTaskName = "Run as a Plugin" +StartFileMonitorAsAServiceTaskName = "Start Library Monitor Service" FileMonitorPluginIsOnTaskQue = plugin.CALLED_AS_STASH_PLUGIN StopLibraryMonitorWaitingInTaskQueue = False JobIdInTheQue = 0 @@ -94,7 +96,7 @@ def isJobWaitingToRun(): StopLibraryMonitorWaitingInTaskQueue = True JobIdInTheQue = jobDetails['id'] jobIsWaiting = True - elif jobDetails['status'] == "RUNNING" and jobDetails['description'].find("Start Library Monitor") > -1: + elif jobDetails['status'] == "RUNNING" and jobDetails['description'].find(StartFileMonitorAsAPluginTaskName) > -1: FileMonitorPluginIsOnTaskQue = True JobIdInTheQue = 0 return jobIsWaiting @@ -312,7 +314,7 @@ def start_library_monitor(): shm_a.unlink() # Call unlink only once to release the shared memory raise KeyboardInterrupt elif JobIsRunning or PutPluginBackOnTaskQueAndExit: - plugin.STASH_INTERFACE.run_plugin_task(plugin_id=plugin.PLUGIN_ID, task_name="Start Library Monitor") + plugin.STASH_INTERFACE.run_plugin_task(plugin_id=plugin.PLUGIN_ID, task_name=StartFileMonitorAsAPluginTaskName) plugin.Trace("Exiting plugin so that other task can run.") return except KeyboardInterrupt: @@ -377,7 +379,7 @@ if parse_args.stop or parse_args.restart or plugin.PLUGIN_TASK_NAME == "stop_lib stop_library_monitor() if parse_args.restart: time.sleep(5) - plugin.STASH_INTERFACE.run_plugin_task(plugin_id=plugin.PLUGIN_ID, task_name="Start Library Monitor") + plugin.STASH_INTERFACE.run_plugin_task(plugin_id=plugin.PLUGIN_ID, task_name=StartFileMonitorAsAPluginTaskName) plugin.Trace(f"Restart FileMonitor EXIT") else: plugin.Trace(f"Stop FileMonitor EXIT")