comment out filemanager

7 files changed, 27 insertions, 24 deletions

diff --git a/module/PyFile.py b/module/PyFile.py
index 02d34e33b..106d601cc 100644
--- a/module/PyFile.py
+++ b/module/PyFile.py
@@ -118,6 +118,7 @@ class PyFile(object):
             self.plugin.clean()
             del self.plugin
         if hasattr(self.progress, "notify"):
+            del self.progress.notify
             self.progress.notify = None
 
         self.m.releaseLink(self.id)
diff --git a/module/config/default.conf b/module/config/default.conf
index 630fcb9ba..b3cc54640 100644
--- a/module/config/default.conf
+++ b/module/config/default.conf
@@ -11,7 +11,7 @@ ssl - "SSL":
 	file key : "SSL Key" = ssl.key

 webinterface - "Webinterface":

 	bool activated : "Activated" = True

-	builtin;threaded;fastcgi server : "Server" = builtin

+	builtin;threaded;fastcgi;lightweight server : "Server" = builtin

 	bool https : "Use HTTPS" = False

 	ip host : "IP" = 0.0.0.0

 	int port : "Port" = 8001

diff --git a/module/plugins/hooks/RealdebridCom.py b/module/plugins/hooks/RealdebridCom.py
index e415f8e05..2c8bf1259 100644
--- a/module/plugins/hooks/RealdebridCom.py
+++ b/module/plugins/hooks/RealdebridCom.py
@@ -26,9 +26,9 @@ class RealdebridCom(Hook):
     def getHostersCached(self):
         if not self.hosters:
             https = "https" if self.getConfig("https") else "http"
-            page = getURL(https + "://real-debrid.com/api/hosters.php")
+            page = getURL(https + "://real-debrid.com/api/hosters.php").replace("\"","").strip()
 
-            self.hosters = [x.strip() for x in page.replace("\"", "").split(",")]
+            self.hosters = [x.strip() for x in page.split(",") if x.strip()]
 
             for rep in self.replacements:
                 if rep[0] in self.hosters:
@@ -56,13 +56,13 @@ class RealdebridCom(Hook):
         module = self.core.pluginManager.getPlugin("RealdebridCom")
         klass = getattr(module, "RealdebridCom")
         #inject real debrid plugin
-        self.core.log.debug("Real-Debrid: Overwritten Hosters: %s" % ", ".join(sorted(supported)))
+        self.logDebug("Overwritten Hosters: %s" % ", ".join(sorted(supported)))
         for hoster in supported:
             dict = self.core.pluginManager.hosterPlugins[hoster]
             dict["new_module"] = module
             dict["new_name"] = "RealdebridCom"
 
-        self.core.log.debug("Real-Debrid: New Hosters: %s" % ", ".join(sorted(new_supported)))
+        self.logDebug("New Hosters: %s" % ", ".join(sorted(new_supported)))
 
         #create new regexp
         regexp = r".*(%s).*" % "|".join([klass.__pattern__] + [x.replace(".", "\\.") for x in new_supported])
diff --git a/module/web/json_app.py b/module/web/json_app.py
index 4b9c91634..d35ca1ad7 100644
--- a/module/web/json_app.py
+++ b/module/web/json_app.py
@@ -426,8 +426,8 @@ def change_password():
         print "Wrong password"
         return HTTPError()
 
-@route("/json/filemanager/rename", method="POST")
-@login_required('filemanager')
+#@route("/json/filemanager/rename", method="POST")
+#@login_required('filemanager')
 def rename_dir():
     try:
         path = decode(request.forms.get("path"))
@@ -446,8 +446,8 @@ def rename_dir():
         return HTTPError()
 
 
-@route("/json/filemanager/delete", method="POST")
-@login_required('filemanager')
+#@route("/json/filemanager/delete", method="POST")
+#@login_required('filemanager')
 def delete_dir():
     try:
         try:
@@ -463,8 +463,8 @@ def delete_dir():
         return HTTPError()
 
 
-@route("/json/filemanager/mkdir", method="POST")
-@login_required('filemanager')
+#@route("/json/filemanager/mkdir", method="POST")
+#@login_required('filemanager')
 def make_dir():
     try:
         path = decode(request.forms.get("path"))
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py
index 47e80c96a..7857f2207 100644
--- a/module/web/pyload_app.py
+++ b/module/web/pyload_app.py
@@ -183,11 +183,13 @@ def downloads():
         'files': []
     }
 
-    for item in sorted(listdir(root)):
+    items = [decode(x) for x in listdir(root)]
+
+    for item in sorted(items):
         if isdir(join(root, item)):
             folder = {
-                'name': decode(item),
-                'path': decode(item),
+                'name': item,
+                'path': item,
                 'files': []
             }
             for file in sorted(listdir(join(root, item))):
@@ -221,8 +223,8 @@ def get_download(path):
         return HTTPError(404, "File not Found.")
 
 
-@route("/filemanager")
-@login_required('filemanager')
+#@route("/filemanager")
+#@login_required('filemanager')
 def filemanager():
     root = PYLOAD.get_conf_val("general", "download_folder")
 
@@ -269,8 +271,8 @@ def iterate_over_dir(root, dir):
     return out
 
 
-@route("/filemanager/get_dir", "POST")
-@login_required('filemanager')
+#@route("/filemanager/get_dir", "POST")
+#@login_required('filemanager')
 def folder():
     path = request.forms.get("path").decode("utf8", "ignore")
     name = request.forms.get("name").decode("utf8", "ignore")
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 40f002a14..30c3a0414 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -225,9 +225,9 @@ function AddBox(){
 		<li {{ selected('downloads') }}>

 		    <a href="/downloads/" title=""><img src="/media/default/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>

 		</li>

-		<li {{ selected('filemanager') }}>

-		    <a href="/filemanager/" title=""><img src="/media/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>

-		</li>

+{#		<li {{ selected('filemanager') }}>#}

+{#		    <a href="/filemanager/" title=""><img src="/media/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}

+{#		</li>#}

 		<li {{ selected('logs', True) }}>

 		    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/media/default/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>

 		</li>

diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index 927287dfc..1239d381d 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -218,9 +218,9 @@ var LinkEntry = new Class({
 <li>

     <a href="/downloads/" title=""><img src="/media/default/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>

 </li>

-<li>

-    <a href="/filemanager/" title=""><img src="/media/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>

-</li>

+{#<li>#}

+{#    <a href="/filemanager/" title=""><img src="/media/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}

+{#</li>#}

 <li class="right">

     <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/media/default/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>

 </li>