From e2d4a21008fe1f44ca4d27abf2c18a85dda5df4a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 4 Oct 2011 10:52:31 +0200 Subject: plugin cleanups --- module/plugins/Plugin.py | 5 ++-- module/plugins/accounts/FileserveCom.py | 6 +---- module/plugins/accounts/FilesonicCom.py | 7 +----- module/plugins/accounts/WuploadCom.py | 6 +---- module/plugins/hoster/BitshareCom.py | 2 +- module/plugins/hoster/FilefactoryCom.py | 4 +-- module/plugins/hoster/FileserveCom.py | 7 ++---- module/plugins/hoster/FilesonicCom.py | 7 ++---- module/plugins/hoster/IfileIt.py | 41 ++++++++++++++++--------------- module/plugins/hoster/NetloadIn.py | 2 +- module/plugins/hoster/UploadStationCom.py | 4 +-- module/plugins/hoster/WuploadCom.py | 7 ++---- 12 files changed, 38 insertions(+), 60 deletions(-) (limited to 'module') diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 720d64091..9417a4bfd 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -402,7 +402,7 @@ class Plugin(Base): return result - def load(self, url, get={}, post={}, ref=True, cookies=True, just_header=False, utf8=False, decode=False): + def load(self, url, get={}, post={}, ref=True, cookies=True, just_header=False, decode=False): """Load content at url and returns it :param url: @@ -411,7 +411,6 @@ class Plugin(Base): :param ref: :param cookies: :param just_header: if True only the header will be retrieved and returned as dict - :param utf8: Deprecated :param decode: Wether to decode the output according to http header, should be True in most cases :return: Loaded content """ @@ -419,7 +418,7 @@ class Plugin(Base): #utf8 vs decode -> please use decode attribute in all future plugins if type(url) == unicode: url = str(url) - res = self.req.load(url, get, post, ref, cookies, just_header, decode=utf8 or decode) + res = self.req.load(url, get, post, ref, cookies, just_header, decode=decode) if self.core.debug: from inspect import currentframe diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 316c2446e..5e5068f22 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -20,11 +20,7 @@ from time import mktime, strptime from module.plugins.Account import Account - -try: - from json import loads as json_loads -except ImportError: - from module.lib.simplejson import loads as json_loads +from module.common.json_layer import json_loads class FileserveCom(Account): __name__ = "FileserveCom" diff --git a/module/plugins/accounts/FilesonicCom.py b/module/plugins/accounts/FilesonicCom.py index ff4e066e2..1207f1b56 100644 --- a/module/plugins/accounts/FilesonicCom.py +++ b/module/plugins/accounts/FilesonicCom.py @@ -17,15 +17,10 @@ @author: RaNaN """ -import re from time import mktime, strptime from module.plugins.Account import Account - -try: - from json import loads as json_loads -except ImportError: # pragma: no cover - from module.lib.simplejson import loads as json_loads +from module.common.json_layer import json_loads class FilesonicCom(Account): __name__ = "FilesonicCom" diff --git a/module/plugins/accounts/WuploadCom.py b/module/plugins/accounts/WuploadCom.py index c6710a657..b3d73df27 100644 --- a/module/plugins/accounts/WuploadCom.py +++ b/module/plugins/accounts/WuploadCom.py @@ -20,11 +20,7 @@ from types import MethodType from module.plugins.Account import Account - -try: - from json import loads as json_loads -except ImportError: # pragma: no cover - from module.lib.simplejson import loads as json_loads +from module.common.json_layer import json_loads class WuploadCom(Account): __name__ = "WuploadCom" diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index d48900f51..794e978b2 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -71,7 +71,7 @@ class BitshareCom(Hoster): # Load main page self.req.cj.setCookie(self.HOSTER_DOMAIN, "language_selection", "EN") - self.html = self.load(self.pyfile.url, ref=False, utf8=True, cookies=True) + self.html = self.load(self.pyfile.url, ref=False, decode=True) # Check offline if re.search(self.FILE_OFFLINE_PATTERN, self.html) is not None: diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index 55bdeb5bf..37b2bb7ce 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -61,7 +61,7 @@ class FilefactoryCom(Hoster): self.req.cj.setCookie("filefactory.com", "ff_locale","") # Load main page - self.html = self.load(self.pyfile.url, ref=False, utf8=True, cookies=True) + self.html = self.load(self.pyfile.url, ref=False, decode=True) # Check offline if re.search(self.FILE_OFFLINE_PATTERN, self.html) is not None: @@ -105,7 +105,7 @@ class FilefactoryCom(Hoster): # This will take us to a wait screen self.log.debug("%s: fetching wait with url [%s]" % (self.__name__, waiturl)) - waithtml = self.load(waiturl, ref=True, utf8=True, cookies=True) + waithtml = self.load(waiturl, decode=True) # Find the wait value and wait wait = int(re.search(self.WAIT_PATTERN, waithtml).group('wait')) diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index ba76f0e39..7f34621aa 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -6,13 +6,10 @@ import re from module.plugins.Hoster import Hoster from module.plugins.ReCaptcha import ReCaptcha +from module.common.json_layer import json_loads from module.network.RequestFactory import getURL from module.utils import parseFileSize -try: - from json import loads as json_loads -except ImportError: # pragma: no cover - from module.lib.simplejson import loads as json_loads def getInfo(urls): reg = r"(http://(?:www\.)?fileserve\.com/file/.+(?:[\r\n\t]+)?)[\r\n\t ]+(.*?)[\r\n\t ]+(.*?)[\r\n\t ]+(Available|Not available)(?:\ )?(?:)" @@ -83,7 +80,7 @@ class FileserveCom(Hoster): # TODO: handle login timeouts self.download(self.pyfile.url) - check = self.checkDownload({"login" : '
'}) + check = self.checkDownload({"login": ''}) if check == "login": self.account.relogin(self.user) diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py index 6535b04f1..a74bcc1c8 100644 --- a/module/plugins/hoster/FilesonicCom.py +++ b/module/plugins/hoster/FilesonicCom.py @@ -9,11 +9,8 @@ from module.plugins.ReCaptcha import ReCaptcha from module.plugins.Plugin import chunks from module.network.RequestFactory import getURL +from module.common.json_layer import json_loads -try: - from json import loads as json_loads -except ImportError: # pragma: no cover - from module.lib.simplejson import loads as json_loads def getInfo(urls): for chunk in chunks(urls, 20): @@ -123,7 +120,7 @@ class FilesonicCom(Hoster): self.logDebug("Premium download") api = self.API_ADDRESS + "/link?method=getDownloadLink&u=%s&p=%s&ids=%s" % ( - self.user, self.account.getAccountData(self.user)["password"], getId(self.pyfile.url)) + self.user, self.account.getAccountData(self.user)["password"], getId(self.pyfile.url)) result = json_loads(self.load(api)) links = result["FSApi_Link"]["getDownloadLink"]["response"]["links"] diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py index 77961e51e..2b70729a9 100644 --- a/module/plugins/hoster/IfileIt.py +++ b/module/plugins/hoster/IfileIt.py @@ -17,7 +17,8 @@ """ import re -from json import loads as json_loads + +from module.common.json_layer import json_loads from module.common.JsEngine import JsEngine from module.plugins.ReCaptcha import ReCaptcha from module.plugins.Hoster import Hoster @@ -42,6 +43,7 @@ def getInfo(urls): result.append((name, size, 2, url)) yield result + class IfileIt(Hoster): __name__ = "IfileIt" __type__ = "hoster" @@ -49,44 +51,43 @@ class IfileIt(Hoster): __version__ = "0.2" __description__ = """Ifile.it""" __author_name__ = ("zoidberg") - + EVAL_PATTERN = r'(eval\(function\(p,a,c,k,e,d\).*)' DEC_PATTERN = r"function requestBtn_clickEvent[^}]*url:\s*([^,]+)" DOWNLOAD_LINK_PATTERN = r' If it doesn\'t, ' RECAPTCHA_KEY_PATTERN = r"var __recaptcha_public\s*=\s*'([^']+)';" FILE_INFO_PATTERN = r'