From aaf5cab138db017477d7a581508597bbabb16f27 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Tue, 27 Aug 2013 23:38:51 +0200
Subject: [PATCH] Encode folder returned from downloader. fix #2071

---
 couchpotato/core/downloaders/deluge/main.py       | 4 ++--
 couchpotato/core/downloaders/nzbget/main.py       | 2 +-
 couchpotato/core/downloaders/nzbvortex/main.py    | 2 +-
 couchpotato/core/downloaders/rtorrent/main.py     | 6 +++---
 couchpotato/core/downloaders/sabnzbd/main.py      | 2 +-
 couchpotato/core/downloaders/transmission/main.py | 4 ++--
 couchpotato/core/downloaders/utorrent/main.py     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/couchpotato/core/downloaders/deluge/main.py b/couchpotato/core/downloaders/deluge/main.py
index 83be6bfc..6ef834ee 100644
--- a/couchpotato/core/downloaders/deluge/main.py
+++ b/couchpotato/core/downloaders/deluge/main.py
@@ -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
diff --git a/couchpotato/core/downloaders/nzbget/main.py b/couchpotato/core/downloaders/nzbget/main.py
index ba3b2618..04f68f48 100644
--- a/couchpotato/core/downloaders/nzbget/main.py
+++ b/couchpotato/core/downloaders/nzbget/main.py
@@ -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
diff --git a/couchpotato/core/downloaders/nzbvortex/main.py b/couchpotato/core/downloaders/nzbvortex/main.py
index b8817aca..2944c327 100644
--- a/couchpotato/core/downloaders/nzbvortex/main.py
+++ b/couchpotato/core/downloaders/nzbvortex/main.py
@@ -57,7 +57,7 @@ class NZBVortex(Downloader):
                 'status': status,
                 'original_status': item['state'],
                 'timeleft':-1,
-                'folder': item['destinationPath'],
+                'folder': ss(item['destinationPath']),
             })
 
         return statuses
diff --git a/couchpotato/core/downloaders/rtorrent/main.py b/couchpotato/core/downloaders/rtorrent/main.py
index c2a9b8af..680c44aa 100755
--- a/couchpotato/core/downloaders/rtorrent/main.py
+++ b/couchpotato/core/downloaders/rtorrent/main.py
@@ -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
diff --git a/couchpotato/core/downloaders/sabnzbd/main.py b/couchpotato/core/downloaders/sabnzbd/main.py
index 468f30b3..68bbd26c 100644
--- a/couchpotato/core/downloaders/sabnzbd/main.py
+++ b/couchpotato/core/downloaders/sabnzbd/main.py
@@ -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
diff --git a/couchpotato/core/downloaders/transmission/main.py b/couchpotato/core/downloaders/transmission/main.py
index fc8c1b93..be7f2f7d 100644
--- a/couchpotato/core/downloaders/transmission/main.py
+++ b/couchpotato/core/downloaders/transmission/main.py
@@ -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
diff --git a/couchpotato/core/downloaders/utorrent/main.py b/couchpotato/core/downloaders/utorrent/main.py
index 3e5df647..59e9a4a4 100644
--- a/couchpotato/core/downloaders/utorrent/main.py
+++ b/couchpotato/core/downloaders/utorrent/main.py
@@ -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