From ce103ce1e60661f7bcdf6a033335134de61d48b1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 26 Mar 2015 12:44:15 +0100 Subject: Prepare to merging --- pyload/plugin/addon/ExtractArchive.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pyload/plugin/addon/ExtractArchive.py') diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py index 245b24322..337b3ea30 100644 --- a/pyload/plugin/addon/ExtractArchive.py +++ b/pyload/plugin/addon/ExtractArchive.py @@ -102,11 +102,11 @@ class ArchiveQueue(object): class ExtractArchive(Addon): - __name = "ExtractArchive" - __type = "addon" - __version = "1.30" + __name__ = "ExtractArchive" + __type__ = "addon" + __version__ = "1.30" - __config = [("activated" , "bool" , "Activated" , True ), + __config__ = [("activated" , "bool" , "Activated" , True ), ("fullpath" , "bool" , "Extract with full paths" , True ), ("overwrite" , "bool" , "Overwrite files" , False ), ("keepbroken" , "bool" , "Try to extract broken archives" , False ), @@ -123,9 +123,9 @@ class ExtractArchive(Addon): ("waitall" , "bool" , "Wait for all downloads to be finished" , False ), ("renice" , "int" , "CPU priority" , 0 )] - __description = """Extract different kind of archives""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com"), + __description__ = """Extract different kind of archives""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com"), ("Immenz" , "immenz@gmx.net" )] @@ -170,7 +170,7 @@ class ExtractArchive(Addon): print_exc() if self.extractors: - self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name,Extractor.VERSION) for Extractor in self.extractors)) + self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name__,Extractor.VERSION) for Extractor in self.extractors)) self.extractQueued() #: Resume unfinished extractions else: self.logInfo(_("No Extract plugins activated")) @@ -282,7 +282,7 @@ class ExtractArchive(Addon): for Extractor in self.extractors: targets = Extractor.getTargets(files_ids) if targets: - self.logDebug("Targets for %s: %s" % (Extractor.__name, targets)) + self.logDebug("Targets for %s: %s" % (Extractor.__name__, targets)) matched = True for fname, fid, fout in targets: -- cgit v1.2.3