From 9fa6a86f1a09b9e68b2531f5c0d5c5b2e13ff61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Sat, 2 Mar 2013 13:18:19 +0100
Subject: [PATCH] fixes to category search

---
 TorrentToMedia.py           | 18 ++++++------------
 autoProcessMedia.cfg.sample |  8 +++-----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index c272fc95..ae8f4090 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -184,29 +184,23 @@ if __name__ == "__main__":
     config.read(configFilename)
                                                                                         # EXAMPLE VALUES:
     clientAgent = config.get("Torrent", "clientAgent")                                  # utorrent | deluge | transmission | other
-    # SICK-BEARD
-    tvCategory = config.get("SickBeard", "category")                                    # tv
-    tvDestination = os.path.normpath(config.get("SickBeard", "outputDirectory"))        # C:\downloaded\tv | /path/to/downloaded/tv
-    # COUCHPOTATOSERVER
-    movieCategory = config.get("CouchPotato", "category")                               # movie
-    movieDestination = os.path.normpath(config.get("CouchPotato", "outputDirectory"))   # C:\downloaded\movies | /path/to/downloaded/movies
-    # TORRENTS
     useLink = config.get("Torrent", "useLink")                                          # true | false
     minSampleSize = int(config.get("Torrent", "minSampleSize"))                         # 200 (in MB)
+    outputDirectory = config.get("Torrent", "outputDirectory")                          # /abs/path/to/complete/
+    categories = (config.get("Torrent", "categories")).split(',')                       # music,music_videos,pictures,software
+
     uTorrentWEBui = config.get("Torrent", "uTorrentWEBui")                              # http://localhost:8090/gui/
     uTorrentUSR = config.get("Torrent", "uTorrentUSR")                                  # mysecretusr
     uTorrentPWD = config.get("Torrent", "uTorrentPWD")                                  # mysecretpwr
+
     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
-    categories = (config.get("Torrent", "categories")).split(',')                       # music,music_videos,pictures,software
-    categories.append(movieCategory)
-    categories.append(tvCategory)  # now have a list of all categories in use.
-    
+
     try:
         inputDirectory, inputName, inputCategory, inputHash = parse_args(clientAgent)
     except Exception as e:
         Logger.error("MAIN: There was a problem loading variables: %s", e)
         sys.exit(-1)
 
-    main(inputDirectory, inputName, inputCategory, inputHash)
+    main(inputDirectory, inputName, inputCategory, inputHash)
\ No newline at end of file
diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample
index e40dd5d3..8a014fe1 100644
--- a/autoProcessMedia.cfg.sample
+++ b/autoProcessMedia.cfg.sample
@@ -1,6 +1,4 @@
 [CouchPotato]
-category = movie
-outputDirectory = /abs/path/to/complete/movies
 apikey =
 host = localhost
 port = 5050
@@ -15,8 +13,6 @@ delete_failed = 0
 
 
 [SickBeard]
-category = tv
-outputDirectory = /abs/path/to/complete/tv
 host=localhost
 port=8081
 username=
@@ -35,8 +31,10 @@ clientAgent = other
 useLink = false
 ###### minSampleSize - Minimum required size to consider a file not an sample file (in MB, eg 200mb)
 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 = music,music_videos,pictures,software
+categories = movie,tv,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