From 15362ebceaee1eb66920d4822d2faa947151e74a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 5 Jul 2014 16:42:24 +0200 Subject: [SimpleCrypter] Better inline docs + support for offline & temp.offline check --- module/plugins/crypter/EasybytezComFolder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index b4a6284fc..7a8ee5424 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -21,12 +21,12 @@ class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' - __version__ = "0.05" + __version__ = "0.06" __description__ = """Easybytez.com decrypter plugin""" __author_name__ = "stickell" __author_mail__ = "l.stickell@yahoo.it" - FILE_URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g?per_page=10000")] + URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g?per_page=10000")] LINK_PATTERN = r'.+(?:)?' TITLE_PATTERN = r'Files of \d+: (?P<title>.+) folder' -- cgit v1.2.3 From 8e47b0de30a25d0fd5dfb518bfe4e1e7beff93fd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:27:44 +0200 Subject: Key attributes cleanup for account, container and crypter plugins --- module/plugins/crypter/EasybytezComFolder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 7a8ee5424..7c78b7946 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -19,9 +19,11 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" + __version__ = "0.06" __type__ = "crypter" + __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' - __version__ = "0.06" + __description__ = """Easybytez.com decrypter plugin""" __author_name__ = "stickell" __author_mail__ = "l.stickell@yahoo.it" -- 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/crypter/EasybytezComFolder.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 7c78b7946..7832bef5f 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -1,26 +1,12 @@ # -*- 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 . # -############################################################################ from module.plugins.internal.SimpleCrypter import SimpleCrypter class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" - __version__ = "0.06" __type__ = "crypter" + __version__ = "0.06" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' -- cgit v1.2.3 From 76c67b22c0b2dbd275fae77e8a3121acb2d4301b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 26 Sep 2014 15:39:33 +0200 Subject: Fix cookie deletion + Account support for SimpleCrypter Fix: https://github.com/pyload/pyload/issues/749 --- module/plugins/crypter/EasybytezComFolder.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 7832bef5f..500f12278 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" - __version__ = "0.06" + __version__ = "0.07" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' @@ -14,7 +14,10 @@ class EasybytezComFolder(SimpleCrypter): __author_name__ = "stickell" __author_mail__ = "l.stickell@yahoo.it" + URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g?per_page=10000")] LINK_PATTERN = r'.+(?:)?' TITLE_PATTERN = r'Files of \d+: (?P<title>.+) folder' + + LOGIN_ACCOUNT = True -- cgit v1.2.3 From ff91b58bf9ee65aaeb048426295af6ad122b119e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 5 Oct 2014 22:14:53 +0200 Subject: Spare code cosmetics --- module/plugins/crypter/EasybytezComFolder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 500f12278..be85a3798 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -10,7 +10,7 @@ class EasybytezComFolder(SimpleCrypter): __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' - __description__ = """Easybytez.com decrypter plugin""" + __description__ = """Easybytez.com folder decrypter plugin""" __author_name__ = "stickell" __author_mail__ = "l.stickell@yahoo.it" -- cgit v1.2.3 From 6f08566dd6c75d76f5cd2c1dc835e0c22838780f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 6 Oct 2014 14:49:16 +0200 Subject: Update SimpleCrypter based plugins --- module/plugins/crypter/EasybytezComFolder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index be85a3798..2a261e709 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" - __version__ = "0.07" + __version__ = "0.08" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' @@ -18,6 +18,6 @@ class EasybytezComFolder(SimpleCrypter): URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g?per_page=10000")] LINK_PATTERN = r'.+(?:)?' - TITLE_PATTERN = r'Files of \d+: (?P<title>.+) folder' + TITLE_PATTERN = r'Files of \d+: (.+) folder' LOGIN_ACCOUNT = 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/crypter/EasybytezComFolder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 2a261e709..565ee0745 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -11,8 +11,7 @@ class EasybytezComFolder(SimpleCrypter): __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' __description__ = """Easybytez.com folder decrypter plugin""" - __author_name__ = "stickell" - __author_mail__ = "l.stickell@yahoo.it" + __authors__ = [("stickell", "l.stickell@yahoo.it")] URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g?per_page=10000")] -- 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/crypter/EasybytezComFolder.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 565ee0745..0b73a10ae 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -11,6 +11,7 @@ class EasybytezComFolder(SimpleCrypter): __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' __description__ = """Easybytez.com folder decrypter plugin""" + __license__ = "GPLv3" __authors__ = [("stickell", "l.stickell@yahoo.it")] -- cgit v1.2.3 From 18836967d39d0b6e6f2aeea4e6aece605246a2bf Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Oct 2014 20:55:00 +0200 Subject: Spare code cosmetics --- module/plugins/crypter/EasybytezComFolder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 0b73a10ae..c80b6cd61 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -15,7 +15,7 @@ class EasybytezComFolder(SimpleCrypter): __authors__ = [("stickell", "l.stickell@yahoo.it")] - URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g?per_page=10000")] + URL_REPLACEMENTS = [(__pattern__, r'http://www.easybytez.com/users/\g?per_page=10000')] LINK_PATTERN = r'.+(?:)?' TITLE_PATTERN = r'Files of \d+: (.+) folder' -- cgit v1.2.3 From be5a34a74c7126dd9606e646cd879369dac7404d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Oct 2014 13:50:09 +0200 Subject: Convert some crypters to use XFSPCrypter instead SimpleCrypter --- module/plugins/crypter/EasybytezComFolder.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index c80b6cd61..4ced45355 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleCrypter import SimpleCrypter +from module.plugins.internal.XFSPCrypter import XFSPCrypter -class EasybytezComFolder(SimpleCrypter): +class EasybytezComFolder(XFSPCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" - __version__ = "0.08" + __version__ = "0.09" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' @@ -15,9 +15,6 @@ class EasybytezComFolder(SimpleCrypter): __authors__ = [("stickell", "l.stickell@yahoo.it")] - URL_REPLACEMENTS = [(__pattern__, r'http://www.easybytez.com/users/\g?per_page=10000')] - - LINK_PATTERN = r'.+(?:)?' - TITLE_PATTERN = r'Files of \d+: (.+) folder' + HOSTER_NAME = "easybytez.com" LOGIN_ACCOUNT = True -- cgit v1.2.3 From 885f8ed782e64d9e73367905e642a84d0a8999f1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 04:01:38 +0100 Subject: Update __config__ --- module/plugins/crypter/EasybytezComFolder.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 4ced45355..e89444271 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -9,6 +9,8 @@ class EasybytezComFolder(XFSPCrypter): __version__ = "0.09" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """Easybytez.com folder decrypter plugin""" __license__ = "GPLv3" -- 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/crypter/EasybytezComFolder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index e89444271..5f8daf55c 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -4,8 +4,8 @@ from module.plugins.internal.XFSPCrypter import XFSPCrypter class EasybytezComFolder(XFSPCrypter): - __name__ = "EasybytezComFolder" - __type__ = "crypter" + __name__ = "EasybytezComFolder" + __type__ = "crypter" __version__ = "0.09" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' @@ -13,8 +13,8 @@ class EasybytezComFolder(XFSPCrypter): ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """Easybytez.com folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] HOSTER_NAME = "easybytez.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/crypter/EasybytezComFolder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 5f8daf55c..f53c8c8b2 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPCrypter import XFSPCrypter +from module.plugins.internal.XFSCrypter import XFSCrypter -class EasybytezComFolder(XFSPCrypter): +class EasybytezComFolder(XFSCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" - __version__ = "0.09" + __version__ = "0.10" __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), @@ -17,6 +17,6 @@ class EasybytezComFolder(XFSPCrypter): __authors__ = [("stickell", "l.stickell@yahoo.it")] - HOSTER_NAME = "easybytez.com" + HOSTER_DOMAIN = "easybytez.com" LOGIN_ACCOUNT = True -- cgit v1.2.3 From 29b39ec6020ec8be623687f03bdf48172a612a66 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 6 Nov 2014 04:32:37 +0100 Subject: Code cosmetics --- module/plugins/crypter/EasybytezComFolder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index f53c8c8b2..fa3e6165c 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -8,7 +8,7 @@ class EasybytezComFolder(XFSCrypter): __type__ = "crypter" __version__ = "0.10" - __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)' + __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -- cgit v1.2.3 From 0f530be2642c63759cb6156866f1d4ab119760da Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 12 Dec 2014 20:33:34 +0100 Subject: Fix missing create_getInfo --- module/plugins/crypter/EasybytezComFolder.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/crypter/EasybytezComFolder.py') diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index fa3e6165c..04f9b853b 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSCrypter import XFSCrypter +from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo class EasybytezComFolder(XFSCrypter): @@ -20,3 +20,6 @@ class EasybytezComFolder(XFSCrypter): HOSTER_DOMAIN = "easybytez.com" LOGIN_ACCOUNT = True + + +getInfo = create_getInfo(EasybytezComFolder) -- cgit v1.2.3