Spare code cosmetics (4)

21 files changed, 43 insertions, 33 deletions

diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py
index 356a75ac1..e0daa6657 100644
--- a/module/plugins/hoster/AlldebridCom.py
+++ b/module/plugins/hoster/AlldebridCom.py
@@ -14,7 +14,8 @@ class AlldebridCom(MultiHoster):
     __version__ = "0.47"
 
     __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Alldebrid.com multi-hoster plugin"""
     __license__     = "GPLv3"
@@ -45,10 +46,5 @@ class AlldebridCom(MultiHoster):
             pyfile.size = parseFileSize(data['filesize'])
             self.link = data['link']
 
-        if self.getConfig('ssl'):
-            self.link = self.link.replace("http://", "https://")
-        else:
-            self.link = self.link.replace("https://", "http://")
-
 
 getInfo = create_getInfo(AlldebridCom)
diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py
index 8bf1b7328..9e3d87934 100644
--- a/module/plugins/hoster/DebridItaliaCom.py
+++ b/module/plugins/hoster/DebridItaliaCom.py
@@ -11,7 +11,8 @@ class DebridItaliaCom(MultiHoster):
     __version__ = "0.18"
 
     __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Debriditalia.com multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py
index b165f1d9d..468bcc8af 100644
--- a/module/plugins/hoster/FastixRu.py
+++ b/module/plugins/hoster/FastixRu.py
@@ -13,7 +13,8 @@ class FastixRu(MultiHoster):
     __version__ = "0.12"
 
     __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Fastix multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index 215dd8f5a..59b3d93bb 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -9,7 +9,8 @@ class FreeWayMe(MultiHoster):
     __version__ = "0.18"
 
     __pattern__ = r'https?://(?:www\.)?free-way\.(bz|me)/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """FreeWayMe multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/HighWayMe.py b/module/plugins/hoster/HighWayMe.py
index dc7a9fc12..a33a1137b 100644
--- a/module/plugins/hoster/HighWayMe.py
+++ b/module/plugins/hoster/HighWayMe.py
@@ -12,7 +12,8 @@ class HighWayMe(MultiHoster):
     __version__ = "0.12"
 
     __pattern__ = r'https?://.+high-way\.my'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """High-Way.me multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py
index f836cb4cc..f7bdef0dd 100644
--- a/module/plugins/hoster/LinksnappyCom.py
+++ b/module/plugins/hoster/LinksnappyCom.py
@@ -13,7 +13,8 @@ class LinksnappyCom(MultiHoster):
     __version__ = "0.09"
 
     __pattern__ = r'https?://(?:[^/]+\.)?linksnappy\.com'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Linksnappy.com multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py
index b83b80e46..e4a002f9b 100644
--- a/module/plugins/hoster/MegaDebridEu.py
+++ b/module/plugins/hoster/MegaDebridEu.py
@@ -13,7 +13,8 @@ class MegaDebridEu(MultiHoster):
     __version__ = "0.48"
 
     __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Mega-debrid.eu multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/MegaRapidoNet.py b/module/plugins/hoster/MegaRapidoNet.py
index ce31308d0..4b0465e44 100644
--- a/module/plugins/hoster/MegaRapidoNet.py
+++ b/module/plugins/hoster/MegaRapidoNet.py
@@ -26,7 +26,8 @@ class MegaRapidoNet(MultiHoster):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """MegaRapido.net multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py
index d9132c821..1211a532f 100644
--- a/module/plugins/hoster/MyfastfileCom.py
+++ b/module/plugins/hoster/MyfastfileCom.py
@@ -12,7 +12,8 @@ class MyfastfileCom(MultiHoster):
     __version__ = "0.09"
 
     __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Myfastfile.com multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py
index 29de7cc77..e300194a6 100644
--- a/module/plugins/hoster/NoPremiumPl.py
+++ b/module/plugins/hoster/NoPremiumPl.py
@@ -10,7 +10,8 @@ class NoPremiumPl(MultiHoster):
     __version__ = "0.03"
 
     __pattern__ = r'https?://direct\.nopremium\.pl.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """NoPremium.pl multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py
index 8ba310b52..944d4c664 100644
--- a/module/plugins/hoster/OverLoadMe.py
+++ b/module/plugins/hoster/OverLoadMe.py
@@ -14,7 +14,8 @@ class OverLoadMe(MultiHoster):
     __version__ = "0.12"
 
     __pattern__ = r'https?://.*overload\.me/.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Over-Load.me multi-hoster plugin"""
     __license__     = "GPLv3"
@@ -26,9 +27,8 @@ class OverLoadMe(MultiHoster):
 
 
     def handlePremium(self, pyfile):
-        https = "https" if self.getConfig('ssl') else "http"
         data  = self.account.getAccountData(self.user)
-        page  = self.load(https + "://api.over-load.me/getdownload.php",
+        page  = self.load("https://api.over-load.me/getdownload.php",
                           get={'auth': data['password'],
                                'link': pyfile.url})
 
diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py
index c810a1f5a..082f17474 100644
--- a/module/plugins/hoster/PremiumTo.py
+++ b/module/plugins/hoster/PremiumTo.py
@@ -14,7 +14,8 @@ class PremiumTo(MultiHoster):
     __version__ = "0.24"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Premium.to multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py
index 8e7d74012..bfd78853b 100644
--- a/module/plugins/hoster/PremiumizeMe.py
+++ b/module/plugins/hoster/PremiumizeMe.py
@@ -10,7 +10,8 @@ class PremiumizeMe(MultiHoster):
     __version__ = "0.18"
 
     __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Premiumize.me multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py
index 47f18afff..2e6271ac6 100644
--- a/module/plugins/hoster/RPNetBiz.py
+++ b/module/plugins/hoster/RPNetBiz.py
@@ -12,7 +12,8 @@ class RPNetBiz(MultiHoster):
     __version__ = "0.15"
 
     __pattern__ = r'https?://.+rpnet\.biz'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """RPNet.biz multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py
index 479371162..dc6e9253e 100644
--- a/module/plugins/hoster/RapideoPl.py
+++ b/module/plugins/hoster/RapideoPl.py
@@ -10,7 +10,8 @@ class RapideoPl(MultiHoster):
     __version__ = "0.03"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Rapideo.pl multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py
index 5a122155a..54cd54008 100644
--- a/module/plugins/hoster/RealdebridCom.py
+++ b/module/plugins/hoster/RealdebridCom.py
@@ -15,7 +15,8 @@ class RealdebridCom(MultiHoster):
     __version__ = "0.68"
 
     __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Real-Debrid.com multi-hoster plugin"""
     __license__     = "GPLv3"
@@ -47,10 +48,5 @@ class RealdebridCom(MultiHoster):
             pyfile.size = parseFileSize(data['file_size'])
             self.link = data['generated_links'][0][-1]
 
-        if self.getConfig('ssl'):
-            self.link = self.link.replace("http://", "https://")
-        else:
-            self.link = self.link.replace("https://", "http://")
-
 
 getInfo = create_getInfo(RealdebridCom)
diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py
index 0d1977dc2..54778ef00 100644
--- a/module/plugins/hoster/RehostTo.py
+++ b/module/plugins/hoster/RehostTo.py
@@ -11,7 +11,8 @@ class RehostTo(MultiHoster):
     __version__ = "0.22"
 
     __pattern__ = r'https?://.*rehost\.to\..+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Rehost.com multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py
index 2ca900b0a..8ea121199 100644
--- a/module/plugins/hoster/SimplyPremiumCom.py
+++ b/module/plugins/hoster/SimplyPremiumCom.py
@@ -12,7 +12,8 @@ class SimplyPremiumCom(MultiHoster):
     __version__ = "0.09"
 
     __pattern__ = r'https?://.+simply-premium\.com'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Simply-Premium.com multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py
index 4326b8206..5e06bed88 100644
--- a/module/plugins/hoster/SimplydebridCom.py
+++ b/module/plugins/hoster/SimplydebridCom.py
@@ -11,7 +11,8 @@ class SimplydebridCom(MultiHoster):
     __version__ = "0.19"
 
     __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Simply-debrid.com multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py
index ab8e7b714..9b62314ad 100644
--- a/module/plugins/hoster/SmoozedCom.py
+++ b/module/plugins/hoster/SmoozedCom.py
@@ -10,7 +10,8 @@ class SmoozedCom(MultiHoster):
     __version__ = "0.07"
 
     __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Smoozed.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py
index c16348ba3..85a813acf 100644
--- a/module/plugins/hoster/ZeveraCom.py
+++ b/module/plugins/hoster/ZeveraCom.py
@@ -12,7 +12,8 @@ class ZeveraCom(MultiHoster):
     __version__ = "0.31"
 
     __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Zevera.com multi-hoster plugin"""
     __license__     = "GPLv3"