From 681deb7ff09956be0bee04453e33ac6e9d6dab4a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 05:56:10 +0200 Subject: Move base plugins to internal folder --- module/plugins/internal/Crypter.py | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 module/plugins/internal/Crypter.py (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py new file mode 100644 index 000000000..d1549fe80 --- /dev/null +++ b/module/plugins/internal/Crypter.py @@ -0,0 +1,72 @@ +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . + + @author: mkaay +""" + +from module.plugins.Plugin import Plugin + +class Crypter(Plugin): + __name__ = "Crypter" + __version__ = "0.1" + __pattern__ = None + __type__ = "container" + __description__ = """Base crypter plugin""" + __author_name__ = ("mkaay") + __author_mail__ = ("mkaay@mkaay.de") + + def __init__(self, pyfile): + Plugin.__init__(self, pyfile) + + #: Put all packages here. It's a list of tuples like: ( name, [list of links], folder ) + self.packages = [] + + #: List of urls, pyLoad will generate packagenames + self.urls = [] + + self.multiDL = True + self.limitDL = 0 + + + def preprocessing(self, thread): + """prepare""" + self.setup() + self.thread = thread + + self.decrypt(self.pyfile) + + self.createPackages() + + + def decrypt(self, pyfile): + raise NotImplementedError + + def createPackages(self): + """ create new packages from self.packages """ + for pack in self.packages: + + self.log.debug("Parsed package %(name)s with %(len)d links" % { "name" : pack[0], "len" : len(pack[1]) } ) + + links = [x.decode("utf-8") for x in pack[1]] + + pid = self.core.api.addPackage(pack[0], links, self.pyfile.package().queue) + + if self.pyfile.package().password: + self.core.api.setPackageData(pid, {"password": self.pyfile.package().password}) + + if self.urls: + self.core.api.generateAndAddPackages(self.urls) + -- cgit v1.2.3 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/internal/Crypter.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index d1549fe80..b87ed1882 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -13,33 +13,33 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . - + @author: mkaay """ -from module.plugins.Plugin import Plugin +from module.plugins.internal.Plugin import Plugin class Crypter(Plugin): __name__ = "Crypter" - __version__ = "0.1" + __version__ = "0.02" __pattern__ = None __type__ = "container" __description__ = """Base crypter plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") - + def __init__(self, pyfile): Plugin.__init__(self, pyfile) - + #: Put all packages here. It's a list of tuples like: ( name, [list of links], folder ) self.packages = [] #: List of urls, pyLoad will generate packagenames self.urls = [] - + self.multiDL = True self.limitDL = 0 - + def preprocessing(self, thread): """prepare""" @@ -47,9 +47,9 @@ class Crypter(Plugin): self.thread = thread self.decrypt(self.pyfile) - + self.createPackages() - + def decrypt(self, pyfile): raise NotImplementedError @@ -59,9 +59,9 @@ class Crypter(Plugin): for pack in self.packages: self.log.debug("Parsed package %(name)s with %(len)d links" % { "name" : pack[0], "len" : len(pack[1]) } ) - + links = [x.decode("utf-8") for x in pack[1]] - + pid = self.core.api.addPackage(pack[0], links, self.pyfile.package().queue) if self.pyfile.package().password: @@ -69,4 +69,4 @@ class Crypter(Plugin): if self.urls: self.core.api.generateAndAddPackages(self.urls) - + -- cgit v1.2.3 From 83db7b72d85b74f0248717444a622156fb4d43b9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 14 Jun 2015 18:37:18 +0200 Subject: Update Crypter --- module/plugins/internal/Crypter.py | 127 +++++++++++++++++++++++-------------- 1 file changed, 81 insertions(+), 46 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index b87ed1882..182354287 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -1,35 +1,36 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . - - @author: mkaay -""" - -from module.plugins.internal.Plugin import Plugin - -class Crypter(Plugin): - __name__ = "Crypter" - __version__ = "0.02" - __pattern__ = None - __type__ = "container" - __description__ = """Base crypter plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") +import urlparse + +from module.plugins.internal.Hoster import Hoster +from module.utils import decode, save_path + + +class Crypter(Hoster): + """ + Base plugin for crypter. + Overwrite `decrypt` in your subclassed plugin. + """ + + __name__ = "Crypter" + __type__ = "crypter" + __version__ = "0.03" + + __pattern__ = r'^unmatchable$' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config.get("general", "folder_per_package") + ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] + + __description__ = """Base decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + + + html = None #: last html loaded #@TODO: Move to Hoster + def __init__(self, pyfile): - Plugin.__init__(self, pyfile) + #: Provide information in dict here + self.info = {} #@TODO: Move to Plugin #: Put all packages here. It's a list of tuples like: ( name, [list of links], folder ) self.packages = [] @@ -37,36 +38,70 @@ class Crypter(Plugin): #: List of urls, pyLoad will generate packagenames self.urls = [] - self.multiDL = True - self.limitDL = 0 + Plugin.__init__(self, pyfile) + + def process(self, pyfile): + """Main method""" - def preprocessing(self, thread): - """prepare""" - self.setup() - self.thread = thread + self.decrypt(pyfile) - self.decrypt(self.pyfile) + if self.urls: + self._generate_packages() + + elif not self.packages: + self.error(_("No link grabbed"), "decrypt") - self.createPackages() + self._create_packages() def decrypt(self, pyfile): raise NotImplementedError - def createPackages(self): - """ create new packages from self.packages """ - for pack in self.packages: - self.log.debug("Parsed package %(name)s with %(len)d links" % { "name" : pack[0], "len" : len(pack[1]) } ) + def _generate_packages(self): + """Generate new packages from self.urls""" - links = [x.decode("utf-8") for x in pack[1]] + packages = [(name, links, None) for name, links in self.core.api.generatePackages(self.urls).iteritems()] + self.packages.extend(packages) - pid = self.core.api.addPackage(pack[0], links, self.pyfile.package().queue) - if self.pyfile.package().password: - self.core.api.setPackageData(pid, {"password": self.pyfile.package().password}) + def _create_packages(self): + """Create new packages from self.packages""" - if self.urls: - self.core.api.generateAndAddPackages(self.urls) + package_folder = self.pyfile.package().folder + package_password = self.pyfile.package().password + package_queue = self.pyfile.package().queue + + folder_per_package = self.core.config.get('general', 'folder_per_package') + use_subfolder = self.getConfig('use_subfolder', folder_per_package) + subfolder_per_package = self.getConfig('subfolder_per_package', True) + + for name, links, folder in self.packages: + self.logDebug("Parsed package: %s" % name, + "%d links" % len(links), + "Saved to folder: %s" % folder if folder else "Saved to download folder") + + links = map(decode, links) + + pid = self.core.api.addPackage(name, links, package_queue) + + if package_password: + self.core.api.setPackageData(pid, {"password": package_password}) + + setFolder = lambda x: self.core.api.setPackageData(pid, {"folder": x or ""}) #@NOTE: Workaround to do not break API addPackage method + + if use_subfolder: + if not subfolder_per_package: + setFolder(package_folder) + self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) + + elif not folder_per_package or name != folder: + if not folder: + folder = urlparse.urlparse(name).path.split("/")[-1] + + setFolder(save_path(folder)) + self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) + elif folder_per_package: + setFolder(None) -- cgit v1.2.3 From 310eff44408075a3563284e74f3a72fd82d2c5ab Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 14 Jun 2015 19:29:47 +0200 Subject: Crypter back to Plugin class --- module/plugins/internal/Crypter.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 182354287..3db36ca8e 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -2,11 +2,11 @@ import urlparse -from module.plugins.internal.Hoster import Hoster +from module.plugins.internal.Plugin import Plugin from module.utils import decode, save_path -class Crypter(Hoster): +class Crypter(Plugin): """ Base plugin for crypter. Overwrite `decrypt` in your subclassed plugin. @@ -29,6 +29,8 @@ class Crypter(Hoster): def __init__(self, pyfile): + super(Crypter, self).__init__(self, pyfile) + #: Provide information in dict here self.info = {} #@TODO: Move to Plugin @@ -38,7 +40,8 @@ class Crypter(Hoster): #: List of urls, pyLoad will generate packagenames self.urls = [] - Plugin.__init__(self, pyfile) + self.multiDL = True + self.limitDL = 0 def process(self, pyfile): -- cgit v1.2.3 From 71d5584e82050a66aa5306ce99e43e7cbc3a62a7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 15 Jun 2015 00:17:49 +0200 Subject: Fix new internal plugins --- module/plugins/internal/Crypter.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 3db36ca8e..5fb9bc5c2 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -7,11 +7,6 @@ from module.utils import decode, save_path class Crypter(Plugin): - """ - Base plugin for crypter. - Overwrite `decrypt` in your subclassed plugin. - """ - __name__ = "Crypter" __type__ = "crypter" __version__ = "0.03" @@ -29,7 +24,7 @@ class Crypter(Plugin): def __init__(self, pyfile): - super(Crypter, self).__init__(self, pyfile) + super(Crypter, self).__init__(pyfile) #: Provide information in dict here self.info = {} #@TODO: Move to Plugin -- 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/internal/Crypter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 5fb9bc5c2..39b09129f 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -3,7 +3,7 @@ import urlparse from module.plugins.internal.Plugin import Plugin -from module.utils import decode, save_path +from module.utils import decode, save_path as safe_filename class Crypter(Plugin): @@ -98,7 +98,7 @@ class Crypter(Plugin): if not folder: folder = urlparse.urlparse(name).path.split("/")[-1] - setFolder(save_path(folder)) + setFolder(safe_filename(folder)) self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) elif folder_per_package: -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/internal/Crypter.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 39b09129f..a713c7da6 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -2,14 +2,14 @@ import urlparse -from module.plugins.internal.Plugin import Plugin -from module.utils import decode, save_path as safe_filename +from module.plugins.internal.Hoster import Hoster +from module.utils import save_path as safe_filename -class Crypter(Plugin): +class Crypter(Hoster): __name__ = "Crypter" __type__ = "crypter" - __version__ = "0.03" + __version__ = "0.04" __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config.get("general", "folder_per_package") @@ -26,18 +26,12 @@ class Crypter(Plugin): def __init__(self, pyfile): super(Crypter, self).__init__(pyfile) - #: Provide information in dict here - self.info = {} #@TODO: Move to Plugin - #: Put all packages here. It's a list of tuples like: ( name, [list of links], folder ) self.packages = [] #: List of urls, pyLoad will generate packagenames self.urls = [] - self.multiDL = True - self.limitDL = 0 - def process(self, pyfile): """Main method""" @@ -80,14 +74,13 @@ class Crypter(Plugin): "%d links" % len(links), "Saved to folder: %s" % folder if folder else "Saved to download folder") - links = map(decode, links) - - pid = self.core.api.addPackage(name, links, package_queue) + pid = self.core.api.addPackage(name, self.fixurl(links), package_queue) if package_password: self.core.api.setPackageData(pid, {"password": package_password}) - setFolder = lambda x: self.core.api.setPackageData(pid, {"folder": x or ""}) #@NOTE: Workaround to do not break API addPackage method + # Workaround to do not break API addPackage method + setFolder = lambda x: self.core.api.setPackageData(pid, {"folder": x or ""}) if use_subfolder: if not subfolder_per_package: -- 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/internal/Crypter.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index a713c7da6..e97f22316 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -34,8 +34,9 @@ class Crypter(Hoster): def process(self, pyfile): - """Main method""" - + """ + Main method + """ self.decrypt(pyfile) if self.urls: @@ -52,20 +53,22 @@ class Crypter(Hoster): def _generate_packages(self): - """Generate new packages from self.urls""" - + """ + Generate new packages from self.urls + """ packages = [(name, links, None) for name, links in self.core.api.generatePackages(self.urls).iteritems()] self.packages.extend(packages) def _create_packages(self): - """Create new packages from self.packages""" - + """ + Create new packages from self.packages + """ package_folder = self.pyfile.package().folder package_password = self.pyfile.package().password package_queue = self.pyfile.package().queue - folder_per_package = self.core.config.get('general', 'folder_per_package') + folder_per_package = self.core.config.get("general", "folder_per_package") use_subfolder = self.getConfig('use_subfolder', folder_per_package) subfolder_per_package = self.getConfig('subfolder_per_package', True) -- 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/internal/Crypter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index e97f22316..d8cda17d4 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -82,7 +82,7 @@ class Crypter(Hoster): if package_password: self.core.api.setPackageData(pid, {"password": package_password}) - # Workaround to do not break API addPackage method + #: Workaround to do not break API addPackage method setFolder = lambda x: self.core.api.setPackageData(pid, {"folder": x or ""}) if use_subfolder: -- 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/internal/Crypter.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index d8cda17d4..f6d3528fd 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -9,7 +9,7 @@ from module.utils import save_path as safe_filename class Crypter(Hoster): __name__ = "Crypter" __type__ = "crypter" - __version__ = "0.04" + __version__ = "0.05" __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config.get("general", "folder_per_package") @@ -69,11 +69,11 @@ class Crypter(Hoster): package_queue = self.pyfile.package().queue folder_per_package = self.core.config.get("general", "folder_per_package") - use_subfolder = self.getConfig('use_subfolder', folder_per_package) - subfolder_per_package = self.getConfig('subfolder_per_package', True) + use_subfolder = self.get_config('use_subfolder', folder_per_package) + subfolder_per_package = self.get_config('subfolder_per_package', True) for name, links, folder in self.packages: - self.logDebug("Parsed package: %s" % name, + self.log_debug("Parsed package: %s" % name, "%d links" % len(links), "Saved to folder: %s" % folder if folder else "Saved to download folder") @@ -88,14 +88,14 @@ class Crypter(Hoster): if use_subfolder: if not subfolder_per_package: setFolder(package_folder) - self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) + self.log_debug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) elif not folder_per_package or name != folder: if not folder: folder = urlparse.urlparse(name).path.split("/")[-1] setFolder(safe_filename(folder)) - self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) + self.log_debug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) elif folder_per_package: setFolder(None) -- 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/internal/Crypter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index f6d3528fd..dbecb0cf8 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -20,7 +20,7 @@ class Crypter(Hoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - html = None #: last html loaded #@TODO: Move to Hoster + html = None #: Last html loaded #@TODO: Move to Hoster def __init__(self, pyfile): -- cgit v1.2.3 From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/internal/Crypter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index dbecb0cf8..9ad16ece8 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -80,22 +80,22 @@ class Crypter(Hoster): pid = self.core.api.addPackage(name, self.fixurl(links), package_queue) if package_password: - self.core.api.setPackageData(pid, {"password": package_password}) + self.core.api.setPackageData(pid, {'password': package_password}) #: Workaround to do not break API addPackage method - setFolder = lambda x: self.core.api.setPackageData(pid, {"folder": x or ""}) + setFolder = lambda x: self.core.api.setPackageData(pid, {'folder': x or ""}) if use_subfolder: if not subfolder_per_package: setFolder(package_folder) - self.log_debug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) + self.log_debug("Set package %(name)s folder to: %(folder)s" % {'name': name, 'folder': folder}) elif not folder_per_package or name != folder: if not folder: folder = urlparse.urlparse(name).path.split("/")[-1] setFolder(safe_filename(folder)) - self.log_debug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder}) + self.log_debug("Set package %(name)s folder to: %(folder)s" % {'name': name, 'folder': folder}) elif folder_per_package: setFolder(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/internal/Crypter.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 9ad16ece8..653469079 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -56,7 +56,7 @@ class Crypter(Hoster): """ Generate new packages from self.urls """ - packages = [(name, links, None) for name, links in self.core.api.generatePackages(self.urls).iteritems()] + packages = [(name, links, None) for name, links in self.pyload.api.generatePackages(self.urls).iteritems()] self.packages.extend(packages) @@ -68,7 +68,7 @@ class Crypter(Hoster): package_password = self.pyfile.package().password package_queue = self.pyfile.package().queue - folder_per_package = self.core.config.get("general", "folder_per_package") + folder_per_package = self.pyload.config.get("general", "folder_per_package") use_subfolder = self.get_config('use_subfolder', folder_per_package) subfolder_per_package = self.get_config('subfolder_per_package', True) @@ -77,13 +77,13 @@ class Crypter(Hoster): "%d links" % len(links), "Saved to folder: %s" % folder if folder else "Saved to download folder") - pid = self.core.api.addPackage(name, self.fixurl(links), package_queue) + pid = self.pyload.api.addPackage(name, self.fixurl(links), package_queue) if package_password: - self.core.api.setPackageData(pid, {'password': package_password}) + self.pyload.api.setPackageData(pid, {'password': package_password}) #: Workaround to do not break API addPackage method - setFolder = lambda x: self.core.api.setPackageData(pid, {'folder': x or ""}) + setFolder = lambda x: self.pyload.api.setPackageData(pid, {'folder': x or ""}) if use_subfolder: if not subfolder_per_package: -- 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/internal/Crypter.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 653469079..034224b4e 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -10,6 +10,7 @@ class Crypter(Hoster): __name__ = "Crypter" __type__ = "crypter" __version__ = "0.05" + __status__ = "stable" __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config.get("general", "folder_per_package") -- cgit v1.2.3 From 4fc28dc09f9632eb4a15a1ef48778427f9dcae33 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 23 Jul 2015 18:53:06 +0200 Subject: Code cosmetics --- module/plugins/internal/Crypter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 034224b4e..627c198e1 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -13,7 +13,7 @@ class Crypter(Hoster): __status__ = "stable" __pattern__ = r'^unmatchable$' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config.get("general", "folder_per_package") + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides pyload.config.get("general", "folder_per_package") ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] __description__ = """Base decrypter plugin""" -- 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/internal/Crypter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 627c198e1..715791949 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -10,7 +10,7 @@ class Crypter(Hoster): __name__ = "Crypter" __type__ = "crypter" __version__ = "0.05" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'^unmatchable$' __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides pyload.config.get("general", "folder_per_package") -- cgit v1.2.3 From 761ca5c66e07559925ebbdbc6531f9ca658b12ce Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 16:11:58 +0200 Subject: Code cosmetics --- module/plugins/internal/Crypter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 715791949..9b09fc9c1 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -91,7 +91,7 @@ class Crypter(Hoster): setFolder(package_folder) self.log_debug("Set package %(name)s folder to: %(folder)s" % {'name': name, 'folder': folder}) - elif not folder_per_package or name != folder: + elif not folder_per_package or name not is folder: if not folder: folder = urlparse.urlparse(name).path.split("/")[-1] -- cgit v1.2.3 From dd13825fbd3df9e441200638cd2a92e3924dfff6 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 23:57:04 +0200 Subject: Fix typo --- module/plugins/internal/Crypter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 9b09fc9c1..7e97c8228 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -91,7 +91,7 @@ class Crypter(Hoster): setFolder(package_folder) self.log_debug("Set package %(name)s folder to: %(folder)s" % {'name': name, 'folder': folder}) - elif not folder_per_package or name not is folder: + elif not folder_per_package or name is not folder: if not folder: folder = urlparse.urlparse(name).path.split("/")[-1] -- 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/internal/Crypter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 7e97c8228..c677b2852 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -57,7 +57,7 @@ class Crypter(Hoster): """ Generate new packages from self.urls """ - packages = [(name, links, None) for name, links in self.pyload.api.generatePackages(self.urls).iteritems()] + packages = [(name, links, None) for name, links in self.pyload.api.generatePackages(self.urls).items()] self.packages.extend(packages) -- cgit v1.2.3 From 7ddcad0fef8d0fe3aade83d786c0f1e0fbe1d818 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 29 Jul 2015 07:53:30 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1587 --- module/plugins/internal/Crypter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index c677b2852..13d82c2ea 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -9,7 +9,7 @@ from module.utils import save_path as safe_filename class Crypter(Hoster): __name__ = "Crypter" __type__ = "crypter" - __version__ = "0.05" + __version__ = "0.06" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -78,7 +78,7 @@ class Crypter(Hoster): "%d links" % len(links), "Saved to folder: %s" % folder if folder else "Saved to download folder") - pid = self.pyload.api.addPackage(name, self.fixurl(links), package_queue) + pid = self.pyload.api.addPackage(name, map(self.fixurl, links), package_queue) if package_password: self.pyload.api.setPackageData(pid, {'password': package_password}) -- cgit v1.2.3 From 092112b44af84c7a59b1fa2cfff5c5875e778a8f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 31 Jul 2015 02:21:35 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1625 --- module/plugins/internal/Crypter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 13d82c2ea..0fdec559d 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -84,19 +84,19 @@ class Crypter(Hoster): self.pyload.api.setPackageData(pid, {'password': package_password}) #: Workaround to do not break API addPackage method - setFolder = lambda x: self.pyload.api.setPackageData(pid, {'folder': x or ""}) + set_folder = lambda x: self.pyload.api.setPackageData(pid, {'folder': x or ""}) if use_subfolder: if not subfolder_per_package: - setFolder(package_folder) + set_folder(package_folder) self.log_debug("Set package %(name)s folder to: %(folder)s" % {'name': name, 'folder': folder}) elif not folder_per_package or name is not folder: if not folder: folder = urlparse.urlparse(name).path.split("/")[-1] - setFolder(safe_filename(folder)) + set_folder(safe_filename(folder)) self.log_debug("Set package %(name)s folder to: %(folder)s" % {'name': name, 'folder': folder}) elif folder_per_package: - setFolder(None) + set_folder(None) -- cgit v1.2.3 From 5e15580202c44628f2fbfabad0c3f693975fb3c9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Aug 2015 17:13:17 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1663 --- module/plugins/internal/Crypter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/Crypter.py') diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py index 0fdec559d..d0e8eb1b4 100644 --- a/module/plugins/internal/Crypter.py +++ b/module/plugins/internal/Crypter.py @@ -2,14 +2,14 @@ import urlparse -from module.plugins.internal.Hoster import Hoster +from module.plugins.internal.Hoster import Hoster, _fixurl from module.utils import save_path as safe_filename class Crypter(Hoster): __name__ = "Crypter" __type__ = "crypter" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -93,7 +93,7 @@ class Crypter(Hoster): elif not folder_per_package or name is not folder: if not folder: - folder = urlparse.urlparse(name).path.split("/")[-1] + folder = urlparse.urlparse(_fixurl(name)).path.split("/")[-1] set_folder(safe_filename(folder)) self.log_debug("Set package %(name)s folder to: %(folder)s" % {'name': name, 'folder': folder}) -- cgit v1.2.3