From 92d1ca2fe0ee6f15681e9876307fcccb1a4da84f Mon Sep 17 00:00:00 2001 From: echel0n Date: Sat, 19 Apr 2014 12:43:23 -0700 Subject: [PATCH] Improved imdbID search code --- nzbtomedia/nzbToMediaUtil.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index a17f5861..96ede036 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -622,28 +622,18 @@ def listMediaFiles(path): def find_imdbid(dirName, nzbName): imdbid = None - nzbName = clean_nzbname(nzbName) - logger.info('Attemping imdbID lookup for %s' % (nzbName)) # find imdbid in dirName - logger.info('Searching folder name for imdbID ...') - m = re.search('(tt\d{7})', dirName) + logger.info('Searching folder and file names for imdbID ...') + m = re.search('(tt\d{7})', dirName+nzbName) if m: imdbid = m.group(1) - logger.info("Found imdbID %s in directory" % 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) + logger.info("Found imdbID [%s]" % imdbid) return imdbid logger.info('Searching IMDB for imdbID ...') - guess = guessit.guess_movie_info(nzbName) + guess = guessit.guess_video_info(dirName) if guess: # Movie Title title = None @@ -673,7 +663,7 @@ def find_imdbid(dirName, nzbName): pass if imdbid: - logger.info("Found imdbID %s on IMDB" % imdbid) + logger.info("Found imdbID [%s]" % imdbid) return imdbid - else: - logger.warning('Unable to find a imdbID for %s' % (nzbName)) \ No newline at end of file + + logger.warning('Unable to find a imdbID for %s' % (nzbName)) \ No newline at end of file