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

fix remote_path handling on different os types.

Browse source
This commit is contained in:
clinton-hall 2014-05-26 16:49:19 +09:30
commit 7ece7997a9
4 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nzbtomedia/autoProcess/autoProcessTV.py
View file

@ -107,6 +107,14 @@ class autoProcessTV:
status = 1
failed = 1
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)
# configure SB params to pass
fork_params['quiet'] = 1
if inputName is not None:
@ -119,7 +127,7 @@ class autoProcessTV:
if param in ["dirName", "dir"]:
fork_params[param] = dirName
if remote_path:
fork_params[param] = os.path.join(remote_path, os.path.basename(dirName))
fork_params[param] = remote_path
if param == "process_method":
if process_method:
@ -163,7 +171,7 @@ class autoProcessTV:
headers = {"X-Api-Key": apikey}
params = {'sortKey': 'series.title', 'page': 1, 'pageSize': 1, 'sortDir': 'asc'}
if remote_path:
data = json.dumps({"name": "DownloadedEpisodesScan", "path": os.path.join(remote_path, os.path.basename(dirName))})
data = json.dumps({"name": "DownloadedEpisodesScan", "path": remote_path})
else:
data = json.dumps({"name": "DownloadedEpisodesScan", "path": dirName})