ignore old UnRar plugin

2 files changed, 6 insertions, 7 deletions

diff --git a/module/ConfigParser.py b/module/ConfigParser.py
index bcf5bcd2a..064f74e36 100644
--- a/module/ConfigParser.py
+++ b/module/ConfigParser.py
@@ -2,14 +2,13 @@
 
 from __future__ import with_statement
 from time import sleep
-from os.path import exists
-from os.path import join
+from os.path import exists, join
 from shutil import copy
 
 from traceback import print_exc
 from utils import chmod
 
-IGNORE = ("FreakshareNet", "SpeedManager", "ArchiveTo", "ShareCx")
+IGNORE = ("FreakshareNet", "SpeedManager", "ArchiveTo", "ShareCx", ('hooks', 'UnRar'))
 # ignore these plugin configs, mainly because plugins were wiped out
 
 CONF_VERSION = 1
diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py
index e6ad14b66..1aaa4593e 100644
--- a/module/plugins/PluginManager.py
+++ b/module/plugins/PluginManager.py
@@ -137,14 +137,14 @@ class PluginManager:
 
                 module = f.replace(".pyc", "").replace(".py", "")
                 if home:
-                    if name in IGNORE:
-                        del plugins[name]
-                        continue
-
                     user = True
                 else:
                     user = False
 
+                    if name in IGNORE or (folder, name) in IGNORE:
+                         del plugins[name]
+                         continue
+
                 # the plugin is loaded from user directory
                 plugins[name]["user"] = user
                 plugins[name]["name"] = module