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

Update filemonitor.py

Browse Source
This commit is contained in:
David Maisonave
2025-01-06 01:56:09 -05:00
parent cb437d7c04
commit 385049235b
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/FileMonitor/filemonitor.py
View File

@@ -109,18 +109,25 @@ NotInLibraryTagName = stash.pluginConfig['NotInLibraryTagName']
dockerMapVolumes = {} dockerMapVolumes = {}
dockerReverseMapVolumes = {} dockerReverseMapVolumes = {}
dockerObservedPaths = {}
if not parse_args.docker == None and len(parse_args.docker) > 0: if not parse_args.docker == None and len(parse_args.docker) > 0:
stash.Log(f"Docker compose YML file = {parse_args.docker}") stash.Log(f"Docker compose YML file = {parse_args.docker}")
ModulesValidate.modulesInstalled(["pyyaml"], silent=True) ModulesValidate.modulesInstalled(["pyyaml"], silent=True)
import yaml import yaml
dockerStashPath = pathlib.Path(parse_args.docker).resolve().parent dockerStashPath = pathlib.Path(parse_args.docker).resolve().parent
with open(parse_args.docker) as stream: with open(parse_args.docker, "r", encoding='utf-8-sig') as stream:
try: try:
data_loaded = yaml.safe_load(stream) data_loaded = yaml.safe_load(stream)
for volume in data_loaded['services']['stash']['volumes']: for service in data_loaded['services']:
for volume in data_loaded['services'][service]['volumes']:
volSplit = volume.replace(":ro", "").split(":/") volSplit = volume.replace(":ro", "").split(":/")
hostPath = volSplit[0] hostPath = volSplit[0]
if volSplit[0].startswith("./"): if volSplit[0].startswith("./../../"):
dockerStashParentPath = pathlib.Path(dockerStashPath).resolve().parent
hostPath = f"{pathlib.Path(dockerStashParentPath).resolve().parent}{hostPath[8:]}"
elif volSplit[0].startswith("./../"):
hostPath = f"{pathlib.Path(dockerStashPath).resolve().parent}{hostPath[5:]}"
elif volSplit[0].startswith("./"):
hostPath = f"{dockerStashPath}{hostPath[1:]}" hostPath = f"{dockerStashPath}{hostPath[1:]}"
elif volSplit[0].startswith("/"): elif volSplit[0].startswith("/"):
continue continue
@@ -128,8 +135,10 @@ if not parse_args.docker == None and len(parse_args.docker) > 0:
dockerReverseMapVolumes[f"/{volSplit[1]}"] = hostPath dockerReverseMapVolumes[f"/{volSplit[1]}"] = hostPath
for hostPath in dockerMapVolumes: for hostPath in dockerMapVolumes:
stash.Log(f"Host-Path = {hostPath}, Docker-Path = {dockerMapVolumes[hostPath]}") stash.Log(f"Host-Path = {hostPath}, Docker-Path = {dockerMapVolumes[hostPath]}")
except yaml.YAMLError as exc: except yaml.YAMLError as e:
stash.Error(exc) import traceback
tb = traceback.format_exc()
stash.Error(f"Exception while parsing Docker file {parse_args.docker}; Error: {e}\nTraceBack={tb}")
if stash.DRY_RUN: if stash.DRY_RUN:
stash.Log("Dry run mode is enabled.") stash.Log("Dry run mode is enabled.")
@@ -636,14 +645,19 @@ def start_library_monitor():
for path in includePathChanges: for path in includePathChanges:
pathToObserve = path pathToObserve = path
if not parse_args.docker == None and len(parse_args.docker) > 0: if not parse_args.docker == None and len(parse_args.docker) > 0:
if path in dockerReverseMapVolumes: if not pathToObserve.startswith("/"):
pathToObserve = dockerReverseMapVolumes[path] pathToObserve = f"/{pathToObserve}"
stash.Debug(f"Converting Docker path '{pathToObserve}' to Host-path; original-path={path}")
if pathToObserve in dockerReverseMapVolumes:
pathToObserve = dockerReverseMapVolumes[pathToObserve]
for dockerPath in dockerReverseMapVolumes: for dockerPath in dockerReverseMapVolumes:
if path.startswith(f"{dockerPath}/"): if pathToObserve.startswith(f"{dockerPath}/"):
pathToObserve = path.replace(f"{dockerPath}/", f"{dockerReverseMapVolumes[dockerPath]}/") pathToObserve = pathToObserve.replace(f"{dockerPath}/", f"{dockerReverseMapVolumes[dockerPath]}/")
break break
observer.schedule(event_handler, pathToObserve, recursive=RECURSIVE) pathToObserve = pathToObserve.replace('/', os.sep)
dockerObservedPaths[f"{pathToObserve}{os.sep}"] = path
stash.Log(f"Observing {pathToObserve}") stash.Log(f"Observing {pathToObserve}")
observer.schedule(event_handler, pathToObserve, recursive=RECURSIVE)
observer.schedule(event_handler, SPECIAL_FILE_DIR, recursive=RECURSIVE) observer.schedule(event_handler, SPECIAL_FILE_DIR, recursive=RECURSIVE)
stash.Trace(f"Observing FileMonitor path {SPECIAL_FILE_DIR}") stash.Trace(f"Observing FileMonitor path {SPECIAL_FILE_DIR}")
observer.start() observer.start()
@@ -707,6 +721,7 @@ def start_library_monitor():
TargetPaths = [] TargetPaths = []
TmpTargetPaths = list(set(TmpTargetPaths)) TmpTargetPaths = list(set(TmpTargetPaths))
if TmpTargetPaths != [] or lastScanJob['DelayedProcessTargetPaths'] != []: if TmpTargetPaths != [] or lastScanJob['DelayedProcessTargetPaths'] != []:
# ToDo: Add check to see if Docker Map path
stash.Log(f"Triggering Stash scan for path(s) {TmpTargetPaths} and/or {lastScanJob['DelayedProcessTargetPaths']}") stash.Log(f"Triggering Stash scan for path(s) {TmpTargetPaths} and/or {lastScanJob['DelayedProcessTargetPaths']}")
if lastScanJob['DelayedProcessTargetPaths'] != [] or len(TmpTargetPaths) > 1 or TmpTargetPaths[0] != SPECIAL_FILE_DIR: if lastScanJob['DelayedProcessTargetPaths'] != [] or len(TmpTargetPaths) > 1 or TmpTargetPaths[0] != SPECIAL_FILE_DIR:
if not stash.DRY_RUN: if not stash.DRY_RUN: