mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-20 21:33:13 -07:00
Added remote_path option to CouchPotato section, allows setting the basepath for where CouchPotato looks for its video files on the server its installed on.
Re-coded autoProcessMovies, it now will attempt to get imdbID from dirName, nzbName and if both fail it then uses a regex to get the movie title and uses that to perform a search on CouchPotato. We also now get the release_id and use that instead of movie id. Fixed a bug that was preventing failed downloads from working properly for CouchPotato.
This commit is contained in:
parent
aa86f74c32
commit
77e07be6c8
5 changed files with 134 additions and 214 deletions
|
@ -1,10 +1,9 @@
|
|||
import time
|
||||
import datetime
|
||||
import socket
|
||||
import urllib
|
||||
import nzbtomedia
|
||||
from lib import requests
|
||||
from nzbtomedia.nzbToMediaUtil import convert_to_ascii, getDirectorySize
|
||||
from nzbtomedia.nzbToMediaUtil import convert_to_ascii
|
||||
from nzbtomedia import logger
|
||||
|
||||
class autoProcessMusic:
|
||||
|
@ -39,10 +38,6 @@ class autoProcessMusic:
|
|||
web_root = nzbtomedia.CFG[section][inputCategory]["web_root"]
|
||||
except:
|
||||
web_root = ""
|
||||
try:
|
||||
TimePerGiB = int(nzbtomedia.CFG[section][inputCategory]["TimePerGiB"])
|
||||
except:
|
||||
TimePerGiB = 60 # note, if using Network to transfer on 100Mbit LAN, expect ~ 600 MB/minute.
|
||||
|
||||
if ssl:
|
||||
protocol = "https://"
|
||||
|
@ -54,11 +49,6 @@ class autoProcessMusic:
|
|||
|
||||
nzbName, dirName = convert_to_ascii(nzbName, dirName)
|
||||
|
||||
dirSize = getDirectorySize(dirName) # get total directory size to calculate needed processing time.
|
||||
TIME_OUT = int(TimePerGiB) * dirSize # HeadPhones needs to complete all moving/transcoding and renaming before returning the status.
|
||||
TIME_OUT += 60 # Add an extra minute for over-head/processing/metadata.
|
||||
socket.setdefaulttimeout(int(TIME_OUT)) #initialize socket timeout.
|
||||
|
||||
baseURL = protocol + host + ":" + port + web_root + "/api?"
|
||||
|
||||
if status == 0:
|
||||
|
@ -68,7 +58,7 @@ class autoProcessMusic:
|
|||
params['cmd'] = "forceProcess"
|
||||
params['dir'] = dirName
|
||||
|
||||
url = baseURL + urllib.urlencode(params)
|
||||
url = baseURL
|
||||
|
||||
logger.postprocess("Waiting for %s seconds to allow HeadPhones to process newly extracted files", str(delay))
|
||||
|
||||
|
@ -77,7 +67,7 @@ class autoProcessMusic:
|
|||
logger.debug("Opening URL: %s", url)
|
||||
|
||||
try:
|
||||
r = requests.get(url)
|
||||
r = requests.get(url, data=params)
|
||||
except requests.ConnectionError:
|
||||
logger.error("Unable to open URL")
|
||||
return 1 # failure
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue