diff options
| author |  Jeix <devnull@localhost>
| 2010-09-08 17:17:45 +0200 |
|---|---|---|
| committer | Jeix <devnull@localhost>
| 2010-09-08 17:17:45 +0200 |
| commit | fa992a369dc83edc115b785f336784a8451033ec (patch) | |
| tree | 3290d4ddc5d8ca978b89e11fa4cbb934f0cb9b0a /module/plugins | |
| parent | corrected ssl instructions (diff) | |
| download | pyload-fa992a369dc83edc115b785f336784a8451033ec.tar.xz | |
depositfiles premium fix and freakshare fix
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/hoster/DepositfilesCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/FreakshareNet.py | 7 | ||||
| -rw-r--r-- | module/plugins/hoster/ShareonlineBiz.py | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index 28d0819d7..0d557b8ad 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -9,7 +9,7 @@ class DepositfilesCom(Hoster): __name__ = "DepositfilesCom" __type__ = "hoster" __pattern__ = r"http://[\w\.]*?depositfiles\.com(/\w{1,3})?/files/[\w]+" - __version__ = "0.1" + __version__ = "0.2" __description__ = """Depositfiles.com Download Hoster""" __author_name__ = ("spoob") __author_mail__ = ("spoob@pyload.org") @@ -18,7 +18,7 @@ class DepositfilesCom(Hoster): self.req.canContinue = self.multiDL = True if self.account else False def process(self, pyfile): - self.html = self.load(self.pyfile.url, cookies=False if self.account else False) + self.html = self.load(self.pyfile.url, cookies=True if self.account else False) if re.search(r"Such file does not exist or it has been removed for infringement of copyrights", self.html): self.offline() @@ -28,7 +28,7 @@ class DepositfilesCom(Hoster): pyfile.name = re.search('File name: <b title="(.*)">', self.html).group(1) - link = urllib.unquote(re.search('<form action="(http://.+?\.depositfiles.com/.+?)" method="get"', self.html).group(1)) + link = urllib.unquote(re.search('<div id="download_url">\s*<a href="(http://.+?\.depositfiles.com/.+?)"', self.html).group(1)) self.download(link) def handleFree(self): diff --git a/module/plugins/hoster/FreakshareNet.py b/module/plugins/hoster/FreakshareNet.py index 76a906ad2..50c5c0941 100644 --- a/module/plugins/hoster/FreakshareNet.py +++ b/module/plugins/hoster/FreakshareNet.py @@ -10,7 +10,7 @@ class FreakshareNet(Hoster): __name__ = "FreakshareNet" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?freakshare\.net/files/\S*?/" - __version__ = "0.2" + __version__ = "0.3" __description__ = """Freakshare.com Download Hoster""" __author_name__ = ("sitacuisses","spoob","mkaay") __author_mail__ = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de") @@ -75,6 +75,11 @@ class FreakshareNet(Hoster): def get_waiting_time(self): if self.html is None: self.download_html() + + if "Der Traffic f\xc3\xbcr heute ist verbraucht!" in self.html: + self.wantReconnect = True + return 24*3600 + timestring = re.search('\s*var\stime\s=\s(\d*?)\.\d*;', self.html).group(1) if timestring: sec = int(timestring) + 1 #add 1 sec as tenths of seconds are cut off diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index 5b1d12f66..926e63a38 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -80,7 +80,7 @@ class ShareonlineBiz(Hoster): html = self.load("%s/free/" % self.pyfile.url, post={"dl_free":"1"}, cookies=True) if re.search(r"/failure/full/1", self.req.lastEffectiveURL): self.setWait(120) - self.log.debug("%s: no free slots, waiting 120 seconds" % (self.__name__)) + self.log.info("%s: no free slots, waiting 120 seconds" % (self.__name__)) self.wait() self.retry() captcha = self.decryptCaptcha("http://www.share-online.biz/captcha.php", get={"rand":"0.%s" % random.randint(10**15,10**16)}, cookies=True) |