mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-14 18:47:09 -07:00
autoProcessMovie now searches for snatched download via imdbid, download_id and torrent hash using torrent api calls.
This commit is contained in:
echel0n
parent
1e90193f47
commit
6c3096851b
3 changed files with 92 additions and 80 deletions
|
|
@ -16,10 +16,7 @@ from nzbtomedia.autoProcess.autoProcessMusic import autoProcessMusic
|
|||
from nzbtomedia.autoProcess.autoProcessTV import autoProcessTV
|
||||
from nzbtomedia.extractor import extractor
|
||||
from nzbtomedia.nzbToMediaUtil import category_search, safeName, is_sample, copy_link, parse_args, flatten, get_dirnames, \
|
||||
remove_read_only, cleanup_directories
|
||||
from nzbtomedia.synchronousdeluge.client import DelugeClient
|
||||
from nzbtomedia.utorrent.client import UTorrentClient
|
||||
from nzbtomedia.transmissionrpc.client import Client as TransmissionClient
|
||||
remove_read_only, cleanup_directories, create_torrent_class
|
||||
from nzbtomedia import logger
|
||||
|
||||
def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID):
|
||||
|
|
@ -37,7 +34,7 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID)
|
|||
|
||||
logger.debug("Determined Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory)
|
||||
|
||||
TorrentClass = create_torrent_class(nzbtomedia.CLIENTAGENT, inputHash)
|
||||
TorrentClass = create_torrent_class(nzbtomedia.CLIENTAGENT)
|
||||
pause_torrent(nzbtomedia.CLIENTAGENT, TorrentClass, inputHash, inputID, inputName)
|
||||
|
||||
processCategories = nzbtomedia.CFG[nzbtomedia.SECTIONS].sections
|
||||
|
|
@ -211,37 +208,6 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID)
|
|||
cleanup_directories(inputCategory, processCategories, result, outputDestination)
|
||||
return result
|
||||
|
||||
def create_torrent_class(clientAgent, inputHash):
|
||||
# Hardlink solution for Torrents
|
||||
TorrentClass = ""
|
||||
if clientAgent in ['utorrent', 'transmission', 'deluge'] and inputHash:
|
||||
if clientAgent == 'utorrent':
|
||||
try:
|
||||
logger.debug("Connecting to %s: %s", clientAgent, nzbtomedia.UTORRENTWEBUI)
|
||||
TorrentClass = UTorrentClient(nzbtomedia.UTORRENTWEBUI, nzbtomedia.UTORRENTUSR, nzbtomedia.UTORRENTPWD)
|
||||
except:
|
||||
logger.error("Failed to connect to uTorrent")
|
||||
|
||||
if clientAgent == 'transmission':
|
||||
try:
|
||||
logger.debug("Connecting to %s: http://%s:%s", clientAgent, nzbtomedia.TRANSMISSIONHOST,
|
||||
nzbtomedia.TRANSMISSIONPORT)
|
||||
TorrentClass = TransmissionClient(nzbtomedia.TRANSMISSIONHOST, nzbtomedia.TRANSMISSIONPORT, nzbtomedia.TRANSMISSIONUSR,
|
||||
nzbtomedia.TRANSMISSIONPWD)
|
||||
except:
|
||||
logger.error("Failed to connect to Transmission")
|
||||
|
||||
if clientAgent == 'deluge':
|
||||
try:
|
||||
logger.debug("Connecting to %s: http://%s:%s", clientAgent, nzbtomedia.DELUGEHOST,
|
||||
nzbtomedia.DELUGEPORT)
|
||||
TorrentClass = DelugeClient()
|
||||
TorrentClass.connect(host =nzbtomedia.DELUGEHOST, port =nzbtomedia.DELUGEPORT, username =nzbtomedia.DELUGEUSR, password =nzbtomedia.DELUGEPWD)
|
||||
except:
|
||||
logger.error("Failed to connect to deluge")
|
||||
|
||||
return TorrentClass
|
||||
|
||||
def pause_torrent(clientAgent, TorrentClass, inputHash, inputID, inputName):
|
||||
# if we are using links with Torrents it means we need to pause it in order to access the files
|
||||
logger.debug("Stoping torrent %s in %s while processing", inputName, clientAgent)
|
||||
|
|
|
|||
|
|
@ -10,19 +10,54 @@ import nzbtomedia
|
|||
from lib import requests
|
||||
from nzbtomedia.Transcoder import Transcoder
|
||||
from nzbtomedia.nzbToMediaSceneExceptions import process_all_exceptions
|
||||
from nzbtomedia.nzbToMediaUtil import convert_to_ascii, delete
|
||||
from nzbtomedia.nzbToMediaUtil import convert_to_ascii, delete, create_torrent_class
|
||||
from nzbtomedia import logger
|
||||
from nzbtomedia.transmissionrpc.client import Client as TransmissionClient
|
||||
|
||||
class autoProcessMovie:
|
||||
def find_release_info(self, baseURL, download_id, dirName, nzbName):
|
||||
def search_torrents(releases, nzbName):
|
||||
for release in releases:
|
||||
try:
|
||||
if release['status'] != 'snatched':
|
||||
continue
|
||||
|
||||
if download_id:
|
||||
if download_id == release['download_info']['id']:
|
||||
return release
|
||||
|
||||
if imdbid:
|
||||
if imdbid == release['download_info']['id']:
|
||||
return release
|
||||
|
||||
downloader = release['download_info']['downloader'].lower()
|
||||
tor_client = create_torrent_class(downloader)
|
||||
|
||||
torrents = []
|
||||
if downloader == "transmission":
|
||||
torrents = tor_client.get_torrents()
|
||||
elif downloader == "deluge":
|
||||
torrents = tor_client.get_torrents()
|
||||
elif downloader == "utorrent":
|
||||
torrents = tor_client.get_torrents()
|
||||
|
||||
for torrent in torrents:
|
||||
tor_name = torrent.name
|
||||
tor_hash = torrent.hashString
|
||||
|
||||
if download_id:
|
||||
if download_id == tor_hash:
|
||||
return release
|
||||
|
||||
if nzbName == tor_name:
|
||||
return release
|
||||
except:pass
|
||||
|
||||
imdbid = None
|
||||
movie_title = None
|
||||
release_id = None
|
||||
media_id = None
|
||||
release_status = None
|
||||
movies = {}
|
||||
releases_found = {}
|
||||
matched_release = None
|
||||
|
||||
while(True):
|
||||
# find imdbid in nzbName
|
||||
|
|
@ -42,26 +77,9 @@ class autoProcessMovie:
|
|||
imdbid = dirName[a:b]
|
||||
logger.postprocess("Found movie id %s in directory", imdbid)
|
||||
break
|
||||
|
||||
# regex match movie title from dirName or nzbName
|
||||
movie_title_results = []
|
||||
movie_title_regex = '(.*?)[ ._-]*([0-9]+)[ ._-](.*?)[ ._-]([^.]+)$'
|
||||
if dirName:
|
||||
movie_title_results.append(re.search(movie_title_regex, os.path.basename(dirName)))
|
||||
if nzbName:
|
||||
movie_title_results.append(re.search(movie_title_regex, nzbName))
|
||||
|
||||
movie_title = [x.group(1) for x in movie_title_results if x]
|
||||
break
|
||||
|
||||
if imdbid:
|
||||
section = 'media'
|
||||
url = baseURL + "/media.get/?id=" + imdbid
|
||||
else:
|
||||
section = 'movies'
|
||||
url = baseURL + "/media.list/?status=done&release_status=snatched,downloaded"
|
||||
if movie_title:
|
||||
url = baseURL + "/media.list/?search=" + movie_title[0] + "&status=done&release_status=snatched,downloaded"
|
||||
url = baseURL + "/media.list/?release_status=snatched"
|
||||
|
||||
logger.debug("Opening URL: %s", url)
|
||||
|
||||
|
|
@ -72,27 +90,20 @@ class autoProcessMovie:
|
|||
return
|
||||
|
||||
results = r.json()
|
||||
for i, movie in enumerate(results[section]):
|
||||
movies[i] = movie
|
||||
for movie in results['movies']:
|
||||
if imdbid:
|
||||
if imdbid != movie['info']['imdb']:
|
||||
continue
|
||||
matched_release = search_torrents(movie['releases'], nzbName)
|
||||
if matched_release:
|
||||
break
|
||||
|
||||
if len(movies) > 0:
|
||||
if matched_release:
|
||||
try:
|
||||
for i, movie in enumerate(movies.values()):
|
||||
for release in movie['releases']:
|
||||
if not release['status'] in ['snatched', 'downloaded']:
|
||||
continue
|
||||
if download_id and 'download_id' in release['info'].keys():
|
||||
if download_id != release['info']['download_id']:
|
||||
continue
|
||||
releases_found.update({i:release})
|
||||
except:pass
|
||||
|
||||
if len(releases_found) == 1:
|
||||
try:
|
||||
release_id = releases_found[0]['_id']
|
||||
media_id = releases_found[0]['media_id']
|
||||
release_status = releases_found[0]['status']
|
||||
download_id = releases_found[0]['info']['download_id']
|
||||
release_id = matched_release['_id']
|
||||
media_id = matched_release['media_id']
|
||||
release_status = matched_release['status']
|
||||
download_id = matched_release['download_info']['id']
|
||||
except:pass
|
||||
|
||||
return media_id, download_id, release_id, release_status
|
||||
|
|
@ -102,11 +113,11 @@ class autoProcessMovie:
|
|||
|
||||
logger.debug("Attempting to get current status for release:%s", release_id)
|
||||
|
||||
url = baseURL + "/media.get/?id=" + str(release_id)
|
||||
url = baseURL + "/media.get"
|
||||
logger.debug("Opening URL: %s", url)
|
||||
|
||||
try:
|
||||
r = requests.get(url)
|
||||
r = requests.get(url, params={'id':release_id})
|
||||
except requests.ConnectionError:
|
||||
logger.error("Unable to open URL")
|
||||
return None, None
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ import nzbtomedia
|
|||
|
||||
from nzbtomedia.linktastic import linktastic
|
||||
from nzbtomedia import logger
|
||||
from nzbtomedia.synchronousdeluge.client import DelugeClient
|
||||
from nzbtomedia.utorrent.client import UTorrentClient
|
||||
from nzbtomedia.transmissionrpc.client import Client as TransmissionClient
|
||||
|
||||
|
||||
def getDirectorySize(directory):
|
||||
dir_size = 0
|
||||
|
|
@ -442,4 +446,35 @@ def cleanup_directories(inputCategory, processCategories, result, directory):
|
|||
else:
|
||||
logger.info("Directory %s still contains %s media and/or meta files. This directory will not be removed.", directory, num_files_new)
|
||||
for item in file_list:
|
||||
logger.debug("media/meta file found: %s", item)
|
||||
logger.debug("media/meta file found: %s", item)
|
||||
|
||||
def create_torrent_class(clientAgent):
|
||||
# Hardlink solution for Torrents
|
||||
TorrentClass = ""
|
||||
if clientAgent in ['utorrent', 'transmission', 'deluge']:
|
||||
if clientAgent == 'utorrent':
|
||||
try:
|
||||
logger.debug("Connecting to %s: %s", clientAgent, nzbtomedia.UTORRENTWEBUI)
|
||||
TorrentClass = UTorrentClient(nzbtomedia.UTORRENTWEBUI, nzbtomedia.UTORRENTUSR, nzbtomedia.UTORRENTPWD)
|
||||
except:
|
||||
logger.error("Failed to connect to uTorrent")
|
||||
|
||||
if clientAgent == 'transmission':
|
||||
try:
|
||||
logger.debug("Connecting to %s: http://%s:%s", clientAgent, nzbtomedia.TRANSMISSIONHOST,
|
||||
nzbtomedia.TRANSMISSIONPORT)
|
||||
TorrentClass = TransmissionClient(nzbtomedia.TRANSMISSIONHOST, nzbtomedia.TRANSMISSIONPORT, nzbtomedia.TRANSMISSIONUSR,
|
||||
nzbtomedia.TRANSMISSIONPWD)
|
||||
except:
|
||||
logger.error("Failed to connect to Transmission")
|
||||
|
||||
if clientAgent == 'deluge':
|
||||
try:
|
||||
logger.debug("Connecting to %s: http://%s:%s", clientAgent, nzbtomedia.DELUGEHOST,
|
||||
nzbtomedia.DELUGEPORT)
|
||||
TorrentClass = DelugeClient()
|
||||
TorrentClass.connect(host =nzbtomedia.DELUGEHOST, port =nzbtomedia.DELUGEPORT, username =nzbtomedia.DELUGEUSR, password =nzbtomedia.DELUGEPWD)
|
||||
except:
|
||||
logger.error("Failed to connect to deluge")
|
||||
|
||||
return TorrentClass
|
||||
Loading…
Add table
Add a link
Reference in a new issue