Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 5 insertions, 16 deletions

diff --git a/module/plugins/addons/AlldebridCom.py b/module/plugins/addons/AlldebridCom.py
index f9657ed8c..6818b8c43 100644
--- a/module/plugins/addons/AlldebridCom.py
+++ b/module/plugins/addons/AlldebridCom.py
@@ -7,33 +7,22 @@ from module.plugins.internal.MultiHoster import MultiHoster
 
 class AlldebridCom(MultiHoster):
     __name__ = "AlldebridCom"
-    __version__ = "0.11"
+    __version__ = "0.13"
     __type__ = "hook"
 
     __config__ = [("activated", "bool", "Activated", "False"),
                   ("https", "bool", "Enable HTTPS", "False"),
                   ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", "")]
+                  ("hosterList", "str", "Hoster list (comma separated)", ""),
+                  ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"),
+                  ("interval", "int", "Reload interval in hours (0 to disable)", "24")]
 
     __description__ = """Real-Debrid.com hook plugin"""
     __author_name__ = ("Andy, Voigt")
     __author_mail__ = ("spamsales@online.de")
 
-    replacements = [("freakshare.net", "freakshare.com")]
-
     def getHoster(self):
         https = "https" if self.getConfig("https") else "http"
         page = getURL(https + "://www.alldebrid.com/api.php?action=get_host").replace("\"","").strip()
         
-        hosters = set([x.strip() for x in page.split(",") if x.strip()])
-        
-        configMode = self.getConfig('hosterListMode')
-        if configMode in ("listed", "unlisted"):
-            configList = set(self.getConfig('hosterList').strip().lower().replace('|',',').replace(';',',').split(','))
-            configList.discard(u'')
-            if configMode == "listed":
-                hosters &= configList
-            else:
-                hosters -= configList
-        
-        return list(hosters)
+        return [x.strip() for x in page.split(",") if x.strip()]