From 4ea4cb6f652032c5048031ecee7a52c48f0fa943 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 30 May 2013 23:14:29 +0200 Subject: Version 1.03: delete package even if there are offline links --- module/plugins/hooks/DeleteFinished.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index 01cb1b8e1..d2882044b 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -23,7 +23,7 @@ from module.plugins.Hook import Hook class DeleteFinished(Hook): __name__ = "DeleteFinished" - __version__ = "1.02" + __version__ = "1.03" __description__ = "Automatically delete finished packages from queue" __config__ = [ ("activated", "bool", "Activated", "False"), @@ -36,7 +36,7 @@ class DeleteFinished(Hook): def periodical(self): # self.logDebug("self.periodical") if not self.info["sleep"]: - self.logInfo("self.deleteFinished") + self.logInfo("Delete all finished packages now") self.deleteFinished() self.info["sleep"] = True self.addEvent("packageFinished", self.wakeup) @@ -54,14 +54,14 @@ class DeleteFinished(Hook): def coreReady(self): # self.logDebug("self.coreReady") self.info = {"sleep": True} - interval = self.getConfig("interval") * 3600 + interval = self.getConf("interval") * 3600 self.pluginConfigChanged("DeleteFinished", "interval", interval) self.addEvent("packageFinished", self.wakeup) ## own methods ## @style.queue def deleteFinished(self): - self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,4))") + self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,1,4))") self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)") def wakeup(self, pypack): @@ -74,20 +74,15 @@ class DeleteFinished(Hook): if event in self.manager.events: if handler not in self.manager.events[event]: self.manager.events[event].append(handler) - # self.logDebug("self.addEvent: " + event + ": added handler") else: - # self.logDebug("self.addEvent: " + event + ": NOT added handler") return False else: self.manager.events[event] = [handler] - # self.logDebug("self.addEvent: " + event + ": added event and handler") return True def removeEvent(self, event, handler): if event in self.manager.events and handler in self.manager.events[event]: self.manager.events[event].remove(handler) - # self.logDebug("self.removeEvent: " + event + ": removed handler") return True else: - # self.logDebug("self.removeEvent: " + event + ": NOT removed handler") return False -- cgit v1.2.3 From ce4658909b5bc495449451d2a83263c098c38141 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 31 May 2013 23:15:50 +0200 Subject: Version 1.04: offline link check as option --- module/plugins/hooks/DeleteFinished.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index d2882044b..59c18add7 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -23,11 +23,12 @@ from module.plugins.Hook import Hook class DeleteFinished(Hook): __name__ = "DeleteFinished" - __version__ = "1.03" + __version__ = "1.04" __description__ = "Automatically delete finished packages from queue" __config__ = [ ("activated", "bool", "Activated", "False"), - ("interval", "int", "Delete every (hours)", "72") + ("interval", "int", "Delete every (hours)", "72"), + ("ignoreoffline", "bool", "Ignore offline link", "False") ] __author_name__ = ("Walter Purcaro") __author_mail__ = ("vuolter@gmail.com") @@ -36,8 +37,9 @@ class DeleteFinished(Hook): def periodical(self): # self.logDebug("self.periodical") if not self.info["sleep"]: + ignoreoffline = self.getConf("ignoreoffline") self.logInfo("Delete all finished packages now") - self.deleteFinished() + self.deleteFinished1() if ignoreoffline else self.deleteFinished2() self.info["sleep"] = True self.addEvent("packageFinished", self.wakeup) @@ -60,10 +62,15 @@ class DeleteFinished(Hook): ## own methods ## @style.queue - def deleteFinished(self): + def deleteFinished1(self): self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,1,4))") self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)") + @style.queue + def deleteFinished2(self): + self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,4))") + self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)") + def wakeup(self, pypack): # self.logDebug("self.wakeup") self.removeEvent("packageFinished", self.wakeup) -- cgit v1.2.3 From 33aed6d562803b6e55e0d5629d068a39dd601f3b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 3 Jun 2013 01:04:35 +0200 Subject: Version 1.05: optimized code a bit --- module/plugins/hooks/DeleteFinished.py | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index 59c18add7..cdb142c9b 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -23,8 +23,8 @@ from module.plugins.Hook import Hook class DeleteFinished(Hook): __name__ = "DeleteFinished" - __version__ = "1.04" - __description__ = "Automatically delete finished packages from queue" + __version__ = "1.05" + __description__ = "Automatically delete all finished packages from queue" __config__ = [ ("activated", "bool", "Activated", "False"), ("interval", "int", "Delete every (hours)", "72"), @@ -35,26 +35,21 @@ class DeleteFinished(Hook): ## overwritten methods ## def periodical(self): - # self.logDebug("self.periodical") if not self.info["sleep"]: - ignoreoffline = self.getConf("ignoreoffline") self.logInfo("Delete all finished packages now") - self.deleteFinished1() if ignoreoffline else self.deleteFinished2() + self.deleteFinished("0,1,4" if self.getConf("ignoreoffline") else "0,4") self.info["sleep"] = True self.addEvent("packageFinished", self.wakeup) def pluginConfigChanged(self, plugin, name, value): - # self.logDebug("self.pluginConfigChanged") if name == "interval" and value != self.interval: self.interval = value self.initPeriodical() def unload(self): - # self.logDebug("self.unload") self.removeEvent("packageFinished", self.wakeup) def coreReady(self): - # self.logDebug("self.coreReady") self.info = {"sleep": True} interval = self.getConf("interval") * 3600 self.pluginConfigChanged("DeleteFinished", "interval", interval) @@ -62,17 +57,11 @@ class DeleteFinished(Hook): ## own methods ## @style.queue - def deleteFinished1(self): - self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,1,4))") - self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)") - - @style.queue - def deleteFinished2(self): - self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,4))") + def deleteFinished(self, mode): + self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (%s))" % mode) self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)") def wakeup(self, pypack): - # self.logDebug("self.wakeup") self.removeEvent("packageFinished", self.wakeup) self.info["sleep"] = False -- cgit v1.2.3 From 7b7a0dd911d32241413ff04409a60cb270ae28a6 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 3 Jun 2013 20:45:19 +0200 Subject: Version 1.06: code cosmetics --- module/plugins/hooks/DeleteFinished.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index cdb142c9b..5947f481a 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -23,12 +23,12 @@ from module.plugins.Hook import Hook class DeleteFinished(Hook): __name__ = "DeleteFinished" - __version__ = "1.05" + __version__ = "1.06" __description__ = "Automatically delete all finished packages from queue" __config__ = [ ("activated", "bool", "Activated", "False"), ("interval", "int", "Delete every (hours)", "72"), - ("ignoreoffline", "bool", "Ignore offline link", "False") + ("incoff", "bool", "Delete packages with offline links", "False") ] __author_name__ = ("Walter Purcaro") __author_mail__ = ("vuolter@gmail.com") @@ -36,8 +36,11 @@ class DeleteFinished(Hook): ## overwritten methods ## def periodical(self): if not self.info["sleep"]: - self.logInfo("Delete all finished packages now") - self.deleteFinished("0,1,4" if self.getConf("ignoreoffline") else "0,4") + incoff = self.getConfig("incoff") + mode = "0,1,4" if incoff else "0,4" + msg = "delete all finished packages now (%s any package with offline links)" + self.logInfo(msg % "including" if incoff else "excluding") + self.deleteFinished(mode) self.info["sleep"] = True self.addEvent("packageFinished", self.wakeup) @@ -51,7 +54,7 @@ class DeleteFinished(Hook): def coreReady(self): self.info = {"sleep": True} - interval = self.getConf("interval") * 3600 + interval = self.getConfig("interval") * 3600 self.pluginConfigChanged("DeleteFinished", "interval", interval) self.addEvent("packageFinished", self.wakeup) -- cgit v1.2.3 From dddf2b822953a96e2b91cca49e69adc064b4fef7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 5 Jun 2013 12:17:07 +0200 Subject: Version 1.07: improved event managing --- module/plugins/hooks/DeleteFinished.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index 5947f481a..5c1db397c 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -23,7 +23,7 @@ from module.plugins.Hook import Hook class DeleteFinished(Hook): __name__ = "DeleteFinished" - __version__ = "1.06" + __version__ = "1.07" __description__ = "Automatically delete all finished packages from queue" __config__ = [ ("activated", "bool", "Activated", "False"), @@ -69,19 +69,15 @@ class DeleteFinished(Hook): self.info["sleep"] = False ## event managing ## - def addEvent(self, event, handler): - if event in self.manager.events: - if handler not in self.manager.events[event]: - self.manager.events[event].append(handler) + def addEvent(self, event, func): + """Adds an event listener for event name""" + if event in self.events: + if func in self.events[event]: + self.logDebug("Function already registered %s" % func) else: - return False + self.events[event].append(func) else: - self.manager.events[event] = [handler] - return True + self.events[event] = [func] - def removeEvent(self, event, handler): - if event in self.manager.events and handler in self.manager.events[event]: - self.manager.events[event].remove(handler) - return True - else: - return False + def setup(self): + self.removeEvent = self.manager.removeEvent -- cgit v1.2.3 From 8d1cd021e3203114cd202cb4a56c678af401683a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 11 Jul 2013 15:00:02 +0200 Subject: Version 1.08: fixes and cosmetics --- module/plugins/hooks/DeleteFinished.py | 68 +++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index 5c1db397c..c03298b2c 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -1,6 +1,6 @@ # -*- 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, @@ -15,69 +15,69 @@ along with this program; if not, see . @author: Walter Purcaro -""" +''' from module.database import style from module.plugins.Hook import Hook class DeleteFinished(Hook): - __name__ = "DeleteFinished" - __version__ = "1.07" - __description__ = "Automatically delete all finished packages from queue" + __name__ = 'DeleteFinished' + __version__ = '1.08' + __description__ = 'Automatically delete all finished packages from queue' __config__ = [ - ("activated", "bool", "Activated", "False"), - ("interval", "int", "Delete every (hours)", "72"), - ("incoff", "bool", "Delete packages with offline links", "False") + ('activated', 'bool', 'Activated', 'False'), + ('interval', 'int', 'Delete every (hours)', '72'), + ('deloffline', 'bool', 'Delete packages with offline links', 'False') ] - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = ('Walter Purcaro') + __author_mail__ = ('vuolter@gmail.com') ## overwritten methods ## def periodical(self): - if not self.info["sleep"]: - incoff = self.getConfig("incoff") - mode = "0,1,4" if incoff else "0,4" - msg = "delete all finished packages now (%s any package with offline links)" - self.logInfo(msg % "including" if incoff else "excluding") + if not self.info['sleep']: + deloffline = self.getConfig('deloffline') + mode = '0,1,4' if deloffline else '0,4' + msg = 'delete all finished packages in queue list (%s packages with offline links)' + self.logInfo(msg % ('including' if deloffline else 'excluding')) self.deleteFinished(mode) - self.info["sleep"] = True - self.addEvent("packageFinished", self.wakeup) + self.info['sleep'] = True + self.addEvent('packageFinished', self.wakeup) def pluginConfigChanged(self, plugin, name, value): - if name == "interval" and value != self.interval: - self.interval = value + if name == 'interval' and value != self.interval: + self.interval = value * 3600 self.initPeriodical() def unload(self): - self.removeEvent("packageFinished", self.wakeup) + self.removeEvent('packageFinished', self.wakeup) def coreReady(self): - self.info = {"sleep": True} - interval = self.getConfig("interval") * 3600 - self.pluginConfigChanged("DeleteFinished", "interval", interval) - self.addEvent("packageFinished", self.wakeup) + self.info = {'sleep': True} + interval = self.getConfig('interval') + self.pluginConfigChanged('DeleteFinished', 'interval', interval) + self.addEvent('packageFinished', self.wakeup) ## own methods ## @style.queue def deleteFinished(self, mode): - self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (%s))" % mode) - self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)") + self.c.execute('DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (%s))' % mode) + self.c.execute('DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)') def wakeup(self, pypack): - self.removeEvent("packageFinished", self.wakeup) - self.info["sleep"] = False + self.removeEvent('packageFinished', self.wakeup) + self.info['sleep'] = False ## event managing ## def addEvent(self, event, func): - """Adds an event listener for event name""" - if event in self.events: - if func in self.events[event]: - self.logDebug("Function already registered %s" % func) + '''Adds an event listener for event name''' + if event in self.manager.events: + if func in self.manager.events[event]: + self.logDebug('Function already registered %s' % func) else: - self.events[event].append(func) + self.manager.events[event].append(func) else: - self.events[event] = [func] + self.manager.events[event] = [func] def setup(self): self.removeEvent = self.manager.removeEvent -- cgit v1.2.3 From 64563ae494fc63dda57949487a3011b8eeb0456f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 11 Jul 2013 16:53:43 +0200 Subject: Version 1.09: code cosmetics --- module/plugins/hooks/DeleteFinished.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index c03298b2c..155158701 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -23,7 +23,7 @@ from module.plugins.Hook import Hook class DeleteFinished(Hook): __name__ = 'DeleteFinished' - __version__ = '1.08' + __version__ = '1.09' __description__ = 'Automatically delete all finished packages from queue' __config__ = [ ('activated', 'bool', 'Activated', 'False'), @@ -71,13 +71,14 @@ class DeleteFinished(Hook): ## event managing ## def addEvent(self, event, func): '''Adds an event listener for event name''' - if event in self.manager.events: - if func in self.manager.events[event]: + if event in self.m.events: + if func in self.m.events[event]: self.logDebug('Function already registered %s' % func) else: - self.manager.events[event].append(func) + self.m.events[event].append(func) else: - self.manager.events[event] = [func] + self.m.events[event] = [func] def setup(self): - self.removeEvent = self.manager.removeEvent + self.m = self.manager + self.removeEvent = self.m.removeEvent -- cgit v1.2.3