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/FileomCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 9fda2353c..70975e6d9 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -41,7 +41,7 @@ class FileomCom(XFileSharingPro): ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'| Date: Mon, 14 Jul 2014 02:23:37 +0200 Subject: Removed all @author flags + key attributes cleanup for internal & hooks plugins --- module/plugins/hoster/FileomCom.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 70975e6d9..7fd1efd34 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -12,8 +12,6 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -# -# @author: Walter Purcaro ############################################################################### # Test links (random.bin): -- 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/FileomCom.py | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 7fd1efd34..2f876466b 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -1,20 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################### -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -############################################################################### - -# Test links (random.bin): +# Test links: # http://fileom.com/gycaytyzdw3g/random.bin.html from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo @@ -23,8 +9,10 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf class FileomCom(XFileSharingPro): __name__ = "FileomCom" __type__ = "hoster" - __pattern__ = r'https?://(?:www\.)?fileom\.com/\w+' __version__ = "0.01" + + __pattern__ = r'https?://(?:www\.)?fileom\.com/\w+' + __description__ = """Fileom.com hoster plugin""" __author_name__ = "Walter Purcaro" __author_mail__ = "vuolter@gmail.com" @@ -41,6 +29,7 @@ class FileomCom(XFileSharingPro): LINK_PATTERN = r"var url2 = '(.+?)';" + def setup(self): self.resumeDownload = self.premium self.multiDL = True -- cgit v1.2.3 From 4709a41c176dd2947709b7f35ccc84213d574624 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 26 Sep 2014 16:59:26 +0200 Subject: Rename SH flags --- module/plugins/hoster/FileomCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 2f876466b..3735daab3 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -20,7 +20,7 @@ class FileomCom(XFileSharingPro): HOSTER_NAME = "fileom.com" FILE_URL_REPLACEMENTS = [(r'/$', "")] - SH_COOKIES = [(".fileom.com", "lang", "english")] + COOKIES = [(".fileom.com", "lang", "english")] FILE_NAME_PATTERN = r'Filename: (?P.+?)<' FILE_SIZE_PATTERN = r'File Size: (?P[\d\.]+) (?P\w+)' -- cgit v1.2.3 From 8add4efc7dc3eeaa873030930e5bd31d6bdf8126 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 28 Sep 2014 14:57:02 +0200 Subject: [XFileSharingPro] COOKIES preset to english + improved setup routine --- module/plugins/hoster/FileomCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 3735daab3..c49344a69 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -17,10 +17,10 @@ class FileomCom(XFileSharingPro): __author_name__ = "Walter Purcaro" __author_mail__ = "vuolter@gmail.com" + HOSTER_NAME = "fileom.com" FILE_URL_REPLACEMENTS = [(r'/$', "")] - COOKIES = [(".fileom.com", "lang", "english")] FILE_NAME_PATTERN = r'Filename: (?P.+?)<' FILE_SIZE_PATTERN = r'File Size: (?P[\d\.]+) (?P\w+)' -- 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/FileomCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index c49344a69..71931eb97 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -11,7 +11,7 @@ class FileomCom(XFileSharingPro): __type__ = "hoster" __version__ = "0.01" - __pattern__ = r'https?://(?:www\.)?fileom\.com/\w+' + __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' __description__ = """Fileom.com hoster plugin""" __author_name__ = "Walter Purcaro" @@ -31,9 +31,9 @@ class FileomCom(XFileSharingPro): def setup(self): - self.resumeDownload = self.premium self.multiDL = True self.chunkLimit = 1 + self.resumeDownload = self.premium getInfo = create_getInfo(FileomCom) -- 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/FileomCom.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 71931eb97..793bc001e 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -14,8 +14,7 @@ class FileomCom(XFileSharingPro): __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' __description__ = """Fileom.com hoster plugin""" - __author_name__ = "Walter Purcaro" - __author_mail__ = "vuolter@gmail.com" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_NAME = "fileom.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/FileomCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 793bc001e..f839bd080 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -3,13 +3,13 @@ # Test links: # http://fileom.com/gycaytyzdw3g/random.bin.html -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo -class FileomCom(XFileSharingPro): +class FileomCom(XFSPHoster): __name__ = "FileomCom" __type__ = "hoster" - __version__ = "0.01" + __version__ = "0.02" __pattern__ = r'https?://(?:www\.)?fileom\.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/FileomCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index f839bd080..22b0dc985 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -3,13 +3,13 @@ # Test links: # http://fileom.com/gycaytyzdw3g/random.bin.html -from module.plugins.hoster.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class FileomCom(XFSPHoster): __name__ = "FileomCom" __type__ = "hoster" - __version__ = "0.02" + __version__ = "0.03" __pattern__ = r'https?://(?:www\.)?fileom\.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/FileomCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 22b0dc985..ec767c1e8 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -14,6 +14,7 @@ class FileomCom(XFSPHoster): __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' __description__ = """Fileom.com hoster plugin""" + __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.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/FileomCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index ec767c1e8..d3038154c 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -23,7 +23,7 @@ class FileomCom(XFSPHoster): FILE_URL_REPLACEMENTS = [(r'/$', "")] FILE_NAME_PATTERN = r'Filename: (?P.+?)<' - FILE_SIZE_PATTERN = r'File Size: (?P[\d\.]+) (?P\w+)' + FILE_SIZE_PATTERN = r'File Size: (?P[\d.]+) (?P\w+)' ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'| Date: Sat, 11 Oct 2014 15:09:53 +0200 Subject: Pattern update 2 --- module/plugins/hoster/FileomCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index d3038154c..80ee35c1c 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -23,7 +23,7 @@ class FileomCom(XFSPHoster): FILE_URL_REPLACEMENTS = [(r'/$', "")] FILE_NAME_PATTERN = r'Filename: (?P.+?)<' - FILE_SIZE_PATTERN = r'File Size: (?P[\d.]+) (?P\w+)' + FILE_SIZE_PATTERN = r'File Size: (?P[\d.,]+) (?P\w+)' ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'| Date: Sat, 11 Oct 2014 15:12:40 +0200 Subject: Pattern update 3 --- module/plugins/hoster/FileomCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 80ee35c1c..6c8be59da 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -27,7 +27,7 @@ class FileomCom(XFSPHoster): ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'| Date: Tue, 14 Oct 2014 13:38:49 +0200 Subject: Improve unit detection in size pattern --- module/plugins/hoster/FileomCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 6c8be59da..60ab5c5f9 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -23,7 +23,7 @@ class FileomCom(XFSPHoster): FILE_URL_REPLACEMENTS = [(r'/$', "")] FILE_NAME_PATTERN = r'Filename: (?P.+?)<' - FILE_SIZE_PATTERN = r'File Size: (?P[\d.,]+) (?P\w+)' + FILE_SIZE_PATTERN = r'File Size: (?P[\d.,]+) (?P[\w^_]+)' ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'| Date: Sun, 26 Oct 2014 21:10:38 +0100 Subject: [XFSPHoster] Improve ERROR_PATTERN --- module/plugins/hoster/FileomCom.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index 60ab5c5f9..ad8fcac4b 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -25,8 +25,6 @@ class FileomCom(XFSPHoster): FILE_NAME_PATTERN = r'Filename: (?P.+?)<' FILE_SIZE_PATTERN = r'File Size: (?P[\d.,]+) (?P[\w^_]+)' - ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'| Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/hoster/FileomCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index ad8fcac4b..c8f9be30b 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -7,15 +7,15 @@ from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo class FileomCom(XFSPHoster): - __name__ = "FileomCom" - __type__ = "hoster" + __name__ = "FileomCom" + __type__ = "hoster" __version__ = "0.03" __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' __description__ = """Fileom.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_NAME = "fileom.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/FileomCom.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index c8f9be30b..dc3397e68 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -3,13 +3,13 @@ # Test links: # http://fileom.com/gycaytyzdw3g/random.bin.html -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class FileomCom(XFSPHoster): +class FileomCom(XFSHoster): __name__ = "FileomCom" __type__ = "hoster" - __version__ = "0.03" + __version__ = "0.04" __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' @@ -18,12 +18,12 @@ class FileomCom(XFSPHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - HOSTER_NAME = "fileom.com" + HOSTER_DOMAIN = "fileom.com" - FILE_URL_REPLACEMENTS = [(r'/$', "")] + URL_REPLACEMENTS = [(r'/$', "")] - FILE_NAME_PATTERN = r'Filename: (?P.+?)<' - FILE_SIZE_PATTERN = r'File Size: (?P[\d.,]+) (?P[\w^_]+)' + NAME_PATTERN = r'Filename: (?P.+?)<' + SIZE_PATTERN = r'File Size: (?P[\d.,]+) (?P[\w^_]+)' LINK_PATTERN = r'var url2 = \'(.+?)\';' -- cgit v1.2.3 From f74309f89923317eeaaca31d74dff10590ed3d40 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 4 Nov 2014 23:42:46 +0100 Subject: [XFSHoster] Use URL_REPLACEMENTS to clean url --- module/plugins/hoster/FileomCom.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'module/plugins/hoster/FileomCom.py') diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py index dc3397e68..2b6fd34db 100644 --- a/module/plugins/hoster/FileomCom.py +++ b/module/plugins/hoster/FileomCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FileomCom(XFSHoster): __name__ = "FileomCom" __type__ = "hoster" - __version__ = "0.04" + __version__ = "0.05" __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' @@ -20,8 +20,6 @@ class FileomCom(XFSHoster): HOSTER_DOMAIN = "fileom.com" - URL_REPLACEMENTS = [(r'/$', "")] - NAME_PATTERN = r'Filename: (?P.+?)<' SIZE_PATTERN = r'File Size: (?P[\d.,]+) (?P[\w^_]+)' -- cgit v1.2.3