From 3b7277cd0013539dd2cd65fd270f7643a5c3779a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 30 Jun 2014 02:28:24 +0200 Subject: [RSDF] Improve code a bit (thx charlie89) --- module/plugins/container/RSDF.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 42296f2d5..f7d3f7377 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -6,9 +6,10 @@ import re from module.plugins.Container import Container + class RSDF(Container): __name__ = "RSDF" - __version__ = "0.21" + __version__ = "0.22" __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" __author_name__ = ("RaNaN", "spoob") @@ -38,10 +39,12 @@ class RSDF(Container): links = [] for link in data: + if link == '': + continue link = base64.b64decode(link) link = obj.decrypt(link) decryptedUrl = link.replace('CCF: ', '') links.append(decryptedUrl) - self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) + self.log.debug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) self.packages.append((pyfile.package().name, links)) -- cgit v1.2.3 From 2a79ebb957adf2ed610e6104fc00f7e51e835edc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 5 Jul 2014 03:21:06 +0200 Subject: Cleaned ShareLinksBiz pattern + better if-check for RSDF plugin --- module/plugins/container/RSDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index f7d3f7377..41cdfccb7 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -39,7 +39,7 @@ class RSDF(Container): links = [] for link in data: - if link == '': + if not link: continue link = base64.b64decode(link) link = obj.decrypt(link) -- cgit v1.2.3 From 94c003dce452e768bf8d1c6598bde2d954cc0af7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 6 Jul 2014 20:41:59 +0200 Subject: Use Base log methods --- module/plugins/container/LinkList.py | 2 +- module/plugins/container/RSDF.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index 79678954d..ab7700181 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -61,7 +61,7 @@ class LinkList(Container): txt = open(file_name, 'wb') txt.close() except: - self.log.warning(_("LinkList could not be cleared.")) + self.logWarning(_("LinkList could not be cleared.")) for name, links in packages.iteritems(): self.packages.append((name, links, name)) diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 41cdfccb7..cc090a267 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -46,5 +46,5 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') links.append(decryptedUrl) - self.log.debug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) + self.logDebug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) self.packages.append((pyfile.package().name, links)) -- 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/container/CCF.py | 1 + module/plugins/container/LinkList.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/container') 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" diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index ab7700181..b8f1b9de5 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -4,6 +4,7 @@ import codecs from module.utils import fs_encode from module.plugins.Container import Container + class LinkList(Container): __name__ = "LinkList" __version__ = "0.12" @@ -33,7 +34,8 @@ class LinkList(Container): for link in links: link = link.strip() - if not link: continue + if not link: + continue if link.startswith(";"): continue -- 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 +++++++---- module/plugins/container/LinkList.py | 8 ++++++-- module/plugins/container/RSDF.py | 3 +++ 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'module/plugins/container') 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", "") diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index b8f1b9de5..7e418bd67 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -1,20 +1,24 @@ # -*- coding: utf-8 -*- import codecs -from module.utils import fs_encode + from module.plugins.Container import Container +from module.utils import fs_encode class LinkList(Container): __name__ = "LinkList" __version__ = "0.12" + __pattern__ = r'.+\.txt' - __description__ = """Read link lists in txt format""" __config__ = [("clear", "bool", "Clear Linklist after adding", False), ("encoding", "string", "File encoding (default utf-8)", "")] + + __description__ = """Read link lists in txt format""" __author_name__ = ("spoob", "jeix") __author_mail__ = ("spoob@pyload.org", "jeix@hasnomail.com") + def decrypt(self, pyfile): try: file_enc = codecs.lookup(self.getConfig("encoding")).name diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index cc090a267..2444ec752 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -10,11 +10,14 @@ from module.plugins.Container import Container class RSDF(Container): __name__ = "RSDF" __version__ = "0.22" + __pattern__ = r'.+\.rsdf' + __description__ = """RSDF container decrypter plugin""" __author_name__ = ("RaNaN", "spoob") __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org") + def decrypt(self, pyfile): from Crypto.Cipher import AES -- 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 +- module/plugins/container/RSDF.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'module/plugins/container') 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] diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 2444ec752..c35efacc6 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -40,14 +40,12 @@ class RSDF(Container): data = binascii.unhexlify(''.join(data.split())) data = data.splitlines() - links = [] for link in data: if not link: continue link = base64.b64decode(link) link = obj.decrypt(link) decryptedUrl = link.replace('CCF: ', '') - links.append(decryptedUrl) + self.urls.append(decryptedUrl) - self.logDebug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) - self.packages.append((pyfile.package().name, links)) + self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) -- 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') 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