diff options
author | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-12-27 20:06:05 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-12-27 22:52:30 +0100 |
commit | 50c1d6c0642ac658a909481e412fd9e6e9a9a1d7 (patch) | |
tree | 5a90b85419a02f8b78ff4493dda32ba338b8aece /module/plugins | |
parent | Update crypters and containers (diff) | |
download | pyload-50c1d6c0642ac658a909481e412fd9e6e9a9a1d7.tar.xz |
Update some hosters
Diffstat (limited to 'module/plugins')
-rw-r--r-- | module/plugins/accounts/ShareonlineBiz.py | 3 | ||||
-rw-r--r-- | module/plugins/hoster/CzshareCom.py | 8 | ||||
-rw-r--r-- | module/plugins/hoster/MultishareCz.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/NitroflareCom.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/StahnuTo.py | 2 | ||||
-rw-r--r-- | module/plugins/hoster/UgouploadNet.py | 4 | ||||
-rw-r--r-- | module/plugins/hoster/VkCom.py | 2 |
7 files changed, 10 insertions, 13 deletions
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 9db9c557c..be5a537c1 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -32,9 +32,6 @@ class ShareonlineBiz(Account): if not 'a' in api: self.fail_login(res.strip('*')) - if api['a'].lower() == "not_available": - self.fail_login(_("No info available")) - return api diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index be4108c23..c2a7d3409 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -44,7 +44,7 @@ class CzshareCom(SimpleHoster): USER_CREDIT_PATTERN = r'<div class="credit">\s*kredit: <strong>([\d .,]+)(\w+)</strong>\s*</div><!-- .credit -->' - def check_traffic(self): + def out_of_traffic(self): #: Check if user logged in m = re.search(self.USER_CREDIT_PATTERN, self.data) if m is None: @@ -52,7 +52,7 @@ class CzshareCom(SimpleHoster): self.data = self.load(self.pyfile.url) m = re.search(self.USER_CREDIT_PATTERN, self.data) if m is None: - return False + return True #: Check user credit try: @@ -61,13 +61,13 @@ class CzshareCom(SimpleHoster): self.log_info(_("User %s has %i KiB left") % (self.account.user, credit / 1024)) if credit < self.pyfile.size: self.log_info(_("Not enough credit to download file: %s") % self.pyfile.name) - return False + return True except Exception, e: #: let's continue and see what happens... self.log_error(e, trace=True) - return True + return False def handle_premium(self, pyfile): diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py index fd326da58..fca6974f9 100644 --- a/module/plugins/hoster/MultishareCz.py +++ b/module/plugins/hoster/MultishareCz.py @@ -46,7 +46,7 @@ class MultishareCz(SimpleHoster): self.update_info() - if not self.check_traffic(): + if self.out_of_traffic(): self.fail(_("Not enough credit left to download file")) self.download("http://dl%d.mms.multishare.cz/html/mms_process.php" % round(random.random() * 10000 * random.random()), diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index 09ddc5ba8..3e2970985 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster class NitroflareCom(SimpleHoster): __name__ = "NitroflareCom" __type__ = "hoster" - __version__ = "0.18" + __version__ = "0.19" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' diff --git a/module/plugins/hoster/StahnuTo.py b/module/plugins/hoster/StahnuTo.py index 80a57bd03..a599c6444 100644 --- a/module/plugins/hoster/StahnuTo.py +++ b/module/plugins/hoster/StahnuTo.py @@ -9,7 +9,7 @@ class StahnuTo(DeadHoster): __version__ = "0.15" __status__ = "stable" - __pattern__ = r"http://(\w*\.)?stahnu.to/(files/get/|.*\?file=)([^/]+).*" + __pattern__ = r'http://(?:www\.)?stahnu\.to/(files/get/|.*\?file=)([^/]+).*' __config__ = [] __description__ = """Stahnu.to hoster plugin""" diff --git a/module/plugins/hoster/UgouploadNet.py b/module/plugins/hoster/UgouploadNet.py index fec2e11d1..e985846c5 100644 --- a/module/plugins/hoster/UgouploadNet.py +++ b/module/plugins/hoster/UgouploadNet.py @@ -3,7 +3,7 @@ import re from module.plugins.captcha.ReCaptcha import ReCaptcha -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.SimpleHoster import SimpleHoster class UgouploadNet(SimpleHoster): @@ -12,7 +12,7 @@ class UgouploadNet(SimpleHoster): __version__ = "0.02" __status__ = "testing" - __pattern__ = r'https?://(?:www)?\.ugoupload\.net/\w{4}/.+' + __pattern__ = r'https?://(?:www)?\.ugoupload\.net/\w{4}' __config__ = [("activated" , "bool", "Activated" , True), ("use_premium" , "bool", "Use premium account if available" , True), ("fallback" , "bool", "Fallback to free download if premium fails" , True), diff --git a/module/plugins/hoster/VkCom.py b/module/plugins/hoster/VkCom.py index 58d465722..762ebc092 100644 --- a/module/plugins/hoster/VkCom.py +++ b/module/plugins/hoster/VkCom.py @@ -14,7 +14,7 @@ class VkCom(SimpleHoster): __version__ = "0.05" __status__ = "testing" - __pattern__ = r"https?://(?:www\.)?vk\.com/video_ext\.php/\?.+" + __pattern__ = r'https?://(?:www\.)?vk\.com/video_ext\.php/\?.+' __config__ = [("activated" , "bool", "Activated" , True), ("use_premium" , "bool", "Use premium account if available" , True), ("fallback" , "bool", "Fallback to free download if premium fails" , True), |