ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of mara.ddp.net:photoassistant

Browse Source
This commit is contained in:
Cameron De Paoli
2021-01-21 15:25:29 +11:00
parent bcb876f475 a9819c613b
commit fae655073a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pa_job_manager.py
View File

@@ -307,7 +307,7 @@ def SymlinkName(path, file):
else: else:
last_bit = os.path.dirname(sig_bit) last_bit = os.path.dirname(sig_bit)
symlink = 'static'+'/'+last_dir+'/'+last_bit symlink = 'static'+'/'+last_dir+'/'+last_bit
if symlink[-1] == os.path.sep: if symlink[-1] == '/':
symlink=symlink[0:-1] symlink=symlink[0:-1]
return symlink return symlink
@@ -387,9 +387,6 @@ def JobImportDir(job):
fname=file.replace(path, "") fname=file.replace(path, "")
stat = os.stat(file) stat = os.stat(file)
dirname=SymlinkName(path, file) dirname=SymlinkName(path, file)
# hack to cater for windows paths and my keep_dirs dict
if 'c:' in jex.value:
dirname=dirname.replace('\\','/')
if stat.st_ctime > keep_dirs[dirname].last_import_date: if stat.st_ctime > keep_dirs[dirname].last_import_date:
if DEBUG==1: if DEBUG==1:
AddLogForJob(job, "DEBUG: {} - {} is newer than {}".format( file, stat.st_ctime, keep_dirs[dirname].last_import_date ), file ) AddLogForJob(job, "DEBUG: {} - {} is newer than {}".format( file, stat.st_ctime, keep_dirs[dirname].last_import_date ), file )