summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2016-05-03 00:40:50 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2016-05-03 00:40:50 +0200
commitd47f70383d06c7d0a938af263dd1b5025ae0fa0d (patch)
treed2fde228060e6f1a25b62f87e1d923057b32761d
parentMerge pull request #2449 from Arno-Nymous/unrar-regex-typo (diff)
parentAdd one space... (diff)
downloadpyload-d47f70383d06c7d0a938af263dd1b5025ae0fa0d.tar.xz
Merge pull request #2448 from OndrejIT/stable
Fix WebshareCz
-rw-r--r--module/plugins/hoster/WebshareCz.py22
1 files changed, 13 insertions, 9 deletions
diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py
index b9c1274f5..5e013c892 100644
--- a/module/plugins/hoster/WebshareCz.py
+++ b/module/plugins/hoster/WebshareCz.py
@@ -9,10 +9,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster
class WebshareCz(SimpleHoster):
__name__ = "WebshareCz"
__type__ = "hoster"
- __version__ = "0.23"
+ __version__ = "0.24"
__status__ = "testing"
- __pattern__ = r'https?://(?:www\.)?(en\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)'
+ __pattern__ = r'https?://(?:www\.)?(en\.)?webshare\.cz/(?:#/)?(file/)?(?P<ID>\w+)'
__config__ = [("activated" , "bool", "Activated" , True),
("use_premium" , "bool", "Use premium account if available" , True),
("fallback" , "bool", "Fallback to free download if premium fails" , True),
@@ -21,23 +21,27 @@ class WebshareCz(SimpleHoster):
__description__ = """WebShare.cz hoster plugin"""
__license__ = "GPLv3"
- __authors__ = [("stickell", "l.stickell@yahoo.it "),
- ("rush" , "radek.senfeld@gmail.com")]
+ __authors__ = [("stickell", "l.stickell@yahoo.it" ),
+ ("rush" , "radek.senfeld@gmail.com"),
+ ("ondrej" , "git@ondrej.it" ),]
@classmethod
def api_info(cls, url):
info = {}
- api = get_url("https://webshare.cz/api/file_info/",
+ api_data = get_url("https://webshare.cz/api/file_info/",
post={'ident': re.match(cls.__pattern__, url).group('ID'),
'wst' : ""})
- if not re.search(r'<status>OK', api):
+ if re.search(r'<status>OK', api_data):
+ info['status'] = 2
+ info['name'] = re.search(r'<name>(.+?)<', api_data).group(1)
+ info['size'] = re.search(r'<size>(.+?)<', api_data).group(1)
+ elif re.search(r'<status>FATAL', api_data):
info['status'] = 1
else:
- info['status'] = 2
- info['name'] = re.search(r'<name>(.+?)<', api).group(1)
- info['size'] = re.search(r'<size>(.+?)<', api).group(1)
+ info['status'] = 8
+ info['error'] = _("Could not find required xml data")
return info