mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-20 13:23:18 -07:00
Cleaned up code and fixed a few small bugs.
This commit is contained in:
echel0n
parent
4bd04436bc
commit
289d451112
11 changed files with 274 additions and 286 deletions
|
|
@ -9,12 +9,11 @@ import nzbtomedia
|
|||
from subprocess import Popen
|
||||
from nzbtomedia import logger, nzbToMediaDB
|
||||
|
||||
|
||||
def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID, clientAgent):
|
||||
status = 1 # 1 = failed | 0 = success
|
||||
root = 0
|
||||
video = 0
|
||||
foundFile = 0
|
||||
copy_list = []
|
||||
|
||||
if clientAgent != 'manual':
|
||||
logger.debug('Adding TORRENT download info for directory %s to database' % (inputDirectory))
|
||||
|
|
@ -33,39 +32,56 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
|
||||
logger.debug("Received Directory: %s | Name: %s | Category: %s" % (inputDirectory, inputName, inputCategory))
|
||||
|
||||
inputDirectory, inputName, inputCategory, root, single = nzbtomedia.category_search(inputDirectory, inputName, inputCategory, root, nzbtomedia.CATEGORIES) # Confirm the category by parsing directory structure
|
||||
inputDirectory, inputName, inputCategory, root, single = nzbtomedia.category_search(inputDirectory, inputName,
|
||||
inputCategory, root,
|
||||
nzbtomedia.CATEGORIES) # Confirm the category by parsing directory structure
|
||||
|
||||
logger.debug("Determined Directory: %s | Name: %s | Category: %s" % (inputDirectory, inputName, inputCategory))
|
||||
|
||||
# Add torrent info hash to folder name incase we need it later on
|
||||
# auto-detect section
|
||||
section = nzbtomedia.CFG.findsection(inputCategory)
|
||||
if not section:
|
||||
if len(section) > 1:
|
||||
logger.error(
|
||||
"We could not find a section with containing a download category labeled %s in your autoProcessMedia.cfg, Exiting!" % inputCategory)
|
||||
'Category:[%s] is not unique, %s are using it. Please rename it or disable all other sections using the same category name in your autoProcessMedia.cfg and try again.' % (
|
||||
inputCategory, section.keys()))
|
||||
return -1
|
||||
|
||||
try:Torrent_NoLink = int(nzbtomedia.CFG[section][inputCategory]["Torrent_NoLink"])
|
||||
except:Torrent_NoLink = 0
|
||||
if section:
|
||||
sectionName = section.keys()[0]
|
||||
logger.info('Auto-detected SECTION:%s' % (sectionName))
|
||||
else:
|
||||
logger.error("Unable to locate a section with subsection:%s enabled in your autoProcessMedia.cfg, exiting!" % (
|
||||
inputCategory))
|
||||
return -1
|
||||
|
||||
try:extract = int(nzbtomedia.CFG[section][inputCategory]['extract'])
|
||||
except:extract = 0
|
||||
try:
|
||||
Torrent_NoLink = int(section[inputCategory]["Torrent_NoLink"])
|
||||
except:
|
||||
Torrent_NoLink = 0
|
||||
|
||||
try:
|
||||
extract = int(section[inputCategory]['extract'])
|
||||
except:
|
||||
extract = 0
|
||||
|
||||
if clientAgent != 'manual':
|
||||
nzbtomedia.pause_torrent(clientAgent, inputHash, inputID, inputName)
|
||||
|
||||
processCategories = nzbtomedia.CFG[nzbtomedia.SECTIONS].sections
|
||||
processCategories = nzbtomedia.CATEGORIES
|
||||
processOnly = processCategories
|
||||
|
||||
if inputCategory == "":
|
||||
inputCategory = "UNCAT"
|
||||
outputDestination = os.path.normpath(nzbtomedia.os.path.join(nzbtomedia.OUTPUTDIRECTORY, inputCategory, nzbtomedia.sanitizeName(inputName)))
|
||||
|
||||
outputDestination = os.path.normpath(
|
||||
nzbtomedia.os.path.join(nzbtomedia.OUTPUTDIRECTORY, inputCategory, nzbtomedia.sanitizeName(inputName)))
|
||||
|
||||
logger.info("Output directory set to: %s" % (outputDestination))
|
||||
|
||||
processOnly = nzbtomedia.CFG[nzbtomedia.SECTIONS].sections
|
||||
if not "NONE" in nzbtomedia.USER_SCRIPT_CATEGORIES: # if None, we only process the 5 listed.
|
||||
if "ALL" in nzbtomedia.USER_SCRIPT_CATEGORIES: # All defined categories
|
||||
if not "NONE" in nzbtomedia.USER_SCRIPT_CATEGORIES: # if None, we only process the 5 listed.
|
||||
if "ALL" in nzbtomedia.USER_SCRIPT_CATEGORIES: # All defined categories
|
||||
processOnly = nzbtomedia.CATEGORIES
|
||||
processOnly.extend(nzbtomedia.USER_SCRIPT_CATEGORIES) # Adds all categories to be processed by userscript.
|
||||
processOnly.extend(nzbtomedia.USER_SCRIPT_CATEGORIES) # Adds all categories to be processed by userscript.
|
||||
|
||||
if not inputCategory in processOnly:
|
||||
logger.info("No processing to be done for category: %s. Exiting" % (inputCategory))
|
||||
|
|
@ -73,8 +89,9 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
|
||||
logger.debug("Scanning files in directory: %s" % (inputDirectory))
|
||||
|
||||
if nzbtomedia.CFG["HeadPhones"][inputCategory]:
|
||||
nzbtomedia.NOFLATTEN.extend(nzbtomedia.CFG["HeadPhones"].sections) # Make sure we preserve folder structure for HeadPhones.
|
||||
if sectionName == 'HeadPhones':
|
||||
nzbtomedia.NOFLATTEN.extend(
|
||||
section.sections) # Make sure we preserve folder structure for HeadPhones.
|
||||
|
||||
now = datetime.datetime.now()
|
||||
|
||||
|
|
@ -88,13 +105,16 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
targetFile = nzbtomedia.os.path.join(outputDestination, fullFileName)
|
||||
if inputCategory in nzbtomedia.NOFLATTEN:
|
||||
if not os.path.basename(filePath) in outputDestination:
|
||||
targetFile = nzbtomedia.os.path.join(nzbtomedia.os.path.join(outputDestination, os.path.basename(filePath)), fullFileName)
|
||||
logger.debug("Setting outputDestination to %s to preserve folder structure" % (os.path.dirname(targetFile)))
|
||||
targetFile = nzbtomedia.os.path.join(
|
||||
nzbtomedia.os.path.join(outputDestination, os.path.basename(filePath)), fullFileName)
|
||||
logger.debug(
|
||||
"Setting outputDestination to %s to preserve folder structure" % (os.path.dirname(targetFile)))
|
||||
|
||||
if root == 1:
|
||||
if not foundFile:
|
||||
logger.debug("Looking for %s in: %s" % (inputName, fullFileName))
|
||||
if (nzbtomedia.sanitizeName(inputName) in nzbtomedia.sanitizeName(fullFileName)) or (nzbtomedia.sanitizeName(fileName) in nzbtomedia.sanitizeName(inputName)):
|
||||
if (nzbtomedia.sanitizeName(inputName) in nzbtomedia.sanitizeName(fullFileName)) or (
|
||||
nzbtomedia.sanitizeName(fileName) in nzbtomedia.sanitizeName(inputName)):
|
||||
foundFile = True
|
||||
logger.debug("Found file %s that matches Torrent Name %s" % (fullFileName, inputName))
|
||||
else:
|
||||
|
|
@ -107,7 +127,6 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
if not foundFile:
|
||||
logger.debug("Looking for files with modified/created dates less than 5 minutes old.")
|
||||
if (mtime_lapse < datetime.timedelta(minutes=5)) or (ctime_lapse < datetime.timedelta(minutes=5)):
|
||||
#pass # This file does match the date time criteria
|
||||
foundFile = True
|
||||
logger.debug("Found file %s with date modifed/created less than 5 minutes ago." % (fullFileName))
|
||||
else:
|
||||
|
|
@ -120,7 +139,7 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
except:
|
||||
logger.error("Failed to link: %s to %s" % (inputFile, targetFile))
|
||||
|
||||
if not inputCategory in nzbtomedia.NOFLATTEN: #don't flatten hp in case multi cd albums, and we need to copy this back later.
|
||||
if not inputCategory in nzbtomedia.NOFLATTEN: #don't flatten hp in case multi cd albums, and we need to copy this back later.
|
||||
nzbtomedia.flatten(outputDestination)
|
||||
|
||||
if extract == 1:
|
||||
|
|
@ -128,8 +147,9 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
nzbtomedia.extractFiles(outputDestination)
|
||||
|
||||
# Now check if video files exist in destination:
|
||||
if nzbtomedia.CFG["SickBeard","NzbDrone", "CouchPotato"][inputCategory]:
|
||||
numVideos = len(nzbtomedia.listMediaFiles(outputDestination, media=True, audio=False, meta=False, archives=False))
|
||||
if sectionName in ["SickBeard", "NzbDrone", "CouchPotato"]:
|
||||
numVideos = len(
|
||||
nzbtomedia.listMediaFiles(outputDestination, media=True, audio=False, meta=False, archives=False))
|
||||
if numVideos > 0:
|
||||
logger.info("Found %s media files in %s" % (numVideos, outputDestination))
|
||||
status = 0
|
||||
|
|
@ -137,43 +157,41 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
logger.warning("Found no media files in %s" % outputDestination)
|
||||
|
||||
# Only these sections can handling failed downloads so make sure everything else gets through without the check for failed
|
||||
if not nzbtomedia.CFG['CouchPotato','SickBeard','NzbDrone'][inputCategory]:
|
||||
if not sectionName in ['CouchPotato', 'SickBeard', 'NzbDrone']:
|
||||
status = 0
|
||||
|
||||
result = 0
|
||||
if (inputCategory in nzbtomedia.USER_SCRIPT_CATEGORIES and not "NONE" in nzbtomedia.USER_SCRIPT_CATEGORIES) or ("ALL" in nzbtomedia.USER_SCRIPT_CATEGORIES and not inputCategory in processCategories):
|
||||
if (inputCategory in nzbtomedia.USER_SCRIPT_CATEGORIES and not "NONE" in nzbtomedia.USER_SCRIPT_CATEGORIES) or (
|
||||
"ALL" in nzbtomedia.USER_SCRIPT_CATEGORIES and not inputCategory in processCategories):
|
||||
logger.info("Processing user script %s." % (nzbtomedia.USER_SCRIPT))
|
||||
result = external_script(outputDestination,inputName,inputCategory)
|
||||
result = external_script(outputDestination, inputName, inputCategory)
|
||||
elif status != 0:
|
||||
logger.error("Something failed! Please check logs. Exiting")
|
||||
return status
|
||||
|
||||
logger.info("Calling %s:%s to post-process:%s" % (sectionName, inputCategory, inputName))
|
||||
|
||||
if nzbtomedia.CFG['CouchPotato'][inputCategory]:
|
||||
logger.info("Calling CouchPotato:" + inputCategory + " to post-process: %s" % (inputName))
|
||||
result = nzbtomedia.autoProcessMovie().process(outputDestination, inputName, status, clientAgent, inputHash, inputCategory)
|
||||
elif nzbtomedia.CFG['SickBeard'][inputCategory]:
|
||||
logger.info("Calling Sick-Beard:" + inputCategory + " to post-process: %s" % (inputName))
|
||||
result = nzbtomedia.autoProcessTV().processEpisode(outputDestination, inputName, status, clientAgent, inputCategory)
|
||||
elif nzbtomedia.CFG['NzbDrone'][inputCategory]:
|
||||
logger.info("Calling NzbDrone:" + inputCategory + " to post-process: %s" % (inputName))
|
||||
result = nzbtomedia.autoProcessTV().processEpisode(outputDestination, inputName, status, clientAgent, inputCategory)
|
||||
elif nzbtomedia.CFG['HeadPhones'][inputCategory]:
|
||||
status = 0 #Failed Handling Not Supported
|
||||
logger.info("Calling HeadPhones:" + inputCategory + " to post-process: %s" % (inputName))
|
||||
result = nzbtomedia.autoProcessMusic().process(outputDestination, inputName, status, clientAgent, inputCategory)
|
||||
elif nzbtomedia.CFG['Mylar'][inputCategory]:
|
||||
status = 0 #Failed Handling Not Supported
|
||||
logger.info("Calling Mylar:" + inputCategory + " to post-process: %s" % (inputName))
|
||||
result = nzbtomedia.autoProcessComics().processEpisode(outputDestination, inputName, status, clientAgent, inputCategory)
|
||||
elif nzbtomedia.CFG['Gamez'][inputCategory]:
|
||||
status = 0 #Failed Handling Not Supported
|
||||
logger.info("Calling Gamez:" + inputCategory + " to post-process: %s" % (inputName))
|
||||
result = nzbtomedia.autoProcessGames().process(outputDestination, inputName, status, clientAgent, inputCategory)
|
||||
if sectionName == 'CouchPotato':
|
||||
result = nzbtomedia.autoProcessMovie().process(sectionName,outputDestination, inputName, status, clientAgent, inputHash,
|
||||
inputCategory)
|
||||
elif sectionName == 'SickBeard':
|
||||
result = nzbtomedia.autoProcessTV().processEpisode(sectionName,outputDestination, inputName, status, clientAgent,
|
||||
inputCategory)
|
||||
elif sectionName == 'NzbDrone':
|
||||
result = nzbtomedia.autoProcessTV().processEpisode(sectionName,outputDestination, inputName, status, clientAgent,
|
||||
inputCategory)
|
||||
elif sectionName == 'HeadPhones':
|
||||
result = nzbtomedia.autoProcessMusic().process(sectionName,outputDestination, inputName, status, clientAgent, inputCategory)
|
||||
elif sectionName == 'Mylar':
|
||||
result = nzbtomedia.autoProcessComics().processEpisode(sectionName,outputDestination, inputName, status, clientAgent,
|
||||
inputCategory)
|
||||
elif sectionName == 'Gamez':
|
||||
result = nzbtomedia.autoProcessGames().process(sectionName,outputDestination, inputName, status, clientAgent, inputCategory)
|
||||
|
||||
if result != 0:
|
||||
if clientAgent != 'manual':
|
||||
logger.error("A problem was reported in the autoProcess* script. If torrent was paused we will resume seeding")
|
||||
logger.error(
|
||||
"A problem was reported in the autoProcess* script. If torrent was paused we will resume seeding")
|
||||
nzbtomedia.resume_torrent(clientAgent, inputHash, inputID, inputName)
|
||||
else:
|
||||
if clientAgent != 'manual':
|
||||
|
|
@ -181,16 +199,16 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
|
|||
nzbtomedia.update_downloadInfoStatus(inputName, 1)
|
||||
|
||||
# remove torrent
|
||||
nzbtomedia.remove_torrent(clientAgent,inputHash,inputID,inputName)
|
||||
nzbtomedia.remove_torrent(clientAgent, inputHash, inputID, inputName)
|
||||
|
||||
# cleanup our processing folders of any misc unwanted files and empty directories
|
||||
nzbtomedia.cleanProcDirs()
|
||||
|
||||
return result
|
||||
|
||||
def external_script(outputDestination, torrentName, torrentLabel):
|
||||
|
||||
final_result = 0 # start at 0.
|
||||
def external_script(outputDestination, torrentName, torrentLabel):
|
||||
final_result = 0 # start at 0.
|
||||
num_files = 0
|
||||
for dirpath, dirnames, filenames in os.walk(outputDestination):
|
||||
for file in filenames:
|
||||
|
|
@ -200,7 +218,7 @@ def external_script(outputDestination, torrentName, torrentLabel):
|
|||
|
||||
if fileExtension in nzbtomedia.USER_SCRIPT_MEDIAEXTENSIONS or "ALL" in nzbtomedia.USER_SCRIPT_MEDIAEXTENSIONS:
|
||||
num_files = num_files + 1
|
||||
if nzbtomedia.USER_SCRIPT_RUNONCE == 1 and num_files > 1: # we have already run once, so just continue to get number of files.
|
||||
if nzbtomedia.USER_SCRIPT_RUNONCE == 1 and num_files > 1: # we have already run once, so just continue to get number of files.
|
||||
continue
|
||||
command = [nzbtomedia.USER_SCRIPT]
|
||||
for param in nzbtomedia.USER_SCRIPT_PARAM:
|
||||
|
|
@ -232,12 +250,14 @@ def external_script(outputDestination, torrentName, torrentLabel):
|
|||
try:
|
||||
p = Popen(command)
|
||||
res = p.wait()
|
||||
if str(res) in nzbtomedia.USER_SCRIPT_SUCCESSCODES: # Linux returns 0 for successful.
|
||||
if str(res) in nzbtomedia.USER_SCRIPT_SUCCESSCODES: # Linux returns 0 for successful.
|
||||
logger.info("UserScript %s was successfull" % (command[0]))
|
||||
result = 0
|
||||
else:
|
||||
logger.error("UserScript %s has failed with return code: %s" % (command[0], res))
|
||||
logger.info("If the UserScript completed successfully you should add %s to the user_script_successCodes" % (res))
|
||||
logger.info(
|
||||
"If the UserScript completed successfully you should add %s to the user_script_successCodes" % (
|
||||
res))
|
||||
result = int(1)
|
||||
except:
|
||||
logger.error("UserScript %s has failed" % (command[0]))
|
||||
|
|
@ -258,9 +278,11 @@ def external_script(outputDestination, torrentName, torrentLabel):
|
|||
logger.info("All files have been processed. Cleaning outputDirectory %s" % (outputDestination))
|
||||
shutil.rmtree(outputDestination)
|
||||
elif nzbtomedia.USER_SCRIPT_CLEAN == int(1) and num_files_new != 0:
|
||||
logger.info("%s files were processed, but %s still remain. outputDirectory will not be cleaned." % (num_files, num_files_new))
|
||||
logger.info("%s files were processed, but %s still remain. outputDirectory will not be cleaned." % (
|
||||
num_files, num_files_new))
|
||||
return final_result
|
||||
|
||||
|
||||
def main(args):
|
||||
# Initialize the config
|
||||
nzbtomedia.initialize()
|
||||
|
|
@ -269,7 +291,7 @@ def main(args):
|
|||
clientAgent = nzbtomedia.TORRENT_CLIENTAGENT
|
||||
|
||||
logger.info("#########################################################")
|
||||
logger.info("## ..::[%s]::.. CLIENT:%s ## STARTING" % (args[0], clientAgent))
|
||||
logger.info("## ..::[%s]::.. ##" % os.path.basename(__file__))
|
||||
logger.info("#########################################################")
|
||||
|
||||
# debug command line options
|
||||
|
|
@ -292,36 +314,42 @@ def main(args):
|
|||
|
||||
for section, subsection in nzbtomedia.SUBSECTIONS.items():
|
||||
for category in subsection:
|
||||
if nzbtomedia.CFG[section][category].isenabled():
|
||||
dirNames = nzbtomedia.getDirs(section, category)
|
||||
for dirName in dirNames:
|
||||
for dirName in nzbtomedia.getDirs(subsection[category]):
|
||||
logger.info("Starting manual run for %s:%s - Folder:%s" % (section, category, dirName))
|
||||
|
||||
logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName)))
|
||||
downloadInfo = nzbtomedia.get_downloadInfo(os.path.basename(dirName), 0)
|
||||
if downloadInfo:
|
||||
logger.info(
|
||||
"Found download info for %s, setting variables now ..." % (os.path.basename(dirName)))
|
||||
else:
|
||||
logger.info(
|
||||
'Unable to locate download info for %s, continuing to try and process this release ...' % (
|
||||
os.path.basename(dirName))
|
||||
)
|
||||
|
||||
try:
|
||||
clientAgent = str(downloadInfo[0]['client_agent'])
|
||||
except:
|
||||
clientAgent = 'manual'
|
||||
try:
|
||||
inputHash = str(downloadInfo[0]['input_hash'])
|
||||
except:
|
||||
inputHash = None
|
||||
try:
|
||||
inputID = str(downloadInfo[0]['input_id'])
|
||||
except:
|
||||
inputID = None
|
||||
|
||||
logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName)))
|
||||
downloadInfo = nzbtomedia.get_downloadInfo(os.path.basename(dirName), 0)
|
||||
if downloadInfo:
|
||||
clientAgent = str(downloadInfo[0]['client_agent'])
|
||||
if not clientAgent.lower() in nzbtomedia.TORRENT_CLIENTS:
|
||||
continue
|
||||
if not clientAgent.lower() in (nzbtomedia.TORRENT_CLIENTS or 'manual'):
|
||||
continue
|
||||
|
||||
inputHash = str(downloadInfo[0]['input_hash'])
|
||||
inputID = str(downloadInfo[0]['input_id'])
|
||||
logger.info("Found download info for %s, setting variables now ..." % (os.path.basename(dirName)))
|
||||
|
||||
|
||||
logger.info("Running %s:%s as a manual run for folder %s ..." % (section, category, dirName))
|
||||
results = processTorrent(dirName, os.path.basename(dirName), category, inputHash, inputID, clientAgent)
|
||||
if results != 0:
|
||||
result = results
|
||||
logger.error("A problem was reported when trying to manually run %s:%s." % (section, category))
|
||||
|
||||
if len(dirNames) == 0:
|
||||
logger.info('[%s] - No directories found to post-process ...' % (str(category).upper()),
|
||||
section)
|
||||
else:
|
||||
logger.warning("%s:%s is DISABLED, you can enable this in autoProcessMedia.cfg ..." % (section, category))
|
||||
results = processTorrent(dirName, os.path.basename(dirName), category, inputHash, inputID,
|
||||
clientAgent)
|
||||
if results != 0:
|
||||
logger.error("A problem was reported when trying to perform a manual run for %s:%s." % (
|
||||
section, category))
|
||||
result = results
|
||||
|
||||
if result == 0:
|
||||
logger.info("The %s script completed successfully." % (args[0]))
|
||||
|
|
@ -330,5 +358,6 @@ def main(args):
|
|||
|
||||
return result
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
exit(main(sys.argv))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue