diff options
Diffstat (limited to 'module/plugins/hoster/TurbobitNet.py')
| -rw-r--r-- | module/plugins/hoster/TurbobitNet.py | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index 1490f5071..2cf9a80ad 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -1,23 +1,23 @@ # -*- coding: utf-8 -*- import binascii -import pycurl import random import re import time import urllib -from Crypto.Cipher import ARC4 +import Crypto.Cipher +import pycurl from module.plugins.captcha.ReCaptcha import ReCaptcha -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.internal.utils import timestamp +from module.plugins.internal.SimpleHoster import SimpleHoster +from module.plugins.internal.misc import timestamp class TurbobitNet(SimpleHoster): __name__ = "TurbobitNet" __type__ = "hoster" - __version__ = "0.25" + __version__ = "0.26" __status__ = "broken" __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' @@ -79,7 +79,7 @@ class TurbobitNet(SimpleHoster): self.log_debug(inputs) if inputs['captcha_type'] == "recaptcha": - recaptcha = ReCaptcha(self) + recaptcha = ReCaptcha(self.pyfile) inputs['recaptcha_response_field'], inputs['recaptcha_challenge_field'] = recaptcha.challenge() else: m = re.search(self.CAPTCHA_PATTERN, self.data) @@ -99,12 +99,12 @@ class TurbobitNet(SimpleHoster): def get_rt_update(self): - rtUpdate = self.retrieve("rtUpdate") + rtUpdate = self.db.retrieve("rtUpdate") if rtUpdate: return rtUpdate - if self.retrieve("version") is not self.__version__ or \ - int(self.retrieve("timestamp", 0)) + 86400000 < timestamp(): + if self.db.retrieve("version") is not self.__version__ or \ + int(self.db.retrieve("timestamp", 0)) + 86400000 < timestamp(): #: that's right, we are even using jdownloader updates rtUpdate = self.load("http://update0.jdownloader.org/pluginstuff/tbupdate.js") rtUpdate = self.decrypt(rtUpdate.splitlines()[1]) @@ -113,9 +113,9 @@ class TurbobitNet(SimpleHoster): r'zza=\2;for(var zzi=0;zzi<zza.length;zzi++){\1=zza[zzi];', rtUpdate) rtUpdate = re.sub(r"for\((\w+)=", r"for(var \1=", rtUpdate) - self.store("rtUpdate", rtUpdate) - self.store("timestamp", timestamp()) - self.store("version", self.__version__) + self.db.store("rtUpdate", rtUpdate) + self.db.store("timestamp", timestamp()) + self.db.store("version", self.__version__) else: self.log_error(_("Unable to download, wait for update...")) self.temp_offline() @@ -152,7 +152,7 @@ class TurbobitNet(SimpleHoster): else: if self.retries >= 2: #: Retry with updated js - self.delete("rtUpdate") + self.db.delete("rtUpdate") else: self.retry() @@ -160,7 +160,7 @@ class TurbobitNet(SimpleHoster): def decrypt(self, data): - cipher = ARC4.new(binascii.hexlify('E\x15\xa1\x9e\xa3M\xa0\xc6\xa0\x84\xb6H\x83\xa8o\xa0')) + cipher = Crypto.Cipher.ARC4.new(binascii.hexlify('E\x15\xa1\x9e\xa3M\xa0\xc6\xa0\x84\xb6H\x83\xa8o\xa0')) return binascii.unhexlify(cipher.encrypt(binascii.unhexlify(data))) @@ -168,6 +168,3 @@ class TurbobitNet(SimpleHoster): lt = time.localtime() tz = time.altzone if lt.tm_isdst else time.timezone return "%s GMT%+03d%02d" % (time.strftime("%a %b %d %Y %H:%M:%S", lt), -tz // 3600, tz % 3600) - - -getInfo = create_getInfo(TurbobitNet) |