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/container/CCF.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 8aec97f6a..eb27aaae3 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -9,6 +9,7 @@ from module.lib.MultipartPostHandler import MultipartPostHandler from os import makedirs from os.path import exists, join + class CCF(Container): __name__ = "CCF" __version__ = "0.2" -- 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/container/CCF.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index eb27aaae3..a55357af4 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -1,23 +1,26 @@ # -*- coding: utf-8 -*- import re -from urllib2 import build_opener - -from module.plugins.Container import Container -from module.lib.MultipartPostHandler import MultipartPostHandler from os import makedirs from os.path import exists, join +from urllib2 import build_opener + +from module.lib.MultipartPostHandler import MultipartPostHandler +from module.plugins.Container import Container class CCF(Container): __name__ = "CCF" __version__ = "0.2" + __pattern__ = r'.+\.ccf' + __description__ = """CCF container decrypter plugin""" __author_name__ = "Willnix" __author_mail__ = "Willnix@pyload.org" + def decrypt(self, pyfile): infile = pyfile.url.replace("\n", "") -- cgit v1.2.3 From a1e78f33dc2b0b6777fdcbc415673f3965b25542 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 16 Jul 2014 00:46:26 +0200 Subject: Prefer self.urls and self.packages for adding links --- module/plugins/container/CCF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index a55357af4..a5a071820 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -41,4 +41,4 @@ class CCF(Container): tempdlc.write(re.search(r'(.*)', tempdlc_content, re.DOTALL).group(1)) tempdlc.close() - self.packages.append((tempdlc_name, [tempdlc_name], tempdlc_name)) + self.urls = [tempdlc_name] -- 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/container/CCF.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index a5a071820..ee92beb9a 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -3,11 +3,13 @@ import re from os import makedirs -from os.path import exists, join +from os.path import exists from urllib2 import build_opener from module.lib.MultipartPostHandler import MultipartPostHandler + from module.plugins.Container import Container +from module.utils import save_join class CCF(Container): @@ -32,11 +34,8 @@ class CCF(Container): tempdlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', params).read() download_folder = self.config['general']['download_folder'] - location = download_folder #join(download_folder, pyfile.package().folder.decode(sys.getfilesystemencoding())) - if not exists(location): - makedirs(location) - tempdlc_name = join(location, "tmp_%s.dlc" % pyfile.name) + tempdlc_name = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) tempdlc = open(tempdlc_name, "w") tempdlc.write(re.search(r'(.*)', tempdlc_content, re.DOTALL).group(1)) tempdlc.close() -- cgit v1.2.3 From a9117257f71984d553811a605150acb5d1b499ce Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 5 Oct 2014 02:27:07 +0200 Subject: Better import lib header --- module/plugins/container/CCF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index ee92beb9a..e6e8c4bb5 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -6,7 +6,7 @@ from os import makedirs from os.path import exists from urllib2 import build_opener -from module.lib.MultipartPostHandler import MultipartPostHandler +from MultipartPostHandler import MultipartPostHandler from module.plugins.Container import Container from module.utils import save_join -- 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/container/CCF.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index e6e8c4bb5..ce307848c 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -19,8 +19,7 @@ class CCF(Container): __pattern__ = r'.+\.ccf' __description__ = """CCF container decrypter plugin""" - __author_name__ = "Willnix" - __author_mail__ = "Willnix@pyload.org" + __authors__ = [("Willnix", "Willnix@pyload.org")] def decrypt(self, pyfile): -- 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/container/CCF.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index ce307848c..7a90ddf1c 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -19,6 +19,7 @@ class CCF(Container): __pattern__ = r'.+\.ccf' __description__ = """CCF container decrypter plugin""" + __license__ = "GPLv3" __authors__ = [("Willnix", "Willnix@pyload.org")] -- cgit v1.2.3 From 0eb6e7ec4a1144dcca824d8add049787d3da1762 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 22 Oct 2014 19:44:59 +0200 Subject: Two space before function declaration --- module/plugins/container/CCF.py | 1 - 1 file changed, 1 deletion(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 7a90ddf1c..4d62be553 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -24,7 +24,6 @@ class CCF(Container): def decrypt(self, pyfile): - infile = pyfile.url.replace("\n", "") opener = build_opener(MultipartPostHandler) -- 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/container/CCF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 4d62be553..e64b0197f 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -36,7 +36,7 @@ class CCF(Container): tempdlc_name = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) tempdlc = open(tempdlc_name, "w") - tempdlc.write(re.search(r'(.*)', tempdlc_content, re.DOTALL).group(1)) + tempdlc.write(re.search(r'(.*)', tempdlc_content, re.S).group(1)) tempdlc.close() self.urls = [tempdlc_name] -- 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/container/CCF.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index e64b0197f..c7824fcc4 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -13,14 +13,14 @@ from module.utils import save_join class CCF(Container): - __name__ = "CCF" + __name__ = "CCF" __version__ = "0.2" __pattern__ = r'.+\.ccf' __description__ = """CCF container decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("Willnix", "Willnix@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("Willnix", "Willnix@pyload.org")] def decrypt(self, pyfile): -- cgit v1.2.3 From 6151e81fa0b325dffda3da4228d5821e73db3ef3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 9 Dec 2014 01:19:46 +0100 Subject: Fix __version__ format in some plugins --- module/plugins/container/CCF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index c7824fcc4..ff7d43e08 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -14,7 +14,7 @@ from module.utils import save_join class CCF(Container): __name__ = "CCF" - __version__ = "0.2" + __version__ = "0.20" __pattern__ = r'.+\.ccf' -- cgit v1.2.3 From 4d578cb15f3d6edd036e438e504739b97660f93e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 9 Dec 2014 16:58:35 +0100 Subject: Spare code cosmetics --- module/plugins/container/CCF.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index ff7d43e08..bca535175 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +from __future__ import with_statement + import re from os import makedirs @@ -35,8 +37,7 @@ class CCF(Container): download_folder = self.config['general']['download_folder'] tempdlc_name = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) - tempdlc = open(tempdlc_name, "w") - tempdlc.write(re.search(r'(.*)', tempdlc_content, re.S).group(1)) - tempdlc.close() + with open(tempdlc_name, "w") as tempdlc: + tempdlc.write(re.search(r'(.*)', tempdlc_content, re.S).group(1)) self.urls = [tempdlc_name] -- cgit v1.2.3