libusermetrics

Merge lp:~unity-team/libusermetrics/handle-shared-data-source-ids into lp:libusermetrics

  1. handle-shared-data-source-ids
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 143
Merged at revision: 143
Proposed branch: lp:~unity-team/libusermetrics/handle-shared-data-source-ids
Merge into: lp:libusermetrics
Diff against target: 721 lines (+120/-124)
17 files modified
data/com.canonical.UserMetrics.xml (+0/-2)
data/com.canonical.usermetrics.DataSet.xml (+1/-1)
data/com.canonical.usermetrics.UserData.xml (+2/-2)
po/en_GB.po (+15/-15)
po/libusermetrics.pot (+15/-15)
src/libusermetricsoutput/SyncedUserData.cpp (+15/-13)
src/libusermetricsoutput/SyncedUserData.h (+3/-2)
src/libusermetricsoutput/SyncedUserMetricsStore.cpp (+20/-32)
src/libusermetricsoutput/SyncedUserMetricsStore.h (+2/-2)
src/libusermetricsoutput/UserMetricsImpl.cpp (+9/-9)
src/libusermetricsoutput/UserMetricsStore.cpp (+2/-2)
src/libusermetricsoutput/UserMetricsStore.h (+1/-1)
src/usermetricsservice/DBusDataSet.cpp (+2/-2)
src/usermetricsservice/DBusDataSet.h (+3/-2)
src/usermetricsservice/DBusUserData.cpp (+8/-3)
src/usermetricsservice/DBusUserMetrics.cpp (+2/-3)
tests/unit/libusermetricsoutput/TestSyncedUserMetricsStore.cpp (+20/-18)
To merge this branch: bzr merge lp:~unity-team/libusermetrics/handle-shared-data-source-ids
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+192112@code.launchpad.net

Commit message

Data sources are now keyed by their dbus path in libusermetricsoutput

This allows them to share the same IDs.

Description of the change

Data sources are now keyed by their dbus path in libusermetricsoutput

This allows them to share the same IDs.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-saucy-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-saucy-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/libusermetrics-saucy-armhf-ci/51/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libusermetrics-ci/51/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/com.canonical.UserMetrics.xml'
2--- data/com.canonical.UserMetrics.xml 2013-09-03 14:59:00 +0000
3+++ data/com.canonical.UserMetrics.xml 2013-10-22 08:55:27 +0000
4@@ -5,12 +5,10 @@
5 <property name="dataSources" type="ao" access="read"/>
6
7 <signal name="dataSourceAdded">
8- <arg name="name" type="s" direction="out"/>
9 <arg name="path" type="o" direction="out"/>
10 </signal>
11
12 <signal name="dataSourceRemoved">
13- <arg name="name" type="s" direction="out"/>
14 <arg name="path" type="o" direction="out"/>
15 </signal>
16
17
18=== modified file 'data/com.canonical.usermetrics.DataSet.xml'
19--- data/com.canonical.usermetrics.DataSet.xml 2013-07-08 11:21:44 +0000
20+++ data/com.canonical.usermetrics.DataSet.xml 2013-10-22 08:55:27 +0000
21@@ -1,7 +1,7 @@
22 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
23 <node>
24 <interface name="com.canonical.usermetrics.DataSet">
25- <property name="dataSource" type="s" access="read"/>
26+ <property name="dataSource" type="o" access="read"/>
27
28 <property name="lastUpdated" type="u" access="read"/>
29
30
31=== modified file 'data/com.canonical.usermetrics.UserData.xml'
32--- data/com.canonical.usermetrics.UserData.xml 2013-07-01 11:17:17 +0000
33+++ data/com.canonical.usermetrics.UserData.xml 2013-10-22 08:55:27 +0000
34@@ -7,12 +7,12 @@
35 <property name="dataSets" type="ao" access="read"/>
36
37 <signal name="dataSetAdded">
38- <arg name="dataSourceName" type="s" direction="out"/>
39+ <arg name="dataSourcePath" type="o" direction="out"/>
40 <arg name="path" type="o" direction="out"/>
41 </signal>
42
43 <signal name="dataSetRemoved">
44- <arg name="dataSourceName" type="s" direction="out"/>
45+ <arg name="dataSourcePath" type="o" direction="out"/>
46 <arg name="path" type="o" direction="out"/>
47 </signal>
48
49
50=== modified file 'po/en_GB.po'
51--- po/en_GB.po 2013-10-02 09:34:27 +0000
52+++ po/en_GB.po 2013-10-22 08:55:27 +0000
53@@ -7,7 +7,7 @@
54 msgstr ""
55 "Project-Id-Version: libusermetrics\n"
56 "Report-Msgid-Bugs-To: \n"
57-"POT-Creation-Date: 2013-10-02 10:29+0100\n"
58+"POT-Creation-Date: 2013-10-22 09:33+0100\n"
59 "PO-Revision-Date: 2013-07-05 15:09+0100\n"
60 "Last-Translator: Pete Woods <pete.woods@canonical.com>\n"
61 "Language-Team: British English <en@li.org>\n"
62@@ -17,15 +17,15 @@
63 "Content-Transfer-Encoding: 8bit\n"
64 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
65
66-#: src/usermetricsservice/DBusUserData.cpp:99
67+#: src/usermetricsservice/DBusUserData.cpp:101
68 msgid "Attempt to create data set owned by another application"
69 msgstr "Attempt to create data set owned by another application"
70
71-#: src/usermetricsservice/DBusUserData.cpp:88
72+#: src/usermetricsservice/DBusUserData.cpp:90
73 msgid "Attempt to create data set owned by another user"
74 msgstr "Attempt to create data set owned by another user"
75
76-#: src/usermetricsservice/DBusUserMetrics.cpp:250
77+#: src/usermetricsservice/DBusUserMetrics.cpp:249
78 #, fuzzy
79 msgid "Attempt to create user data owned by another user"
80 msgstr "Attempt to create user data owned by another user"
81@@ -55,12 +55,12 @@
82 msgid "Could not open database"
83 msgstr "Could not open database"
84
85-#: src/usermetricsservice/DBusUserData.cpp:49
86+#: src/usermetricsservice/DBusUserData.cpp:51
87 msgid "Could not register user data object with DBus"
88 msgstr "Could not register user data object with DBus"
89
90 #: src/usermetricsservice/DBusDataSet.cpp:127
91-#: src/usermetricsservice/DBusUserData.cpp:123
92+#: src/usermetricsservice/DBusUserData.cpp:125
93 msgid "Could not save data set"
94 msgstr "Could not save data set"
95
96@@ -73,11 +73,11 @@
97 #: src/usermetricsservice/DBusDataSource.cpp:190
98 #: src/usermetricsservice/DBusDataSource.cpp:216
99 #: src/usermetricsservice/DBusDataSource.cpp:234
100-#: src/usermetricsservice/DBusUserMetrics.cpp:188
101+#: src/usermetricsservice/DBusUserMetrics.cpp:187
102 msgid "Could not save data source"
103 msgstr "Couldn't save data source"
104
105-#: src/usermetricsservice/DBusUserMetrics.cpp:268
106+#: src/usermetricsservice/DBusUserMetrics.cpp:267
107 msgid "Could not save user data"
108 msgstr "Couldn't save user data"
109
110@@ -90,16 +90,16 @@
111 msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]"
112 msgstr "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]"
113
114-#: src/usermetricsservice/DBusUserData.cpp:110
115+#: src/usermetricsservice/DBusUserData.cpp:112
116 msgid "Data set query failed"
117 msgstr "Data set query failed"
118
119-#: src/libusermetricsoutput/UserMetricsImpl.cpp:260
120+#: src/libusermetricsoutput/UserMetricsImpl.cpp:255
121 msgid "Data source not found"
122 msgstr "Data source not found"
123
124-#: src/usermetricsservice/DBusUserMetrics.cpp:142
125-#: src/usermetricsservice/DBusUserMetrics.cpp:154
126+#: src/usermetricsservice/DBusUserMetrics.cpp:141
127+#: src/usermetricsservice/DBusUserMetrics.cpp:153
128 msgid "Data source query failed"
129 msgstr "Data source query failed"
130
131@@ -119,7 +119,7 @@
132 msgid "Failed to update metric:"
133 msgstr "Failed to update metric:"
134
135-#: src/usermetricsservice/DBusUserData.cpp:133
136+#: src/usermetricsservice/DBusUserData.cpp:135
137 msgid "New data set could not be found"
138 msgstr "New data set couldn't be found"
139
140@@ -143,7 +143,7 @@
141 msgid "Unable to unregister user metrics service on DBus"
142 msgstr "Unable to unregister user metrics service on DBus"
143
144-#: src/usermetricsservice/DBusUserData.cpp:79
145+#: src/usermetricsservice/DBusUserData.cpp:81
146 msgid "Unknown data source"
147 msgstr "Unknown data source"
148
149@@ -152,7 +152,7 @@
150 msgid "Usage: "
151 msgstr "Usage: "
152
153-#: src/usermetricsservice/DBusUserMetrics.cpp:259
154+#: src/usermetricsservice/DBusUserMetrics.cpp:258
155 msgid "User data query failed"
156 msgstr "User data query failed"
157
158
159=== modified file 'po/libusermetrics.pot'
160--- po/libusermetrics.pot 2013-10-02 09:34:27 +0000
161+++ po/libusermetrics.pot 2013-10-22 08:55:27 +0000
162@@ -8,7 +8,7 @@
163 msgstr ""
164 "Project-Id-Version: libusermetrics\n"
165 "Report-Msgid-Bugs-To: \n"
166-"POT-Creation-Date: 2013-10-02 10:29+0100\n"
167+"POT-Creation-Date: 2013-10-22 09:33+0100\n"
168 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
169 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
170 "Language-Team: LANGUAGE <LL@li.org>\n"
171@@ -38,7 +38,7 @@
172 #: src/usermetricsservice/DBusDataSource.cpp:190
173 #: src/usermetricsservice/DBusDataSource.cpp:216
174 #: src/usermetricsservice/DBusDataSource.cpp:234
175-#: src/usermetricsservice/DBusUserMetrics.cpp:188
176+#: src/usermetricsservice/DBusUserMetrics.cpp:187
177 msgid "Could not save data source"
178 msgstr ""
179
180@@ -46,25 +46,25 @@
181 msgid "Unable to register user metrics object on DBus"
182 msgstr ""
183
184-#: src/usermetricsservice/DBusUserMetrics.cpp:142
185-#: src/usermetricsservice/DBusUserMetrics.cpp:154
186+#: src/usermetricsservice/DBusUserMetrics.cpp:141
187+#: src/usermetricsservice/DBusUserMetrics.cpp:153
188 msgid "Data source query failed"
189 msgstr ""
190
191-#: src/usermetricsservice/DBusUserMetrics.cpp:250
192+#: src/usermetricsservice/DBusUserMetrics.cpp:249
193 msgid "Attempt to create user data owned by another user"
194 msgstr ""
195
196-#: src/usermetricsservice/DBusUserMetrics.cpp:259
197+#: src/usermetricsservice/DBusUserMetrics.cpp:258
198 msgid "User data query failed"
199 msgstr ""
200
201-#: src/usermetricsservice/DBusUserMetrics.cpp:268
202+#: src/usermetricsservice/DBusUserMetrics.cpp:267
203 msgid "Could not save user data"
204 msgstr ""
205
206 #: src/usermetricsservice/DBusDataSet.cpp:127
207-#: src/usermetricsservice/DBusUserData.cpp:123
208+#: src/usermetricsservice/DBusUserData.cpp:125
209 msgid "Could not save data set"
210 msgstr ""
211
212@@ -84,27 +84,27 @@
213 msgid "Attempt to increment data owned by another application"
214 msgstr ""
215
216-#: src/usermetricsservice/DBusUserData.cpp:49
217+#: src/usermetricsservice/DBusUserData.cpp:51
218 msgid "Could not register user data object with DBus"
219 msgstr ""
220
221-#: src/usermetricsservice/DBusUserData.cpp:79
222+#: src/usermetricsservice/DBusUserData.cpp:81
223 msgid "Unknown data source"
224 msgstr ""
225
226-#: src/usermetricsservice/DBusUserData.cpp:88
227+#: src/usermetricsservice/DBusUserData.cpp:90
228 msgid "Attempt to create data set owned by another user"
229 msgstr ""
230
231-#: src/usermetricsservice/DBusUserData.cpp:99
232+#: src/usermetricsservice/DBusUserData.cpp:101
233 msgid "Attempt to create data set owned by another application"
234 msgstr ""
235
236-#: src/usermetricsservice/DBusUserData.cpp:110
237+#: src/usermetricsservice/DBusUserData.cpp:112
238 msgid "Data set query failed"
239 msgstr ""
240
241-#: src/usermetricsservice/DBusUserData.cpp:133
242+#: src/usermetricsservice/DBusUserData.cpp:135
243 msgid "New data set could not be found"
244 msgstr ""
245
246@@ -141,7 +141,7 @@
247 msgid "No data sources available"
248 msgstr ""
249
250-#: src/libusermetricsoutput/UserMetricsImpl.cpp:260
251+#: src/libusermetricsoutput/UserMetricsImpl.cpp:255
252 msgid "Data source not found"
253 msgstr ""
254
255
256=== modified file 'src/libusermetricsoutput/SyncedUserData.cpp'
257--- src/libusermetricsoutput/SyncedUserData.cpp 2013-09-04 13:44:30 +0000
258+++ src/libusermetricsoutput/SyncedUserData.cpp 2013-10-22 08:55:27 +0000
259@@ -45,13 +45,14 @@
260 m_userDatas.insert(interface);
261
262 connect(interface.data(),
263- SIGNAL(dataSetAdded(const QString &, const QDBusObjectPath &)),
264- this, SLOT(addDataSet(const QString &, const QDBusObjectPath &)));
265+ SIGNAL(dataSetAdded(const QDBusObjectPath &, const QDBusObjectPath &)),
266+ this,
267+ SLOT(addDataSet(const QDBusObjectPath &, const QDBusObjectPath &)));
268
269 connect(interface.data(),
270- SIGNAL(dataSetRemoved(const QString &, const QDBusObjectPath &)),
271+ SIGNAL(dataSetRemoved(const QDBusObjectPath &, const QDBusObjectPath &)),
272 this,
273- SLOT(removeDataSet(const QString &, const QDBusObjectPath &)));
274+ SLOT(removeDataSet(const QDBusObjectPath &, const QDBusObjectPath &)));
275
276 for (const QDBusObjectPath &path : interface->dataSets()) {
277
278@@ -59,29 +60,30 @@
279 new canonical::usermetrics::DataSet(DBusPaths::serviceName(),
280 path.path(), interface->connection()));
281
282- QString dataSourceId(dataSet->dataSource());
283- insert(dataSourceId,
284+ QString dataSourcePath(dataSet->dataSource().path());
285+ insert(dataSourcePath,
286 DataSetPtr(
287 new SyncedDataSet(dataSet,
288- m_userMetricsStore.dataSource(dataSourceId))));
289+ m_userMetricsStore.dataSource(
290+ dataSourcePath))));
291 }
292 }
293
294-void SyncedUserData::addDataSet(const QString &dataSourceName,
295+void SyncedUserData::addDataSet(const QDBusObjectPath &dataSourcePath,
296 const QDBusObjectPath &path) {
297 QSharedPointer<canonical::usermetrics::DataSet> dataSet(
298 new canonical::usermetrics::DataSet(DBusPaths::serviceName(),
299 path.path(), (*m_userDatas.begin())->connection()));
300
301- QString dataSourceId(dataSet->dataSource());
302- insert(dataSourceName,
303+ insert(dataSourcePath.path(),
304 DataSetPtr(
305 new SyncedDataSet(dataSet,
306- m_userMetricsStore.dataSource(dataSourceId))));
307+ m_userMetricsStore.dataSource(
308+ dataSourcePath.path()))));
309 }
310
311-void SyncedUserData::removeDataSet(const QString &dataSetName,
312+void SyncedUserData::removeDataSet(const QDBusObjectPath &dataSourcePath,
313 const QDBusObjectPath &path) {
314 Q_UNUSED(path);
315- m_dataSets.remove(dataSetName);
316+ m_dataSets.remove(dataSourcePath.path());
317 }
318
319=== modified file 'src/libusermetricsoutput/SyncedUserData.h'
320--- src/libusermetricsoutput/SyncedUserData.h 2013-09-04 13:44:30 +0000
321+++ src/libusermetricsoutput/SyncedUserData.h 2013-10-22 08:55:27 +0000
322@@ -41,9 +41,10 @@
323 QSharedPointer<com::canonical::usermetrics::UserData> interface);
324
325 public Q_SLOTS:
326- void addDataSet(const QString &dataSourceName, const QDBusObjectPath &path);
327+ void addDataSet(const QDBusObjectPath &dataSourcePath,
328+ const QDBusObjectPath &path);
329
330- void removeDataSet(const QString &dataSourceName,
331+ void removeDataSet(const QDBusObjectPath &dataSourcePath,
332 const QDBusObjectPath &path);
333
334 protected:
335
336=== modified file 'src/libusermetricsoutput/SyncedUserMetricsStore.cpp'
337--- src/libusermetricsoutput/SyncedUserMetricsStore.cpp 2013-09-04 13:44:30 +0000
338+++ src/libusermetricsoutput/SyncedUserMetricsStore.cpp 2013-10-22 08:55:27 +0000
339@@ -47,33 +47,23 @@
340 }
341
342 connect(&m_interface,
343- SIGNAL(dataSourceAdded(const QString &, const QDBusObjectPath &)),
344- this,
345- SLOT(addDataSource(const QString &, const QDBusObjectPath &)));
346-
347- connect(&m_interface,
348- SIGNAL(dataSourceRemoved(const QString &, const QDBusObjectPath &)),
349- this,
350- SLOT(removeDataSource(const QString &, const QDBusObjectPath &)));
351-
352- connect(&m_interface,
353- SIGNAL(userDataAdded(const QString &, const QDBusObjectPath &)),
354- this, SLOT(addUserData(const QString &, const QDBusObjectPath &)));
355-
356- connect(&m_interface,
357- SIGNAL(userDataRemoved(const QString &, const QDBusObjectPath &)),
358- this,
359- SLOT(removeUserData(const QString &, const QDBusObjectPath &)));
360+ SIGNAL(dataSourceAdded(const QDBusObjectPath &)), this,
361+ SLOT(addDataSource(const QDBusObjectPath &)));
362+
363+ connect(&m_interface,
364+ SIGNAL(dataSourceRemoved(const QDBusObjectPath &)), this,
365+ SLOT(removeDataSource(const QDBusObjectPath &)));
366+
367+ connect(&m_interface,
368+ SIGNAL(userDataAdded(const QString &, const QDBusObjectPath &)), this,
369+ SLOT(addUserData(const QString &, const QDBusObjectPath &)));
370+
371+ connect(&m_interface,
372+ SIGNAL(userDataRemoved(const QString &, const QDBusObjectPath &)), this,
373+ SLOT(removeUserData(const QString &, const QDBusObjectPath &)));
374
375 for (const QDBusObjectPath &path : m_interface.dataSources()) {
376-
377- QSharedPointer<canonical::usermetrics::DataSource> dataSource(
378- new canonical::usermetrics::DataSource(DBusPaths::serviceName(),
379- path.path(), m_interface.connection()));
380-
381- QString name(dataSource->name());
382- insert(name,
383- DataSourcePtr(new SyncedDataSource(dataSource, m_localeDir)));
384+ addDataSource(path);
385 }
386
387 QSharedPointer<canonical::usermetrics::UserData> systemData;
388@@ -137,18 +127,16 @@
389 m_dataSources.remove(username);
390 }
391
392-void SyncedUserMetricsStore::addDataSource(const QString &name,
393- const QDBusObjectPath &path) {
394+void SyncedUserMetricsStore::addDataSource(const QDBusObjectPath &path) {
395
396 QSharedPointer<canonical::usermetrics::DataSource> dataSource(
397 new canonical::usermetrics::DataSource(DBusPaths::serviceName(),
398 path.path(), m_interface.connection()));
399
400- insert(name, DataSourcePtr(new SyncedDataSource(dataSource, m_localeDir)));
401+ insert(path.path(),
402+ DataSourcePtr(new SyncedDataSource(dataSource, m_localeDir)));
403 }
404
405-void SyncedUserMetricsStore::removeDataSource(const QString &name,
406- const QDBusObjectPath &path) {
407- Q_UNUSED(path);
408- m_userData.remove(name);
409+void SyncedUserMetricsStore::removeDataSource(const QDBusObjectPath &path) {
410+ m_userData.remove(path.path());
411 }
412
413=== modified file 'src/libusermetricsoutput/SyncedUserMetricsStore.h'
414--- src/libusermetricsoutput/SyncedUserMetricsStore.h 2013-09-04 13:44:30 +0000
415+++ src/libusermetricsoutput/SyncedUserMetricsStore.h 2013-10-22 08:55:27 +0000
416@@ -42,9 +42,9 @@
417
418 void removeUserData(const QString &username, const QDBusObjectPath &path);
419
420- void addDataSource(const QString &username, const QDBusObjectPath &path);
421+ void addDataSource(const QDBusObjectPath &path);
422
423- void removeDataSource(const QString &username, const QDBusObjectPath &path);
424+ void removeDataSource(const QDBusObjectPath &path);
425
426 void sync();
427
428
429=== modified file 'src/libusermetricsoutput/UserMetricsImpl.cpp'
430--- src/libusermetricsoutput/UserMetricsImpl.cpp 2013-08-08 14:44:26 +0000
431+++ src/libusermetricsoutput/UserMetricsImpl.cpp 2013-10-22 08:55:27 +0000
432@@ -238,12 +238,7 @@
433 // the data is out of date
434 }
435
436- const QString &dataSetId(m_dataSetIterator.key());
437- ColorThemePtrPair colorTheme(
438- m_colorThemeProvider->getColorTheme(dataSetId));
439- m_firstColor->setColors(*colorTheme.first);
440- m_secondColor->setColors(*colorTheme.second);
441-
442+ const QString &dataSourcePath(m_dataSetIterator.key());
443 const QVariantList &data(m_dataSet->data());
444
445 QVariantList::const_iterator dataIndex(data.begin());
446@@ -255,17 +250,22 @@
447 updateMonth(*m_secondMonth, valuesToCopyForSecondMonth,
448 secondMonthDate.daysInMonth(), dataIndex, end);
449
450- DataSourcePtr dataSource(m_userMetricsStore->dataSource(dataSetId));
451+ DataSourcePtr dataSource(m_userMetricsStore->dataSource(dataSourcePath));
452 if (dataSource.isNull()) {
453- qWarning() << _("Data source not found") << " [" << dataSetId << "]";
454+ qWarning() << _("Data source not found") << " [" << dataSourcePath << "]";
455 } else {
456+ ColorThemePtrPair colorTheme(
457+ m_colorThemeProvider->getColorTheme(dataSourcePath));
458+ m_firstColor->setColors(*colorTheme.first);
459+ m_secondColor->setColors(*colorTheme.second);
460+
461 if (data.empty() || currentDate != lastUpdated
462 || m_dataSet->head().isNull()) {
463 const QString &emptyDataString = dataSource->emptyDataString();
464 if (emptyDataString.isEmpty()) {
465 QString empty(_("No data for today"));
466 empty.append(" (");
467- empty.append(dataSetId);
468+ empty.append(dataSourcePath);
469 empty.append(")");
470 setLabel(empty);
471 } else {
472
473=== modified file 'src/libusermetricsoutput/UserMetricsStore.cpp'
474--- src/libusermetricsoutput/UserMetricsStore.cpp 2013-07-17 11:40:21 +0000
475+++ src/libusermetricsoutput/UserMetricsStore.cpp 2013-10-22 08:55:27 +0000
476@@ -43,8 +43,8 @@
477 return it;
478 }
479
480-DataSourcePtr UserMetricsStore::dataSource(const QString &name) {
481- return m_dataSources.value(name);
482+DataSourcePtr UserMetricsStore::dataSource(const QString &path) {
483+ return m_dataSources.value(path);
484 }
485
486 void UserMetricsStore::insert(const QString &name, DataSourcePtr dataSource) {
487
488=== modified file 'src/libusermetricsoutput/UserMetricsStore.h'
489--- src/libusermetricsoutput/UserMetricsStore.h 2013-07-17 11:40:21 +0000
490+++ src/libusermetricsoutput/UserMetricsStore.h 2013-10-22 08:55:27 +0000
491@@ -50,7 +50,7 @@
492
493 virtual void insert(const QString &name, DataSourcePtr dataSource);
494
495- virtual DataSourcePtr dataSource(const QString &name);
496+ virtual DataSourcePtr dataSource(const QString &path);
497
498 Q_SIGNALS:
499 void userDataAdded(const QString &username, UserDataPtr userData);
500
501=== modified file 'src/usermetricsservice/DBusDataSet.cpp'
502--- src/usermetricsservice/DBusDataSet.cpp 2013-09-24 16:33:47 +0000
503+++ src/usermetricsservice/DBusDataSet.cpp 2013-10-22 08:55:27 +0000
504@@ -216,6 +216,6 @@
505 return m_path;
506 }
507
508-QString DBusDataSet::dataSource() const {
509- return m_dataSource;
510+QDBusObjectPath DBusDataSet::dataSource() const {
511+ return QDBusObjectPath(m_dataSource);
512 }
513
514=== modified file 'src/usermetricsservice/DBusDataSet.h'
515--- src/usermetricsservice/DBusDataSet.h 2013-09-24 11:26:56 +0000
516+++ src/usermetricsservice/DBusDataSet.h 2013-10-22 08:55:27 +0000
517@@ -24,6 +24,7 @@
518 #include <QtCore/QScopedPointer>
519 #include <QtDBus/QDBusContext>
520 #include <QtDBus/QDBusConnection>
521+#include <QtDBus/QDBusObjectPath>
522
523 class DataSetAdaptor;
524
525@@ -46,7 +47,7 @@
526
527 Q_PROPERTY(uint lastUpdated READ lastUpdated)
528
529-Q_PROPERTY(QString dataSource READ dataSource)
530+Q_PROPERTY(QDBusObjectPath dataSource READ dataSource)
531
532 public:
533 DBusDataSet(int id, const QString &dataSource,
534@@ -58,7 +59,7 @@
535
536 QString path() const;
537
538- QString dataSource() const;
539+ QDBusObjectPath dataSource() const;
540
541 int id() const;
542
543
544=== modified file 'src/usermetricsservice/DBusUserData.cpp'
545--- src/usermetricsservice/DBusUserData.cpp 2013-10-01 10:22:38 +0000
546+++ src/usermetricsservice/DBusUserData.cpp 2013-10-22 08:55:27 +0000
547@@ -19,8 +19,10 @@
548 #include <stdexcept>
549
550 #include <usermetricsservice/Authentication.h>
551+#include <usermetricsservice/DBusUserMetrics.h>
552 #include <usermetricsservice/DBusUserData.h>
553 #include <usermetricsservice/DBusDataSet.h>
554+#include <usermetricsservice/DBusDataSource.h>
555 #include <usermetricsservice/UserDataAdaptor.h>
556 #include <usermetricsservice/database/DataSet.h>
557 #include <usermetricsservice/database/DataSource.h>
558@@ -146,11 +148,14 @@
559 dataSetIds << id;
560 // if we don't have a local cache
561 if (!m_dataSets.contains(id)) {
562+ DBusDataSourcePtr dbusDataSource(
563+ m_userMetrics.dataSource(dataSet.dataSource()->name(),
564+ dataSet.dataSource()->secret()));
565 DBusDataSetPtr dbusDataSet(
566- new DBusDataSet(id, dataSet.dataSource()->name(),
567+ new DBusDataSet(id, dbusDataSource->path(),
568 m_dbusConnection, m_dateFactory, m_authentication));
569 m_dataSets.insert(id, dbusDataSet);
570- m_adaptor->dataSetAdded(dbusDataSet->dataSource(),
571+ m_adaptor->dataSetAdded(QDBusObjectPath(dbusDataSet->dataSource()),
572 QDBusObjectPath(dbusDataSet->path()));
573 }
574 }
575@@ -159,7 +164,7 @@
576 QSet<int> &toRemove(cachedDataSetIds.subtract(dataSetIds));
577 for (int id : toRemove) {
578 DBusDataSetPtr dataSet = m_dataSets.take(id);
579- m_adaptor->dataSetRemoved(dataSet->dataSource(),
580+ m_adaptor->dataSetRemoved(QDBusObjectPath(dataSet->dataSource()),
581 QDBusObjectPath(dataSet->path()));
582 }
583 }
584
585=== modified file 'src/usermetricsservice/DBusUserMetrics.cpp'
586--- src/usermetricsservice/DBusUserMetrics.cpp 2013-10-01 10:40:17 +0000
587+++ src/usermetricsservice/DBusUserMetrics.cpp 2013-10-22 08:55:27 +0000
588@@ -82,7 +82,7 @@
589 new DBusDataSource(id, dataSource.name(),
590 m_dbusConnection));
591 m_dataSources.insert(id, dbusDataSource);
592- m_adaptor->dataSourceAdded(dbusDataSource->name(),
593+ m_adaptor->dataSourceAdded(
594 QDBusObjectPath(dbusDataSource->path()));
595 }
596 }
597@@ -92,8 +92,7 @@
598 QSet<int> &toRemove(cachedDataSourceNames.subtract(dataSourceNames));
599 for (int id : toRemove) {
600 DBusDataSourcePtr dataSource(m_dataSources.take(id));
601- m_adaptor->dataSourceRemoved(dataSource->name(),
602- QDBusObjectPath(dataSource->path()));
603+ m_adaptor->dataSourceRemoved(QDBusObjectPath(dataSource->path()));
604 }
605 }
606
607
608=== modified file 'tests/unit/libusermetricsoutput/TestSyncedUserMetricsStore.cpp'
609--- tests/unit/libusermetricsoutput/TestSyncedUserMetricsStore.cpp 2013-09-04 13:44:30 +0000
610+++ tests/unit/libusermetricsoutput/TestSyncedUserMetricsStore.cpp 2013-10-22 08:55:27 +0000
611@@ -71,7 +71,8 @@
612 connectionEstablishedSpy.wait();
613
614 {
615- DataSourcePtr dataSource(store.dataSource("data-source-one"));
616+ DataSourcePtr dataSource(store.dataSource(DBusPaths::dataSource(1)));
617+ ASSERT_FALSE(dataSource.isNull());
618 EXPECT_EQ(QString("format string one %1"), dataSource->formatString());
619 EXPECT_EQ(QString("empty data string one"),
620 dataSource->emptyDataString());
621@@ -79,7 +80,8 @@
622 }
623
624 {
625- DataSourcePtr dataSource(store.dataSource("data-source-two"));
626+ DataSourcePtr dataSource(store.dataSource(DBusPaths::dataSource(2)));
627+ ASSERT_FALSE(dataSource.isNull());
628 EXPECT_EQ(QString("format string two %1"), dataSource->formatString());
629 EXPECT_EQ(QString("empty data string two"),
630 dataSource->emptyDataString());
631@@ -103,7 +105,7 @@
632 connectionEstablishedSpy.wait();
633
634 {
635- DataSourcePtr dataSource(store.dataSource("data-source-one"));
636+ DataSourcePtr dataSource(store.dataSource(DBusPaths::dataSource(1)));
637 ASSERT_FALSE(dataSource.isNull());
638 EXPECT_EQ(QString("format string one %1"), dataSource->formatString());
639 EXPECT_EQ(QString("text-domain-one"), dataSource->textDomain());
640@@ -115,7 +117,7 @@
641 }
642
643 QSignalSpy spy(&userMetricsInterface,
644- SIGNAL(dataSourceAdded(const QString &, const QDBusObjectPath &)));
645+ SIGNAL(dataSourceAdded(const QDBusObjectPath &)));
646
647 QDBusObjectPath dataSourcePath2(
648 userMetricsInterface.createDataSource("data-source-two",
649@@ -126,7 +128,7 @@
650 spy.wait();
651
652 {
653- DataSourcePtr dataSource(store.dataSource("data-source-one"));
654+ DataSourcePtr dataSource(store.dataSource(DBusPaths::dataSource(1)));
655 ASSERT_FALSE(dataSource.isNull());
656 EXPECT_EQ(QString("format string one %1"), dataSource->formatString());
657 EXPECT_EQ(QString("no data source ones"),
658@@ -135,7 +137,7 @@
659 }
660
661 {
662- DataSourcePtr dataSource(store.dataSource("data-source-two"));
663+ DataSourcePtr dataSource(store.dataSource(DBusPaths::dataSource(2)));
664 ASSERT_FALSE(dataSource.isNull());
665 EXPECT_EQ(QString("format string two %1"), dataSource->formatString());
666 EXPECT_EQ(QString("no data source twos"),
667@@ -307,7 +309,7 @@
668 {
669 UserData::const_iterator dataSetIterator(userData->constBegin());
670 ASSERT_NE(dataSetIterator, userData->constEnd());
671- EXPECT_EQ(QString("twitter"), dataSetIterator.key());
672+ EXPECT_EQ(QString(DBusPaths::dataSource(1)), dataSetIterator.key());
673
674 ++dataSetIterator;
675 ASSERT_EQ(dataSetIterator, userData->constEnd());
676@@ -327,12 +329,12 @@
677 UserData::const_iterator dataSetIterator(userData->constBegin());
678
679 ASSERT_NE(dataSetIterator, userData->constEnd());
680- EXPECT_EQ(QString("facebook").toStdString(),
681+ EXPECT_EQ(DBusPaths::dataSource(1).toStdString(),
682 dataSetIterator.key().toStdString());
683
684 ++dataSetIterator;
685 ASSERT_NE(dataSetIterator, userData->constEnd());
686- EXPECT_EQ(QString("twitter"), dataSetIterator.key());
687+ EXPECT_EQ(DBusPaths::dataSource(2), dataSetIterator.key());
688
689 ++dataSetIterator;
690 ASSERT_EQ(dataSetIterator, userData->constEnd());
691@@ -404,21 +406,21 @@
692
693 UserData::const_iterator dataSetIterator(userData->constBegin());
694 ASSERT_NE(dataSetIterator, userData->constEnd());
695+ // twitter data set
696+ {
697+ DataSetPtr dataSet(*dataSetIterator);
698+ EXPECT_EQ(twitterExpected, dataSet->data());
699+ EXPECT_EQ(QDate::currentDate(), dataSet->lastUpdated());
700+ }
701+
702+ ++dataSetIterator;
703+ ASSERT_NE(dataSetIterator, userData->constEnd());
704 // battery data set
705 {
706 DataSetPtr dataSet(*dataSetIterator);
707 EXPECT_EQ(batteryExpected, dataSet->data());
708 EXPECT_EQ(QDate::currentDate(), dataSet->lastUpdated());
709 }
710-
711- ++dataSetIterator;
712- ASSERT_NE(dataSetIterator, userData->constEnd());
713- // twitter data set
714- {
715- DataSetPtr dataSet(*dataSetIterator);
716- EXPECT_EQ(twitterExpected, dataSet->data());
717- EXPECT_EQ(QDate::currentDate(), dataSet->lastUpdated());
718- }
719 }
720
721 } // namespace

Subscribers

People subscribed via source and target branches

to all changes: