summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-19 13:42:29 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-19 13:42:29 +0200
commit33e2b36605e41962a2e8eee304a7f3d29690ffa8 (patch)
treee4e5fb38b8882ffe868f4f1ca965659f42b92612
parent[OCR] Fix __init__ (diff)
downloadpyload-33e2b36605e41962a2e8eee304a7f3d29690ffa8.tar.xz
[OCR] Fix __init__ (2)
-rw-r--r--module/plugins/captcha/GigasizeCom.py6
-rw-r--r--module/plugins/captcha/LinksaveIn.py5
-rw-r--r--module/plugins/captcha/NetloadIn.py6
-rw-r--r--module/plugins/captcha/ShareonlineBiz.py6
-rw-r--r--module/plugins/hoster/FshareVn.py2
-rw-r--r--module/plugins/hoster/LetitbitNet.py2
-rw-r--r--module/plugins/hoster/ShareonlineBiz.py4
-rw-r--r--module/plugins/hoster/UploadedTo.py3
-rw-r--r--module/plugins/hoster/WebshareCz.py4
-rw-r--r--module/plugins/internal/SimpleHoster.py2
10 files changed, 14 insertions, 26 deletions
diff --git a/module/plugins/captcha/GigasizeCom.py b/module/plugins/captcha/GigasizeCom.py
index 83fc393e4..8ec8e367b 100644
--- a/module/plugins/captcha/GigasizeCom.py
+++ b/module/plugins/captcha/GigasizeCom.py
@@ -6,17 +6,13 @@ from module.plugins.internal.OCR import OCR
class GigasizeCom(OCR):
__name__ = "GigasizeCom"
__type__ = "ocr"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """Gigasize.com ocr plugin"""
__license__ = "GPLv3"
__authors__ = [("pyLoad Team", "admin@pyload.org")]
- def __init__(self):
- OCR.__init__(self)
-
-
def get_captcha(self, image):
self.load_image(image)
self.threshold(2.8)
diff --git a/module/plugins/captcha/LinksaveIn.py b/module/plugins/captcha/LinksaveIn.py
index f263f4588..23944369b 100644
--- a/module/plugins/captcha/LinksaveIn.py
+++ b/module/plugins/captcha/LinksaveIn.py
@@ -15,15 +15,14 @@ from module.plugins.internal.OCR import OCR
class LinksaveIn(OCR):
__name__ = "LinksaveIn"
__type__ = "ocr"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """Linksave.in ocr plugin"""
__license__ = "GPLv3"
__authors__ = [("pyLoad Team", "admin@pyload.org")]
- def __init__(self):
- OCR.__init__(self)
+ def init(self):
self.data_dir = os.path.dirname(os.path.abspath(__file__)) + os.sep + "LinksaveIn" + os.sep
diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py
index 16902128d..bc31eaaff 100644
--- a/module/plugins/captcha/NetloadIn.py
+++ b/module/plugins/captcha/NetloadIn.py
@@ -6,17 +6,13 @@ from module.plugins.internal.OCR import OCR
class NetloadIn(OCR):
__name__ = "NetloadIn"
__type__ = "ocr"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """Netload.in ocr plugin"""
__license__ = "GPLv3"
__authors__ = [("pyLoad Team", "admin@pyload.org")]
- def __init__(self):
- OCR.__init__(self)
-
-
def get_captcha(self, image):
self.load_image(image)
self.to_greyscale()
diff --git a/module/plugins/captcha/ShareonlineBiz.py b/module/plugins/captcha/ShareonlineBiz.py
index 234f39a51..b96781f9b 100644
--- a/module/plugins/captcha/ShareonlineBiz.py
+++ b/module/plugins/captcha/ShareonlineBiz.py
@@ -6,17 +6,13 @@ from module.plugins.internal.OCR import OCR
class ShareonlineBiz(OCR):
__name__ = "ShareonlineBiz"
__type__ = "ocr"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """Shareonline.biz ocr plugin"""
__license__ = "GPLv3"
__authors__ = [("RaNaN", "RaNaN@pyload.org")]
- def __init__(self):
- OCR.__init__(self)
-
-
def get_captcha(self, image):
self.load_image(image)
self.to_greyscale()
diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py
index 3ece85c96..4fc77ab26 100644
--- a/module/plugins/hoster/FshareVn.py
+++ b/module/plugins/hoster/FshareVn.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, parse_fileInfo
def get_info(urls):
for url in urls:
html = get_url("http://www.fshare.vn/check_link.php",
- post={'action': "check_link", 'arrlinks': url})
+ post={'action': "check_link", 'arrlinks': url})
yield parse_fileInfo(FshareVn, url, html)
diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py
index 8e912bcb8..1676a9399 100644
--- a/module/plugins/hoster/LetitbitNet.py
+++ b/module/plugins/hoster/LetitbitNet.py
@@ -18,7 +18,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, seconds_to_midnig
def api_response(url):
json_data = ["yw7XQy2v9", ["download/info", {'link': url}]]
api_rep = get_url("http://api.letitbit.net/json",
- post={'r': json_dumps(json_data)})
+ post={'r': json_dumps(json_data)})
return json_loads(api_rep)
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index da1509c94..6a2ee0b09 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -40,8 +40,8 @@ class ShareonlineBiz(SimpleHoster):
info = super(ShareonlineBiz, cls).api_info(url)
field = get_url("http://api.share-online.biz/linkcheck.php",
- get={'md5' : "1",
- 'links': re.match(cls.__pattern__, url).group("ID")}).split(";")
+ get={'md5' : "1",
+ 'links': re.match(cls.__pattern__, url).group("ID")}).split(";")
try:
if field[1] == "OK":
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index be139f354..4023a0e66 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -45,7 +45,8 @@ class UploadedTo(SimpleHoster):
for _i in xrange(5):
html = get_url("http://uploaded.net/api/filemultiple",
- get={'apikey': cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')})
+ get={'apikey': cls.API_KEY,
+ 'id_0': re.match(cls.__pattern__, url).group('ID')})
if html != "can't find request":
api = html.split(",", 4)
diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py
index feea234f3..f772fa496 100644
--- a/module/plugins/hoster/WebshareCz.py
+++ b/module/plugins/hoster/WebshareCz.py
@@ -27,7 +27,7 @@ class WebshareCz(SimpleHoster):
info['pattern'] = re.match(cls.__pattern__, url).groupdict()
api_data = get_url("https://webshare.cz/api/file_info/",
- post={'ident': info['pattern']['ID'], 'wst': ""})
+ post={'ident': info['pattern']['ID'], 'wst': ""})
if not re.search(r'<status>OK', api_data):
info['status'] = 1
@@ -43,7 +43,7 @@ class WebshareCz(SimpleHoster):
wst = self.account.get_account_data(self.user).get('wst', None) if self.account else None
api_data = get_url("https://webshare.cz/api/file_link/",
- post={'ident': self.info['pattern']['ID'], 'wst': wst})
+ post={'ident': self.info['pattern']['ID'], 'wst': wst})
self.log_debug("API data: " + api_data)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 3003723a6..de3e78da8 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -500,7 +500,7 @@ class SimpleHoster(Hoster):
#: Deprecated method
def get_fileInfo(self):
- self.info = {}
+ self.info = {}
self.check_info()
return self.info