Path encode

couchpotato/core/_base/updater/main.py

@@ -10,7 +10,7 @@ from threading import RLock
 
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.helpers.encoding import ss, sp
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
@@ -182,7 +182,7 @@ class BaseUpdater(Plugin):
 
     def deletePyc(self, only_excess = True, show_logs = True):
 
-        for root, dirs, files in scandir.walk(ss(Env.get('app_dir'))):
+        for root, dirs, files in scandir.walk(Env.get('app_dir')):
 
             pyc_files = filter(lambda filename: filename.endswith('.pyc'), files)
             py_files = set(filter(lambda filename: filename.endswith('.py'), files))
@@ -322,6 +322,7 @@ class SourceUpdater(BaseUpdater):
         return False
 
     def replaceWith(self, path):
+        path = sp(path)
         app_dir = ss(Env.get('app_dir'))
         data_dir = ss(Env.get('data_dir'))
 

couchpotato/core/downloaders/rtorrent_.py

@@ -238,7 +238,7 @@ class rTorrent(DownloaderBase):
             if torrent.is_multi_file() and torrent.directory.endswith(torrent.name):
                 # Remove empty directories bottom up
                 try:
-                    for path, _, _ in scandir.walk(torrent.directory, topdown = False):
+                    for path, _, _ in scandir.walk(sp(torrent.directory), topdown = False):
                         os.rmdir(path)
                 except OSError:
                     log.info('Directory "%s" contains extra files, unable to remove', torrent.directory)

couchpotato/core/plugins/renamer.py

@@ -118,10 +118,7 @@ class Renamer(Plugin):
         to_folder = sp(self.conf('to'))
 
         # Get media folder to process
-        media_folder = release_download.get('folder')
-
-        # Quality order for calculation quality priority
-        quality_order = fireEvent('quality.order', single = True)
+        media_folder = sp(release_download.get('folder'))
 
         # Get all folders that should not be processed
         no_process = [to_folder]
@@ -149,9 +146,9 @@ class Renamer(Plugin):
 
             # Update to the from folder
             if len(release_download.get('files', [])) == 1:
-                new_media_folder = from_folder
+                new_media_folder = sp(from_folder)
             else:
-                new_media_folder = os.path.join(from_folder, os.path.basename(media_folder))
+                new_media_folder = sp(os.path.join(from_folder, os.path.basename(media_folder)))
 
             if not os.path.isdir(new_media_folder):
                 log.error('The provided media folder %s does not exist and could also not be found in the \'from\' folder.', media_folder)
@@ -319,7 +316,7 @@ class Renamer(Plugin):
                     '3d': '3D' if group['meta_data']['quality'].get('is_3d', 0) else '',
                     '3d_type': group['meta_data'].get('3d_type'),
                 }
-                
+
                 if replacements['mpaa_only'] not in ('G', 'PG', 'PG-13', 'R', 'NC-17'):
                     replacements['mpaa_only'] = 'Not Rated'
 
@@ -667,7 +664,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
 
             # Tag all files in release folder
             elif release_download['folder']:
-                for root, folders, names in scandir.walk(release_download['folder']):
+                for root, folders, names in scandir.walk(sp(release_download['folder'])):
                     tag_files.extend([os.path.join(root, name) for name in names])
 
         for filename in tag_files:
@@ -691,13 +688,13 @@ Remove it if you want it to be renamed (again, or at least let it try again)
         if isinstance(group, dict):
             tag_files = [sorted(list(group['files']['movie']))[0]]
 
-            folder = group['parentdir']
+            folder = sp(group['parentdir'])
             if not group.get('dirname') or not os.path.isdir(folder):
                 return False
 
         elif isinstance(release_download, dict):
 
-            folder = release_download['folder']
+            folder = sp(release_download['folder'])
             if not os.path.isdir(folder):
                 return False
 
@@ -731,7 +728,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
         if not release_download:
             return False
 
-        folder = release_download['folder']
+        folder = sp(release_download['folder'])
         if not os.path.isdir(folder):
             return False