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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container/CCF.py') 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$' -- 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/CCF.py') 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/CCF.py') 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 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 +- 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 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$' -- 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/CCF.py') 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 + 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 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$' -- 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 +- 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 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$' -- cgit v1.2.3