diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index dd729cc5..57e94b33 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -474,9 +474,9 @@ def parse_deluge(args): # Deluge usage: call TorrentToMedia.py TORRENT_ID TORRENT_NAME TORRENT_DIR inputDirectory = os.path.normpath(args[3]) inputName = args[2] - inputCategory = '' # We dont have a category yet inputHash = args[1] inputID = args[1] + inputCategory = nzbtomedia.TORRENT_CLASS.core.get_torrent_status(inputID, ['label']).get()['label'] return inputDirectory, inputName, inputCategory, inputHash, inputID @@ -732,7 +732,6 @@ def create_torrent_class(clientAgent): return tc - def pause_torrent(clientAgent, inputHash, inputID, inputName): logger.debug("Stopping torrent %s in %s while processing" % (inputName, clientAgent)) @@ -745,7 +744,6 @@ def pause_torrent(clientAgent, inputHash, inputID, inputName): time.sleep(5) - def resume_torrent(clientAgent, inputHash, inputID, inputName): logger.debug("Starting torrent %s in %s" % (inputName, clientAgent)) diff --git a/tests/general.py b/tests/general.py index f3463e61..4e1ed66f 100755 --- a/tests/general.py +++ b/tests/general.py @@ -1,5 +1,6 @@ #! /usr/bin/env python2 import os +import sys import datetime import re import nzbtomedia @@ -11,6 +12,9 @@ from nzbtomedia.nzbToMediaUtil import get_downloadInfo, server_responding # Initialize the config nzbtomedia.initialize() +#label = nzbtomedia.TORRENT_CLASS.core.get_torrent_status("f33a9c4b15cbd9170722d700069af86746817ade", ["label"]).get()['label'] +#print label + if transcoder.isVideoGood(nzbtomedia.TEST_FILE, 0): print "FFPROBE Works" else: