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

More lib fixes

Browse source
This commit is contained in:
echel0n 2014-04-22 08:20:48 -07:00
commit 2f7ee9ff08
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nzbtomedia/__init__.py
View file

@ -20,8 +20,6 @@ CONFIG_SPEC_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg.spec')
CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg') CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg')
CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg') CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg')
import requests
import guessit
from nzbtomedia.autoProcess.autoProcessComics import autoProcessComics from nzbtomedia.autoProcess.autoProcessComics import autoProcessComics
from nzbtomedia.autoProcess.autoProcessGames import autoProcessGames from nzbtomedia.autoProcess.autoProcessGames import autoProcessGames
from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie

12
nzbtomedia/nzbToMediaUtil.py
View file

@ -6,6 +6,8 @@ import struct
import shutil import shutil
import time import time
import datetime import datetime
import guessit
import requests
import nzbtomedia import nzbtomedia
from nzbtomedia.extractor import extractor from nzbtomedia.extractor import extractor
@ -543,8 +545,8 @@ def find_download(clientAgent, download_id):
params['output'] = 'json' params['output'] = 'json'
params['value'] = download_id params['value'] = download_id
try: try:
r = nzbtomedia.requests.get(url, params=params) r = requests.get(url, params=params)
except nzbtomedia.requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL") logger.error("Unable to open URL")
return 1 # failure return 1 # failure
@ -628,7 +630,7 @@ def find_imdbid(dirName, inputName):
return imdbid return imdbid
logger.info('Searching IMDB for imdbID ...') logger.info('Searching IMDB for imdbID ...')
guess = nzbtomedia.guessit.guess_movie_info(inputName) guess = guessit.guess_movie_info(inputName)
if guess: if guess:
# Movie Title # Movie Title
title = None title = None
@ -645,8 +647,8 @@ def find_imdbid(dirName, inputName):
logger.debug("Opening URL: %s" % url) logger.debug("Opening URL: %s" % url)
try: try:
r = nzbtomedia.requests.get(url, params={'y': year, 't': title}) r = requests.get(url, params={'y': year, 't': title})
except nzbtomedia.requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL %s" % url) logger.error("Unable to open URL %s" % url)
return return