fixed up a few issues found from linter

This commit is contained in:
2021-03-19 17:38:46 +11:00
parent 517069c709
commit ef0971f6a3

View File

@@ -426,19 +426,6 @@ def JobForceScan(job):
session.commit() session.commit()
return return
def SymlinkName(path, file):
sig_bit=file.replace(path, "")
last_dir=os.path.basename(path[0:-1])
if sig_bit[-1] == '/':
last_bit = os.path.dirname(sig_bit)[0:-1]
else:
last_bit = os.path.dirname(sig_bit)
symlink = 'static/'+last_dir+'/'+last_bit
if symlink[-1] == '/':
symlink=symlink[0:-1]
return symlink
# to serve static content of the images, we create a symlink from inside the static subdir of each import_path that exists # to serve static content of the images, we create a symlink from inside the static subdir of each import_path that exists
def CreateSymlink(job,path): def CreateSymlink(job,path):
symlink='static/{}'.format(os.path.basename(path[0:-1])) symlink='static/{}'.format(os.path.basename(path[0:-1]))
@@ -506,7 +493,7 @@ def HandleAnyFSDeletions(job):
rmdirs = session.query(Entry).filter(Entry.exists_on_fs==False,Entry.type_id==1).order_by(Entry.id.desc()).all() rmdirs = session.query(Entry).filter(Entry.exists_on_fs==False,Entry.type_id==1).order_by(Entry.id.desc()).all()
for rmdir in rmdirs: for rmdir in rmdirs:
print(f"We have a directory ({rmdir.name}) to delete from DB as it no longer exists on fs"); print(f"We have a directory ({rmdir.name}) to delete from DB as it no longer exists on fs")
session.query(EntryDirLink).filter(EntryDirLink.entry_id==rmdir.id).delete() session.query(EntryDirLink).filter(EntryDirLink.entry_id==rmdir.id).delete()
session.query(Dir).filter(Dir.eid==rmdir.id).delete() session.query(Dir).filter(Dir.eid==rmdir.id).delete()
session.query(Entry).filter(Entry.id==rmdir.id).delete() session.query(Entry).filter(Entry.id==rmdir.id).delete()
@@ -532,7 +519,7 @@ def GetDateFromFile(file, stat):
except: except:
# try parsing filename # try parsing filename
try: try:
m=re.search( '(\d{4})(\d{2})(\d{2})', file) m=re.search( r'(\d{4})(\d{2})(\d{2})', file)
year=int(m[1]) year=int(m[1])
month=int(m[2]) month=int(m[2])
day=int(m[3]) day=int(m[3])
@@ -793,7 +780,7 @@ def isVideo(file):
if track.track_type == "Video": if track.track_type == "Video":
return True return True
return False return False
except Exception as e: except Exception:
return False return False
# Returns an md5 hash of the fnames' contents # Returns an md5 hash of the fnames' contents
@@ -808,7 +795,7 @@ def md5(job, fname):
def isImage(file): def isImage(file):
try: try:
img = Image.open(file) Image.open(file)
return True return True
except: except:
return False return False
@@ -874,7 +861,6 @@ def CheckForDups(job):
def RemoveDups(job): def RemoveDups(job):
# clear FE message we are deleting dups for this now... # clear FE message we are deleting dups for this now...
fe_msg_id =[jex.value for jex in job.extra if jex.name == "fe_msg_id"][0] fe_msg_id =[jex.value for jex in job.extra if jex.name == "fe_msg_id"][0]
msg=session.query(PA_JobManager_FE_Message).get(fe_msg_id)
session.query(PA_JobManager_FE_Message).filter(PA_JobManager_FE_Message.id==fe_msg_id).delete() session.query(PA_JobManager_FE_Message).filter(PA_JobManager_FE_Message.id==fe_msg_id).delete()
session.commit() session.commit()