diff options
author | Walter Purcaro <vuolter@gmail.com> | 2015-02-02 00:14:56 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2015-02-02 00:14:56 +0100 |
commit | fb6585452b8dc10f21005293dd3b9fbb5c41073a (patch) | |
tree | 8a64992e5ae55e7489bb125cf4ec7374a05f8bb6 /module | |
parent | [UploadedTo] Improve checkErrors routine (diff) | |
download | pyload-fb6585452b8dc10f21005293dd3b9fbb5c41073a.tar.xz |
[UploadedTo] Fix apiInfo
Diffstat (limited to 'module')
-rw-r--r-- | module/plugins/hoster/UploadedTo.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index b56ce8412..995b766b4 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -21,13 +21,10 @@ class UploadedTo(SimpleHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - API_KEY = "bGhGMkllZXByd2VEZnU5Y2NXbHhYVlZ5cEE1bkEzRUw=" #@NOTE: base64 encoded + API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')] - INFO_PATTERN = r'<a href="file/(?P<ID>\w+)" id="filename">(?P<N>[^<]+)</a> \s*<small[^>]*>(?P<S>[^<]+)</small>' - OFFLINE_PATTERN = r'<small class="cL">Error: 404' - LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"' WAIT_PATTERN = r'Current waiting period: <span>(\d+)' @@ -39,18 +36,16 @@ class UploadedTo(SimpleHoster): info = super(UploadedTo, cls).apiInfo(url) for _i in xrange(5): - api = getURL("http://uploaded.net/api/filemultiple", - post={"apikey": cls.API_KEY.decode('base64'), 'id_0': re.match(cls.__pattern__, url).group('ID')}, + html = getURL("http://uploaded.net/api/filemultiple", + get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}, decode=True) - if api != "can't find request": - api = api.splitlines()[0].split(",", 4) - - if api[0] == "online": - info.update({'name': api[4], 'size': api[2], 'status': 2}) - elif api[0] == "offline": + if html != "can't find request": + api = html.split(",", 4) + if api[0] == "offline": info['status'] = 1 - + else: + info.update({'name': api[4], 'size': api[2], 'status': 2}) break else: sleep(3) |