From 04038a2cf0c4c2d9cc9a0c8e8bf9beb6426afae8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 10 Jul 2014 03:02:26 +0200 Subject: Use parseError instead PluginParseError + unified all download pattern attributes as LINK_PATTERN + removed some old patterns (not used anymore) + other code cosmetics --- module/plugins/hoster/NosuploadCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 1de734222..ff7628c46 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -17,7 +17,7 @@ class NosuploadCom(XFileSharingPro): HOSTER_NAME = "nosupload.com" FILE_SIZE_PATTERN = r'

Size: (?P[0-9\.]+) (?P[kKMG]?B)

' - DIRECT_LINK_PATTERN = r'Download' + LINK_PATTERN = r'Download' WAIT_PATTERN = r'Please wait.*?>(\d+)' def getDownloadLink(self): @@ -33,7 +33,7 @@ class NosuploadCom(XFileSharingPro): self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True) # stage3: get the download link - return re.search(self.DIRECT_LINK_PATTERN, self.html, re.S).group(1) + return re.search(self.LINK_PATTERN, self.html, re.S).group(1) getInfo = create_getInfo(NosuploadCom) -- 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/NosuploadCom.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index ff7628c46..3187dd89f 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -9,7 +9,9 @@ class NosuploadCom(XFileSharingPro): __name__ = "NosuploadCom" __type__ = "hoster" __version__ = "0.1" + __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' + __description__ = """Nosupload.com hoster plugin""" __author_name__ = "igel" __author_mail__ = "igelkun@myopera.com" @@ -20,6 +22,7 @@ class NosuploadCom(XFileSharingPro): LINK_PATTERN = r'Download' WAIT_PATTERN = r'Please wait.*?>(\d+)' + def getDownloadLink(self): # stage1: press the "Free Download" button data = self.getPostParameters() -- cgit v1.2.3 From 0d220d634e512d89bda540f91c643b361c82ea8a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 27 Sep 2014 01:38:32 +0200 Subject: Logging string cosmetics --- module/plugins/hoster/NosuploadCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 3187dd89f..d35daa8f7 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -31,7 +31,7 @@ class NosuploadCom(XFileSharingPro): # stage2: wait some time and press the "Download File" button data = self.getPostParameters() wait_time = re.search(self.WAIT_PATTERN, self.html, re.MULTILINE | re.DOTALL).group(1) - self.logDebug("hoster told us to wait %s seconds" % wait_time) + self.logDebug("Hoster told us to wait %s seconds" % wait_time) self.wait(wait_time) self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True) -- 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/NosuploadCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index d35daa8f7..050890cde 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -13,8 +13,8 @@ class NosuploadCom(XFileSharingPro): __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' __description__ = """Nosupload.com hoster plugin""" - __author_name__ = "igel" - __author_mail__ = "igelkun@myopera.com" + __authors__ = [("igel", "igelkun@myopera.com")] + HOSTER_NAME = "nosupload.com" -- cgit v1.2.3 From 60320d4addec35b9cbd14a05b6c33fba63d6c620 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 16:14:33 +0200 Subject: Update plugins XFileSharingPro based --- module/plugins/hoster/NosuploadCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 050890cde..4d76c93ee 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -2,13 +2,13 @@ import re -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo -class NosuploadCom(XFileSharingPro): +class NosuploadCom(XFSPHoster): __name__ = "NosuploadCom" __type__ = "hoster" - __version__ = "0.1" + __version__ = "0.2" __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' -- cgit v1.2.3 From 355c80c5e456f22a4fd3247985710a46a43a79f9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 19:51:40 +0200 Subject: Fix previous plugins update --- module/plugins/hoster/NosuploadCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 4d76c93ee..e756c63f6 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -2,13 +2,13 @@ import re -from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class NosuploadCom(XFSPHoster): __name__ = "NosuploadCom" __type__ = "hoster" - __version__ = "0.2" + __version__ = "0.3" __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' -- 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/NosuploadCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index e756c63f6..d94593227 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -13,6 +13,7 @@ class NosuploadCom(XFSPHoster): __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' __description__ = """Nosupload.com hoster plugin""" + __license__ = "GPLv3" __authors__ = [("igel", "igelkun@myopera.com")] -- cgit v1.2.3 From f76e5c2336718dca9da8033ba22cd83c72c7b3b3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 11 Oct 2014 15:14:28 +0200 Subject: Pattern update 1 --- module/plugins/hoster/NosuploadCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index d94593227..cd28baf19 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -19,7 +19,7 @@ class NosuploadCom(XFSPHoster): HOSTER_NAME = "nosupload.com" - FILE_SIZE_PATTERN = r'

Size: (?P[0-9\.]+) (?P[kKMG]?B)

' + FILE_SIZE_PATTERN = r'

Size: (?P[\d.]+) (?P\w+)

' LINK_PATTERN = r'Download' WAIT_PATTERN = r'Please wait.*?>(\d+)' -- cgit v1.2.3 From c5d1a4fd8943877c6d2eb3843e0de725dba5191e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 11 Oct 2014 15:09:53 +0200 Subject: Pattern update 2 --- module/plugins/hoster/NosuploadCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index cd28baf19..a8bb345f2 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -19,7 +19,7 @@ class NosuploadCom(XFSPHoster): HOSTER_NAME = "nosupload.com" - FILE_SIZE_PATTERN = r'

Size: (?P[\d.]+) (?P\w+)

' + FILE_SIZE_PATTERN = r'

Size: (?P[\d.,]+) (?P\w+)

' LINK_PATTERN = r'Download' WAIT_PATTERN = r'Please wait.*?>(\d+)' -- cgit v1.2.3 From 388a2f6478d42e423f1f8442d8539983f3762f22 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 14 Oct 2014 13:38:49 +0200 Subject: Improve unit detection in size pattern --- module/plugins/hoster/NosuploadCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index a8bb345f2..19d851b0a 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -19,7 +19,7 @@ class NosuploadCom(XFSPHoster): HOSTER_NAME = "nosupload.com" - FILE_SIZE_PATTERN = r'

Size: (?P[\d.,]+) (?P\w+)

' + FILE_SIZE_PATTERN = r'

Size: (?P[\d.,]+) (?P[\w^_]+)

' LINK_PATTERN = r'Download' WAIT_PATTERN = r'Please wait.*?>(\d+)' -- 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/NosuploadCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 19d851b0a..7416f82bc 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -31,7 +31,7 @@ class NosuploadCom(XFSPHoster): # stage2: wait some time and press the "Download File" button data = self.getPostParameters() - wait_time = re.search(self.WAIT_PATTERN, self.html, re.MULTILINE | re.DOTALL).group(1) + wait_time = re.search(self.WAIT_PATTERN, self.html, re.M | re.S).group(1) self.logDebug("Hoster told us to wait %s seconds" % wait_time) self.wait(wait_time) self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True) -- cgit v1.2.3 From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/hoster/NosuploadCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index 7416f82bc..a673610d9 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -6,15 +6,15 @@ from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class NosuploadCom(XFSPHoster): - __name__ = "NosuploadCom" - __type__ = "hoster" + __name__ = "NosuploadCom" + __type__ = "hoster" __version__ = "0.3" __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' __description__ = """Nosupload.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("igel", "igelkun@myopera.com")] + __license__ = "GPLv3" + __authors__ = [("igel", "igelkun@myopera.com")] HOSTER_NAME = "nosupload.com" -- cgit v1.2.3 From 772e47ef806d18fd209e910be0535bce7c07dc7b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Nov 2014 22:47:07 +0100 Subject: Update all other plugins --- module/plugins/hoster/NosuploadCom.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index a673610d9..b2255ca54 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -2,13 +2,13 @@ import re -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class NosuploadCom(XFSPHoster): +class NosuploadCom(XFSHoster): __name__ = "NosuploadCom" __type__ = "hoster" - __version__ = "0.3" + __version__ = "0.31" __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' @@ -17,9 +17,9 @@ class NosuploadCom(XFSPHoster): __authors__ = [("igel", "igelkun@myopera.com")] - HOSTER_NAME = "nosupload.com" + HOSTER_DOMAIN = "nosupload.com" - FILE_SIZE_PATTERN = r'

Size: (?P[\d.,]+) (?P[\w^_]+)

' + SIZE_PATTERN = r'

Size: (?P[\d.,]+) (?P[\w^_]+)

' LINK_PATTERN = r'Download' WAIT_PATTERN = r'Please wait.*?>(\d+)' -- cgit v1.2.3 From f26faa7a68f645f8664874f4ff361caf8503d651 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Dec 2014 23:49:18 +0100 Subject: Update plugins after XFSHoster changes --- module/plugins/hoster/NosuploadCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/NosuploadCom.py') diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py index b2255ca54..8a03d7090 100644 --- a/module/plugins/hoster/NosuploadCom.py +++ b/module/plugins/hoster/NosuploadCom.py @@ -21,6 +21,7 @@ class NosuploadCom(XFSHoster): SIZE_PATTERN = r'

Size: (?P[\d.,]+) (?P[\w^_]+)

' LINK_PATTERN = r'Download' + WAIT_PATTERN = r'Please wait.*?>(\d+)' -- cgit v1.2.3