From d0b55d3d53fb4bc448fd4dff371107bc36252bd6 Mon Sep 17 00:00:00 2001 From: echel0n Date: Fri, 25 Apr 2014 14:48:28 -0700 Subject: [PATCH] Fixes issue #350, unicode errors --- TorrentToMedia.py | 10 +++++----- autoProcessMedia.cfg.spec | 1 + nzbToMedia.py | 10 +++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 20116621..bb60e85b 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -31,11 +31,11 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID, myDB = nzbToMediaDB.DBConnection() - controlValueDict = {"input_directory": inputDirectory} - newValueDict = {"input_name": inputName, - "input_hash": inputHash, - "input_id": inputID, - "client_agent": clientAgent, + controlValueDict = {"input_directory": unicode(inputDirectory)} + newValueDict = {"input_name": unicode(inputName), + "input_hash": unicode(inputHash), + "input_id": unicode(inputID), + "client_agent": unicode(clientAgent), "status": 0, "last_update": datetime.date.today().toordinal() } diff --git a/autoProcessMedia.cfg.spec b/autoProcessMedia.cfg.spec index 6f72b7dd..7e172a67 100644 --- a/autoProcessMedia.cfg.spec +++ b/autoProcessMedia.cfg.spec @@ -244,6 +244,7 @@ #Set the categories to use external script. #Use "UNCAT" to process non-category downloads, and "ALL" for all. Set to "NONE" to disable external script. [[UNCAT]] + #Enable/Disable this subsection category enabled = 0 #What extension do you want to process? Specify all the extension, or use "ALL" to process all files. user_script_mediaExtensions = .mkv,.avi,.divx,.xvid,.mov,.wmv,.mp4,.mpg,.mpeg diff --git a/nzbToMedia.py b/nzbToMedia.py index ba851806..9fab403c 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -292,11 +292,11 @@ def process(inputDirectory, inputName=None, status=0, clientAgent='manual', down myDB = nzbToMediaDB.DBConnection() - controlValueDict = {"input_directory": inputDirectory} - newValueDict = {"input_name": inputName, - "input_hash": download_id, - "input_id": download_id, - "client_agent": clientAgent, + controlValueDict = {"input_directory": unicode(inputDirectory)} + newValueDict = {"input_name": unicode(inputName), + "input_hash": unicode(download_id), + "input_id": unicode(download_id), + "client_agent": unicode(clientAgent), "status": 0, "last_update": datetime.date.today().toordinal() }