diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-20 23:07:42 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-20 23:07:42 +0200 |
| commit | 2475ddb7654d0d6fb1be18082b5c8c480befdbb3 (patch) | |
| tree | b82a8b5fc0a309f69733b0a004284f4ef45833d8 /pyload/plugin/addon | |
| parent | Spare code cosmetics (9) (diff) | |
| parent | added check of classname == filename (diff) | |
| download | pyload-2475ddb7654d0d6fb1be18082b5c8c480befdbb3.tar.xz | |
Merge branch 'pr/n10_ardi69' into 0.4.10
Conflicts:
pyload/plugin/hoster/FileserveCom.py
Diffstat (limited to 'pyload/plugin/addon')
| -rw-r--r-- | pyload/plugin/addon/DeleteFinished.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/addon/ExtractArchive.py | 36 | ||||
| -rw-r--r-- | pyload/plugin/addon/RestartFailed.py | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py index b9368a642..8fe0b1497 100644 --- a/pyload/plugin/addon/DeleteFinished.py +++ b/pyload/plugin/addon/DeleteFinished.py @@ -53,7 +53,7 @@ class DeleteFinished(Addon): def activate(self): self.info['sleep'] = True # interval = self.getConfig('interval') - # self.pluginConfigChanged(self.__class__.__name__, 'interval', interval) + # self.pluginConfigChanged(self.getClassName(), 'interval', interval) self.interval = max(self.MIN_CHECK_INTERVAL, self.getConfig('interval') * 60 * 60) self.addEvent('packageFinished', self.wakeup) self.initPeriodical() diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py index 82938921e..b0a24446a 100644 --- a/pyload/plugin/addon/ExtractArchive.py +++ b/pyload/plugin/addon/ExtractArchive.py @@ -111,28 +111,28 @@ class ExtractArchive(Addon): __type = "addon" __version = "1.41" - __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 ), - ("repair" , "bool" , "Repair broken archives (RAR required)" , False ), - ("test" , "bool" , "Test archive before extracting" , False ), - ("usepasswordfile", "bool" , "Use password file" , True ), - ("passwordfile" , "file" , "Password file" , "archive_password.txt" ), - ("delete" , "bool" , "Delete archive after extraction" , True ), - ("deltotrash" , "bool" , "Move to trash (recycle bin) instead delete", True ), - ("subfolder" , "bool" , "Create subfolder for each package" , False ), - ("destination" , "folder" , "Extract files to folder" , "" ), + __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), + ("repair" , "bool" , "Repair broken archives (RAR required)" , False), + ("test" , "bool" , "Test archive before extracting" , False), + ("usepasswordfile", "bool" , "Use password file" , True), + ("passwordfile" , "file" , "Password file" , "archive_password.txt"), + ("delete" , "bool" , "Delete archive after extraction" , True), + ("deltotrash" , "bool" , "Move to trash (recycle bin) instead delete", True), + ("subfolder" , "bool" , "Create subfolder for each package" , False), + ("destination" , "folder" , "Extract files to folder" , ""), ("extensions" , "str" , "Extract archives ending with extension" , "7z,bz2,bzip2,gz,gzip,lha,lzh,lzma,rar,tar,taz,tbz,tbz2,tgz,xar,xz,z,zip"), - ("excludefiles" , "str" , "Don't extract the following files" , "*.nfo,*.DS_Store,index.dat,thumb.db" ), - ("recursive" , "bool" , "Extract archives in archives" , True ), - ("waitall" , "bool" , "Run after all downloads was processed" , False ), - ("renice" , "int" , "CPU priority" , 0 )] + ("excludefiles" , "str" , "Don't extract the following files" , "*.nfo,*.DS_Store,index.dat,thumb.db"), + ("recursive" , "bool" , "Extract archives in archives" , True), + ("waitall" , "bool" , "Run after all downloads was processed" , False), + ("renice" , "int" , "CPU priority" , 0)] __description = """Extract different kind of archives""" __license = "GPLv3" __authors = [("Walter Purcaro", "vuolter@gmail.com"), - ("Immenz" , "immenz@gmx.net" )] + ("Immenz" , "immenz@gmx.net")] event_list = ["allDownloadsProcessed", "packageDeleted"] @@ -186,7 +186,7 @@ class ExtractArchive(Addon): traceback.print_exc() if self.extractors: - self.logDebug(*["Found %s %s" % (Extractor.__name__, Extractor.VERSION) for Extractor in self.extractors]) + self.logDebug(*["Found %s %s" % (Extractor.NAME(), Extractor.VERSION) for Extractor in self.extractors]) self.extractQueued() #: Resume unfinished extractions else: self.logInfo(_("No Extract plugins activated")) diff --git a/pyload/plugin/addon/RestartFailed.py b/pyload/plugin/addon/RestartFailed.py index 695ebb154..8a3a36fe1 100644 --- a/pyload/plugin/addon/RestartFailed.py +++ b/pyload/plugin/addon/RestartFailed.py @@ -38,6 +38,6 @@ class RestartFailed(Addon): def activate(self): - # self.pluginConfigChanged(self.__class__.__name__, "interval", self.getConfig('interval')) + # self.pluginConfigChanged(self.getClassName(), "interval", self.getConfig('interval')) self.interval = max(self.MIN_CHECK_INTERVAL, self.getConfig('interval') * 60) self.initPeriodical() |