summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/hoster/AlldebridCom.py3
-rw-r--r--module/plugins/hoster/DebridItaliaCom.py3
-rw-r--r--module/plugins/hoster/FastixRu.py3
-rw-r--r--module/plugins/hoster/FreeWayMe.py3
-rw-r--r--module/plugins/hoster/LinksnappyCom.py2
-rw-r--r--module/plugins/hoster/MegaDebridEu.py2
-rw-r--r--module/plugins/hoster/MyfastfileCom.py3
-rw-r--r--module/plugins/hoster/OverLoadMe.py3
-rw-r--r--module/plugins/hoster/PremiumTo.py3
-rw-r--r--module/plugins/hoster/PremiumizeMe.py3
-rw-r--r--module/plugins/hoster/RPNetBiz.py3
-rw-r--r--module/plugins/hoster/RealdebridCom.py3
-rw-r--r--module/plugins/hoster/RehostTo.py3
-rw-r--r--module/plugins/hoster/SimplyPremiumCom.py3
-rw-r--r--module/plugins/hoster/SimplydebridCom.py3
-rw-r--r--module/plugins/hoster/UnrestrictLi.py3
-rw-r--r--module/plugins/hoster/ZeveraCom.py3
-rw-r--r--module/plugins/internal/MultiHoster.py41
-rw-r--r--module/plugins/internal/SimpleHoster.py2
19 files changed, 73 insertions, 19 deletions
diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py
index 8a4e31986..abcb1e5b1 100644
--- a/module/plugins/hoster/AlldebridCom.py
+++ b/module/plugins/hoster/AlldebridCom.py
@@ -22,6 +22,9 @@ class AlldebridCom(SimpleHoster):
__authors__ = [("Andy Voigt", "spamsales@online.de")]
+ MULTI_HOSTER = True
+
+
def getFilename(self, url):
try:
name = unquote(url.rsplit("/", 1)[1])
diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py
index 28c49091b..f9f4ce06d 100644
--- a/module/plugins/hoster/DebridItaliaCom.py
+++ b/module/plugins/hoster/DebridItaliaCom.py
@@ -18,6 +18,9 @@ class DebridItaliaCom(SimpleHoster):
("Walter Purcaro", "vuolter@gmail.com")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.chunkLimit = -1
self.resumeDownload = True
diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py
index 379ac1cd4..56d1e911a 100644
--- a/module/plugins/hoster/FastixRu.py
+++ b/module/plugins/hoster/FastixRu.py
@@ -21,6 +21,9 @@ class FastixRu(SimpleHoster):
__authors__ = [("Massimo Rosamilia", "max@spiritix.eu")]
+ MULTI_HOSTER = True
+
+
def getFilename(self, url):
try:
name = unquote(url.rsplit("/", 1)[1])
diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index 307ab7811..9c7344f95 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -15,6 +15,9 @@ class FreeWayMe(SimpleHoster):
__authors__ = [("Nicolas Giese", "james@free-way.me")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.resumeDownload = False
self.multiDL = self.premium
diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py
index 878e4222b..c7bce407e 100644
--- a/module/plugins/hoster/LinksnappyCom.py
+++ b/module/plugins/hoster/LinksnappyCom.py
@@ -20,6 +20,8 @@ class LinksnappyCom(SimpleHoster):
__authors__ = [("stickell", "l.stickell@yahoo.it")]
+ MULTI_HOSTER = True
+
SINGLE_CHUNK_HOSTERS = ('easybytez.com')
diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py
index a6a42a884..8feab4b24 100644
--- a/module/plugins/hoster/MegaDebridEu.py
+++ b/module/plugins/hoster/MegaDebridEu.py
@@ -20,6 +20,8 @@ class MegaDebridEu(SimpleHoster):
__authors__ = [("D.Ducatel", "dducatel@je-geek.fr")]
+ MULTI_HOSTER = True
+
API_URL = "https://www.mega-debrid.eu/api.php"
diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py
index f009a83b5..2b9200d4b 100644
--- a/module/plugins/hoster/MyfastfileCom.py
+++ b/module/plugins/hoster/MyfastfileCom.py
@@ -18,6 +18,9 @@ class MyfastfileCom(SimpleHoster):
__authors__ = [("stickell", "l.stickell@yahoo.it")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.chunkLimit = -1
self.resumeDownload = True
diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py
index bccccf615..815313dd1 100644
--- a/module/plugins/hoster/OverLoadMe.py
+++ b/module/plugins/hoster/OverLoadMe.py
@@ -22,6 +22,9 @@ class OverLoadMe(SimpleHoster):
__authors__ = [("marley", "marley@over-load.me")]
+ MULTI_HOSTER = True
+
+
def getFilename(self, url):
try:
name = unquote(url.rsplit("/", 1)[1])
diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py
index c946fbc7e..6c94b3fa9 100644
--- a/module/plugins/hoster/PremiumTo.py
+++ b/module/plugins/hoster/PremiumTo.py
@@ -24,6 +24,9 @@ class PremiumTo(SimpleHoster):
("stickell", "l.stickell@yahoo.it")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.resumeDownload = True
self.chunkLimit = 1
diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py
index 76a283b09..b3da7dca1 100644
--- a/module/plugins/hoster/PremiumizeMe.py
+++ b/module/plugins/hoster/PremiumizeMe.py
@@ -16,6 +16,9 @@ class PremiumizeMe(SimpleHoster):
__authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")]
+ MULTI_HOSTER = True
+
+
def handleMulti(self):
# In some cases hostsers do not supply us with a filename at download, so we
# are going to set a fall back filename (e.g. for freakshare or xfileshare)
diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py
index 901c7ee77..a7bc3ea71 100644
--- a/module/plugins/hoster/RPNetBiz.py
+++ b/module/plugins/hoster/RPNetBiz.py
@@ -18,6 +18,9 @@ class RPNetBiz(SimpleHoster):
__authors__ = [("Dman", "dmanugm@gmail.com")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.chunkLimit = -1
self.resumeDownload = True
diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py
index 1c1347b4e..4fa42242a 100644
--- a/module/plugins/hoster/RealdebridCom.py
+++ b/module/plugins/hoster/RealdebridCom.py
@@ -23,6 +23,9 @@ class RealdebridCom(SimpleHoster):
__authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
+ MULTI_HOSTER = True
+
+
def getFilename(self, url):
try:
name = unquote(url.rsplit("/", 1)[1])
diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py
index 4f978cdce..dbd943d37 100644
--- a/module/plugins/hoster/RehostTo.py
+++ b/module/plugins/hoster/RehostTo.py
@@ -17,6 +17,9 @@ class RehostTo(SimpleHoster):
__authors__ = [("RaNaN", "RaNaN@pyload.org")]
+ MULTI_HOSTER = True
+
+
def getFilename(self, url):
return unquote(url.rsplit("/", 1)[1])
diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py
index e381fb29f..9857f514a 100644
--- a/module/plugins/hoster/SimplyPremiumCom.py
+++ b/module/plugins/hoster/SimplyPremiumCom.py
@@ -20,6 +20,9 @@ class SimplyPremiumCom(SimpleHoster):
__authors__ = [("EvolutionClip", "evolutionclip@live.de")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.chunkLimit = 16
self.resumeDownload = False
diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py
index 196cdfd4b..1b8ff11b2 100644
--- a/module/plugins/hoster/SimplydebridCom.py
+++ b/module/plugins/hoster/SimplydebridCom.py
@@ -17,6 +17,9 @@ class SimplydebridCom(SimpleHoster):
__authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.resumeDownload = True
self.multiDL = True
diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
index fcdbbd284..911061f24 100644
--- a/module/plugins/hoster/UnrestrictLi.py
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -38,6 +38,9 @@ class UnrestrictLi(SimpleHoster):
__authors__ = [("stickell", "l.stickell@yahoo.it")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.chunkLimit = 16
self.resumeDownload = True
diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py
index d8c2ffe7a..8effea20b 100644
--- a/module/plugins/hoster/ZeveraCom.py
+++ b/module/plugins/hoster/ZeveraCom.py
@@ -15,6 +15,9 @@ class ZeveraCom(SimpleHoster):
__authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+ MULTI_HOSTER = True
+
+
def setup(self):
self.resumeDownload = True
self.multiDL = True
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 6d10d17d9..0bcb79817 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
class MultiHoster(Hook):
__name__ = "MultiHoster"
__type__ = "hook"
- __version__ = "0.21"
+ __version__ = "0.22"
__description__ = """Generic MultiHoster plugin"""
__license__ = "GPLv3"
@@ -18,19 +18,22 @@ class MultiHoster(Hook):
interval = 12 * 60 * 60 #: reload hosters every 12h
- HOSTER_REPLACEMENTS = [("1fichier.com", "onefichier.com"),
- ("2shared.com", "twoshared.com"),
- ("4shared.com", "fourshared.com"),
- ("cloudnator.com", "shragle.com"),
- ("easy-share.com", "crocko.com"),
- ("freakshare.net", "freakshare.com"),
- ("hellshare.com", "hellshare.cz"),
- ("ifile.it", "filecloud.io"),
- ("putlocker.com", "firedrive.com"),
- ("share-rapid.cz", "multishare.cz"),
- ("sharerapid.cz", "multishare.cz"),
- ("ul.to", "uploaded.to"),
- ("uploaded.net", "uploaded.to")]
+ HOSTER_REPLACEMENTS = [("1fichier.com" , "onefichier.com"),
+ ("2shared.com" , "twoshared.com" ),
+ ("4shared.com" , "fourshared.com"),
+ ("cloudnator.com" , "shragle.com" ),
+ ("easy-share.com" , "crocko.com" ),
+ ("fileparadox.com", "fileparadox.in"),
+ ("freakshare.net" , "freakshare.com"),
+ ("hellshare.com" , "hellshare.cz" ),
+ ("ifile.it" , "filecloud.io" ),
+ ("nowdownload.ch" , "nowdownload.sx"),
+ ("nowvideo.co" , "nowvideo.sx" ),
+ ("putlocker.com" , "firedrive.com" ),
+ ("share-rapid.cz" , "multishare.cz" ),
+ ("sharerapid.cz" , "multishare.cz" ),
+ ("ul.to" , "uploaded.to" ),
+ ("uploaded.net" , "uploaded.to" )]
HOSTER_EXCLUDED = []
@@ -133,12 +136,12 @@ class MultiHoster(Hook):
def overridePlugins(self):
- pluginMap = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.keys())
+ pluginMap = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.iterkeys())
accountList = [name.lower() for name, data in self.core.accountManager.accounts.iteritems() if data]
excludedList = []
for hoster in self.getHosterCached():
- name = remove_chars(hoster.lower(), "-.")
+ name = remove_chars(hoster, "-.")
if name in accountList:
excludedList.append(hoster)
@@ -166,10 +169,12 @@ class MultiHoster(Hook):
self.logInfo(_("The following hosters were not overwritten - account exists"), ", ".join(sorted(excludedList)))
if self.new_supported:
- self.logDebug("New Hosters", ", ".join(sorted(self.new_supported)))
+ hosters = sorted(self.new_supported)
+
+ self.logDebug("New Hosters", ", ".join(hosters))
# create new regexp
- regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in self.new_supported])
+ regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in hosters])
if hasattr(klass, "__pattern__") and isinstance(klass.__pattern__, basestring) and '://' in klass.__pattern__:
regexp = r'%s|%s' % (klass.__pattern__, regexp)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ad140423c..2ff60d6ea 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -361,7 +361,7 @@ class SimpleHoster(Hoster):
if self.multihost:
self.logDebug("Looking for leeched download link...")
- self.logDebug("File url: %s" % self.pyfile.url)
+ self.logDebug("File url: %s" % pyfile.url)
self.handleMulti()
elif self.directDL:
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 22:47:24 +0100