github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 05:13:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-order torrentToMedia. fixes #185 #210 #218

Browse source
This commit is contained in:
clinton-hall 2013-12-09 14:33:26 +10:30
commit cb435de331
1 changed files with 108 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

178
TorrentToMedia.py
View file

@ -34,6 +34,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
foundFile = int(0) foundFile = int(0)
extracted_folder = [] extracted_folder = []
extractionSuccess = False extractionSuccess = False
copy_list = []
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)
if inputCategory == sbCategory and sbFork in SICKBEARD_TORRENT: if inputCategory == sbCategory and sbFork in SICKBEARD_TORRENT:
@ -49,9 +50,6 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
outputDestination = "" outputDestination = ""
for category in categories: for category in categories:
if category == inputCategory: if category == inputCategory:
if inputCategory == hpCategory:
outputDestination = inputDirectory #HP needs to scan the same dir as passed to downloader.
break
if os.path.basename(inputDirectory) == inputName: if os.path.basename(inputDirectory) == inputName:
Logger.info("MAIN: Download is a directory") Logger.info("MAIN: Download is a directory")
outputDestination = os.path.normpath(os.path.join(outputDirectory, category, safeName(inputName))) outputDestination = os.path.normpath(os.path.join(outputDirectory, category, safeName(inputName)))
@ -63,14 +61,52 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
else: else:
continue continue
if outputDestination == "": if outputDestination == "":
if inputCategory == "":
inputCategory = "UNCAT"
if os.path.basename(inputDirectory) == inputName: if os.path.basename(inputDirectory) == inputName:
Logger.info("MAIN: Download is a directory") Logger.info("MAIN: Download is a directory")
outputDestination = os.path.normpath(os.path.join(outputDirectory, safeName(inputName))) outputDestination = os.path.normpath(os.path.join(outputDirectory, inputCategory, safeName(inputName)))
else: else:
Logger.info("MAIN: Download is not a directory") Logger.info("MAIN: Download is not a directory")
outputDestination = os.path.normpath(os.path.join(outputDirectory, os.path.splitext(safeName(inputName))[0])) outputDestination = os.path.normpath(os.path.join(outputDirectory, inputCategory, os.path.splitext(safeName(inputName))[0]))
Logger.info("MAIN: Output directory set to: %s", outputDestination) Logger.info("MAIN: Output directory set to: %s", outputDestination)
processOnly = [cpsCategory, sbCategory, hpCategory, mlCategory, gzCategory]
if not "NONE" in user_script_categories: # if None, we only process the 5 listed.
if "ALL" in user_script_categories: # All defined categories
processOnly = categories
processOnly.extend(user_script_categories) # Adds all categories to be processed by userscript.
if not inputCategory in processOnly:
Logger.info("MAIN: No processing to be done for category: %s. Exiting", inputCategory)
Logger.info("MAIN: All done.")
sys.exit()
# Hardlink solution for uTorrent, need to implent support for deluge, transmission
if clientAgent in ['utorrent', 'transmission'] and inputHash and useLink != "no":
if clientAgent == 'utorrent':
try:
Logger.debug("MAIN: Connecting to %s: %s", clientAgent, uTorrentWEBui)
utorrentClass = UTorrentClient(uTorrentWEBui, uTorrentUSR, uTorrentPWD)
except:
Logger.exception("MAIN: Failed to connect to uTorrent")
utorrentClass = ""
if clientAgent == 'transmission':
try:
Logger.debug("MAIN: Connecting to %s: http://%s:%s", clientAgent, TransmissionHost, TransmissionPort)
TransmissionClass = TransmissionClient(TransmissionHost, TransmissionPort, TransmissionUSR, TransmissionPWD)
except:
Logger.exception("MAIN: Failed to connect to Transmission")
TransmissionClass = ""
# if we are using links with uTorrent it means we need to pause it in order to access the files
Logger.debug("MAIN: Stoping torrent %s in %s while processing", inputName, clientAgent)
if clientAgent == 'utorrent' and utorrentClass != "":
utorrentClass.stop(inputHash)
if clientAgent == 'transmission' and TransmissionClass !="":
TransmissionClass.stop_torrent(inputID)
time.sleep(5) # Give Torrent client some time to catch up with the change
Logger.debug("MAIN: Scanning files in directory: %s", inputDirectory) Logger.debug("MAIN: Scanning files in directory: %s", inputDirectory)
now = datetime.datetime.now() now = datetime.datetime.now()
@ -102,11 +138,8 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
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
if not inputCategory in [cpsCategory, sbCategory, hpCategory]: #process all for non-video categories, except HP. if fileExtension in mediaContainer: # If the file is a video file
Logger.info("MAIN: Found file %s for category %s", filePath, inputCategory) if is_sample(filePath, inputName, minSampleSize) and not inputCategory == hpCategory: # Ignore samples
copy_link(filePath, targetDirectory, useLink, outputDestination)
elif fileExtension in mediaContainer and not inputCategory == hpCategory: # If the file is a video file
if is_sample(filePath, inputName, minSampleSize): # Ignore samples
Logger.info("MAIN: Ignoring sample file: %s ", filePath) Logger.info("MAIN: Ignoring sample file: %s ", filePath)
continue continue
else: else:
@ -114,15 +147,25 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
Logger.info("MAIN: Found video file %s in %s", fileExtension, filePath) Logger.info("MAIN: Found video file %s in %s", fileExtension, filePath)
try: try:
copy_link(filePath, targetDirectory, useLink, outputDestination) copy_link(filePath, targetDirectory, useLink, outputDestination)
copy_list.append([filePath, os.path.join(outputDestination, file)])
except: except:
Logger.exception("MAIN: Failed to link file: %s", file) Logger.exception("MAIN: Failed to link file: %s", file)
elif fileExtension in metaContainer and not inputCategory == hpCategory: elif fileExtension in metaContainer:
Logger.info("MAIN: Found metadata file %s for file %s", fileExtension, filePath) Logger.info("MAIN: Found metadata file %s for file %s", fileExtension, filePath)
try: try:
copy_link(filePath, targetDirectory, useLink, outputDestination) copy_link(filePath, targetDirectory, useLink, outputDestination)
copy_list.append([filePath, os.path.join(outputDestination, file)])
except: except:
Logger.exception("MAIN: Failed to link file: %s", file) Logger.exception("MAIN: Failed to link file: %s", file)
continue
elif fileExtension in compressedContainer: elif fileExtension in compressedContainer:
if inputCategory in [hpCategory]: # We need to link all files for HP in order to move these back to support seeding.
Logger.info("MAIN: Linking compressed archive file %s for file %s", fileExtension, filePath)
try:
copy_link(filePath, targetDirectory, useLink, outputDestination)
copy_list.append([filePath, os.path.join(outputDestination, file)])
except:
Logger.exception("MAIN: Failed to link file: %s", file)
# find part numbers in second "extension" from right, if we have more than 1 compressed file in the same directory. # find part numbers in second "extension" from right, if we have more than 1 compressed file in the same directory.
if re.search(r'\d+', os.path.splitext(fileName)[1]) and os.path.dirname(filePath) in extracted_folder and not (os.path.splitext(fileName)[1] in ['.720p','.1080p']): if re.search(r'\d+', os.path.splitext(fileName)[1]) and os.path.dirname(filePath) in extracted_folder and not (os.path.splitext(fileName)[1] in ['.720p','.1080p']):
part = int(re.search(r'\d+', os.path.splitext(fileName)[1]).group()) part = int(re.search(r'\d+', os.path.splitext(fileName)[1]).group())
@ -133,69 +176,50 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
continue continue
Logger.info("MAIN: Found compressed archive %s for file %s", fileExtension, filePath) Logger.info("MAIN: Found compressed archive %s for file %s", fileExtension, filePath)
try: try:
extractor.extract(filePath, outputDestination) if inputCategory == hpCategory: # HP needs to scan the same dir as passed to downloader.
extractor.extract(filePath, inputDirectory)
else:
extractor.extract(filePath, outputDestination)
extractionSuccess = True # we use this variable to determine if we need to pause a torrent or not in uTorrent (don't need to pause archived content) extractionSuccess = True # we use this variable to determine if we need to pause a torrent or not in uTorrent (don't need to pause archived content)
extracted_folder.append(os.path.dirname(filePath)) extracted_folder.append(os.path.dirname(filePath))
except: except:
Logger.exception("MAIN: Extraction failed for: %s", file) Logger.exception("MAIN: Extraction failed for: %s", file)
elif inputCategory == hpCategory: continue
elif not inputCategory in [cpsCategory, sbCategory]: #process all for non-video categories.
Logger.info("MAIN: Found file %s for category %s", filePath, inputCategory)
copy_link(filePath, targetDirectory, useLink, outputDestination)
copy_list.append([filePath, os.path.join(outputDestination, file)])
continue continue
else: else:
Logger.debug("MAIN: Ignoring unknown filetype %s for file %s", fileExtension, filePath) Logger.debug("MAIN: Ignoring unknown filetype %s for file %s", fileExtension, filePath)
continue continue
if not inputCategory in [hpCategory]: #don't flatten hp in case multi cd albums. if not inputCategory in [hpCategory]: #don't flatten hp in case multi cd albums, and we need to copy this back later.
flatten(outputDestination) flatten(outputDestination)
# Now check if movie files exist in destination: # Now check if movie files exist in destination:
for dirpath, dirnames, filenames in os.walk(outputDestination): if inputCategory in [cpsCategory, sbCategory]:
for file in filenames: for dirpath, dirnames, filenames in os.walk(outputDestination):
filePath = os.path.join(dirpath, file) for file in filenames:
fileName, fileExtension = os.path.splitext(file) filePath = os.path.join(dirpath, file)
if fileExtension in mediaContainer: # If the file is a video file fileName, fileExtension = os.path.splitext(file)
if is_sample(filePath, inputName, minSampleSize): if fileExtension in mediaContainer: # If the file is a video file
Logger.debug("MAIN: Removing sample file: %s", filePath) if is_sample(filePath, inputName, minSampleSize):
os.unlink(filePath) # remove samples Logger.debug("MAIN: Removing sample file: %s", filePath)
os.unlink(filePath) # remove samples
else:
Logger.debug("MAIN: Found media file: %s", filePath)
video2 = video2 + 1
else: else:
Logger.debug("MAIN: Found media file: %s", filePath) Logger.debug("MAIN: File %s is not a media file", filePath)
video2 = video2 + 1 if video2 >= video and video2 > int(0): # Check that all video files were moved
else: Logger.debug("MAIN: Found %s media files", str(video2))
Logger.debug("MAIN: File %s is not a media file", filePath) status = int(0)
if video2 >= video and video2 > int(0): # Check that all video files were moved else:
Logger.debug("MAIN: Found %s media files", str(video2)) Logger.debug("MAIN: Found %s media files in output. %s were found in input", str(video2), str(video))
status = int(0)
else:
Logger.debug("MAIN: Found %s media files in output. %s were found in input", str(video2), str(video))
# Hardlink solution for uTorrent, need to implent support for deluge, transmission
if clientAgent in ['utorrent', 'transmission'] and inputHash and useLink != "no":
if clientAgent == 'utorrent':
try:
Logger.debug("MAIN: Connecting to %s: %s", clientAgent, uTorrentWEBui)
utorrentClass = UTorrentClient(uTorrentWEBui, uTorrentUSR, uTorrentPWD)
except:
Logger.exception("MAIN: Failed to connect to uTorrent")
utorrentClass = ""
if clientAgent == 'transmission':
try:
Logger.debug("MAIN: Connecting to %s: http://%s:%s", clientAgent, TransmissionHost, TransmissionPort)
TransmissionClass = TransmissionClient(TransmissionHost, TransmissionPort, TransmissionUSR, TransmissionPWD)
except:
Logger.exception("MAIN: Failed to connect to Transmission")
TransmissionClass = ""
# if we are using links with uTorrent it means we need to pause it in order to access the files
Logger.debug("MAIN: Stoping torrent %s in %s while processing", inputName, clientAgent)
if clientAgent == 'utorrent' and utorrentClass != "":
utorrentClass.stop(inputHash)
if clientAgent == 'transmission' and TransmissionClass !="":
TransmissionClass.stop_torrent(inputID)
time.sleep(5) # Give Torrent client some time to catch up with the change
processCategories = Set([cpsCategory, sbCategory, hpCategory, mlCategory, gzCategory]) processCategories = Set([cpsCategory, sbCategory, hpCategory, mlCategory, gzCategory])
if inputCategory == "":
inputCategory = "UNCAT"
if (user_script_categories != "NONE" and inputCategory in user_script_categories) or (user_script_categories == "ALL" and not inputCategory in processCategories): if (inputCategory in user_script_categories and not "NONE" in user_script_categories) or ("ALL" in user_script_categories and not inputCategory in processCategories):
Logger.info("MAIN: Processing user script %s.", user_script) Logger.info("MAIN: Processing user script %s.", user_script)
result = external_script(outputDestination) result = external_script(outputDestination)
elif status == int(0) or (inputCategory in [hpCategory, mlCategory, gzCategory]): # if movies linked/extracted or for other categories. elif status == int(0) or (inputCategory in [hpCategory, mlCategory, gzCategory]): # if movies linked/extracted or for other categories.
@ -214,7 +238,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
result = autoProcessTV.processEpisode(outputDestination, inputName, status) result = autoProcessTV.processEpisode(outputDestination, inputName, status)
elif inputCategory == hpCategory: elif inputCategory == hpCategory:
Logger.info("MAIN: Calling HeadPhones to post-process: %s", inputName) Logger.info("MAIN: Calling HeadPhones to post-process: %s", inputName)
result = autoProcessMusic.process(outputDestination, inputName, status) result = autoProcessMusic.process(inputDirectory, inputName, status)
elif inputCategory == mlCategory: elif inputCategory == mlCategory:
Logger.info("MAIN: Calling Mylar to post-process: %s", inputName) Logger.info("MAIN: Calling Mylar to post-process: %s", inputName)
result = autoProcessComics.processEpisode(outputDestination, inputName, status) result = autoProcessComics.processEpisode(outputDestination, inputName, status)
@ -225,15 +249,22 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
if result == 1: if result == 1:
Logger.info("MAIN: A problem was reported in the autoProcess* script. If torrent was paused we will resume seeding") Logger.info("MAIN: A problem was reported in the autoProcess* script. If torrent was paused we will resume seeding")
if inputCategory == hpCategory:
# we need to move the output dir files back...
Logger.debug("MAIN: Moving temporary HeadPhones files back to allow seeding.")
for item in copy_list:
if os.path.isfile(item[1]): # check to ensure temp files still exist.
if os.path.isfile(item[0]): # both exist, remove temp version
Logger.debug("MAIN: File %s still present. Removing tempoary file %s", str(item[0]), str(item[1])
os.unlink(item[1])
continue
else: # move temp version back to allow seeding or Torrent removal.
Logger.debug("MAIN: Moving %s to %s", str(item[1]), str(item[0])
shutil.move(item[1], item[0])
continue
# Hardlink solution for uTorrent, need to implent support for deluge, transmission # Hardlink solution for uTorrent, need to implent support for deluge, transmission
if clientAgent in ['utorrent', 'transmission'] and inputHash and useLink != "no": if clientAgent in ['utorrent', 'transmission'] and inputHash and useLink != "no":
# we always want to resume seeding, for now manually find out what is wrong when extraction fails
if deleteOriginal == 0:
Logger.debug("MAIN: Starting torrent %s in %s", inputName, clientAgent)
if clientAgent == 'utorrent' and utorrentClass != "":
utorrentClass.start(inputHash)
if clientAgent == 'transmission' and TransmissionClass !="":
TransmissionClass.start_torrent(inputID)
# Delete torrent and torrentdata from Torrent client if processing was successful. # Delete torrent and torrentdata from Torrent client if processing was successful.
if deleteOriginal == 1 and result != 1: if deleteOriginal == 1 and result != 1:
Logger.debug("MAIN: Deleting torrent %s from %s", inputName, clientAgent) Logger.debug("MAIN: Deleting torrent %s from %s", inputName, clientAgent)
@ -246,7 +277,14 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID):
TransmissionClass.remove_torrent(inputID, False) TransmissionClass.remove_torrent(inputID, False)
else: else:
TransmissionClass.remove_torrent(inputID, True) TransmissionClass.remove_torrent(inputID, True)
time.sleep(5) # we always want to resume seeding, for now manually find out what is wrong when extraction fails
else:
Logger.debug("MAIN: Starting torrent %s in %s", inputName, clientAgent)
if clientAgent == 'utorrent' and utorrentClass != "":
utorrentClass.start(inputHash)
if clientAgent == 'transmission' and TransmissionClass !="":
TransmissionClass.start_torrent(inputID)
time.sleep(5)
#cleanup #cleanup
if inputCategory in processCategories and result == 0 and os.path.isdir(outputDestination): if inputCategory in processCategories and result == 0 and os.path.isdir(outputDestination):
num_files_new = int(0) num_files_new = int(0)
@ -386,8 +424,8 @@ if __name__ == "__main__":
categories.append(mlCategory) categories.append(mlCategory)
categories.append(gzCategory) categories.append(gzCategory)
user_script_categories = config.get("UserScript", "user_script_categories") # NONE user_script_categories = config.get("UserScript", "user_script_categories").split(',') # NONE
if user_script_categories != "None": if not "NONE" in user_script_categories:
user_script_mediaExtensions = (config.get("UserScript", "user_script_mediaExtensions")).split(',') user_script_mediaExtensions = (config.get("UserScript", "user_script_mediaExtensions")).split(',')
user_script = config.get("UserScript", "user_script_path") user_script = config.get("UserScript", "user_script_path")
user_script_param = (config.get("UserScript", "user_script_param")).split(',') user_script_param = (config.get("UserScript", "user_script_param")).split(',')