1
=== modified file 'plugins/about/click.cpp'
2
--- plugins/about/click.cpp	2013-10-30 01:22:51 +0000
3
+++ plugins/about/click.cpp	2014-07-01 12:20:23 +0000
4
@@ -25,7 +25,6 @@
5
25
#include <libintl.h>
25
#include <libintl.h>
6
26
26
7
27
#include <QDebug>
27
#include <QDebug>
8
28
#include <QDir>
9
29
#include <QIcon>
28
#include <QIcon>
10
30
#include <QJsonArray>
29
#include <QJsonArray>
11
31
#include <QJsonDocument>
30
#include <QJsonDocument>
12
@@ -38,6 +37,135 @@
13
38
    m_clickPackages = buildClickList();
37
    m_clickPackages = buildClickList();
14
39
}
38
}
15
40
39
16
40
/* Look through `hooks' for a desktop file in `directory'
17
41
 * and set the display name and icon from this.
18
42
 *
19
43
 * Will set with information from the first desktop file found and parsed.
20
44
 */
21
45
void ClickModel::populateFromDesktopFile (Click *newClick,
22
46
                                          QVariantMap hooks,
23
47
                                          QDir directory)
24
48
{
25
49
    QVariantMap appHooks;
26
50
    GKeyFile *appinfo = g_key_file_new();
27
51
    gchar *desktopFileName = NULL;
28
52
29
53
    QVariantMap::ConstIterator begin(hooks.constBegin());
30
54
    QVariantMap::ConstIterator end(hooks.constEnd());
31
55
32
56
    // Look through the hooks for a 'desktop' key which points to a desktop
33
57
    // file referring to this app.
34
58
    while (begin != end) {
35
59
        appHooks = (*begin++).toMap();
36
60
        if (!appHooks.isEmpty() &&
37
61
            appHooks.contains("desktop") &&
38
62
            directory.exists()) {
39
63
            QFile desktopFile(directory.absoluteFilePath(
40
64
                        appHooks.value("desktop", "undefined").toString()));
41
65
42
66
           desktopFileName =
43
67
               g_strdup(desktopFile.fileName().toLocal8Bit().constData());
44
68
45
69
            g_debug ("Desktop file: %s", desktopFileName);
46
70
47
71
            if (!desktopFile.exists())
48
72
                goto out;
49
73
50
74
            gboolean loaded = g_key_file_load_from_file(appinfo,
51
75
                                                        desktopFileName,
52
76
                                                        G_KEY_FILE_NONE,
53
77
                                                        NULL);
54
78
55
79
            if (!loaded) {
56
80
                g_warning ("Couldn't parse desktop file %s", desktopFileName);
57
81
                goto out;
58
82
            }
59
83
60
84
            gchar * name = g_key_file_get_string (appinfo,
61
85
                                                  G_KEY_FILE_DESKTOP_GROUP,
62
86
                                                  G_KEY_FILE_DESKTOP_KEY_NAME,
63
87
                                                  NULL);
64
88
65
89
            if (name) {
66
90
                g_debug ("Name is %s", name);
67
91
                newClick->displayName = name;
68
92
                g_free (name);
69
93
                name = NULL;
70
94
            }
71
95
72
96
            // Overwrite the icon with the .desktop file's one if we have it.
73
97
            // This is the one that the app scope displays so use that if we
74
98
            // can.
75
99
            gchar * icon = g_key_file_get_string (appinfo,
76
100
                                                  G_KEY_FILE_DESKTOP_GROUP,
77
101
                                                  G_KEY_FILE_DESKTOP_KEY_ICON,
78
102
                                                  NULL);
79
103
80
104
            if (icon) {
81
105
                g_debug ("Icon is %s", icon);
82
106
                QFile iconFile(icon);
83
107
                if (iconFile.exists()) {
84
108
                    newClick->icon = icon;
85
109
                } else {
86
110
                    QString qIcon(QString::fromLocal8Bit(icon));
87
111
                    iconFile.setFileName(directory.absoluteFilePath(
88
112
                                QDir::cleanPath(qIcon)));
89
113
                    if (iconFile.exists())
90
114
                        newClick->icon = iconFile.fileName();
91
115
                    else if (QIcon::hasThemeIcon(qIcon)) // try the icon theme
92
116
                        newClick->icon = qIcon;
93
117
                }
94
118
            }
95
119
        }
96
120
out:
97
121
        g_free (desktopFileName);
98
122
        g_key_file_free (appinfo);
99
123
        return;
100
124
    }
101
125
}
102
126
103
127
ClickModel::Click ClickModel::buildClick(QVariantMap manifest)
104
128
{
105
129
    Click newClick;
106
130
    QDir directory;
107
131
108
132
    newClick.name = manifest.value("title",
109
133
                              gettext("Unknown title")).toString();
110
134
111
135
    // This key is the base directory where the click package is installed to.
112
136
    // We'll look for files relative to this.
113
137
    if (manifest.contains("_directory")) {
114
138
        directory = manifest.value("_directory", "/undefined").toString();
115
139
        // Set the icon from the click package. Might be a path or a reference to a themed icon.
116
140
        QString iconFile(manifest.value("icon", "undefined").toString());
117
141
118
142
        if (directory.exists()) {
119
143
            QFile icon(directory.absoluteFilePath(iconFile.simplified()));
120
144
            if (!icon.exists() && QIcon::hasThemeIcon(iconFile)) // try the icon theme
121
145
                newClick.icon = iconFile;
122
146
            else
123
147
                newClick.icon = icon.fileName();
124
148
        }
125
149
126
150
    }
127
151
128
152
    // "hooks" → title → "desktop" / "icon"
129
153
    QVariant hooks(manifest.value("hooks"));
130
154
131
155
    if (hooks.isValid()) {
132
156
        QVariantMap allHooks(hooks.toMap());
133
157
        // The desktop file contains an icon and the display name
134
158
        populateFromDesktopFile(&newClick, allHooks, directory);
135
159
   }
136
160
137
161
    newClick.installSize = manifest.value("installed-size",
138
162
        "0").toString().toUInt()*1024;
139
163
140
164
    m_totalClickSize += newClick.installSize;
141
165
142
166
    return newClick;
143
167
}
144
168
145
41
QList<ClickModel::Click> ClickModel::buildClickList()
169
QList<ClickModel::Click> ClickModel::buildClickList()
146
42
{
170
{
147
43
    QFile clickBinary("/usr/bin/click");
171
    QFile clickBinary("/usr/bin/click");
148
@@ -80,86 +208,8 @@
149
80
208
150
81
    while (begin != end) {
209
    while (begin != end) {
151
82
        QVariantMap val = (*begin++).toObject().toVariantMap();
210
        QVariantMap val = (*begin++).toObject().toVariantMap();
232
83
        Click newClick;
211
233
84
        QDir directory;
212
        clickPackages.append(buildClick(val));
154
85
155
86
        newClick.name = val.value("title",
156
87
                                  gettext("Unknown title")).toString();
157
88
158
89
        if (val.contains("_directory")) {
159
90
            directory = val.value("_directory", "/undefined").toString();
160
91
            // Set the icon from the click package
161
92
            QString iconFile(val.value("icon", "undefined").toString());
162
93
            if (directory.exists()) {
163
94
                QString icon(directory.filePath(iconFile.simplified()));
164
95
                newClick.icon = icon;
165
96
            }
166
97
        }
167
98
168
99
        // "hooks" → title → "desktop" / "icon"
169
100
        QVariant hooks(val.value("hooks"));
170
101
171
102
        if (hooks.isValid()) {
172
103
            QVariantMap allHooks(hooks.toMap());
173
104
174
105
            if (allHooks.contains(newClick.name)) {
175
106
                QVariantMap appHooks(allHooks.value(newClick.name).toMap());
176
107
                if (!appHooks.isEmpty() &&
177
108
                    appHooks.contains("desktop") &&
178
109
                    directory.exists()) {
179
110
                    QFile desktopFile(
180
111
                                directory.absoluteFilePath(
181
112
                                    appHooks.value("desktop",
182
113
                                                   "undefined").toString()));
183
114
                    const char * desktopFileName =
184
115
                        desktopFile.fileName().toLocal8Bit().constData();
185
116
                    g_debug ("Desktop file: %s", desktopFileName);
186
117
                    if (desktopFile.exists()) {
187
118
                        GDesktopAppInfo *appinfo =
188
119
                                g_desktop_app_info_new_from_filename (
189
120
                                    desktopFileName);
190
121
191
122
                        if (!appinfo) {
192
123
                            g_warning ("Couldn't parse desktop file %s",
193
124
                                       desktopFileName);
194
125
                        } else {
195
126
                            const char * name = g_app_info_get_name (
196
127
                                        (GAppInfo *) appinfo);
197
128
198
129
                            if (name) {
199
130
                                g_debug ("Name is %s", name);
200
131
                                newClick.displayName = name;
201
132
                            }
202
133
203
134
                            // Overwrite the icon with the .desktop file's one
204
135
                            // if we have it. This one is more reliable.
205
136
                            const char * icon = g_desktop_app_info_get_string (
206
137
                                        appinfo, "Icon");
207
138
                            if (icon) {
208
139
                                g_debug ("Icon is %s", icon);
209
140
                                QFile iconFile(icon);
210
141
                                if (iconFile.exists()) {
211
142
                                    newClick.icon = icon;
212
143
                                } else {
213
144
                                    iconFile.setFileName(
214
145
                                                directory.absoluteFilePath(
215
146
                                                    QString::fromLocal8Bit(icon)));
216
147
                                    if (iconFile.exists())
217
148
                                        newClick.icon = iconFile.fileName();
218
149
                                }
219
150
                            }
220
151
                        }
221
152
                    }
222
153
                }
223
154
            }
224
155
        }
225
156
226
157
        newClick.installSize = val.value("installed-size",
227
158
                                         "0").toString().toUInt()*1024;
228
159
229
160
        m_totalClickSize += newClick.installSize;
230
161
231
162
        clickPackages.append(newClick);
234
163
    }
213
    }
235
164
214
236
165
    return clickPackages;
215
    return clickPackages;
237
166
216
238
=== modified file 'plugins/about/click.h'
239
--- plugins/about/click.h	2013-10-29 22:43:40 +0000
240
+++ plugins/about/click.h	2014-07-01 12:20:23 +0000
241
@@ -21,9 +21,10 @@
242
21
#define CLICK_H
21
#define CLICK_H
243
22
22
244
23
#include <QAbstractTableModel>
23
#include <QAbstractTableModel>
246
24
#include <QSortFilterProxyModel>
24
#include <QDir>
247
25
#include <QObject>
25
#include <QObject>
248
26
#include <QProcess>
26
#include <QProcess>
249
27
#include <QSortFilterProxyModel>
250
27
28
251
28
class ClickModel : public QAbstractTableModel
29
class ClickModel : public QAbstractTableModel
252
29
{
30
{
253
@@ -56,7 +57,12 @@
254
56
    quint64 getClickSize() const;
57
    quint64 getClickSize() const;
255
57
58
256
58
private:
59
private:
257
60
    void populateFromDesktopFile(Click *newClick,
258
61
                                 QVariantMap hooks,
259
62
                                 QDir directory);
260
63
    Click buildClick(QVariantMap manifest);
261
59
    QList<Click> buildClickList();
64
    QList<Click> buildClickList();
262
65
263
60
    QList<Click> m_clickPackages;
66
    QList<Click> m_clickPackages;
264
61
    int m_totalClickSize;
67
    int m_totalClickSize;
265
62
68
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-06-27	Approve on 2014-07-02
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-01
Review via email: mp+224871@code.launchpad.net