mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-07-06 05:01:10 -07:00
Merge pull request #1982 from MattPark/last-resort-movie-id
Last resort movie identification
This commit is contained in:
commit
b802aca7e1
3 changed files with 9 additions and 6 deletions
|
@ -1047,6 +1047,7 @@ def initialize(section=None):
|
||||||
configure_utility_locations()
|
configure_utility_locations()
|
||||||
configure_sections(section)
|
configure_sections(section)
|
||||||
configure_torrent_class()
|
configure_torrent_class()
|
||||||
|
configure_groups()
|
||||||
|
|
||||||
__INITIALIZED__ = True
|
__INITIALIZED__ = True
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ def process(section, dir_name, input_name=None, status=0, client_agent='manual',
|
||||||
else:
|
else:
|
||||||
extract = int(cfg.get('extract', 0))
|
extract = int(cfg.get('extract', 0))
|
||||||
|
|
||||||
imdbid = find_imdbid(dir_name, input_name, omdbapikey)
|
imdbid, dir_name = find_imdbid(dir_name, input_name, omdbapikey)
|
||||||
if section == 'CouchPotato':
|
if section == 'CouchPotato':
|
||||||
base_url = '{0}{1}:{2}{3}/api/{4}/'.format(protocol, host, port, web_root, apikey)
|
base_url = '{0}{1}:{2}{3}/api/{4}/'.format(protocol, host, port, web_root, apikey)
|
||||||
if section == 'Radarr':
|
if section == 'Radarr':
|
||||||
|
|
|
@ -27,14 +27,14 @@ def find_imdbid(dir_name, input_name, omdb_api_key):
|
||||||
if m:
|
if m:
|
||||||
imdbid = m.group(1)
|
imdbid = m.group(1)
|
||||||
logger.info('Found imdbID [{0}]'.format(imdbid))
|
logger.info('Found imdbID [{0}]'.format(imdbid))
|
||||||
return imdbid
|
return imdbid, dir_name
|
||||||
if os.path.isdir(dir_name):
|
if os.path.isdir(dir_name):
|
||||||
for file in os.listdir(text_type(dir_name)):
|
for file in os.listdir(text_type(dir_name)):
|
||||||
m = re.search(r'\b(tt\d{7,8})\b', file)
|
m = re.search(r'\b(tt\d{7,8})\b', file)
|
||||||
if m:
|
if m:
|
||||||
imdbid = m.group(1)
|
imdbid = m.group(1)
|
||||||
logger.info('Found imdbID [{0}] via file name'.format(imdbid))
|
logger.info('Found imdbID [{0}] via file name'.format(imdbid))
|
||||||
return imdbid
|
return imdbid, dir_name
|
||||||
if 'NZBPR__DNZB_MOREINFO' in os.environ:
|
if 'NZBPR__DNZB_MOREINFO' in os.environ:
|
||||||
dnzb_more_info = os.environ.get('NZBPR__DNZB_MOREINFO', '')
|
dnzb_more_info = os.environ.get('NZBPR__DNZB_MOREINFO', '')
|
||||||
if dnzb_more_info != '':
|
if dnzb_more_info != '':
|
||||||
|
@ -43,7 +43,7 @@ def find_imdbid(dir_name, input_name, omdb_api_key):
|
||||||
if m:
|
if m:
|
||||||
imdbid = m.group(1)
|
imdbid = m.group(1)
|
||||||
logger.info('Found imdbID [{0}] from DNZB-MoreInfo'.format(imdbid))
|
logger.info('Found imdbID [{0}] from DNZB-MoreInfo'.format(imdbid))
|
||||||
return imdbid
|
return imdbid, dir_name
|
||||||
logger.info('Searching IMDB for imdbID ...')
|
logger.info('Searching IMDB for imdbID ...')
|
||||||
try:
|
try:
|
||||||
guess = guessit.guessit(input_name)
|
guess = guessit.guessit(input_name)
|
||||||
|
@ -87,10 +87,12 @@ def find_imdbid(dir_name, input_name, omdb_api_key):
|
||||||
|
|
||||||
if imdbid:
|
if imdbid:
|
||||||
logger.info('Found imdbID [{0}]'.format(imdbid))
|
logger.info('Found imdbID [{0}]'.format(imdbid))
|
||||||
return imdbid
|
new_dir_name = '{}.cp({})'.format(dir_name, imdbid)
|
||||||
|
os.rename(dir_name, new_dir_name)
|
||||||
|
return imdbid, new_dir_name
|
||||||
|
|
||||||
logger.warning('Unable to find a imdbID for {0}'.format(input_name))
|
logger.warning('Unable to find a imdbID for {0}'.format(input_name))
|
||||||
return imdbid
|
return imdbid, dir_name
|
||||||
|
|
||||||
|
|
||||||
def category_search(input_directory, input_name, input_category, root, categories):
|
def category_search(input_directory, input_name, input_category, root, categories):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue