filebeer workaround, rehost.to chunklimit, multihoster config

6 files changed, 24 insertions, 17 deletions

diff --git a/module/plugins/accounts/FilebeerInfo.py b/module/plugins/accounts/FilebeerInfo.py
index 9cfdb867c..40ab70519 100644
--- a/module/plugins/accounts/FilebeerInfo.py
+++ b/module/plugins/accounts/FilebeerInfo.py
@@ -24,7 +24,7 @@ from module.utils import parseFileSize
 
 class FilebeerInfo(Account):
     __name__ = "FilebeerInfo"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __type__ = "account"
     __description__ = """filebeer.info account plugin"""
     __author_name__ = ("zoidberg")
@@ -34,14 +34,14 @@ class FilebeerInfo(Account):
     
     def loadAccountInfo(self, user, req):
         html = req.load("http://filebeer.info/upgrade.php", decode = True)        
-        premium = 'Paid User </td>' in html
+        premium = not 'Free User </td>' in html
                 
         validuntil = None
         if premium:
             try:
                 validuntil = mktime(strptime(re.search(self.VALID_UNTIL_PATTERN, html).group(1), "%d/%m/%Y %H:%M:%S")) 
             except Exception, e:
-                self.logError(e)
+                self.logError("Unable to parse account info", e)
 
         return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
     
diff --git a/module/plugins/hooks/AlldebridCom.py b/module/plugins/hooks/AlldebridCom.py
index 91a0a6e5b..6818b8c43 100644
--- a/module/plugins/hooks/AlldebridCom.py
+++ b/module/plugins/hooks/AlldebridCom.py
@@ -7,13 +7,15 @@ from module.plugins.internal.MultiHoster import MultiHoster
 
 class AlldebridCom(MultiHoster):
     __name__ = "AlldebridCom"
-    __version__ = "0.12"
+    __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")
diff --git a/module/plugins/hooks/PremiumizeMe.py b/module/plugins/hooks/PremiumizeMe.py
index 37905c23e..a10c24f85 100644
--- a/module/plugins/hooks/PremiumizeMe.py
+++ b/module/plugins/hooks/PremiumizeMe.py
@@ -5,18 +5,18 @@ from module.network.RequestFactory import getURL
 
 class PremiumizeMe(MultiHoster):
     __name__ = "PremiumizeMe"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __type__ = "hook"
     __description__ = """Premiumize.Me hook plugin"""
 
     __config__ = [("activated", "bool", "Activated", "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")]
 
     __author_name__ = ("Florian Franzen")
     __author_mail__ = ("FlorianFranzen@gmail.com")
-
-    interval = 0 # Disable periodic calls, we dont use them anyway
     
     def getHoster(self):     
         # If no accounts are available there will be no hosters available
diff --git a/module/plugins/hooks/RealdebridCom.py b/module/plugins/hooks/RealdebridCom.py
index 0f06d14bc..be74b47c3 100644
--- a/module/plugins/hooks/RealdebridCom.py
+++ b/module/plugins/hooks/RealdebridCom.py
@@ -5,13 +5,15 @@ from module.plugins.internal.MultiHoster import MultiHoster
 
 class RealdebridCom(MultiHoster):
     __name__ = "RealdebridCom"
-    __version__ = "0.42"
+    __version__ = "0.43"
     __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__ = ("Devirex, Hazzard")
     __author_mail__ = ("naibaf_11@yahoo.de")
diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py
index 8903bd07f..7ca5e5cde 100644
--- a/module/plugins/hooks/RehostTo.py
+++ b/module/plugins/hooks/RehostTo.py
@@ -5,10 +5,14 @@ from module.plugins.internal.MultiHoster import MultiHoster
 
 class RehostTo(MultiHoster):
     __name__ = "RehostTo"
-    __version__ = "0.41"
+    __version__ = "0.42"
     __type__ = "hook"
 
-    __config__ = [("activated", "bool", "Activated", "False")]
+    __config__ = [("activated", "bool", "Activated", "False"),
+                  ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                  ("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__ = """rehost.to hook plugin"""
     __author_name__ = ("RaNaN")
@@ -34,4 +38,4 @@ class RehostTo(MultiHoster):
         self.ses = data["ses"]
         self.long_ses = data["long_ses"]
 
-        return MultiHoster.coreReady(self)
+        return MultiHoster.coreReady(self)
\ No newline at end of file
diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py
index 370adf077..141dcb8c8 100644
--- a/module/plugins/hoster/RehostTo.py
+++ b/module/plugins/hoster/RehostTo.py
@@ -6,9 +6,8 @@ from module.plugins.Hoster import Hoster
 
 class RehostTo(Hoster):
     __name__ = "RehostTo"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __type__ = "hoster"
-
     __pattern__ = r"https?://.*rehost.to\..*"
     __description__ = """rehost.com hoster plugin"""
     __author_name__ = ("RaNaN")
@@ -18,7 +17,7 @@ class RehostTo(Hoster):
         return unquote(url.rsplit("/", 1)[1])
 
     def setup(self):
-        self.chunkLimit = 3
+        self.chunkLimit = 1
         self.resumeDownload = True
 
     def process(self, pyfile):