Merge lp:~chipaca/ubuntu-push/fix-click-hook-wrt-legacy-apps into lp:ubuntu-push/automatic

[John Lenton]

Fix the click hook wrt legacy apps.

Fix the click hook wrt legacy apps.

[lp:~chipaca/ubuntu-push/fix-click-hook-wrt-legacy-apps]

342. By John Lenton on 2014-10-15

oops, use the second element now that we know the first one is empty :)

[Guillermo Gonzalez (verterok)]

Looks good.

review: Approve

[lp:~chipaca/ubuntu-push/fix-click-hook-wrt-legacy-apps]

343. By John Lenton on 2014-10-15

tweak the click hook a bit

[Guillermo Gonzalez (verterok)]

still +1 ;-)

review: Approve

=== modified file 'scripts/click-hook'
--- scripts/click-hook	2014-08-04 15:37:01 +0000
+++ scripts/click-hook	2014-10-15 11:56:55 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+# -*- python -*-
 """Collect helpers hook data into a single json file"""
 
 import argparse
@@ -24,25 +25,30 @@
 
 
 def cleanup_settings():
+    settings = Gio.Settings.new('com.ubuntu.notifications.hub')
+    blacklist = settings.get_value('blacklist').unpack()
+    if not blacklist:
+        return
+
     clickdb = Click.DB.new()
     clickdb.read()
 
-    pkgnames = []
+    pkgnames = set()
     for package in clickdb.get_packages(False):
-        pkgnames.append(package.get_property('package'))
+        pkgnames.add(package.get_property('package'))
 
-    settings = Gio.Settings.new('com.ubuntu.notifications.hub')
     goodapps = GLib.VariantBuilder.new(GLib.VariantType.new("a(ss)"))
 
-    for appname in settings.get_value('blacklist').unpack():
-        if appname[0] in pkgnames:
+    dirty = False
+
+    for appname in blacklist:
+        if appname[0] not in pkgnames and Gio.DesktopAppInfo.new(appname[1] + ".desktop") is None:
+            dirty = True
+        else:
             goodapps.add_value(tup2variant(appname))
-        elif (appname[0] == appname[1]):
-            appinfo = Gio.DesktopAppInfo.new(appname[0] + ".desktop")
-            if not appinfo is None:
-                goodapps.add_value(tup2variant(appname))
 
-    settings.set_value('blacklist', goodapps.end())
+    if dirty:
+        settings.set_value('blacklist', goodapps.end())
 
 
 def collect_helpers(helpers_data_path, helpers_data_path_tmp, hooks_path):