Merge branch 'refs/heads/develop' into redesign

Conflicts:
	couchpotato/static/scripts/couchpotato.js

couchpotato/core/_base/_core.py

@@ -90,7 +90,11 @@ class Core(Plugin):
 
         def shutdown():
             self.initShutdown()
-        IOLoop.current().add_callback(shutdown)
+
+        if IOLoop.current()._closing:
+            shutdown()
+        else:
+            IOLoop.current().add_callback(shutdown)
 
         return 'shutdown'
 
@@ -139,7 +143,8 @@ class Core(Plugin):
         log.debug('Safe to shutdown/restart')
 
         try:
-            IOLoop.current().stop()
+            if not IOLoop.current()._closing:
+                IOLoop.current().stop()
         except RuntimeError:
             pass
         except:

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,8 +322,9 @@ class SourceUpdater(BaseUpdater):
         return False
 
     def replaceWith(self, path):
-        app_dir = ss(Env.get('app_dir'))
-        data_dir = ss(Env.get('data_dir'))
+        path = sp(path)
+        app_dir = Env.get('app_dir')
+        data_dir = Env.get('data_dir')
 
         # Get list of files we want to overwrite
         self.deletePyc()