@@ -24,6 +24,19 @@
2424#include <QDir>
2525#include <QDBusArgument>
2626#include <QFileInfo>
27+#include <QGSettings>
28+#include <QDebug>
29+
30+class LauncherBackendItem
31+{
32+public:
33+ LauncherBackendItem(): pinned(false) {}
34+
35+ QString desktopFile;
36+ QString displayName;
37+ QString icon;
38+ bool pinned;
39+};
2740
2841LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
2942 QObject(parent),
@@ -32,95 +45,122 @@ LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
3245 if (useStorage) {
3346 m_accounts = new AccountsService(this);
3447 }
35− setUser(qgetenv("USER"));
48+ m_user = qgetenv("USER");
49+ syncFromAccounts();
3650}
3751
3852LauncherBackend::~LauncherBackend()
3953{
40− clearItems();
41−}
54+ m_storedApps.clear();
4255
43−void LauncherBackend::clearItems()
44−{
45− for (LauncherBackendItem &app: m_storedApps) {
46− delete app.settings;
56+ Q_FOREACH(LauncherBackendItem *item, m_itemCache) {
57+ delete item;
4758 }
48− m_storedApps.clear();
59+ m_itemCache.clear();
4960}
5061
5162QStringList LauncherBackend::storedApplications() const
5263{
53− auto files = QStringList();
54− for (const LauncherBackendItem &app: m_storedApps) {
55− files << app.settings->fileName();
56− }
57− return files;
64+ return m_storedApps;
5865}
5966
6067void LauncherBackend::setStoredApplications(const QStringList &appIds)
6168{
62− // Record all existing pinned apps, so we can notice them in new list
63− auto pinnedItems = QStringList();
64− for (LauncherBackendItem &app: m_storedApps) {
65− if (app.pinned) {
66− pinnedItems.append(app.settings->fileName());
69+ if (appIds.count() < m_storedApps.count()) {
70+ Q_FOREACH(const QString &appId, m_storedApps) {
71+ if (!appIds.contains(appId)) {
72+ delete m_itemCache.take(appId);
73+ }
6774 }
6875 }
69−
70− clearItems();
71−
72− for (const QString &appId: appIds) {
73− loadApp(makeAppDetails(appId, pinnedItems.contains(desktopFile(appId))));
76+ m_storedApps = appIds;
77+ Q_FOREACH(const QString &appId, appIds) {
78+ if (!m_itemCache.contains(appId)) {
79+ QString df = findDesktopFile(appId);
80+ if (!df.isEmpty()) {
81+ LauncherBackendItem *item = parseDesktopFile(df);
82+ m_itemCache.insert(appId, item);
83+ } else {
84+ // Cannot find any data for that app... ignoring it.
85+ qWarning() << "cannot find desktop file for" << appId << ". discarding app.";
86+ m_storedApps.removeAll(appId);
87+ }
88+ }
7489 }
75−
7690 syncToAccounts();
7791}
7892
7993QString LauncherBackend::desktopFile(const QString &appId) const
8094{
81− QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
82− return fileInfo.absoluteFilePath();
95+ LauncherBackendItem *item = m_itemCache.value(appId);
96+ if (item) {
97+ return item->desktopFile;
98+ }
99+
100+ return findDesktopFile(appId);
83101}
84102
85103QString LauncherBackend::displayName(const QString &appId) const
86104{
87− auto desktopFile = parseDesktopFile(appId);
88− auto displayName = desktopFile->value("Desktop Entry/Name").toString();
89− delete desktopFile;
90− return displayName;
105+ LauncherBackendItem *item = m_itemCache.value(appId);
106+ if (item) {
107+ return item->displayName;
108+ }
109+
110+ QString df = findDesktopFile(appId);
111+ if (!df.isEmpty()) {
112+ LauncherBackendItem *item = parseDesktopFile(df);
113+ m_itemCache.insert(appId, item);
114+ return item->displayName;
115+ }
116+
117+ return QString();
91118}
92119
93120QString LauncherBackend::icon(const QString &appId) const
94121{
95− auto desktopFile = parseDesktopFile(appId);
96− auto iconName = desktopFile->value("Desktop Entry/Icon").toString();
97− delete desktopFile;
98−
99− if (!iconName.isEmpty()) {
100− QFileInfo iconFileInfo(iconName);
101− if (iconFileInfo.isRelative()) {
102− iconName = "image://gicon/" + iconName;
122+ QString iconName;
123+ LauncherBackendItem *item = m_itemCache.value(appId);
124+ if (item) {
125+ iconName = item->icon;
126+ } else {
127+ QString df = findDesktopFile(appId);
128+ if (!df.isEmpty()) {
129+ LauncherBackendItem *item = parseDesktopFile(df);
130+ m_itemCache.insert(appId, item);
131+ iconName = item->icon;
103132 }
104133 }
105134
106− return iconName;
135+ QFileInfo info(iconName);
136+ if (info.exists()) {
137+ return info.absoluteFilePath();
138+ }
139+ return "image://theme/" + iconName;
107140}
108141
109142bool LauncherBackend::isPinned(const QString &appId) const
110143{
111− auto index = findItem(appId);
112− if (index < 0) {
113− return false;
114− } else {
115− return m_storedApps[index].pinned;
144+ LauncherBackendItem *item = m_itemCache.value(appId);
145+ if (item) {
146+ return item->pinned;
116147 }
148+ return false;
117149}
118150
119151void LauncherBackend::setPinned(const QString &appId, bool pinned)
120152{
121− auto index = findItem(appId);
122− if (index >= 0 && !m_storedApps[index].pinned) {
123− m_storedApps[index].pinned = pinned;
153+ if (!m_storedApps.contains(appId)) {
154+ return;
155+ }
156+
157+ LauncherBackendItem *item = m_itemCache.value(appId);
158+ if (!item) {
159+ item = new LauncherBackendItem();
160+ m_itemCache.insert(appId, item);
161+ }
162+ if (item->pinned != pinned) {
163+ item->pinned = pinned;
124164 syncToAccounts();
125165 }
126166}
@@ -153,8 +193,10 @@ int LauncherBackend::count(const QString &appId) const
153193
154194void LauncherBackend::setUser(const QString &username)
155195{
156− m_user = username;
157− syncFromAccounts();
196+ if (qgetenv("USER") == "lightdm" && m_user != username) {
197+ m_user = username;
198+ syncFromAccounts();
199+ }
158200}
159201
160202void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
@@ -169,75 +211,132 @@ void LauncherBackend::syncFromAccounts()
169211 QList<QVariantMap> apps;
170212 bool defaults = true;
171213
172− clearItems();
214+ m_storedApps.clear();
173215
174− if (m_user != "" && m_accounts != nullptr) {
175− auto variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
216+ if (m_accounts && !m_user.isEmpty()) {
217+ QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
176218 apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
177219 defaults = isDefaultsItem(apps);
178220 }
179221
180− // TODO: load default pinned ones from default config, instead of hardcoding here...
181− if (defaults) {
182− apps <<
183− makeAppDetails("dialer-app.desktop", true) <<
184− makeAppDetails("messaging-app.desktop", true) <<
185− makeAppDetails("address-book-app.desktop", true) <<
186− makeAppDetails("camera-app.desktop", true) <<
187− makeAppDetails("gallery-app.desktop", true) <<
188− makeAppDetails("facebook-webapp.desktop", true) <<
189− makeAppDetails("webbrowser-app.desktop", true) <<
190− makeAppDetails("twitter-webapp.desktop", true) <<
191− makeAppDetails("gmail-webapp.desktop", true) <<
192− makeAppDetails("ubuntu-weather-app.desktop", true) <<
193− makeAppDetails("notes-app.desktop", true) <<
194− makeAppDetails("calendar-app.desktop", true);
195− }
196−
197− for (const QVariant &app: apps) {
198− loadApp(app.toMap());
222+ if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage
223+ QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
224+ Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {
225+ if (entry.startsWith("application://")) {
226+ QString appId = entry;
227+ // Transform "application://foobar.desktop" to "foobar"
228+ appId.remove("application://");
229+ if (appId.endsWith(".desktop")) {
230+ appId.chop(8);
231+ }
232+ QString df = findDesktopFile(appId);
233+
234+ if (!df.isEmpty()) {
235+ m_storedApps << appId;
236+
237+ if (!m_itemCache.contains(appId)) {
238+ m_itemCache.insert(appId, parseDesktopFile(df));
239+ }
240+ m_itemCache.value(appId)->pinned = true;
241+ }
242+ }
243+ }
244+ } else {
245+ for (const QVariant &app: apps) {
246+ loadFromVariant(app.toMap());
247+ }
199248 }
200249}
201250
202251void LauncherBackend::syncToAccounts()
203252{
204− if (m_user != "" && m_accounts != nullptr) {
253+ if (m_accounts && !m_user.isEmpty()) {
205254 QList<QVariantMap> items;
206255
207− for (LauncherBackendItem &app: m_storedApps) {
208− items << makeAppDetails(app.settings->fileName(), app.pinned);
256+ Q_FOREACH(const QString &appId, m_storedApps) {
257+ items << itemToVariant(appId);
209258 }
210259
211260 m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));
212261 }
213262}
214263
215−QSettings *LauncherBackend::parseDesktopFile(const QString &appId) const
264+QString LauncherBackend::findDesktopFile(const QString &appId) const
216265{
217− auto fullAppId = desktopFile(appId);
218− return new QSettings(fullAppId, QSettings::IniFormat);
266+ int dashPos = -1;
267+ QString helper = appId;
268+
269+ QStringList searchDirs;
270+ searchDirs << QDir::homePath() + "/.local/share/applications";
271+ searchDirs << "/usr/share/applications";
272+
273+#ifdef LAUNCHER_TESTING
274+ searchDirs << "";
275+#endif
276+
277+ do {
278+ if (dashPos != -1) {
279+ helper = helper.replace(dashPos, 1, '/');
280+ }
281+
282+ Q_FOREACH(const QString &searchDir, searchDirs) {
283+ QFileInfo fileInfo(QDir(searchDir), helper + ".desktop");
284+ if (fileInfo.exists()) {
285+ return fileInfo.absoluteFilePath();
286+ }
287+ }
288+
289+ dashPos = helper.indexOf("-");
290+ } while (dashPos != -1);
291+
292+ return QString();
219293}
220294
221−void LauncherBackend::loadApp(const QVariantMap &details)
295+LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFile) const
222296{
223− auto appId = details.value("id").toString();
224− auto isPinned = details.value("is-pinned").toBool();
297+ QSettings settings(desktopFile, QSettings::IniFormat);
225298
226− if (appId.isEmpty()) {
299+
300+ LauncherBackendItem* item = new LauncherBackendItem();
301+ item->desktopFile = desktopFile;
302+ item->displayName = settings.value("Desktop Entry/Name").toString();
303+ item->icon = settings.value("Desktop Entry/Icon").toString();
304+ item->pinned = false;
305+ return item;
306+}
307+
308+void LauncherBackend::loadFromVariant(const QVariantMap &details)
309+{
310+ if (!details.contains("id")) {
227311 return;
228312 }
313+ QString appId = details.value("id").toString();
314+
315+ LauncherBackendItem *item = m_itemCache.value(appId);
316+ if (item) {
317+ delete item;
318+ }
319+
320+ item = new LauncherBackendItem();
229321
230− LauncherBackendItem item;
231− item.settings = parseDesktopFile(appId);
232− item.pinned = isPinned;
233− m_storedApps.append(item);
322+ item->desktopFile = details.value("desktopFile").toString();
323+ item->displayName = details.value("name").toString();
324+ item->icon = details.value("icon").toString();
325+ item->pinned = details.value("is-pinned").toBool();
326+
327+ m_itemCache.insert(appId, item);
328+ m_storedApps.append(appId);
234329}
235330
236−QVariantMap LauncherBackend::makeAppDetails(const QString &appId, bool pinned) const
331+QVariantMap LauncherBackend::itemToVariant(const QString &appId) const
237332{
333+ LauncherBackendItem *item = m_itemCache.value(appId);
238334 QVariantMap details;
239335 details.insert("id", appId);
240− details.insert("is-pinned", pinned);
336+ details.insert("name", item->displayName);
337+ details.insert("icon", item->icon);
338+ details.insert("desktopFile", item->desktopFile);
339+ details.insert("is-pinned", item->pinned);
241340 return details;
242341}
243342
@@ -248,14 +347,3 @@ bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const
248347 // list of one item with the 'defaults' field set to true.
249348 return (apps.size() == 1 && apps[0].value("defaults").toBool());
250349}
251−
252−int LauncherBackend::findItem(const QString &appId) const
253−{
254− auto fullAppId = desktopFile(appId);
255− for (int i = 0; i < m_storedApps.size(); ++i) {
256− if (m_storedApps[i].settings->fileName() == fullAppId) {
257− return i;
258− }
259− }
260− return -1;
261−}