stop the loop when found the correct file

This commit is contained in:
Joel Kåberg 2013-03-25 10:15:41 +01:00
commit f1a9d62fde

View file

@ -31,6 +31,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash):
root = int(0) root = int(0)
video = int(0) video = int(0)
video2 = int(0) video2 = int(0)
foundFile = int(0)
extractionSuccess = False extractionSuccess = False
Logger.debug("MAIN: Received Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory) Logger.debug("MAIN: Received Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory)
@ -57,8 +58,9 @@ def main(inputDirectory, inputName, inputCategory, inputHash):
if root == 1: if root == 1:
Logger.debug("MAIN: Looking for %s in filename", inputName) Logger.debug("MAIN: Looking for %s in filename", inputName)
if (safeName(inputName) in safeName(file)) or (safeName(os.path.splitext(file)[0]) in safeName(inputName)): if (safeName(inputName) in safeName(file)) or (safeName(os.path.splitext(file)[0]) in safeName(inputName)) and foundFile = 0:
pass # This file does match the Torrent name pass # This file does match the Torrent name
foundFile = 1
Logger.debug("Found file %s that matches Torrent Name %s", file, inputName) Logger.debug("Found file %s that matches Torrent Name %s", file, inputName)
else: else:
continue # This file does not match the Torrent name, skip it continue # This file does not match the Torrent name, skip it
@ -67,8 +69,9 @@ def main(inputDirectory, inputName, inputCategory, inputHash):
Logger.debug("MAIN: Looking for files with modified/created dates less than 5 minutes old.") Logger.debug("MAIN: Looking for files with modified/created dates less than 5 minutes old.")
mtime_lapse = now - datetime.datetime.fromtimestamp(os.path.getmtime(os.path.join(dirpath, file))) mtime_lapse = now - datetime.datetime.fromtimestamp(os.path.getmtime(os.path.join(dirpath, file)))
ctime_lapse = now - datetime.datetime.fromtimestamp(os.path.getctime(os.path.join(dirpath, file))) ctime_lapse = now - datetime.datetime.fromtimestamp(os.path.getctime(os.path.join(dirpath, file)))
if (mtime_lapse < datetime.timedelta(minutes=5)) or (ctime_lapse < datetime.timedelta(minutes=5)): if (mtime_lapse < datetime.timedelta(minutes=5)) or (ctime_lapse < datetime.timedelta(minutes=5)) and foundFile = 0:
pass # This file does match the date time criteria pass # This file does match the date time criteria
foundFile = 1
Logger.debug("Found file %s with date modifed/created less than 5 minutes ago.", file) Logger.debug("Found file %s with date modifed/created less than 5 minutes ago.", file)
else: else:
continue # This file has not been recently moved or created, skip it continue # This file has not been recently moved or created, skip it