fixes to category search

This commit is contained in:
Joel Kåberg 2013-03-02 13:18:19 +01:00
commit 9fa6a86f1a
2 changed files with 9 additions and 17 deletions

View file

@ -184,29 +184,23 @@ if __name__ == "__main__":
config.read(configFilename) config.read(configFilename)
# EXAMPLE VALUES: # EXAMPLE VALUES:
clientAgent = config.get("Torrent", "clientAgent") # utorrent | deluge | transmission | other 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 useLink = config.get("Torrent", "useLink") # true | false
minSampleSize = int(config.get("Torrent", "minSampleSize")) # 200 (in MB) 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/ uTorrentWEBui = config.get("Torrent", "uTorrentWEBui") # http://localhost:8090/gui/
uTorrentUSR = config.get("Torrent", "uTorrentUSR") # mysecretusr uTorrentUSR = config.get("Torrent", "uTorrentUSR") # mysecretusr
uTorrentPWD = config.get("Torrent", "uTorrentPWD") # mysecretpwr uTorrentPWD = config.get("Torrent", "uTorrentPWD") # mysecretpwr
compressedContainer = (config.get("Torrent", "compressedExtentions")).split(',') # .zip,.rar,.7z compressedContainer = (config.get("Torrent", "compressedExtentions")).split(',') # .zip,.rar,.7z
mediaContainer = (config.get("Torrent", "mediaExtentions")).split(',') # .mkv,.avi,.divx mediaContainer = (config.get("Torrent", "mediaExtentions")).split(',') # .mkv,.avi,.divx
metaContainer = (config.get("Torrent", "metaExtentions")).split(',') # .nfo,.sub,.srt 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: try:
inputDirectory, inputName, inputCategory, inputHash = parse_args(clientAgent) inputDirectory, inputName, inputCategory, inputHash = parse_args(clientAgent)
except Exception as e: except Exception as e:
Logger.error("MAIN: There was a problem loading variables: %s", e) Logger.error("MAIN: There was a problem loading variables: %s", e)
sys.exit(-1) sys.exit(-1)
main(inputDirectory, inputName, inputCategory, inputHash) main(inputDirectory, inputName, inputCategory, inputHash)

View file

@ -1,6 +1,4 @@
[CouchPotato] [CouchPotato]
category = movie
outputDirectory = /abs/path/to/complete/movies
apikey = apikey =
host = localhost host = localhost
port = 5050 port = 5050
@ -15,8 +13,6 @@ delete_failed = 0
[SickBeard] [SickBeard]
category = tv
outputDirectory = /abs/path/to/complete/tv
host=localhost host=localhost
port=8081 port=8081
username= username=
@ -35,8 +31,10 @@ clientAgent = other
useLink = false useLink = false
###### minSampleSize - Minimum required size to consider a file not an sample file (in MB, eg 200mb) ###### minSampleSize - Minimum required size to consider a file not an sample file (in MB, eg 200mb)
minSampleSize = 200 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** :-) ###### **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) ###### uTorrent Hardlink solution (You must edit this if your using TorrentToMedia.py with uTorrent)
uTorrentWEBui = http://localhost:8090/gui/ uTorrentWEBui = http://localhost:8090/gui/
uTorrentUSR = your username uTorrentUSR = your username