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/XHamsterCom.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 0f0371f21..b5b548620 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -42,13 +42,13 @@ class XHamsterCom(Hoster): def get_file_url(self): """ returns the absolute downloadable filepath """ - if self.html is None: + if not self.html: self.download_html() flashvar_pattern = re.compile('flashvars = ({.*?});', re.DOTALL) json_flashvar = flashvar_pattern.search(self.html) - if json_flashvar is None: + if not json_flashvar: self.fail("Parse error (flashvars)") j = clean_json(json_flashvar.group(1)) @@ -66,7 +66,7 @@ class XHamsterCom(Hoster): if self.desired_fmt == ".mp4": file_url = re.search(r"(.*?) - xHamster\.com" file_name = re.search(file_name_pattern, self.html) - if file_name is None: + if not file_name: file_name_pattern = r"

(.*)

" file_name = re.search(file_name_pattern, self.html) - if file_name is None: + if not file_name: file_name_pattern = r"http://[www.]+xhamster\.com/movies/.*/(.*?)\.html?" file_name = re.match(file_name_pattern, self.pyfile.url) - if file_name is None: + if not file_name: file_name_pattern = r"
(.*)
" file_name = re.search(file_name_pattern, self.html) - if file_name is None: + if not file_name: return "Unknown" return file_name.group(1) @@ -109,7 +109,7 @@ class XHamsterCom(Hoster): def file_exists(self): """ returns True or False """ - if self.html is None: + if not self.html: self.download_html() if re.search(r"(.*Video not found.*)", self.html) is not None: return False -- cgit v1.2.3 From 7b8c458cca7d21a029620f98e453f746fce69cd1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 16:10:01 +0200 Subject: Prefer single quote for dict key name --- module/plugins/hoster/XHamsterCom.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index b5b548620..d11520cd5 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -54,13 +54,13 @@ class XHamsterCom(Hoster): j = clean_json(json_flashvar.group(1)) flashvars = json_loads(j) - if flashvars["srv"]: - srv_url = flashvars["srv"] + '/' + if flashvars['srv']: + srv_url = flashvars['srv'] + '/' else: self.fail("Parse error (srv_url)") - if flashvars["url_mode"]: - url_mode = flashvars["url_mode"] + if flashvars['url_mode']: + url_mode = flashvars['url_mode'] else: self.fail("Parse error (url_mode)") @@ -72,8 +72,8 @@ class XHamsterCom(Hoster): long_url = srv_url + file_url self.logDebug("long_url: %s" % long_url) else: - if flashvars["file"]: - file_url = unquote(flashvars["file"]) + if flashvars['file']: + file_url = unquote(flashvars['file']) else: self.fail("Parse error (file_url)") -- 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/XHamsterCom.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index d11520cd5..9c93d4ee1 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -66,7 +66,7 @@ class XHamsterCom(Hoster): if self.desired_fmt == ".mp4": file_url = re.search(r"(.*?) - xHamster\.com" - file_name = re.search(file_name_pattern, self.html) - if not file_name: - file_name_pattern = r"

(.*)

" - file_name = re.search(file_name_pattern, self.html) - if not file_name: - file_name_pattern = r"http://[www.]+xhamster\.com/movies/.*/(.*?)\.html?" - file_name = re.match(file_name_pattern, self.pyfile.url) - if not file_name: - file_name_pattern = r"
(.*)
" - file_name = re.search(file_name_pattern, self.html) - if not file_name: + pattern = r"(.*?) - xHamster\.com" + name = re.search(pattern, self.html) + if name is None: + pattern = r"

(.*)

" + name = re.search(pattern, self.html) + if name is None: + pattern = r"http://[www.]+xhamster\.com/movies/.*/(.*?)\.html?" + name = re.match(file_name_pattern, self.pyfile.url) + if name is None: + pattern = r"
(.*)
" + name = re.search(pattern, self.html) + if name is None: return "Unknown" - return file_name.group(1) + return name.group(1) def file_exists(self): """ returns True or False -- 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/XHamsterCom.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 9c93d4ee1..3e002a0bb 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- import re + from urllib import unquote -from module.plugins.Hoster import Hoster from module.common.json_layer import json_loads +from module.plugins.Hoster import Hoster def clean_json(json_expr): @@ -18,10 +19,15 @@ def clean_json(json_expr): class XHamsterCom(Hoster): __name__ = "XHamsterCom" __type__ = "hoster" - __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+' __version__ = "0.12" + + __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+' __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] + __description__ = """XHamster.com hoster plugin""" + __author_name__ = None + __author_mail__ = None + def process(self, pyfile): self.pyfile = pyfile -- cgit v1.2.3 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/hoster/XHamsterCom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 3e002a0bb..4224ecb34 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -25,8 +25,7 @@ class XHamsterCom(Hoster): __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] __description__ = """XHamster.com hoster plugin""" - __author_name__ = None - __author_mail__ = None + __authors__ = [] def process(self, pyfile): @@ -67,6 +66,8 @@ class XHamsterCom(Hoster): if flashvars['url_mode']: url_mode = flashvars['url_mode'] + + else: self.fail("Parse error (url_mode)") -- cgit v1.2.3 From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 20:18:13 +0200 Subject: Add __license__ key attribute to plugins --- module/plugins/hoster/XHamsterCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 4224ecb34..6dc9b4a29 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -25,6 +25,7 @@ class XHamsterCom(Hoster): __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] __description__ = """XHamster.com hoster plugin""" + __license__ = "GPLv3" __authors__ = [] -- cgit v1.2.3 From 8939f015a688a07ec7d0bd14b6a3704f6a2cb4a0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 11 Oct 2014 15:12:40 +0200 Subject: Pattern update 3 --- module/plugins/hoster/XHamsterCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 6dc9b4a29..dae9a8eae 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -98,16 +98,16 @@ class XHamsterCom(Hoster): if not self.html: self.download_html() - pattern = r"(.*?) - xHamster\.com" + pattern = r'(.*?) - xHamster\.com' name = re.search(pattern, self.html) if name is None: - pattern = r"

(.*)

" + pattern = r'

(.*)

' name = re.search(pattern, self.html) if name is None: - pattern = r"http://[www.]+xhamster\.com/movies/.*/(.*?)\.html?" + pattern = r'http://[www.]+xhamster\.com/movies/.*/(.*?)\.html?' name = re.match(file_name_pattern, self.pyfile.url) if name is None: - pattern = r"
(.*)
" + pattern = r'' name = re.search(pattern, self.html) if name is None: return "Unknown" -- cgit v1.2.3 From 0eb6e7ec4a1144dcca824d8add049787d3da1762 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 22 Oct 2014 19:44:59 +0200 Subject: Two space before function declaration --- module/plugins/hoster/XHamsterCom.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index dae9a8eae..7257b2988 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -41,10 +41,12 @@ class XHamsterCom(Hoster): pyfile.name = self.get_file_name() + self.desired_fmt self.download(self.get_file_url()) + def download_html(self): url = self.pyfile.url self.html = self.load(url) + def get_file_url(self): """ returns the absolute downloadable filepath """ @@ -94,6 +96,7 @@ class XHamsterCom(Hoster): return long_url + def get_file_name(self): if not self.html: self.download_html() @@ -114,6 +117,7 @@ class XHamsterCom(Hoster): return name.group(1) + def file_exists(self): """ returns True or False """ -- cgit v1.2.3 From 4da90891eb2544ac15a7d512aba8cb357f68ee5f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Oct 2014 01:11:29 +0200 Subject: Spare code cosmetics --- module/plugins/hoster/XHamsterCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 7257b2988..9b97b5e94 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -53,7 +53,7 @@ class XHamsterCom(Hoster): if not self.html: self.download_html() - flashvar_pattern = re.compile('flashvars = ({.*?});', re.DOTALL) + flashvar_pattern = re.compile('flashvars = ({.*?});', re.S) json_flashvar = flashvar_pattern.search(self.html) if not json_flashvar: @@ -80,7 +80,7 @@ class XHamsterCom(Hoster): self.fail("Parse error (file_url)") file_url = file_url.group(1) long_url = srv_url + file_url - self.logDebug("long_url: %s" % long_url) + self.logDebug("long_url = " + long_url) else: if flashvars['file']: file_url = unquote(flashvars['file']) @@ -89,10 +89,10 @@ class XHamsterCom(Hoster): if url_mode == '3': long_url = file_url - self.logDebug("long_url: %s" % long_url) + self.logDebug("long_url = " + long_url) else: long_url = srv_url + "key=" + file_url - self.logDebug("long_url: %s" % long_url) + self.logDebug("long_url = " + long_url) return long_url -- cgit v1.2.3 From 9f2ebe486a3e155fb6a60e07cccb77ab6a772eb2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 26 Oct 2014 02:31:54 +0200 Subject: Extend translation support in plugins + a lot of code cosmetics and typo fixes --- module/plugins/hoster/XHamsterCom.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 9b97b5e94..1c0a094f3 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -57,7 +57,7 @@ class XHamsterCom(Hoster): json_flashvar = flashvar_pattern.search(self.html) if not json_flashvar: - self.fail("Parse error (flashvars)") + self.error(_("flashvar not found")) j = clean_json(json_flashvar.group(1)) flashvars = json_loads(j) @@ -65,19 +65,19 @@ class XHamsterCom(Hoster): if flashvars['srv']: srv_url = flashvars['srv'] + '/' else: - self.fail("Parse error (srv_url)") + self.error(_("srv_url not found")) if flashvars['url_mode']: url_mode = flashvars['url_mode'] else: - self.fail("Parse error (url_mode)") + self.error(_("url_mode not found")) if self.desired_fmt == ".mp4": file_url = re.search(r" Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/hoster/XHamsterCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/XHamsterCom.py') diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 1c0a094f3..c6e789fa8 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -17,16 +17,16 @@ def clean_json(json_expr): class XHamsterCom(Hoster): - __name__ = "XHamsterCom" - __type__ = "hoster" + __name__ = "XHamsterCom" + __type__ = "hoster" __version__ = "0.12" __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+' __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] __description__ = """XHamster.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [] + __license__ = "GPLv3" + __authors__ = [] def process(self, pyfile): -- cgit v1.2.3