github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 13:23:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Forgot to add linkage between our new function parsing and TorrentToMedia

Browse source
This commit is contained in:
Berkona 2013-02-26 02:07:22 -05:00
commit 36a3dabadb
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TorrentToMedia.py
View file

@ -22,6 +22,11 @@ from utorrent.client import UTorrentClient
nzbtomedia_configure_logging(os.path.dirname(sys.argv[0])) nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)
def category_search_recurs(inputDirectory, inputName, root, categories):
pass
def category_search(inputDirectory, inputName, inputCategory, root, categories): def category_search(inputDirectory, inputName, inputCategory, root, categories):
categorySearch = [os.path.normpath(inputDirectory),""] #initializie categorySearch = [os.path.normpath(inputDirectory),""] #initializie
notfound = 0 notfound = 0
@ -272,7 +277,7 @@ config.read(configFilename)
clientAgent = config.get("Torrent", "clientAgent") clientAgent = config.get("Torrent", "clientAgent")
try: try:
parse_args(clientAgent) inputDirectory, inputName, inputCategory = parse_args(clientAgent)
except: except:
Logger.error("MAIN: There was a problem loading variables: Exiting") Logger.error("MAIN: There was a problem loading variables: Exiting")
sys.exit(-1) sys.exit(-1)

13
nzbToMediaUtil.py
View file

@ -13,9 +13,11 @@ def nzbtomedia_configure_logging(dirname):
fileHandler.level = logging.DEBUG fileHandler.level = logging.DEBUG
logging.getLogger().addHandler(fileHandler) logging.getLogger().addHandler(fileHandler)
def parse_other(args): def parse_other(args):
return os.path.normpath(sys.argv[1]), '', '' return os.path.normpath(sys.argv[1]), '', ''
def parse_utorrent(args): def parse_utorrent(args):
# uTorrent usage: call TorrentToMedia.py "%D" "%N" "%L" "%I" # uTorrent usage: call TorrentToMedia.py "%D" "%N" "%L" "%I"
inputDirectory = os.path.normpath(sys.argv[1]) inputDirectory = os.path.normpath(sys.argv[1])
@ -28,20 +30,28 @@ def parse_utorrent(args):
inputHash = sys.argv[4] inputHash = sys.argv[4]
except: except:
inputHash = '' inputHash = ''
if inputHash: if inputHash:
utorrentClass = UTorrentClient(uTorrentWEBui, uTorrentUSR, uTorrentPWD) utorrentClass = UTorrentClient(uTorrentWEBui, uTorrentUSR, uTorrentPWD)
return inputDirectory, inputName, inputCategory
def parse_deluge(args): def parse_deluge(args):
# Deluge usage: call TorrentToMedia.py TORRENT_ID TORRENT_NAME TORRENT_DIR # Deluge usage: call TorrentToMedia.py TORRENT_ID TORRENT_NAME TORRENT_DIR
inputDirectory = os.path.normpath(sys.argv[3]) inputDirectory = os.path.normpath(sys.argv[3])
inputName = sys.argv[2] inputName = sys.argv[2]
inputCategory = '' # We dont have a category yet inputCategory = '' # We dont have a category yet
return inputDirectory, inputName, inputCategory
def parse_transmission(args): def parse_transmission(args):
# Transmission usage: call TorrenToMedia.py (%TR_TORRENT_DIR% %TR_TORRENT_NAME% is passed on as environmental variables) # Transmission usage: call TorrenToMedia.py (%TR_TORRENT_DIR% %TR_TORRENT_NAME% is passed on as environmental variables)
inputDirectory = os.path.normpath(os.getenv('TR_TORRENT_DIR')) inputDirectory = os.path.normpath(os.getenv('TR_TORRENT_DIR'))
inputName = os.getenv('TR_TORRENT_NAME') inputName = os.getenv('TR_TORRENT_NAME')
inputCategory = '' # We dont have a category yet inputCategory = '' # We dont have a category yet
return inputDirectory, inputName, inputCategory
__ARG_PARSERS__ = { __ARG_PARSERS__ = {
'other': parse_other, 'other': parse_other,
@ -50,8 +60,9 @@ __ARG_PARSERS__ = {
'transmission': parse_transmission, 'transmission': parse_transmission,
} }
def parse_args(clientAgent): def parse_args(clientAgent):
parseFunc = __ARG_PARSERS__.get(clientAgent, None) parseFunc = __ARG_PARSERS__.get(clientAgent, None)
if not parseFunc: if not parseFunc:
raise RuntimeError("Could not find client-agent") raise RuntimeError("Could not find client-agent")
parseFunc(sys.argv) return parseFunc(sys.argv)