github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 21:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

new remote path handling #409

Browse source
This commit is contained in:
clinton-hall 2014-05-30 20:49:22 +09:30
commit d569b5d6d5
14 changed files with 186 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nzbtomedia/autoProcess/autoProcessMusic.py
View file

@ -3,7 +3,7 @@ import time
import requests
import nzbtomedia
from nzbtomedia.nzbToMediaUtil import convert_to_ascii
from nzbtomedia.nzbToMediaUtil import convert_to_ascii, remoteDir
from nzbtomedia import logger
class autoProcessMusic:
@ -47,9 +47,9 @@ class autoProcessMusic:
web_root = ""
try:
remote_path = nzbtomedia.CFG[section][inputCategory]["remote_path"]
remote_path = int(nzbtomedia.CFG[section][inputCategory]["remote_path"])
except:
remote_path = None
remote_path = 0
if ssl:
protocol = "https://"
@ -58,14 +58,6 @@ class autoProcessMusic:
inputName, dirName = convert_to_ascii(inputName, dirName)
if remote_path:
if remote_path[-1] in ['\\','/']: # supplied directory includes final directory separator
remote_path = remote_path + os.path.basename(dirName)
elif remote_path[0] == '/': # posix path
remote_path = remote_path + '/' + os.path.basename(dirName)
else: # assume windows path or UNF path
remote_path = remote_path + '\\' + os.path.basename(dirName)
url = "%s%s:%s%s/api" % (protocol,host,port,web_root)
if status == 0:
@ -76,7 +68,7 @@ class autoProcessMusic:
params['dir'] = os.path.dirname(dirName)
if remote_path:
params['dir'] = remote_path
params['dir'] = remoteDir(dirName)
release_status = self.get_status(url, apikey, dirName)
if not release_status: