summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/container/DLC.py2
-rw-r--r--module/plugins/crypter/Dereferer.py12
-rw-r--r--module/plugins/crypter/LinkdecrypterCom.py6
-rw-r--r--module/plugins/crypter/ShSt.py4
-rw-r--r--module/plugins/crypter/ShareLinksBiz.py6
-rw-r--r--module/plugins/crypter/XFileSharingProFolder.py26
-rw-r--r--module/plugins/internal/Container.py3
-rw-r--r--module/plugins/internal/Plugin.py5
-rw-r--r--module/plugins/internal/SevenZip.py4
9 files changed, 33 insertions, 35 deletions
diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py
index 145322942..c92ba64c4 100644
--- a/module/plugins/container/DLC.py
+++ b/module/plugins/container/DLC.py
@@ -17,7 +17,7 @@ class DLC(Container):
__version__ = "0.26"
__status__ = "testing"
- __pattern__ = r'.+\.dlc$'
+ __pattern__ = r'(.+\.dlc|[\w+^_]+==[\w+^_/]+==)$'
__description__ = """DLC container decrypter plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index 9051abcc2..d7dfe52d7 100644
--- a/module/plugins/crypter/Dereferer.py
+++ b/module/plugins/crypter/Dereferer.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
class Dereferer(SimpleCrypter):
__name__ = "Dereferer"
__type__ = "crypter"
- __version__ = "0.18"
+ __version__ = "0.19"
__status__ = "testing"
__pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>(?:ht|f)tps?://.+)'
@@ -20,12 +20,12 @@ class Dereferer(SimpleCrypter):
__authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
- HOSTER_DOMAIN = None
- HOSTER_NAME = None
+ PLUGIN_DOMAIN = None
+ PLUGIN_NAME = None
def _log(self, level, plugintype, pluginname, messages):
- return super(Dereferer, self)._log(level, plugintype, pluginname, (self.HOSTER_NAME,) + messages)
+ return super(Dereferer, self)._log(level, plugintype, pluginname, (self.PLUGIN_NAME,) + messages)
def init(self):
@@ -33,8 +33,8 @@ class Dereferer(SimpleCrypter):
self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern'] #@TODO: Recheck in 0.4.10
- self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
- self.HOSTER_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')
+ self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
+ self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.PLUGIN_DOMAIN) if part != '.')
def get_links(self):
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index d8812dbd5..0f0c3e7a9 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.MultiCrypter import MultiCrypter
class LinkdecrypterCom(MultiCrypter):
__name__ = "LinkdecrypterCom"
__type__ = "crypter"
- __version__ = "0.32"
+ __version__ = "0.33"
__status__ = "testing"
__pattern__ = r'^unmatchable$'
@@ -28,7 +28,6 @@ class LinkdecrypterCom(MultiCrypter):
def setup(self):
- self.password = self.get_password()
self.req.setOption("timeout", 300)
@@ -61,7 +60,8 @@ class LinkdecrypterCom(MultiCrypter):
elif self.PASSWORD_PATTERN in self.html:
if self.password:
self.log_info(_("Password protected link"))
- self.html = self.load('http://linkdecrypter.com/', post={'password': self.password})
+ self.html = self.load('http://linkdecrypter.com/',
+ post={'password': self.get_password()})
else:
self.fail(_("Missing password"))
diff --git a/module/plugins/crypter/ShSt.py b/module/plugins/crypter/ShSt.py
index 754bc542c..43cc4e779 100644
--- a/module/plugins/crypter/ShSt.py
+++ b/module/plugins/crypter/ShSt.py
@@ -9,7 +9,7 @@ import re
class ShSt(Crypter):
__name__ = "ShSt"
__type__ = "crypter"
- __version__ = "0.04"
+ __version__ = "0.05"
__status__ = "testing"
__pattern__ = r'http://sh\.st/\w+'
@@ -19,7 +19,7 @@ class ShSt(Crypter):
__authors__ = [("Frederik Möllers", "fred-public@posteo.de")]
- NAME_PATTERN = r'<title>(?P<N>.+?) - .+</title>'
+ NAME_PATTERN = r'<title>(?P<N>.+?) -'
def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index 2e9abff61..3316aea56 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -10,7 +10,7 @@ from module.plugins.internal.Crypter import Crypter
class ShareLinksBiz(Crypter):
__name__ = "ShareLinksBiz"
__type__ = "crypter"
- __version__ = "1.17"
+ __version__ = "1.18"
__status__ = "testing"
__pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)'
@@ -131,7 +131,7 @@ class ShareLinksBiz(Crypter):
href = self._resolve_coords(coords, captchaMap)
if href is None:
self.captcha.invalid()
- self.retry(wait_time=5)
+ self.retry(delay=5)
url = self.base_url + href
self.html = self.load(url)
@@ -161,7 +161,7 @@ class ShareLinksBiz(Crypter):
if self.captcha:
if "Your choice was wrong" in self.html:
self.captcha.invalid()
- self.retry(wait_time=5)
+ self.retry(delay=5)
else:
self.captcha.correct()
diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py
index 584cc7668..f693698bc 100644
--- a/module/plugins/crypter/XFileSharingProFolder.py
+++ b/module/plugins/crypter/XFileSharingProFolder.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
class XFileSharingProFolder(XFSCrypter):
__name__ = "XFileSharingProFolder"
__type__ = "crypter"
- __version__ = "0.13"
+ __version__ = "0.14"
__status__ = "testing"
__pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+'
@@ -23,7 +23,7 @@ class XFileSharingProFolder(XFSCrypter):
def _log(self, level, plugintype, pluginname, messages):
return super(XFileSharingProFolder, self)._log(level,
plugintype,
- "%s: %s" % (pluginname, self.HOSTER_NAME),
+ "%s: %s" % (pluginname, self.PLUGIN_NAME),
messages)
@@ -32,18 +32,18 @@ class XFileSharingProFolder(XFSCrypter):
self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern']
- self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
- self.HOSTER_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|\-)', self.HOSTER_DOMAIN) if part != '.')
+ self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
+ self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|\-)', self.PLUGIN_DOMAIN) if part != '.')
def _setup(self):
- account_name = self.__name__ if self.account.HOSTER_DOMAIN is None else self.HOSTER_NAME
+ account_name = self.__name__ if self.account.PLUGIN_DOMAIN is None else self.PLUGIN_NAME
self.chunk_limit = 1
self.multiDL = True
if self.account:
- self.req = self.pyload.requestFactory.getRequest(accountname, self.user)
- self.premium = self.account.is_premium(self.user)
+ self.req = self.pyload.requestFactory.getRequest(accountname, self.account.user)
+ self.premium = self.account.premium
self.resume_download = self.premium
else:
self.req = self.pyload.requestFactory.getRequest(account_name)
@@ -56,19 +56,19 @@ class XFileSharingProFolder(XFSCrypter):
self.req.close()
if not self.account:
- self.account = self.pyload.accountManager.getAccountPlugin(self.HOSTER_NAME)
+ self.account = self.pyload.accountManager.getAccountPlugin(self.PLUGIN_NAME)
if not self.account:
self.account = self.pyload.accountManager.getAccountPlugin(self.__name__)
if self.account:
- if not self.account.HOSTER_DOMAIN:
- self.account.HOSTER_DOMAIN = self.HOSTER_DOMAIN
+ if not self.account.PLUGIN_DOMAIN:
+ self.account.PLUGIN_DOMAIN = self.PLUGIN_DOMAIN
- if not self.user:
- self.user = self.account.select()[0]
+ if not self.account.user: #@TODO: Move to `Account` in 0.4.10
+ self.account.user = self.account.select()[0]
- if not self.user or not self.account.is_logged(self.user, True):
+ if not self.account.logged:
self.account = False
diff --git a/module/plugins/internal/Container.py b/module/plugins/internal/Container.py
index 524b55839..2300c4cab 100644
--- a/module/plugins/internal/Container.py
+++ b/module/plugins/internal/Container.py
@@ -20,7 +20,8 @@ class Container(Crypter):
__description__ = """Base container decrypter plugin"""
__license__ = "GPLv3"
- __authors__ = [("mkaay", "mkaay@mkaay.de")]
+ __authors__ = [("mkaay" , "mkaay@mkaay.de" ),
+ ("Walter Purcaro", "vuolter@gmail.com")]
def process(self, pyfile):
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index f1cd74fcb..6f3e52962 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -192,10 +192,7 @@ class Plugin(object):
__description__ = """Base plugin"""
__license__ = "GPLv3"
- __authors__ = [("RaNaN" , "RaNaN@pyload.org" ),
- ("spoob" , "spoob@pyload.org" ),
- ("mkaay" , "mkaay@mkaay.de" ),
- ("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
def __init__(self, core):
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 9d3a71a21..7ed64ecdf 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -15,8 +15,8 @@ class SevenZip(UnRar):
__description__ = """7-Zip extractor plugin"""
__license__ = "GPLv3"
- __authors__ = [("Michael Nowak" , "" ),
- ("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("Walter Purcaro", "vuolter@gmail.com"),
+ ("Michael Nowak" , None )]
CMD = "7z"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 00:18:56 +0100