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 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') 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 +-- module/plugins/container/LinkList.py | 4 ++-- module/plugins/container/RSDF.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'module/plugins/container') 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): diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index 7e418bd67..934ee96cd 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -15,8 +15,8 @@ class LinkList(Container): ("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") + __authors__ = [("spoob", "spoob@pyload.org"), + ("jeix", "jeix@hasnomail.com")] def decrypt(self, pyfile): diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index c35efacc6..6c3271750 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -14,8 +14,8 @@ class RSDF(Container): __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" - __author_name__ = ("RaNaN", "spoob") - __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org") + __authors__ = [("RaNaN", "RaNaN@pyload.org"), + ("spoob", "spoob@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 + module/plugins/container/LinkList.py | 1 + module/plugins/container/RSDF.py | 1 + 3 files changed, 3 insertions(+) (limited to 'module/plugins/container') 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")] diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index 934ee96cd..9fc900100 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -15,6 +15,7 @@ class LinkList(Container): ("encoding", "string", "File encoding (default utf-8)", "")] __description__ = """Read link lists in txt format""" + __license__ = "GPLv3" __authors__ = [("spoob", "spoob@pyload.org"), ("jeix", "jeix@hasnomail.com")] diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 6c3271750..4b9e3119a 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -14,6 +14,7 @@ class RSDF(Container): __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" + __license__ = "GPLv3" __authors__ = [("RaNaN", "RaNaN@pyload.org"), ("spoob", "spoob@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') 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 c41d4ec4c5935ee702a44e919730971028bf5724 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Oct 2014 01:16:52 +0200 Subject: Fix and improve plugins logging --- 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 4b9e3119a..60afb5600 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -49,4 +49,4 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') self.urls.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))) -- 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') 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 9f2ebe486a3e155fb6a60e07cccb77ab6a772eb2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 26 Oct 2014 02:31:54 +0200 Subject: Extend translation support in plugins + a lot of code cosmetics and typo fixes --- 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 9fc900100..af52b90f2 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -68,7 +68,7 @@ class LinkList(Container): txt = open(file_name, 'wb') txt.close() except: - self.logWarning(_("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 60afb5600..781b00326 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -49,4 +49,4 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') self.urls.append(decryptedUrl) - self.logDebug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) + self.logDebug("Adding package %s with %d links" % (pyfile.package().name, len(links))) -- cgit v1.2.3 From 0362f342d3526ded8650acb219e205d3f93c37a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 26 Oct 2014 20:48:37 +0100 Subject: [RSDF] Fix typo (thx Guidobelix) --- module/plugins/container/RSDF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 781b00326..0819fcdea 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -9,7 +9,7 @@ from module.plugins.Container import Container class RSDF(Container): __name__ = "RSDF" - __version__ = "0.22" + __version__ = "0.23" __pattern__ = r'.+\.rsdf' @@ -49,4 +49,4 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') self.urls.append(decryptedUrl) - self.logDebug("Adding package %s with %d links" % (pyfile.package().name, len(links))) + self.logDebug("Adding package %s with %d links" % (pyfile.package().name, len(self.urls))) -- cgit v1.2.3 From 146fe1e309c33ab149bfaf58ad86c0dd4fb9b156 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 27 Oct 2014 01:18:45 +0100 Subject: Spare code cosmetics --- module/plugins/container/LinkList.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index af52b90f2..2b3f313f8 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -26,9 +26,6 @@ class LinkList(Container): except: file_enc = "utf-8" - print repr(pyfile.url) - print pyfile.url - file_name = fs_encode(pyfile.url) txt = codecs.open(file_name, 'r', file_enc) -- 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 +++--- module/plugins/container/DLC_25.pyc | Bin 8340 -> 8346 bytes module/plugins/container/DLC_26.pyc | Bin 8313 -> 8319 bytes module/plugins/container/DLC_27.pyc | Bin 8237 -> 8243 bytes module/plugins/container/LinkList.py | 8 ++++---- module/plugins/container/RSDF.py | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'module/plugins/container') 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): diff --git a/module/plugins/container/DLC_25.pyc b/module/plugins/container/DLC_25.pyc index b8fde0051..409264902 100644 Binary files a/module/plugins/container/DLC_25.pyc and b/module/plugins/container/DLC_25.pyc differ diff --git a/module/plugins/container/DLC_26.pyc b/module/plugins/container/DLC_26.pyc index 41a4e0cb8..685995fc2 100644 Binary files a/module/plugins/container/DLC_26.pyc and b/module/plugins/container/DLC_26.pyc differ diff --git a/module/plugins/container/DLC_27.pyc b/module/plugins/container/DLC_27.pyc index a6bffaf74..6c6d663e5 100644 Binary files a/module/plugins/container/DLC_27.pyc and b/module/plugins/container/DLC_27.pyc differ diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py index 2b3f313f8..c6173ad73 100644 --- a/module/plugins/container/LinkList.py +++ b/module/plugins/container/LinkList.py @@ -7,7 +7,7 @@ from module.utils import fs_encode class LinkList(Container): - __name__ = "LinkList" + __name__ = "LinkList" __version__ = "0.12" __pattern__ = r'.+\.txt' @@ -15,9 +15,9 @@ class LinkList(Container): ("encoding", "string", "File encoding (default utf-8)", "")] __description__ = """Read link lists in txt format""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org"), - ("jeix", "jeix@hasnomail.com")] + __license__ = "GPLv3" + __authors__ = [("spoob", "spoob@pyload.org"), + ("jeix", "jeix@hasnomail.com")] def decrypt(self, pyfile): diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 0819fcdea..c3846b9e4 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -8,15 +8,15 @@ from module.plugins.Container import Container class RSDF(Container): - __name__ = "RSDF" + __name__ = "RSDF" __version__ = "0.23" __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org"), - ("spoob", "spoob@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org"), + ("spoob", "spoob@pyload.org")] def decrypt(self, pyfile): -- cgit v1.2.3 From bd8259220ab4d56ab419b7b32045b08cc9b0a7c8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 9 Nov 2014 03:08:19 +0100 Subject: Use with statement instead open method when accessing fod + handle i/o error --- module/plugins/container/RSDF.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index c3846b9e4..9c57c8ddb 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -5,6 +5,7 @@ import binascii import re from module.plugins.Container import Container +from module.utils import fs_encode class RSDF(Container): @@ -23,7 +24,7 @@ class RSDF(Container): from Crypto.Cipher import AES - infile = pyfile.url.replace("\n", "") + infile = fs_encode(pyfile.url.replace("\n", "")) Key = binascii.unhexlify('8C35192D964DC3182C6F84F3252239EB4A320D2500000000') IV = binascii.unhexlify('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF') @@ -32,10 +33,11 @@ class RSDF(Container): obj = AES.new(Key, AES.MODE_CFB, IV) - rsdf = open(infile, 'r') - - data = rsdf.read() - rsdf.close() + try: + with open(infile, 'r') as rsdf: + data = rsdf.read() + except IOError, e: + self.fail(str(e)) if re.search(r"404 - Not Found", data) is None: data = binascii.unhexlify(''.join(data.split())) -- cgit v1.2.3 From 52664e6fe8dd99fc9bb78ea8cf158c17705b6ded Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 5 Dec 2014 19:18:11 +0100 Subject: Fix with statement on old env like python 2.5 (2) --- module/plugins/container/RSDF.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 9c57c8ddb..0c43f0e6c 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +from __future__ import with_statement + import base64 import binascii import re @@ -10,7 +12,7 @@ from module.utils import fs_encode class RSDF(Container): __name__ = "RSDF" - __version__ = "0.23" + __version__ = "0.24" __pattern__ = r'.+\.rsdf' -- 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') 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') 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