From 93592862b520a862c01f80c019e5c4bc43746c19 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 5 Jul 2014 16:54:20 +0200 Subject: [SimpleHoster] Better inline docs + changed "FILE_OFFLINE_PATTERN" to "OFFLINE_PATTERN" --- module/plugins/hoster/QuickshareCz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/QuickshareCz.py') diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 46639444e..8909e94c6 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -34,7 +34,7 @@ class QuickshareCz(SimpleHoster): FILE_NAME_PATTERN = r'Název:\s*(?P[^<]+)' FILE_SIZE_PATTERN = r'Velikost:\s*(?P[0-9.]+) (?P[kKMG])i?B' - FILE_OFFLINE_PATTERN = r'' + OFFLINE_PATTERN = r'' def process(self, pyfile): self.html = self.load(pyfile.url, decode=True) -- cgit v1.2.3 From 48c0c42fd6faffc56432d5f037cd575979f180cc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 02:23:37 +0200 Subject: Removed all @author flags + key attributes cleanup for internal & hooks plugins --- module/plugins/hoster/QuickshareCz.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'module/plugins/hoster/QuickshareCz.py') diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 8909e94c6..b4693f7ba 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -13,8 +13,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . - - @author: zoidberg """ import re -- cgit v1.2.3 From 5060e4c6374a5116d0d8b02528f910f8c5f8bcf9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:25:41 +0200 Subject: Fix code indentation, some bad whitespaces and missing authors + use 'not' instead 'is None' + replace __pattern__'s r" with r' + other minor cosmetics --- module/plugins/hoster/QuickshareCz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/QuickshareCz.py') diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index b4693f7ba..35506c5da 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -66,7 +66,7 @@ class QuickshareCz(SimpleHoster): def handleFree(self): # get download url download_url = '%s/download.php' % self.jsvars['server'] - data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ('ID1', 'ID2', 'ID3', 'ID4')) + data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ("ID1", "ID2", "ID3", "ID4")) self.logDebug("FREE URL1:" + download_url, data) self.req.http.c.setopt(FOLLOWLOCATION, 0) @@ -95,7 +95,7 @@ class QuickshareCz(SimpleHoster): def handlePremium(self): download_url = '%s/download_premium.php' % self.jsvars['server'] - data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ('ID1', 'ID2', 'ID4', 'ID5')) + data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ("ID1", "ID2", "ID4", "ID5")) self.logDebug("PREMIUM URL:" + download_url, data) self.download(download_url, get=data) -- cgit v1.2.3 From 05d258d98dd8c2faf0b769840fa1e3c4acccdce8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 20 Jul 2014 03:25:14 +0200 Subject: Fix and improve 5060e4c6374a5116d0d8b02528f910f8c5f8bcf9 --- module/plugins/hoster/QuickshareCz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/QuickshareCz.py') diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 35506c5da..9fd189829 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -75,7 +75,7 @@ class QuickshareCz(SimpleHoster): self.req.http.c.setopt(FOLLOWLOCATION, 1) found = re.search("Location\s*:\s*(.*)", self.header, re.I) - if not found: + if found is None: self.fail('File not found') download_url = found.group(1) self.logDebug("FREE URL2:" + download_url) -- cgit v1.2.3 From 9395182da7afed55a29bde1c7cbefe4204e783f0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 20 Jul 2014 03:02:09 +0200 Subject: Store all re.search/match object as "m" instead "found" --- module/plugins/hoster/QuickshareCz.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'module/plugins/hoster/QuickshareCz.py') diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 9fd189829..f56daa1af 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -61,7 +61,7 @@ class QuickshareCz(SimpleHoster): check = self.checkDownload({"err": re.compile(r"\AChyba!")}, max_size=100) if check == "err": - self.fail("File not found or plugin defect") + self.fail("File not m or plugin defect") def handleFree(self): # get download url @@ -74,21 +74,21 @@ class QuickshareCz(SimpleHoster): self.header = self.req.http.header self.req.http.c.setopt(FOLLOWLOCATION, 1) - found = re.search("Location\s*:\s*(.*)", self.header, re.I) - if found is None: + m = re.search("Location\s*:\s*(.*)", self.header, re.I) + if m is None: self.fail('File not found') - download_url = found.group(1) + download_url = m.group(1) self.logDebug("FREE URL2:" + download_url) # check errors - found = re.search(r'/chyba/(\d+)', download_url) - if found: - if found.group(1) == '1': + m = re.search(r'/chyba/(\d+)', download_url) + if m: + if m.group(1) == '1': self.retry(60, 2 * 60, "This IP is already downloading") - elif found.group(1) == '2': + elif m.group(1) == '2': self.retry(60, 60, "No free slots available") else: - self.fail('Error %d' % found.group(1)) + self.fail('Error %d' % m.group(1)) # download file self.download(download_url) -- cgit v1.2.3 From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 Aug 2014 19:35:59 +0200 Subject: Remove trailing whitespaces + remove license headers + import urllib methods directly + sort and fix key attributes + use save_join instead join + sort some import declarations + other minor code cosmetics --- module/plugins/hoster/QuickshareCz.py | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'module/plugins/hoster/QuickshareCz.py') diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index f56daa1af..972effffb 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -1,21 +1,7 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . -""" - import re + from pycurl import FOLLOWLOCATION from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo @@ -24,8 +10,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class QuickshareCz(SimpleHoster): __name__ = "QuickshareCz" __type__ = "hoster" - __pattern__ = r'http://(?:[^/]*\.)?quickshare.cz/stahnout-soubor/.*' __version__ = "0.54" + + __pattern__ = r'http://(?:[^/]*\.)?quickshare.cz/stahnout-soubor/.*' + __description__ = """Quickshare.cz hoster plugin""" __author_name__ = "zoidberg" __author_mail__ = "zoidberg@mujmail.cz" @@ -34,6 +22,7 @@ class QuickshareCz(SimpleHoster): FILE_SIZE_PATTERN = r'Velikost:\s*(?P[0-9.]+) (?P[kKMG])i?B' OFFLINE_PATTERN = r'' + def process(self, pyfile): self.html = self.load(pyfile.url, decode=True) self.getFileInfo() -- cgit v1.2.3