[nanny] Update Custom Filter exported to NannyDbus
- From: Roberto Majadas <telemaco src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [nanny] Update Custom Filter exported to NannyDbus
- Date: Sun, 31 Jan 2010 14:34:58 +0000 (UTC)
commit 58ccad5708278a3470b4274af514303ce5deb2ca
Author: Roberto Majadas <roberto majadas openshine com>
Date: Sun Jan 31 15:34:36 2010 +0100
Update Custom Filter exported to NannyDbus
daemon/src/FilterManager.py | 17 +++++++++++++++--
daemon/src/NannyDBus.py | 10 +++++++++-
2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/daemon/src/FilterManager.py b/daemon/src/FilterManager.py
index 0dbcdef..761938d 100644
--- a/daemon/src/FilterManager.py
+++ b/daemon/src/FilterManager.py
@@ -124,7 +124,20 @@ class FilterManager (gobject.GObject) :
except:
print "Something goes wrong Removing Custom Filters"
return False
-
-
+ def update_custom_filter(self, list_id, name, description, regex):
+ sql_query = 'update customfilters set name="%s", description="%s", regexp="%s" where id=%s' % (name,
+ description,
+ regex,
+ int(list_id))
+
+ print sql_query
+ query = self.custom_filters_db.runQuery(sql_query)
+ block_d = BlockingDeferred(query)
+ try:
+ qr = block_d.blockOn()
+ return True
+ except:
+ print "Something goes wrong Updating Custom Filter"
+ return False
diff --git a/daemon/src/NannyDBus.py b/daemon/src/NannyDBus.py
index 15524f0..7618541 100644
--- a/daemon/src/NannyDBus.py
+++ b/daemon/src/NannyDBus.py
@@ -121,6 +121,15 @@ class NannyDBus(dbus.service.Object):
in_signature='i', out_signature='b')
def RemoveCustomFilter(self, list_id):
return self.quarterback.filter_manager.remove_custom_filter(int(list_id))
+
+
+ @dbus.service.method("org.gnome.Nanny.WebDatabase",
+ in_signature='isss', out_signature='b')
+ def UpdateCustomFilter(self, list_id, name, description, regex):
+ return self.quarterback.filter_manager.update_custom_filter(int(list_id),
+ str(name),
+ str(description),
+ str(regex))
#DEPRECATED
@dbus.service.method("org.gnome.Nanny.WebDatabase",
@@ -134,7 +143,6 @@ class NannyDBus(dbus.service.Object):
def RemoveFilter(self, list_id):
return self.quarterback.filter_manager.remove_custom_filter(int(list_id))
-
@dbus.service.method("org.gnome.Nanny.WebDatabase",
in_signature='ssss', out_signature='b')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]