chris/Axter-Stash
1
0
Fork 0
forked from Github/Axter-Stash
Code Pull Requests Activity

Fixed bug with starting FM as a plugin

Browse Source
This commit is contained in:
David Maisonave
2024-08-11 12:48:24 -04:00
parent 7438b354dd
commit ae7d1079a3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/FileMonitor/filemonitor.py
View File

@@ -77,6 +77,8 @@ if plugin.DRY_RUN:
plugin.Log("Dry run mode is enabled.") plugin.Log("Dry run mode is enabled.")
plugin.Trace(f"(SCAN_MODIFIED={SCAN_MODIFIED}) (SCAN_ON_ANY_EVENT={SCAN_ON_ANY_EVENT}) (RECURSIVE={RECURSIVE})") 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 FileMonitorPluginIsOnTaskQue = plugin.CALLED_AS_STASH_PLUGIN
StopLibraryMonitorWaitingInTaskQueue = False StopLibraryMonitorWaitingInTaskQueue = False
JobIdInTheQue = 0 JobIdInTheQue = 0
@@ -94,7 +96,7 @@ def isJobWaitingToRun():
StopLibraryMonitorWaitingInTaskQueue = True StopLibraryMonitorWaitingInTaskQueue = True
JobIdInTheQue = jobDetails['id'] JobIdInTheQue = jobDetails['id']
jobIsWaiting = True 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 FileMonitorPluginIsOnTaskQue = True
JobIdInTheQue = 0 JobIdInTheQue = 0
return jobIsWaiting return jobIsWaiting
@@ -312,7 +314,7 @@ def start_library_monitor():
shm_a.unlink() # Call unlink only once to release the shared memory shm_a.unlink() # Call unlink only once to release the shared memory
raise KeyboardInterrupt raise KeyboardInterrupt
elif JobIsRunning or PutPluginBackOnTaskQueAndExit: 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.") plugin.Trace("Exiting plugin so that other task can run.")
return return
except KeyboardInterrupt: except KeyboardInterrupt:
@@ -377,7 +379,7 @@ if parse_args.stop or parse_args.restart or plugin.PLUGIN_TASK_NAME == "stop_lib
stop_library_monitor() stop_library_monitor()
if parse_args.restart: if parse_args.restart:
time.sleep(5) 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") plugin.Trace(f"Restart FileMonitor EXIT")
else: else:
plugin.Trace(f"Stop FileMonitor EXIT") plugin.Trace(f"Stop FileMonitor EXIT")