From 93592862b520a862c01f80c019e5c4bc43746c19 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 5 Jul 2014 16:54:20 +0200 Subject: [SimpleHoster] Better inline docs + changed "FILE_OFFLINE_PATTERN" to "OFFLINE_PATTERN" --- module/plugins/hoster/MovReelCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 2dedcf13d..5d7bbe71b 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -19,7 +19,7 @@ class MovReelCom(XFileSharingPro): #FILE_NAME_PATTERN = r'Filename:(?P.*?)
' #FILE_SIZE_PATTERN = r'Size:(?P.*?)
' FILE_INFO_PATTERN = r'

(?P.+?) (?P[\d.]+) (?P..)

' - FILE_OFFLINE_PATTERN = r'File Not Found

' + OFFLINE_PATTERN = r'File Not Found

' DIRECT_LINK_PATTERN = r'Download Link' #OVR_DOWNLOAD_LINK_PATTERN = "var file_link = '(.*)';" -- cgit v1.2.3 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/MovReelCom.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 5d7bbe71b..f719982cb 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -16,12 +16,9 @@ class MovReelCom(XFileSharingPro): HOSTER_NAME = "movreel.com" - #FILE_NAME_PATTERN = r'Filename:(?P.*?)
' - #FILE_SIZE_PATTERN = r'Size:(?P.*?)
' FILE_INFO_PATTERN = r'

(?P.+?) (?P[\d.]+) (?P..)

' OFFLINE_PATTERN = r'File Not Found

' - DIRECT_LINK_PATTERN = r'Download Link' - #OVR_DOWNLOAD_LINK_PATTERN = "var file_link = '(.*)';" + LINK_PATTERN = r'Download Link' getInfo = create_getInfo(MovReelCom) -- cgit v1.2.3 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/MovReelCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index f719982cb..266e9dc55 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -5,6 +5,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf #from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME + class MovReelCom(XFileSharingPro): __name__ = "MovReelCom" __type__ = "hoster" -- 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/MovReelCom.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 266e9dc55..6b13422b0 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -1,16 +1,15 @@ # -*- coding: utf-8 -*- -#import re from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo -#from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME - class MovReelCom(XFileSharingPro): __name__ = "MovReelCom" __type__ = "hoster" - __pattern__ = r'http://(?:www\.)?movreel.com/.*' __version__ = "1.20" + + __pattern__ = r'http://(?:www\.)?movreel.com/.*' + __description__ = """MovReel.com hoster plugin""" __author_name__ = "JorisV83" __author_mail__ = "jorisv83-pyload@yahoo.com" -- 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/MovReelCom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 6b13422b0..eef4e2580 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -8,12 +8,13 @@ class MovReelCom(XFileSharingPro): __type__ = "hoster" __version__ = "1.20" - __pattern__ = r'http://(?:www\.)?movreel.com/.*' + __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' __description__ = """MovReel.com hoster plugin""" __author_name__ = "JorisV83" __author_mail__ = "jorisv83-pyload@yahoo.com" + HOSTER_NAME = "movreel.com" FILE_INFO_PATTERN = r'

(?P.+?) (?P[\d.]+) (?P..)

' -- cgit v1.2.3 From 9a8c57c198bf88c87872166caa35780f476c3b16 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 3 Oct 2014 09:01:44 +0200 Subject: [MovReelCom] Fixed LINK_PATTERN --- module/plugins/hoster/MovReelCom.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index eef4e2580..fa5a2265a 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -6,7 +6,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf class MovReelCom(XFileSharingPro): __name__ = "MovReelCom" __type__ = "hoster" - __version__ = "1.20" + __version__ = "1.21" __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' @@ -17,9 +17,10 @@ class MovReelCom(XFileSharingPro): HOSTER_NAME = "movreel.com" - FILE_INFO_PATTERN = r'

(?P.+?) (?P[\d.]+) (?P..)

' - OFFLINE_PATTERN = r'File Not Found

' - LINK_PATTERN = r'Download Link' + FILE_NAME_PATTERN = r'Filename: (?P.+?)<' + FILE_SIZE_PATTERN = r'Size: (?P[\d.]+) (?P\w+)' + + LINK_PATTERN = r'Download Link' getInfo = create_getInfo(MovReelCom) -- 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/MovReelCom.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index fa5a2265a..682adc48d 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -11,8 +11,7 @@ class MovReelCom(XFileSharingPro): __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' __description__ = """MovReel.com hoster plugin""" - __author_name__ = "JorisV83" - __author_mail__ = "jorisv83-pyload@yahoo.com" + __authors__ = [("JorisV83", "jorisv83-pyload@yahoo.com")] HOSTER_NAME = "movreel.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/MovReelCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 682adc48d..4c6bc355c 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo -class MovReelCom(XFileSharingPro): +class MovReelCom(XFSPHoster): __name__ = "MovReelCom" __type__ = "hoster" - __version__ = "1.21" + __version__ = "1.22" __pattern__ = r'http://(?:www\.)?movreel\.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/MovReelCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 4c6bc355c..9fd28385c 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class MovReelCom(XFSPHoster): __name__ = "MovReelCom" __type__ = "hoster" - __version__ = "1.22" + __version__ = "1.23" __pattern__ = r'http://(?:www\.)?movreel\.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/MovReelCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 9fd28385c..3a795ba2e 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -11,6 +11,7 @@ class MovReelCom(XFSPHoster): __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' __description__ = """MovReel.com hoster plugin""" + __license__ = "GPLv3" __authors__ = [("JorisV83", "jorisv83-pyload@yahoo.com")] -- 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/MovReelCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 3a795ba2e..96741f347 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -18,7 +18,7 @@ class MovReelCom(XFSPHoster): HOSTER_NAME = "movreel.com" FILE_NAME_PATTERN = r'Filename: (?P.+?)<' - FILE_SIZE_PATTERN = r'Size: (?P[\d.]+) (?P\w+)' + FILE_SIZE_PATTERN = r'Size: (?P[\d.,]+) (?P\w+)' LINK_PATTERN = r'Download Link' -- 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/MovReelCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 96741f347..4b3cca4d5 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -18,7 +18,7 @@ class MovReelCom(XFSPHoster): HOSTER_NAME = "movreel.com" FILE_NAME_PATTERN = r'Filename: (?P.+?)<' - FILE_SIZE_PATTERN = r'Size: (?P[\d.,]+) (?P\w+)' + FILE_SIZE_PATTERN = r'Size: (?P[\d.,]+) (?P[\w^_]+)' LINK_PATTERN = r'Download Link' -- 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/MovReelCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 4b3cca4d5..55de0a5f7 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -4,15 +4,15 @@ from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class MovReelCom(XFSPHoster): - __name__ = "MovReelCom" - __type__ = "hoster" + __name__ = "MovReelCom" + __type__ = "hoster" __version__ = "1.23" __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' __description__ = """MovReel.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("JorisV83", "jorisv83-pyload@yahoo.com")] + __license__ = "GPLv3" + __authors__ = [("JorisV83", "jorisv83-pyload@yahoo.com")] HOSTER_NAME = "movreel.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/MovReelCom.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 55de0a5f7..cd1626f6f 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class MovReelCom(XFSPHoster): +class MovReelCom(XFSHoster): __name__ = "MovReelCom" __type__ = "hoster" - __version__ = "1.23" + __version__ = "1.24" __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' @@ -15,10 +15,10 @@ class MovReelCom(XFSPHoster): __authors__ = [("JorisV83", "jorisv83-pyload@yahoo.com")] - HOSTER_NAME = "movreel.com" + HOSTER_DOMAIN = "movreel.com" - FILE_NAME_PATTERN = r'Filename: (?P.+?)<' - FILE_SIZE_PATTERN = r'Size: (?P[\d.,]+) (?P[\w^_]+)' + NAME_PATTERN = r'Filename: (?P.+?)<' + SIZE_PATTERN = r'Size: (?P[\d.,]+) (?P[\w^_]+)' LINK_PATTERN = r'Download Link' -- 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/MovReelCom.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'module/plugins/hoster/MovReelCom.py') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index cd1626f6f..9bb63701c 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -17,9 +17,6 @@ class MovReelCom(XFSHoster): HOSTER_DOMAIN = "movreel.com" - NAME_PATTERN = r'Filename: (?P.+?)<' - SIZE_PATTERN = r'Size: (?P[\d.,]+) (?P[\w^_]+)' - LINK_PATTERN = r'Download Link' -- cgit v1.2.3