dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encode folder returned from downloader. fix #2071

Browse Source
This commit is contained in:
Ruud
2013-08-27 23:38:51 +02:00
parent 22b744340a
commit aaf5cab138
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/downloaders/deluge/main.py
+2 -2
View File
@@ -1,7 +1,7 @@
from base64 import b64encode
from couchpotato.core.helpers.variable import tryInt, tryFloat
from couchpotato.core.downloaders.base import Downloader, StatusList
from couchpotato.core.helpers.encoding import isInt
from couchpotato.core.helpers.encoding import isInt, ss
from couchpotato.core.logger import CPLog
from couchpotato.environment import Env
from datetime import timedelta
@@ -122,7 +122,7 @@ class Deluge(Downloader):
'original_status': item['state'],
'seed_ratio': item['ratio'],
'timeleft': str(timedelta(seconds = item['eta'])),
'folder': os.path.join(download_dir, item['name']),
'folder': ss(os.path.join(download_dir, item['name'])),
})
return statuses
couchpotato/core/downloaders/nzbget/main.py
+1 -1
View File
@@ -143,7 +143,7 @@ class NZBGet(Downloader):
'status': 'completed' if item['ParStatus'] == 'SUCCESS' and item['ScriptStatus'] == 'SUCCESS' else 'failed',
'original_status': item['ParStatus'] + ', ' + item['ScriptStatus'],
'timeleft': str(timedelta(seconds = 0)),
'folder': item['DestDir']
'folder': ss(item['DestDir'])
})
return statuses
couchpotato/core/downloaders/nzbvortex/main.py
+1 -1
View File
@@ -57,7 +57,7 @@ class NZBVortex(Downloader):
'status': status,
'original_status': item['state'],
'timeleft':-1,
'folder': item['destinationPath'],
'folder': ss(item['destinationPath']),
})
return statuses
couchpotato/core/downloaders/rtorrent/main.py
+3 -3
View File
@@ -2,6 +2,7 @@ from base64 import b16encode, b32decode
from datetime import timedelta
from hashlib import sha1
import shutil
from couchpotato.core.helpers.encoding import ss
from rtorrent.err import MethodError
from bencode import bencode, bdecode
@@ -157,9 +158,8 @@ class rTorrent(Downloader):
'status': status,
'seed_ratio': item.ratio,
'original_status': item.state,
'timeleft': str(timedelta(seconds = float(item.left_bytes) / item.down_rate))
if item.down_rate > 0 else -1,
'folder': item.directory
'timeleft': str(timedelta(seconds = float(item.left_bytes) / item.down_rate)) if item.down_rate > 0 else -1,
'folder': ss(item.directory)
})
return statuses
couchpotato/core/downloaders/sabnzbd/main.py
+1 -1
View File
@@ -109,7 +109,7 @@ class Sabnzbd(Downloader):
'status': status,
'original_status': item['status'],
'timeleft': str(timedelta(seconds = 0)),
'folder': item['storage'],
'folder': ss(item['storage']),
})
return statuses
couchpotato/core/downloaders/transmission/main.py
+2 -2
View File
@@ -1,6 +1,6 @@
from base64 import b64encode
from couchpotato.core.downloaders.base import Downloader, StatusList
from couchpotato.core.helpers.encoding import isInt
from couchpotato.core.helpers.encoding import isInt, ss
from couchpotato.core.helpers.variable import tryInt, tryFloat
from couchpotato.core.logger import CPLog
from couchpotato.environment import Env
@@ -122,7 +122,7 @@ class Transmission(Downloader):
'original_status': item['status'],
'seed_ratio': item['uploadRatio'],
'timeleft': str(timedelta(seconds = item['eta'])),
'folder': os.path.join(item['downloadDir'], item['name']),
'folder': ss(os.path.join(item['downloadDir'], item['name'])),
})
return statuses
couchpotato/core/downloaders/utorrent/main.py
+1 -1
View File
@@ -144,7 +144,7 @@ class uTorrent(Downloader):
'seed_ratio': float(item[7]) / 1000,
'original_status': item[1],
'timeleft': str(timedelta(seconds = item[10])),
'folder': item[26],
'folder': ss(item[26]),
})
return statuses