Merge lp:~townsend/libertine/puritine-favorite-libertine-scope into lp:libertine

[Christopher Townsend]

Add functionality to "favorite" the Libertine scope upon first installation of the Puritine click package.

[lp:~townsend/libertine/puritine-favorite-libertine-scope]

274. By Christopher Townsend on 2016-07-18

Remove extra line.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:274
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/56/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/184
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/144
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/144
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/144
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/144
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/144
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/144
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/143/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/187
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/165
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/165/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/165
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/165/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/165
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/165/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/165
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/165/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/165
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/165/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/165
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/165/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/56/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

verified works

review: Approve

=== modified file 'tools/update-puritine-containers'
--- tools/update-puritine-containers	2016-06-10 20:34:33 +0000
+++ tools/update-puritine-containers	2016-07-18 21:00:41 +0000
@@ -23,10 +23,20 @@
 import shutil
 import subprocess
 
+from gi.repository import GLib, Gio
+
 puritine_hook_dir = os.path.join(os.environ['HOME'], '.cache', 'libertine', 'puritine')
 puritine_symlink_farm_file = os.path.join(puritine_hook_dir, 'PuritineSymlinkFarm.json')
 puritine_click_config_file = os.path.join('libertine-config', 'libertine', 'ContainersConfig.json')
 
+def symlink_farm_entries_count():
+    if (puritine_symlink_farm_list and
+        puritine_symlink_farm_list['customContainers']):
+        return len(puritine_symlink_farm_list['customContainers'])
+
+    return 0
+
+
 def puritine_symlink_exists(symlink):
     for file in os.listdir(puritine_hook_dir):
         if file == symlink:
@@ -117,21 +127,59 @@
     return puritine_symlink_farm_list
 
 
-puritine_symlink_farm_list = {}
-
-if not os.path.exists(puritine_hook_dir):
-    os.makedirs(puritine_hook_dir)
-
-if (os.path.exists(puritine_symlink_farm_file) and
-    os.path.getsize(puritine_symlink_farm_file) != 0):
-    with open(puritine_symlink_farm_file, 'r') as fd:
-        puritine_symlink_farm_list = json.load(fd)
-
-puritine_symlink_farm_list = find_new_or_updated_puritine_symlinks(puritine_symlink_farm_list)
-
-if puritine_symlink_farm_list:
-    puritine_symlink_farm_list = find_removed_puritine_symlinks(puritine_symlink_farm_list)
-
-with open(puritine_symlink_farm_file, 'w') as fd:
-    json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
-    fd.write('\n')
+def favorite_libertine_scope():
+    libertine_scope_value = 'scope://libertine-scope.ubuntu_libertine-scope'
+    click_scope_value = 'scope://clickscope'
+    schema = 'com.canonical.Unity.Dash'
+    schema_key = 'favorite-scopes'
+
+    settings = Gio.Settings.new(schema)
+
+    favorites = settings.get_value(schema_key)
+
+    array = favorites.dup_strv()
+
+    if not libertine_scope_value in array:
+        array.insert(array.index(click_scope_value) + 1, libertine_scope_value)
+        new_favorites = GLib.Variant.new_strv(array)
+        settings.set_value(schema_key, new_favorites)
+        del new_favorites
+
+    del array
+    del favorites
+    del settings
+
+
+if __name__ == '__main__':
+    puritine_symlink_farm_list = {}
+
+    with open(os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session'), 'r') as fd:
+        dbus_session_str = fd.read()
+
+    os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
+
+    if not os.path.exists(puritine_hook_dir):
+        os.makedirs(puritine_hook_dir)
+
+    if (os.path.exists(puritine_symlink_farm_file) and
+        os.path.getsize(puritine_symlink_farm_file) != 0):
+        with open(puritine_symlink_farm_file, 'r') as fd:
+            puritine_symlink_farm_list = json.load(fd)
+
+    count_at_start = symlink_farm_entries_count()
+
+    puritine_symlink_farm_list = find_new_or_updated_puritine_symlinks(puritine_symlink_farm_list)
+
+    if puritine_symlink_farm_list:
+        puritine_symlink_farm_list = find_removed_puritine_symlinks(puritine_symlink_farm_list)
+
+    count_at_finish = symlink_farm_entries_count()
+
+    with open(puritine_symlink_farm_file, 'w') as fd:
+        json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
+        fd.write('\n')
+
+    if count_at_start == 0 and count_at_finish > 0:
+        favorite_libertine_scope()
+
+    libertine.utils.refresh_libertine_scope()