Improved imdbID search code

This commit is contained in:
echel0n 2014-04-19 12:43:23 -07:00
commit 92d1ca2fe0

View file

@ -622,28 +622,18 @@ def listMediaFiles(path):
def find_imdbid(dirName, nzbName): def find_imdbid(dirName, nzbName):
imdbid = None imdbid = None
nzbName = clean_nzbname(nzbName)
logger.info('Attemping imdbID lookup for %s' % (nzbName)) logger.info('Attemping imdbID lookup for %s' % (nzbName))
# find imdbid in dirName # find imdbid in dirName
logger.info('Searching folder name for imdbID ...') logger.info('Searching folder and file names for imdbID ...')
m = re.search('(tt\d{7})', dirName) m = re.search('(tt\d{7})', dirName+nzbName)
if m: if m:
imdbid = m.group(1) imdbid = m.group(1)
logger.info("Found imdbID %s in directory" % imdbid) logger.info("Found imdbID [%s]" % imdbid)
return imdbid
# find imdbid in nzbName
logger.info('Searching filename for imdbID ...')
m = re.search('(tt\d{7})', nzbName)
if m:
imdbid = m.group(1)
logger.info("Found imdbID %s in filename" % imdbid)
return imdbid return imdbid
logger.info('Searching IMDB for imdbID ...') logger.info('Searching IMDB for imdbID ...')
guess = guessit.guess_movie_info(nzbName) guess = guessit.guess_video_info(dirName)
if guess: if guess:
# Movie Title # Movie Title
title = None title = None
@ -673,7 +663,7 @@ def find_imdbid(dirName, nzbName):
pass pass
if imdbid: if imdbid:
logger.info("Found imdbID %s on IMDB" % imdbid) logger.info("Found imdbID [%s]" % imdbid)
return imdbid return imdbid
else:
logger.warning('Unable to find a imdbID for %s' % (nzbName)) logger.warning('Unable to find a imdbID for %s' % (nzbName))