diff --git a/TorrentToMedia.py b/TorrentToMedia.py index ae8f4090..75ef44ef 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -139,10 +139,10 @@ def main(inputDirectory, inputName, inputCategory, inputHash) ##### quick 'n dirt hardlink solution for uTorrent, need to implent support for deluge, transmission # Now we pass off to CouchPotato or Sick-Beard - if inputCategory == movieCategory: + if inputCategory == cpsCategory: Logger.info("MAIN: Calling CouchPotatoServer to post-process: %s", inputName) # can we use logger while logfile open? autoProcessMovie.process(outputDestination, inputName, status) - elif inputCategory == tvCategory: + elif inputCategory == sbCategory: Logger.info("MAIN: Calling Sick-Beard to post-process: %s", inputName) # can we use logger while logfile open? autoProcessTV.processEpisode(outputDestination, inputName, status) @@ -196,6 +196,10 @@ if __name__ == "__main__": compressedContainer = (config.get("Torrent", "compressedExtentions")).split(',') # .zip,.rar,.7z mediaContainer = (config.get("Torrent", "mediaExtentions")).split(',') # .mkv,.avi,.divx metaContainer = (config.get("Torrent", "metaExtentions")).split(',') # .nfo,.sub,.srt + + cpsCategory = config.get("CouchPotato", "cpsCategory") # movie + sbCategory = config.get("SickBeard", "tvCategory") # tv + categories.append(cpsCategory, sbCategory) try: inputDirectory, inputName, inputCategory, inputHash = parse_args(clientAgent) diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample index 8a014fe1..cee0d47a 100644 --- a/autoProcessMedia.cfg.sample +++ b/autoProcessMedia.cfg.sample @@ -1,4 +1,6 @@ [CouchPotato] +#### cpsCategory - category that gets called for post-processing with CPS +cpsCategory = movie apikey = host = localhost port = 5050 @@ -13,6 +15,8 @@ delete_failed = 0 [SickBeard] +#### sbCategory - category that gets called for post-processing with CPS +sbCategory = tv host=localhost port=8081 username= @@ -23,9 +27,9 @@ ssl=0 watch_dir= failed_fork=0 + [Torrent] -###### Set to whatever torrent client you use. -###### Supported values: utorrent, transmission, deluge, other +###### clientAgent - Supported clients: utorrent, transmission, deluge, other clientAgent = other ###### useLink - Set to true or false depending on if you want to use hardlinks useLink = false @@ -34,7 +38,7 @@ minSampleSize = 200 ###### outputDirectory - Default output directory (categories will be appended as sub directory to outputDirectory) outputDirectory = /abs/path/to/complete/ ###### **insert descriptive comment for categories here** :-) -categories = movie,tv,music,music_videos,pictures,software +categories = music,music_videos,pictures,software ###### uTorrent Hardlink solution (You must edit this if your using TorrentToMedia.py with uTorrent) uTorrentWEBui = http://localhost:8090/gui/ uTorrentUSR = your username