From 18d10d28a648950be6be2fabc9820232b014d513 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Wed, 8 Jan 2014 07:42:27 +1030 Subject: [PATCH] minor fixes for #230 --- TorrentToMedia.py | 2 +- autoProcess/migratecfg.py | 4 ++++ changelog.txt | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 635a7fed..a1412b90 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -184,7 +184,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID): except: Logger.exception("MAIN: Extraction failed for: %s", file) continue - elif (not inputCategory in cpsCategory) and (not inputCategory in sbCategory): #process all for non-video categories. + 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)]) diff --git a/autoProcess/migratecfg.py b/autoProcess/migratecfg.py index 129173f8..06196642 100644 --- a/autoProcess/migratecfg.py +++ b/autoProcess/migratecfg.py @@ -121,6 +121,10 @@ def migrate(): original = configold.items(section) except: continue + try: + confignew.add_section(section) + except: + pass for item in original: option, value = item confignew.set(section, option, value) diff --git a/changelog.txt b/changelog.txt index ad2332af..9cd6cf1c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -13,6 +13,7 @@ Added Torrent Hash to Deluge to assist with movie ID. Added passwords option to attempt extraction od passworded archives. Impacts All +Made processing Category Centric as an option for people running multiple versions of SickBeard and CouchPotato etc. Added TPB version of SickBeard processing. This now uses a fork pass-in instead of failed_fork. Added new option to convert files, directories, and parameters to ASCII. To be used if you regularly download "foreign" titles and have problems with CP/SB. Now only parse results from CouchPotato 50 at a time to prevent error with large wanted list.