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/NovafileCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index c552c166c..9b4d50907 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -20,7 +20,7 @@ class NovafileCom(XFileSharingPro): FILE_SIZE_PATTERN = r'
(?P.+?)
' ERROR_PATTERN = r'class="alert[^"]*alert-separate"[^>]*>\s*(?:

)?(.*?)\s*Download File' + LINK_PATTERN = r'Download File' WAIT_PATTERN = r'

Please wait ]*>(\d+) seconds

' def setup(self): -- 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/NovafileCom.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 9b4d50907..4a89064ea 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- - -# Test links (random.bin): +# +# Test links: # http://novafile.com/vfun4z6o2cit # http://novafile.com/s6zrr5wemuz4 @@ -10,8 +10,10 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf class NovafileCom(XFileSharingPro): __name__ = "NovafileCom" __type__ = "hoster" - __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' __version__ = "0.02" + + __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' + __description__ = """Novafile.com hoster plugin""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -23,6 +25,7 @@ class NovafileCom(XFileSharingPro): LINK_PATTERN = r'Download File' WAIT_PATTERN = r'

Please wait ]*>(\d+) seconds

' + def setup(self): self.multiDL = False -- cgit v1.2.3 From 390f7deca39ba14f698b3c56660eee2a5502b79a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 28 Sep 2014 16:50:29 +0200 Subject: Cleaned-up XFileSharingPro based plugins --- module/plugins/hoster/NovafileCom.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 4a89064ea..116312c5c 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -18,6 +18,7 @@ class NovafileCom(XFileSharingPro): __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + HOSTER_NAME = "novafile.com" FILE_SIZE_PATTERN = r'
(?P.+?)
' @@ -26,8 +27,4 @@ class NovafileCom(XFileSharingPro): WAIT_PATTERN = r'

Please wait ]*>(\d+) seconds

' - def setup(self): - self.multiDL = False - - getInfo = create_getInfo(NovafileCom) -- 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/NovafileCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 116312c5c..fb75f0470 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -15,8 +15,8 @@ class NovafileCom(XFileSharingPro): __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' __description__ = """Novafile.com hoster plugin""" - __author_name__ = ("zoidberg", "stickell") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] HOSTER_NAME = "novafile.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/NovafileCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index fb75f0470..19873a59f 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -4,13 +4,13 @@ # http://novafile.com/vfun4z6o2cit # http://novafile.com/s6zrr5wemuz4 -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo -class NovafileCom(XFileSharingPro): +class NovafileCom(XFSPHoster): __name__ = "NovafileCom" __type__ = "hoster" - __version__ = "0.02" + __version__ = "0.03" __pattern__ = r'http://(?:www\.)?novafile\.com/\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/NovafileCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 19873a59f..958c10411 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -4,13 +4,13 @@ # http://novafile.com/vfun4z6o2cit # http://novafile.com/s6zrr5wemuz4 -from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class NovafileCom(XFSPHoster): __name__ = "NovafileCom" __type__ = "hoster" - __version__ = "0.03" + __version__ = "0.04" __pattern__ = r'http://(?:www\.)?novafile\.com/\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/NovafileCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 958c10411..4963559c8 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -15,6 +15,7 @@ class NovafileCom(XFSPHoster): __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' __description__ = """Novafile.com hoster plugin""" + __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), ("stickell", "l.stickell@yahoo.it")] -- 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/NovafileCom.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 4963559c8..fe6765a5d 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -8,16 +8,16 @@ from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class NovafileCom(XFSPHoster): - __name__ = "NovafileCom" - __type__ = "hoster" + __name__ = "NovafileCom" + __type__ = "hoster" __version__ = "0.04" __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' __description__ = """Novafile.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("stickell", "l.stickell@yahoo.it")] + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("stickell", "l.stickell@yahoo.it")] HOSTER_NAME = "novafile.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/NovafileCom.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index fe6765a5d..5c4dfddca 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -4,13 +4,13 @@ # http://novafile.com/vfun4z6o2cit # http://novafile.com/s6zrr5wemuz4 -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class NovafileCom(XFSPHoster): +class NovafileCom(XFSHoster): __name__ = "NovafileCom" __type__ = "hoster" - __version__ = "0.04" + __version__ = "0.05" __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' @@ -20,9 +20,9 @@ class NovafileCom(XFSPHoster): ("stickell", "l.stickell@yahoo.it")] - HOSTER_NAME = "novafile.com" + HOSTER_DOMAIN = "novafile.com" - FILE_SIZE_PATTERN = r'
(?P.+?)
' + SIZE_PATTERN = r'
(?P.+?)
' ERROR_PATTERN = r'class="alert[^"]*alert-separate"[^>]*>\s*(?:

)?(.*?)\s*Download File' WAIT_PATTERN = r'

Please wait ]*>(\d+) seconds

' -- 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/NovafileCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/NovafileCom.py') diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index 5c4dfddca..9754ceed1 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -22,10 +22,10 @@ class NovafileCom(XFSHoster): HOSTER_DOMAIN = "novafile.com" - SIZE_PATTERN = r'
(?P.+?)
' ERROR_PATTERN = r'class="alert[^"]*alert-separate"[^>]*>\s*(?:

)?(.*?)\s*Please wait ]*>(\d+) seconds

' + LINK_PATTERN = r'Download File' - WAIT_PATTERN = r'

Please wait ]*>(\d+) seconds

' getInfo = create_getInfo(NovafileCom) -- cgit v1.2.3