summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-02 16:36:49 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-02 16:36:49 +0100
commit252e75ffcbcafc2e7e32d0e71f0d7a3c478cf6ba (patch)
treeec1a341c795db4c609d46b614603175bd41f48b1
parentMerge pull request #1132 from zapp-brannigan/patch-3 (diff)
downloadpyload-252e75ffcbcafc2e7e32d0e71f0d7a3c478cf6ba.tar.xz
[UploadedTo] Improve apiInfo (2)
-rw-r--r--module/plugins/accounts/UploadedTo.py4
-rw-r--r--module/plugins/hoster/UploadedTo.py8
2 files changed, 7 insertions, 5 deletions
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 1b6df97fb..4e5c8035b 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -55,7 +55,9 @@ class UploadedTo(Account):
else:
trafficleft = self.parseTraffic(size + unit)
- return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
+ return {'validuntil' : validuntil,
+ 'trafficleft': trafficleft,
+ 'premium' : premium}
def login(self, user, data, req):
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 0022fc94f..42ad3e06d 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
class UploadedTo(SimpleHoster):
__name__ = "UploadedTo"
__type__ = "hoster"
- __version__ = "0.81"
+ __version__ = "0.82"
__pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)'
@@ -42,10 +42,10 @@ class UploadedTo(SimpleHoster):
if html != "can't find request":
api = html.split(",", 4)
- if api[0] == "offline":
- info['status'] = 1
- else:
+ if api[0] == "online":
info.update({'name': api[4], 'size': api[2], 'status': 2})
+ else:
+ info['status'] = 1
break
else:
sleep(3)