1
=== modified file 'tools/update-puritine-containers'
2
--- tools/update-puritine-containers	2016-06-10 20:34:33 +0000
3
+++ tools/update-puritine-containers	2016-07-18 21:00:41 +0000
4
@@ -23,10 +23,20 @@
5
23
import shutil
23
import shutil
6
24
import subprocess
24
import subprocess
7
25
25
8
26
from gi.repository import GLib, Gio
9
27
10
26
puritine_hook_dir = os.path.join(os.environ['HOME'], '.cache', 'libertine', 'puritine')
28
puritine_hook_dir = os.path.join(os.environ['HOME'], '.cache', 'libertine', 'puritine')
11
27
puritine_symlink_farm_file = os.path.join(puritine_hook_dir, 'PuritineSymlinkFarm.json')
29
puritine_symlink_farm_file = os.path.join(puritine_hook_dir, 'PuritineSymlinkFarm.json')
12
28
puritine_click_config_file = os.path.join('libertine-config', 'libertine', 'ContainersConfig.json')
30
puritine_click_config_file = os.path.join('libertine-config', 'libertine', 'ContainersConfig.json')
13
29
31
14
32
def symlink_farm_entries_count():
15
33
    if (puritine_symlink_farm_list and
16
34
        puritine_symlink_farm_list['customContainers']):
17
35
        return len(puritine_symlink_farm_list['customContainers'])
18
36
19
37
    return 0
20
38
21
39
22
30
def puritine_symlink_exists(symlink):
40
def puritine_symlink_exists(symlink):
23
31
    for file in os.listdir(puritine_hook_dir):
41
    for file in os.listdir(puritine_hook_dir):
24
32
        if file == symlink:
42
        if file == symlink:
25
@@ -117,21 +127,59 @@
26
117
    return puritine_symlink_farm_list
127
    return puritine_symlink_farm_list
27
118
128
28
119
129
47
120
puritine_symlink_farm_list = {}
130
def favorite_libertine_scope():
48
121
131
    libertine_scope_value = 'scope://libertine-scope.ubuntu_libertine-scope'
49
122
if not os.path.exists(puritine_hook_dir):
132
    click_scope_value = 'scope://clickscope'
50
123
    os.makedirs(puritine_hook_dir)
133
    schema = 'com.canonical.Unity.Dash'
51
124
134
    schema_key = 'favorite-scopes'
52
125
if (os.path.exists(puritine_symlink_farm_file) and
135
53
126
    os.path.getsize(puritine_symlink_farm_file) != 0):
136
    settings = Gio.Settings.new(schema)
54
127
    with open(puritine_symlink_farm_file, 'r') as fd:
137
55
128
        puritine_symlink_farm_list = json.load(fd)
138
    favorites = settings.get_value(schema_key)
56
129
139
57
130
puritine_symlink_farm_list = find_new_or_updated_puritine_symlinks(puritine_symlink_farm_list)
140
    array = favorites.dup_strv()
58
131
141
59
132
if puritine_symlink_farm_list:
142
    if not libertine_scope_value in array:
60
133
    puritine_symlink_farm_list = find_removed_puritine_symlinks(puritine_symlink_farm_list)
143
        array.insert(array.index(click_scope_value) + 1, libertine_scope_value)
61
134
144
        new_favorites = GLib.Variant.new_strv(array)
62
135
with open(puritine_symlink_farm_file, 'w') as fd:
145
        settings.set_value(schema_key, new_favorites)
63
136
    json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
146
        del new_favorites
64
137
    fd.write('\n')
147
65
148
    del array
66
149
    del favorites
67
150
    del settings
68
151
69
152
70
153
if __name__ == '__main__':
71
154
    puritine_symlink_farm_list = {}
72
155
73
156
    with open(os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session'), 'r') as fd:
74
157
        dbus_session_str = fd.read()
75
158
76
159
    os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
77
160
78
161
    if not os.path.exists(puritine_hook_dir):
79
162
        os.makedirs(puritine_hook_dir)
80
163
81
164
    if (os.path.exists(puritine_symlink_farm_file) and
82
165
        os.path.getsize(puritine_symlink_farm_file) != 0):
83
166
        with open(puritine_symlink_farm_file, 'r') as fd:
84
167
            puritine_symlink_farm_list = json.load(fd)
85
168
86
169
    count_at_start = symlink_farm_entries_count()
87
170
88
171
    puritine_symlink_farm_list = find_new_or_updated_puritine_symlinks(puritine_symlink_farm_list)
89
172
90
173
    if puritine_symlink_farm_list:
91
174
        puritine_symlink_farm_list = find_removed_puritine_symlinks(puritine_symlink_farm_list)
92
175
93
176
    count_at_finish = symlink_farm_entries_count()
94
177
95
178
    with open(puritine_symlink_farm_file, 'w') as fd:
96
179
        json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
97
180
        fd.write('\n')
98
181
99
182
    if count_at_start == 0 and count_at_finish > 0:
100
183
        favorite_libertine_scope()
101
184
102
185
    libertine.utils.refresh_libertine_scope()
Reviewer	Review Type	Date Requested	Status
Larry Price		2016-07-18	Approve on 2016-07-19
Libertine CI Bot	continuous-integration		Approve on 2016-07-18
Review via email: mp+300393@code.launchpad.net