From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/container/CCF.py | 4 ++-- module/plugins/container/DLC.py | 4 ++-- module/plugins/container/RSDF.py | 4 ++-- module/plugins/container/TXT.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 235d5dc1d..082786e2b 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -6,14 +6,14 @@ import MultipartPostHandler import re import urllib2 -from module.plugins.Container import Container +from module.plugins.internal.Container import Container from module.utils import fs_encode, save_join class CCF(Container): __name__ = "CCF" __type__ = "container" - __version__ = "0.23" + __version__ = "0.24" __pattern__ = r'.+\.ccf$' diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index ff2f0104a..31037fd45 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -7,14 +7,14 @@ import xml.dom.minidom from Crypto.Cipher import AES -from module.plugins.Container import Container +from module.plugins.internal.Container import Container from module.utils import decode, fs_encode class DLC(Container): __name__ = "DLC" __type__ = "container" - __version__ = "0.24" + __version__ = "0.25" __pattern__ = r'.+\.dlc$' diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index dd2d14cf7..e3a88c8ae 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -7,14 +7,14 @@ import re from Crypto.Cipher import AES -from module.plugins.Container import Container +from module.plugins.internal.Container import Container from module.utils import fs_encode class RSDF(Container): __name__ = "RSDF" __type__ = "container" - __version__ = "0.29" + __version__ = "0.30" __pattern__ = r'.+\.rsdf$' diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index d419ee060..66abb9ae8 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -2,14 +2,14 @@ import codecs -from module.plugins.Container import Container +from module.plugins.internal.Container import Container from module.utils import fs_encode class TXT(Container): __name__ = "TXT" __type__ = "container" - __version__ = "0.15" + __version__ = "0.16" __pattern__ = r'.+\.(txt|text)$' __config__ = [("flush" , "bool" , "Flush list after adding", False ), -- cgit v1.2.3 From 5a139055ae658d3a05cbb658cbd66aeae0d01db5 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 15 Jun 2015 21:06:10 +0200 Subject: Spare code cosmetics --- module/plugins/container/CCF.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 082786e2b..395f8c953 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -7,7 +7,7 @@ import re import urllib2 from module.plugins.internal.Container import Container -from module.utils import fs_encode, save_join +from module.utils import fs_encode, save_join as fs_join class CCF(Container): @@ -32,8 +32,8 @@ class CCF(Container): 'filename': "test.ccf", 'upload' : open(fs_filename, "rb")}).read() - download_folder = self.config['general']['download_folder'] - dlc_file = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) + download_folder = self.core.config['general']['download_folder'] + dlc_file = fs_join(download_folder, "tmp_%s.dlc" % pyfile.name) try: dlc = re.search(r'(.+)', dlc_content, re.S).group(1).decode('base64') -- cgit v1.2.3 From 164512b6a74c94a731fcee7435dce1ccfa2f71e7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Jun 2015 18:29:50 +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 395f8c953..314a76eb5 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -32,7 +32,7 @@ class CCF(Container): 'filename': "test.ccf", 'upload' : open(fs_filename, "rb")}).read() - download_folder = self.core.config['general']['download_folder'] + download_folder = self.core.config.get("general", "download_folder") dlc_file = fs_join(download_folder, "tmp_%s.dlc" % pyfile.name) try: -- cgit v1.2.3 From 20b6a2ec022202b0efb6cb69415239fb8f4d1445 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Jun 2015 18:59:20 +0200 Subject: Spare code cosmetics (2) --- module/plugins/container/TXT.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index 66abb9ae8..76cf41f60 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -43,7 +43,7 @@ class TXT(Container): continue if link.startswith("[") and link.endswith("]"): - # new package + #: new package curPack = link[1:-1] packages[curPack] = [] continue @@ -52,7 +52,7 @@ class TXT(Container): txt.close() - # empty packages fix + #: empty packages fix for key, value in packages.iteritems(): if not value: packages.pop(key, None) -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/container/CCF.py | 2 +- module/plugins/container/DLC.py | 14 +++++++------- module/plugins/container/RSDF.py | 2 +- module/plugins/container/TXT.py | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 314a76eb5..ca77f0c00 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -13,7 +13,7 @@ from module.utils import fs_encode, save_join as fs_join class CCF(Container): __name__ = "CCF" __type__ = "container" - __version__ = "0.24" + __version__ = "0.25" __pattern__ = r'.+\.ccf$' diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index 31037fd45..7d71165b3 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -14,7 +14,7 @@ from module.utils import decode, fs_encode class DLC(Container): __name__ = "DLC" __type__ = "container" - __version__ = "0.25" + __version__ = "0.26" __pattern__ = r'.+\.dlc$' @@ -53,20 +53,20 @@ class DLC(Container): self.data = AES.new(key, AES.MODE_CBC, iv).decrypt(dlc_data).decode('base64') self.packages = [(name or pyfile.name, links, name or pyfile.name) \ - for name, links in self.getPackages()] + for name, links in self.get_packages()] - def getPackages(self): + def get_packages(self): root = xml.dom.minidom.parseString(self.data).documentElement content = root.getElementsByTagName("content")[0] - return self.parsePackages(content) + return self.parse_packages(content) - def parsePackages(self, startNode): - return [(decode(node.getAttribute("name")).decode('base64'), self.parseLinks(node)) \ + def parse_packages(self, startNode): + return [(decode(node.getAttribute("name")).decode('base64'), self.parse_links(node)) \ for node in startNode.getElementsByTagName("package")] - def parseLinks(self, startNode): + def parse_links(self, startNode): return [node.getElementsByTagName("url")[0].firstChild.data.decode('base64') \ for node in startNode.getElementsByTagName("file")] diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index e3a88c8ae..06b5c065f 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -14,7 +14,7 @@ from module.utils import fs_encode class RSDF(Container): __name__ = "RSDF" __type__ = "container" - __version__ = "0.30" + __version__ = "0.31" __pattern__ = r'.+\.rsdf$' diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index 76cf41f60..b7355d80c 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -9,7 +9,7 @@ from module.utils import fs_encode class TXT(Container): __name__ = "TXT" __type__ = "container" - __version__ = "0.16" + __version__ = "0.17" __pattern__ = r'.+\.(txt|text)$' __config__ = [("flush" , "bool" , "Flush list after adding", False ), @@ -23,7 +23,7 @@ class TXT(Container): def decrypt(self, pyfile): try: - encoding = codecs.lookup(self.getConfig('encoding')).name + encoding = codecs.lookup(self.get_config('encoding')).name except Exception: encoding = "utf-8" @@ -57,13 +57,13 @@ class TXT(Container): if not value: packages.pop(key, None) - if self.getConfig('flush'): + if self.get_config('flush'): try: txt = open(fs_filename, 'wb') txt.close() except IOError: - self.logWarning(_("Failed to flush list")) + self.log_warning(_("Failed to flush list")) for name, links in packages.iteritems(): self.packages.append((name, links, name)) -- cgit v1.2.3 From dad722ac7255640e7e0541c4094a4d2e4de79cd3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 00:05:58 +0200 Subject: Code cosmetics (2) --- module/plugins/container/TXT.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index b7355d80c..52f597f9f 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -43,7 +43,7 @@ class TXT(Container): continue if link.startswith("[") and link.endswith("]"): - #: new package + #: New package curPack = link[1:-1] packages[curPack] = [] continue @@ -52,7 +52,7 @@ class TXT(Container): txt.close() - #: empty packages fix + #: Empty packages fix for key, value in packages.iteritems(): if not value: packages.pop(key, None) -- cgit v1.2.3 From 56389e28ba5d2f5658278bc7f486d73be747f135 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 11:44:49 +0200 Subject: Rename self.core to self.pyload (plugins only) --- 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 ca77f0c00..d283658b0 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -32,7 +32,7 @@ class CCF(Container): 'filename': "test.ccf", 'upload' : open(fs_filename, "rb")}).read() - download_folder = self.core.config.get("general", "download_folder") + download_folder = self.pyload.config.get("general", "download_folder") dlc_file = fs_join(download_folder, "tmp_%s.dlc" % pyfile.name) try: -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/container/CCF.py | 1 + module/plugins/container/DLC.py | 1 + module/plugins/container/RSDF.py | 1 + module/plugins/container/TXT.py | 1 + 4 files changed, 4 insertions(+) (limited to 'module/plugins/container') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index d283658b0..10ed124e7 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -14,6 +14,7 @@ class CCF(Container): __name__ = "CCF" __type__ = "container" __version__ = "0.25" + __status__ = "stable" __pattern__ = r'.+\.ccf$' diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index 7d71165b3..d761a9b0c 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -15,6 +15,7 @@ class DLC(Container): __name__ = "DLC" __type__ = "container" __version__ = "0.26" + __status__ = "stable" __pattern__ = r'.+\.dlc$' diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 06b5c065f..e0f312aac 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -15,6 +15,7 @@ class RSDF(Container): __name__ = "RSDF" __type__ = "container" __version__ = "0.31" + __status__ = "stable" __pattern__ = r'.+\.rsdf$' diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index 52f597f9f..a34e458fe 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -10,6 +10,7 @@ class TXT(Container): __name__ = "TXT" __type__ = "container" __version__ = "0.17" + __status__ = "stable" __pattern__ = r'.+\.(txt|text)$' __config__ = [("flush" , "bool" , "Flush list after adding", False ), -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/container/CCF.py | 2 +- module/plugins/container/DLC.py | 2 +- module/plugins/container/RSDF.py | 2 +- module/plugins/container/TXT.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 10ed124e7..3126d69a5 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -14,7 +14,7 @@ class CCF(Container): __name__ = "CCF" __type__ = "container" __version__ = "0.25" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'.+\.ccf$' diff --git a/module/plugins/container/DLC.py b/module/plugins/container/DLC.py index d761a9b0c..145322942 100644 --- a/module/plugins/container/DLC.py +++ b/module/plugins/container/DLC.py @@ -15,7 +15,7 @@ class DLC(Container): __name__ = "DLC" __type__ = "container" __version__ = "0.26" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'.+\.dlc$' diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index e0f312aac..cedb2b605 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -15,7 +15,7 @@ class RSDF(Container): __name__ = "RSDF" __type__ = "container" __version__ = "0.31" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'.+\.rsdf$' diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index a34e458fe..90b7ccc90 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -10,7 +10,7 @@ class TXT(Container): __name__ = "TXT" __type__ = "container" __version__ = "0.17" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'.+\.(txt|text)$' __config__ = [("flush" , "bool" , "Flush list after adding", False ), -- cgit v1.2.3 From 952001324e1faf584b1adcb01c4a0406a3722932 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 09:42:49 +0200 Subject: =?UTF-8?q?Don't=20user=20dictionary=E2=80=99s=20iterator=20method?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/plugins/container/TXT.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container') diff --git a/module/plugins/container/TXT.py b/module/plugins/container/TXT.py index 90b7ccc90..8c9f99c27 100644 --- a/module/plugins/container/TXT.py +++ b/module/plugins/container/TXT.py @@ -54,7 +54,7 @@ class TXT(Container): txt.close() #: Empty packages fix - for key, value in packages.iteritems(): + for key, value in packages.items(): if not value: packages.pop(key, None) @@ -66,5 +66,5 @@ class TXT(Container): except IOError: self.log_warning(_("Failed to flush list")) - for name, links in packages.iteritems(): + for name, links in packages.items(): self.packages.append((name, links, name)) -- cgit v1.2.3