1
=== modified file 'scope/store/i18n.h'
2
--- scope/store/i18n.h	2016-09-01 17:12:55 +0000
3
+++ scope/store/i18n.h	2016-09-15 17:01:59 +0000
4
@@ -60,4 +60,3 @@
5
60
}
60
}
6
61
61
7
62
#endif /* LIBERTINE_STORE_I18N_H_ */
62
#endif /* LIBERTINE_STORE_I18N_H_ */
8
63
9
64
63
10
=== added file 'scope/store/package.cpp'
11
--- scope/store/package.cpp	1970-01-01 00:00:00 +0000
12
+++ scope/store/package.cpp	2016-09-15 17:01:59 +0000
13
@@ -0,0 +1,52 @@
14
1
/*
15
2
 * Copyright 2016 Canonical Ltd.
16
3
 *
17
4
 * This program is free software: you can redistribute it and/or modify it under
18
5
 * the terms of the GNU General Public License, version 3, as published by the
19
6
 * Free Software Foundation.
20
7
 *
21
8
 * This program is distributed in the hope that it will be useful,
22
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
23
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
24
11
 * GNU General Public License for more details.
25
12
 *
26
13
 * You should have received a copy of the GNU General Public License
27
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
28
15
 */
29
16
#include "scope/store/package.h"
30
17
31
18
32
19
Libertine::Store::Package Libertine::Store::Package::
33
20
from_map(QVariantMap const& pkgMap)
34
21
{
35
22
  Package pkg;
36
23
  pkg.name = pkgMap["name"].toString().toStdString();
37
24
  pkg.summary = pkgMap["summary"].toString().toStdString();
38
25
  pkg.description = pkgMap["description"].toString().toStdString();
39
26
  pkg.icon = pkgMap["icon"].toString().toStdString();
40
27
  pkg.publisher = pkgMap["publisher"].toString().toStdString();
41
28
  pkg.website = pkgMap["website"].toString().toStdString();
42
29
  pkg.license = pkgMap["license"].toString().toStdString();
43
30
  pkg.id = pkgMap["id"].toString().toStdString();
44
31
45
32
  for (auto const& screenshot: pkgMap["screenshots"].toStringList())
46
33
  {
47
34
    pkg.screenshots.push_back(screenshot.toStdString());
48
35
  }
49
36
50
37
  return pkg;
51
38
}
52
39
53
40
54
41
QList<Libertine::Store::Package> Libertine::Store::Package::
55
42
from_map(QList<QVariantMap> const& pkgMap)
56
43
{
57
44
  QList<Package> pkgs;
58
45
59
46
  for (auto const& pkg: pkgMap)
60
47
  {
61
48
    pkgs << Package::from_map(pkg);
62
49
  }
63
50
64
51
  return pkgs;
65
52
}
66
0
53
67
=== added file 'scope/store/package.h'
68
--- scope/store/package.h	1970-01-01 00:00:00 +0000
69
+++ scope/store/package.h	2016-09-15 17:01:59 +0000
70
@@ -0,0 +1,57 @@
71
1
/*
72
2
 * Copyright 2016 Canonical Ltd.
73
3
 *
74
4
 * This program is free software: you can redistribute it and/or modify it under
75
5
 * the terms of the GNU General Public License, version 3, as published by the
76
6
 * Free Software Foundation.
77
7
 *
78
8
 * This program is distributed in the hope that it will be useful,
79
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
80
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
81
11
 * GNU General Public License for more details.
82
12
 *
83
13
 * You should have received a copy of the GNU General Public License
84
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
85
15
 */
86
16
#ifndef LIBERTINE_STORE_PACKAGE_H_
87
17
#define LIBERTINE_STORE_PACKAGE_H_
88
18
89
19
90
20
#include <QList>
91
21
#include <QVariant>
92
22
93
23
94
24
namespace Libertine
95
25
{
96
26
namespace Store
97
27
{
98
28
99
29
100
30
class Package
101
31
{
102
32
public:
103
33
  explicit Package() = default;
104
34
  virtual ~Package() = default;
105
35
106
36
  static Package from_map(QVariantMap const&);
107
37
  static QList<Package> from_map(QList<QVariantMap> const&);
108
38
109
39
110
40
  std::string id;
111
41
  std::string name;
112
42
  std::string summary;
113
43
114
44
  std::string description;
115
45
  std::string icon;
116
46
  std::string publisher;
117
47
  std::string website;
118
48
  std::string license;
119
49
120
50
  std::vector<std::string> screenshots;
121
51
};
122
52
123
53
124
54
} // Store
125
55
} // Libertine
126
56
127
57
#endif // LIBERTINE_STORE_PACKAGE_H_
128
0
58
129
=== added file 'scope/store/preview.cpp'
130
--- scope/store/preview.cpp	1970-01-01 00:00:00 +0000
131
+++ scope/store/preview.cpp	2016-09-15 17:01:59 +0000
132
@@ -0,0 +1,220 @@
133
1
/*
134
2
 * Copyright 2016 Canonical Ltd.
135
3
 *
136
4
 * This program is free software: you can redistribute it and/or modify it under
137
5
 * the terms of the GNU General Public License, version 3, as published by the
138
6
 * Free Software Foundation.
139
7
 *
140
8
 * This program is distributed in the hope that it will be useful,
141
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
142
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
143
11
 * GNU General Public License for more details.
144
12
 *
145
13
 * You should have received a copy of the GNU General Public License
146
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
147
15
 */
148
16
#include "scope/store/preview.h"
149
17
150
18
151
19
#include "scope/store/i18n.h"
152
20
#include "scope/store/service_manager.h"
153
21
#include <unity/UnityExceptions.h>
154
22
#include <unity/scopes/ColumnLayout.h>
155
23
#include <unity/scopes/PreviewReply.h>
156
24
#include <unity/scopes/Variant.h>
157
25
#include <unity/scopes/VariantBuilder.h>
158
26
#include <unity/scopes/ActionMetadata.h>
159
27
#include <unity/scopes/Result.h>
160
28
#include <QDebug>
161
29
162
30
163
31
namespace usc = unity::scopes;
164
32
165
33
166
34
namespace
167
35
{
168
36
static auto constexpr HEADER_ID = "hdr";
169
37
static auto constexpr ACTIONS_ID = "buttons";
170
38
static auto constexpr METADATA_ID = "other_metadata";
171
39
static auto constexpr SUMMARY_ID = "summary";
172
40
static auto constexpr SCREENSHOTS_ID = "screenshots";
173
41
static auto const SUMMARY_TITLE = _("Info");
174
42
static auto const ACTION_INSTALL = _("Install");
175
43
static auto const METADATA_PUBLISHER = _("Publisher/Creator");
176
44
static auto const METADATA_WEBSITE = _("Website");
177
45
static auto const METADATA_LICENSE = _("License");
178
46
179
47
180
48
static usc::PreviewWidgetList
181
49
headerWidgets(Libertine::Store::Package const& app)
182
50
{
183
51
  usc::PreviewWidget header(HEADER_ID, "header");
184
52
  header.add_attribute_value("title", usc::Variant(app.name));
185
53
  header.add_attribute_value("subtitle", usc::Variant(app.summary));
186
54
  header.add_attribute_value("mascot", usc::Variant(app.icon));
187
55
  header.add_attribute_value("fallback", usc::Variant("image://theme/placeholder-app-icon"));
188
56
189
57
  usc::PreviewWidgetList widgets;
190
58
  widgets.push_back(header);
191
59
192
60
  qDebug() << "Pushed widgets for package:" << QString::fromStdString(app.name);
193
61
  return widgets;
194
62
}
195
63
196
64
197
65
static usc::PreviewWidget
198
66
metadataWidgets(Libertine::Store::Package const& app)
199
67
{
200
68
  usc::PreviewWidget widget(METADATA_ID, "table");
201
69
  usc::VariantArray values;
202
70
  if (!app.publisher.empty())
203
71
  {
204
72
    values.push_back(usc::Variant{usc::VariantArray{usc::Variant{METADATA_PUBLISHER}, usc::Variant{app.publisher}}});
205
73
  }
206
74
  if (!app.website.empty())
207
75
  {
208
76
    values.push_back(usc::Variant{usc::VariantArray{usc::Variant{METADATA_WEBSITE}, usc::Variant{app.website}}});
209
77
  }
210
78
  if (!app.license.empty())
211
79
  {
212
80
    values.push_back(usc::Variant{usc::VariantArray{usc::Variant{METADATA_LICENSE}, usc::Variant{app.license}}});
213
81
  }
214
82
215
83
  widget.add_attribute_value("values", usc::Variant(values));
216
84
  return widget;
217
85
}
218
86
219
87
220
88
static usc::PreviewWidget
221
89
buttonWidgets(Libertine::Store::Package const&)
222
90
{
223
91
  usc::PreviewWidget buttons(ACTIONS_ID, "actions");
224
92
  usc::VariantBuilder builder;
225
93
  builder.add_tuple(
226
94
      {
227
95
          {"id", usc::Variant("install_xapp")},
228
96
          {"label", usc::Variant(ACTION_INSTALL)},
229
97
      });
230
98
  buttons.add_attribute_value("actions", builder.end());
231
99
  return buttons;
232
100
}
233
101
234
102
235
103
static usc::PreviewWidget
236
104
descriptionWidgets(Libertine::Store::Package const& app)
237
105
{
238
106
  usc::PreviewWidget summary(SUMMARY_ID, "text");
239
107
  summary.add_attribute_value("title", usc::Variant(SUMMARY_TITLE));
240
108
  summary.add_attribute_value("text", usc::Variant(app.description));
241
109
  return summary;
242
110
}
243
111
244
112
245
113
static usc::PreviewWidget
246
114
screenshotWidgets(Libertine::Store::Package const& app)
247
115
{
248
116
  usc::PreviewWidget gallery(SCREENSHOTS_ID, "gallery");
249
117
  usc::VariantArray arr;
250
118
  for (auto const& screenshot: app.screenshots)
251
119
  {
252
120
    arr.push_back(usc::Variant(screenshot));
253
121
  }
254
122
  gallery.add_attribute_value("sources", usc::Variant(arr));
255
123
  return gallery;
256
124
}
257
125
258
126
259
127
static usc::PreviewWidgetList
260
128
createWidgets(Libertine::Store::Package const& app)
261
129
{
262
130
  auto widgets = headerWidgets(app);
263
131
  widgets.push_back(buttonWidgets(app));
264
132
  widgets.push_back(metadataWidgets(app));
265
133
  if (!app.screenshots.empty())
266
134
  {
267
135
    widgets.push_back(screenshotWidgets(app));
268
136
  }
269
137
  widgets.push_back(descriptionWidgets(app));
270
138
271
139
  return widgets;
272
140
}
273
141
}
274
142
275
143
276
144
Libertine::Store::Preview::
277
145
Preview(usc::Result const&         result,
278
146
        usc::ActionMetadata const& metadata,
279
147
        std::shared_ptr<ServiceManager>  const& service)
280
148
  : PreviewQueryBase(result, metadata)
281
149
  , service_(service)
282
150
{
283
151
}
284
152
285
153
286
154
void Libertine::Store::Preview::
287
155
cancelled()
288
156
{
289
157
}
290
158
291
159
292
160
void Libertine::Store::Preview::
293
161
createSingleColumnLayout(Package const& app)
294
162
{
295
163
  oneColumn.column.push_back(HEADER_ID);
296
164
  oneColumn.column.push_back(ACTIONS_ID);
297
165
  oneColumn.column.push_back(METADATA_ID);
298
166
  if (!app.screenshots.empty())
299
167
  {
300
168
    oneColumn.column.push_back(SCREENSHOTS_ID);
301
169
  }
302
170
  oneColumn.column.push_back(SUMMARY_ID);
303
171
}
304
172
305
173
306
174
void Libertine::Store::Preview::
307
175
createDualColumnLayout(Package const& app)
308
176
{
309
177
  twoColumns.column1.push_back(HEADER_ID);
310
178
  twoColumns.column1.push_back(ACTIONS_ID);
311
179
  twoColumns.column1.push_back(SUMMARY_ID);
312
180
  twoColumns.column2.push_back(METADATA_ID);
313
181
  if (!app.screenshots.empty())
314
182
  {
315
183
    twoColumns.column2.push_back(SCREENSHOTS_ID);
316
184
  }
317
185
}
318
186
319
187
320
188
void Libertine::Store::Preview::
321
189
run(usc::PreviewReplyProxy const& reply)
322
190
{
323
191
  auto app = service_->app_info(QString::fromStdString(result()["id"].get_string()));
324
192
  auto widgets = createWidgets(app);
325
193
326
194
  createSingleColumnLayout(app);
327
195
  createDualColumnLayout(app);
328
196
329
197
  registerLayouts(reply);
330
198
  reply->push(widgets);
331
199
}
332
200
333
201
334
202
void Libertine::Store::Preview::
335
203
registerLayouts(unity::scopes::PreviewReplyProxy const& reply)
336
204
{
337
205
    usc::ColumnLayout layout1col(1);
338
206
    layout1col.add_column(oneColumn.column);
339
207
340
208
    usc::ColumnLayout layout2col(2);
341
209
    layout2col.add_column(twoColumns.column1);
342
210
    layout2col.add_column(twoColumns.column2);
343
211
344
212
    try
345
213
    {
346
214
        reply->register_layout({layout1col, layout2col});
347
215
    }
348
216
    catch (unity::LogicException const& e)
349
217
    {
350
218
        qWarning() << "Failed to register layout:" << QString::fromStdString(e.what());
351
219
    }
352
220
}
353
0
221
354
=== added file 'scope/store/preview.h'
355
--- scope/store/preview.h	1970-01-01 00:00:00 +0000
356
+++ scope/store/preview.h	2016-09-15 17:01:59 +0000
357
@@ -0,0 +1,74 @@
358
1
/*
359
2
 * Copyright 2016 Canonical Ltd.
360
3
 *
361
4
 * This program is free software: you can redistribute it and/or modify it under
362
5
 * the terms of the GNU General Public License, version 3, as published by the
363
6
 * Free Software Foundation.
364
7
 *
365
8
 * This program is distributed in the hope that it will be useful,
366
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
367
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
368
11
 * GNU General Public License for more details.
369
12
 *
370
13
 * You should have received a copy of the GNU General Public License
371
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
372
15
 */
373
16
#ifndef LIBERTINE_STORE_PREVIEW_H
374
17
#define LIBERTINE_STORE_PREVIEW_H
375
18
376
19
#include <unity/scopes/PreviewQueryBase.h>
377
20
378
21
379
22
namespace Libertine
380
23
{
381
24
namespace Store
382
25
{
383
26
384
27
385
28
class ServiceManager;
386
29
class Package;
387
30
388
31
389
32
class Preview
390
33
: public unity::scopes::PreviewQueryBase
391
34
{
392
35
public:
393
36
  explicit Preview(unity::scopes::Result const&           result,
394
37
                   unity::scopes::ActionMetadata const&   metadata,
395
38
                   std::shared_ptr<ServiceManager> const& service);
396
39
397
40
  virtual ~Preview() = default;
398
41
399
42
  virtual void
400
43
  cancelled() override;
401
44
402
45
  virtual void
403
46
  run(unity::scopes::PreviewReplyProxy const& reply) override;
404
47
405
48
private:
406
49
  void
407
50
  registerLayouts(unity::scopes::PreviewReplyProxy const& reply);
408
51
409
52
  void
410
53
  createSingleColumnLayout(Package const& app);
411
54
412
55
  void
413
56
  createDualColumnLayout(Package const& app);
414
57
415
58
  struct {
416
59
    std::vector<std::string> column;
417
60
  } oneColumn;
418
61
419
62
  struct {
420
63
    std::vector<std::string> column1;
421
64
    std::vector<std::string> column2;
422
65
  } twoColumns;
423
66
424
67
  std::shared_ptr<ServiceManager> service_;
425
68
};
426
69
427
70
428
71
}
429
72
}
430
73
431
74
#endif /* LIBERTINE_STORE_PREVIEW_H */
432
0
75
433
=== modified file 'scope/store/query.cpp'
434
--- scope/store/query.cpp	2016-09-01 15:58:02 +0000
435
+++ scope/store/query.cpp	2016-09-15 17:01:59 +0000
436
@@ -20,7 +20,6 @@
437
20
#include <unity/scopes/SearchReply.h>
20
#include <unity/scopes/SearchReply.h>
438
21
#include <unity/scopes/CategoryRenderer.h>
21
#include <unity/scopes/CategoryRenderer.h>
439
22
#include <unity/scopes/VariantBuilder.h>
22
#include <unity/scopes/VariantBuilder.h>
440
23
#include <sstream>
441
24
#include <QtDBus>
23
#include <QtDBus>
442
25
#include <QDebug>
24
#include <QDebug>
443
26
25
444
@@ -65,27 +64,9 @@
445
65
    }
64
    }
446
66
)";
65
)";
447
67
66
469
68
static std::string render_rating_stars(double rating)
67
470
69
{
68
static auto const SINGLE_RESULT_FOUND = _("%1 result found");
471
70
  std::ostringstream ss;
69
static auto const MULTIPLE_RESULTS_FOUND = _("%1 results found");
451
71
  int rounded;
452
72
453
73
  if (rating < 0.0f) {
454
74
    rounded = 0;
455
75
  } else if (rating > 5.0f) {
456
76
    rounded = 5;
457
77
  } else {
458
78
    rounded = floor(rating);
459
79
  }
460
80
461
81
  for (int i = 0; i < rounded; i++) {
462
82
    ss << "★";
463
83
  }
464
84
  for (int j = 0; j < 5 - rounded; j++) {
465
85
    ss << "☆";
466
86
  }
467
87
  return ss.str();
468
88
}
472
89
}
70
}
473
90
71
474
91
72
475
@@ -94,9 +75,9 @@
476
94
75
477
95
76
478
96
Libertine::Store::Query::
77
Libertine::Store::Query::
482
97
Query(usc::CannedQuery const&                query,
78
Query(usc::CannedQuery                 const&    query,
483
98
      usc::SearchMetadata const&             metadata,
79
      usc::SearchMetadata              const& metadata,
484
99
      std::shared_ptr<ServiceManager> const& service)
80
      std::shared_ptr<ServiceManager>  const& service)
485
100
  : usc::SearchQueryBase(query, metadata)
81
  : usc::SearchQueryBase(query, metadata)
486
101
  , service_(service)
82
  , service_(service)
487
102
{
83
{
488
@@ -139,20 +120,15 @@
489
139
  for (auto const& result: results)
120
  for (auto const& result: results)
490
140
  {
121
  {
491
141
    usc::CategorisedResult cr(category);
122
    usc::CategorisedResult cr(category);
503
142
    cr.set_title(result.toStdString());
123
    cr.set_title(result.name);
504
143
    cr["subtitle"] = "Publisher Placeholder";
124
    cr["subtitle"] = result.summary;
505
144
    cr["rating"] = render_rating_stars(3);
125
    cr["id"] = result.id;
506
145
126
    cr.set_art(result.icon);
507
146
    usc::VariantBuilder builder;
127
    cr.set_uri("appid://" + result.id);
508
147
    builder.add_tuple({
128
498
148
            {"value", cr["rating"]},
499
149
        });
500
150
    cr["attributes"] = builder.end();
501
151
502
152
    cr.set_uri(self_uri);
509
153
    if (!reply->push(cr))
129
    if (!reply->push(cr))
510
154
    {
130
    {
512
155
      qCritical() << "Error while adding result " << result;
131
      qCritical() << "Error while adding result " << QString::fromStdString(result.name);
513
156
      return;
132
      return;
514
157
    }
133
    }
515
158
  }
134
  }
516
159
135
517
=== modified file 'scope/store/query.h'
518
--- scope/store/query.h	2016-07-18 20:41:41 +0000
519
+++ scope/store/query.h	2016-09-15 17:01:59 +0000
520
@@ -16,7 +16,7 @@
521
16
#ifndef LIBERTINE_STORE_QUERY_H_
16
#ifndef LIBERTINE_STORE_QUERY_H_
522
17
#define LIBERTINE_STORE_QUERY_H_
17
#define LIBERTINE_STORE_QUERY_H_
523
18
18
525
19
#include "scope/store/service_manager.h"
19
526
20
#include <unity/scopes/ReplyProxyFwd.h>
20
#include <unity/scopes/ReplyProxyFwd.h>
527
21
#include <unity/scopes/SearchQueryBase.h>
21
#include <unity/scopes/SearchQueryBase.h>
528
22
22
529
@@ -28,6 +28,8 @@
530
28
namespace Store
28
namespace Store
531
29
{
29
{
532
30
30
533
31
class ServiceManager;
534
32
535
31
/**
33
/**
536
32
 * Engine to run a specific store query.
34
 * Engine to run a specific store query.
537
33
 */
35
 */
538
34
36
539
=== modified file 'scope/store/scope.cpp'
540
--- scope/store/scope.cpp	2016-08-04 14:56:27 +0000
541
+++ scope/store/scope.cpp	2016-09-15 17:01:59 +0000
542
@@ -20,7 +20,9 @@
543
20
#include "scope/store/scope.h"
20
#include "scope/store/scope.h"
544
21
21
545
22
#include "scope/store/i18n.h"
22
#include "scope/store/i18n.h"
546
23
#include "scope/store/preview.h"
547
23
#include "scope/store/query.h"
24
#include "scope/store/query.h"
548
25
#include "scope/store/service_manager.h"
549
24
26
550
25
27
551
26
namespace usc = unity::scopes;
28
namespace usc = unity::scopes;
552
@@ -45,8 +47,8 @@
553
45
47
554
46
48
555
47
usc::PreviewQueryBase::UPtr Libertine::Store::Scope::
49
usc::PreviewQueryBase::UPtr Libertine::Store::Scope::
558
48
preview(usc::Result const&,
50
preview(usc::Result const&         result,
559
49
        usc::ActionMetadata const&)
51
        usc::ActionMetadata const& metadata)
560
50
{
52
{
562
51
  return usc::PreviewQueryBase::UPtr();
53
  return usc::PreviewQueryBase::UPtr(new Preview(result, metadata, std::make_shared<ServiceManager>()));
563
52
}
54
}
564
53
55
565
=== modified file 'scope/store/service_manager.cpp'
566
--- scope/store/service_manager.cpp	2016-08-31 17:59:10 +0000
567
+++ scope/store/service_manager.cpp	2016-09-15 17:01:59 +0000
568
@@ -17,20 +17,36 @@
569
17
17
570
18
#include <QtDBus>
18
#include <QtDBus>
571
19
#include <QDebug>
19
#include <QDebug>
572
20
#include <QDBusMetaType>
573
20
21
574
21
namespace
22
namespace
575
22
{
23
{
576
23
constexpr auto SEARCH_CACHE_METHOD = "search";
24
constexpr auto SEARCH_CACHE_METHOD = "search";
577
25
constexpr auto APP_INFO_METHOD = "app_info";
578
24
constexpr auto LIBERTINE_SERVICE_DESTINATION = "com.canonical.libertine.ContainerManager";
26
constexpr auto LIBERTINE_SERVICE_DESTINATION = "com.canonical.libertine.ContainerManager";
579
25
constexpr auto LIBERTINE_SERVICE_INTERFACE = "com.canonical.libertine.ContainerManager";
27
constexpr auto LIBERTINE_SERVICE_INTERFACE = "com.canonical.libertine.ContainerManager";
580
26
constexpr auto LIBERTINE_SERVICE_OBJECT = "/Manager";
28
constexpr auto LIBERTINE_SERVICE_OBJECT = "/Manager";
581
27
}
29
}
582
28
30
583
29
31
585
30
QStringList Libertine::Store::ServiceManager::
32
Libertine::Store::ServiceManager::
586
33
ServiceManager()
587
34
{
588
35
  qDBusRegisterMetaType<QList<QVariantMap > >();
589
36
}
590
37
591
38
592
39
Libertine::Store::Package Libertine::Store::ServiceManager::
593
40
app_info(const QString &app_id) const
594
41
{
595
42
  return Package::from_map(call<QVariantMap >(APP_INFO_METHOD, QVariant(app_id)));
596
43
}
597
44
598
45
599
46
QList<Libertine::Store::Package> Libertine::Store::ServiceManager::
600
31
search_cache(const QString &query) const
47
search_cache(const QString &query) const
601
32
{
48
{
603
33
  return call<QStringList>(SEARCH_CACHE_METHOD, QVariant(query));
49
  return Package::from_map(call<QList<QVariantMap > >(SEARCH_CACHE_METHOD, QVariant(query)));
604
34
}
50
}
605
35
51
606
36
52
607
@@ -62,7 +78,3 @@
608
62
  return QDBusConnection::sessionBus().isConnected();
78
  return QDBusConnection::sessionBus().isConnected();
609
63
}
79
}
610
64
80
611
65
612
66
// explicit template declarations so we can define template in implementation file
613
67
template QStringList Libertine::Store::ServiceManager::
614
68
call<QStringList>(QString const&, QVariant const&) const;
615
69
81
616
=== modified file 'scope/store/service_manager.h'
617
--- scope/store/service_manager.h	2016-07-18 20:41:41 +0000
618
+++ scope/store/service_manager.h	2016-09-15 17:01:59 +0000
619
@@ -13,13 +13,15 @@
620
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU General Public License
621
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
622
15
 */
15
 */
623
16
624
17
#ifndef SERVICE_MANAGER_H
16
#ifndef SERVICE_MANAGER_H
625
18
#define SERVICE_MANAGER_H
17
#define SERVICE_MANAGER_H
626
19
18
627
19
#include "scope/store/package.h"
628
20
629
20
#include <QString>
21
#include <QString>
630
21
#include <QVariant>
22
#include <QVariant>
631
22
23
632
24
633
23
namespace Libertine
25
namespace Libertine
634
24
{
26
{
635
25
namespace Store
27
namespace Store
636
@@ -29,10 +31,11 @@
637
29
class ServiceManager
31
class ServiceManager
638
30
{
32
{
639
31
public:
33
public:
641
32
  ServiceManager() = default;
34
  explicit ServiceManager();
642
33
  virtual ~ServiceManager() = default;
35
  virtual ~ServiceManager() = default;
643
34
36
645
35
  virtual QStringList search_cache(QString const& query) const;
37
  virtual QList<Package> search_cache(QString const& query) const;
646
38
  virtual Package app_info(QString const& app_id) const;
647
36
39
648
37
private:
40
private:
649
38
  bool valid() const;
41
  bool valid() const;
650
@@ -45,4 +48,5 @@
651
45
} // namespace Libertine
48
} // namespace Libertine
652
46
} // namespace Store
49
} // namespace Store
653
47
50
654
51
655
48
#endif // SERVICE_MANAGER_H
52
#endif // SERVICE_MANAGER_H
656
49
53
657
=== modified file 'service/libertine_service/apt.py'
658
--- service/libertine_service/apt.py	2016-07-18 20:41:41 +0000
659
+++ service/libertine_service/apt.py	2016-09-15 17:01:59 +0000
660
@@ -15,7 +15,7 @@
661
15
import apt
15
import apt
662
16
import glob
16
import glob
663
17
import os
17
import os
665
18
18
import re
666
19
19
667
20
def _use_system_gpg():
20
def _use_system_gpg():
668
21
    """ Configures APT to use the system-wide GPG store.  Always."""
21
    """ Configures APT to use the system-wide GPG store.  Always."""
669
@@ -28,12 +28,10 @@
670
28
    sources_path = os.path.join('/etc', 'apt')
28
    sources_path = os.path.join('/etc', 'apt')
671
29
    sources_list = glob.glob(os.path.join(sources_path, 'sources.list.d', '*.list'))
29
    sources_list = glob.glob(os.path.join(sources_path, 'sources.list.d', '*.list'))
672
30
    sources_list.append(os.path.join(sources_path, 'sources.list'))
30
    sources_list.append(os.path.join(sources_path, 'sources.list'))
673
31
674
32
    sources = ''
31
    sources = ''
675
33
    for source in sources_list:
32
    for source in sources_list:
676
34
        with open(source) as f:
33
        with open(source) as f:
677
35
            sources += f.read()
34
            sources += f.read()
678
36
679
37
    return sources
35
    return sources
680
38
36
681
39
37
682
@@ -61,10 +59,45 @@
683
61
    return apt_cache
59
    return apt_cache
684
62
60
685
63
61
687
64
def get_apt_cache(config):
62
def _get_apt_cache(config):
688
65
    """ Factory function to get the APT cache obejct. """
63
    """ Factory function to get the APT cache obejct. """
689
66
    _use_system_gpg()
64
    _use_system_gpg()
690
67
    if config.use_local_cache:
65
    if config.use_local_cache:
691
68
        return _get_local_apt_cache()
66
        return _get_local_apt_cache()
692
69
    else:
67
    else:
693
70
        return apt.Cache()
68
        return apt.Cache()
694
69
695
70
class AptCache(object):
696
71
    """docstring for AptCache"""
697
72
    def __init__(self, config):
698
73
        super(AptCache, self).__init__()
699
74
        self.config = config
700
75
701
76
    def search(self, query):
702
77
        apps = []
703
78
704
79
        cache = _get_apt_cache(self.config)
705
80
        pkg_keys = [key for key in cache.keys() if re.match(query, key)]
706
81
        for key in pkg_keys:
707
82
            app = {}
708
83
            app["name"] = cache[key].name
709
84
            app["id"] = cache[key].name
710
85
            if len(cache[key].versions) > 0:
711
86
                app["summary"] = cache[key].versions[0].summary
712
87
                app["website"] = cache[key].versions[0].homepage
713
88
            apps.append(app)
714
89
        return apps
715
90
716
91
    def app_info(self, app_id):
717
92
        app_data = {}
718
93
        cache = _get_apt_cache(self.config)
719
94
        if app_id in cache:
720
95
            app = cache[app_id]
721
96
            app_data["name"] = app.name
722
97
            app_data["id"] = app.name
723
98
            if len(app.versions) > 0:
724
99
                app_data["summary"] = app.versions[0].summary
725
100
                app_data["website"] = app.versions[0].homepage
726
101
            app_data["description"] = app.versions[0].description
727
102
728
103
        return app_data
729
71
104
730
=== modified file 'service/libertine_service/dbus.py'
731
--- service/libertine_service/dbus.py	2016-08-31 16:57:31 +0000
732
+++ service/libertine_service/dbus.py	2016-09-15 17:01:59 +0000
733
@@ -15,7 +15,6 @@
734
15
import dbus
15
import dbus
735
16
import dbus.service
16
import dbus.service
736
17
import logging
17
import logging
737
18
import re
738
19
from libertine_service import apt
18
from libertine_service import apt
739
20
from dbus.mainloop.glib import DBusGMainLoop
19
from dbus.mainloop.glib import DBusGMainLoop
740
21
20
741
@@ -31,7 +30,7 @@
742
31
30
743
32
    def __init__(self, config):
31
    def __init__(self, config):
744
33
        log.info("creating service")
32
        log.info("creating service")
746
34
        self.config = config
33
        self.cache = apt.AptCache(config)
747
35
        DBusGMainLoop(set_as_default=True)
34
        DBusGMainLoop(set_as_default=True)
748
36
        try:
35
        try:
749
37
            bus_name = dbus.service.BusName(LIBERTINE_SERVICE_NAME,
36
            bus_name = dbus.service.BusName(LIBERTINE_SERVICE_NAME,
750
@@ -62,11 +61,17 @@
751
62
61
752
63
    @dbus.service.method(LIBERTINE_STORE_INTERFACE,
62
    @dbus.service.method(LIBERTINE_STORE_INTERFACE,
753
64
                         in_signature='s',
63
                         in_signature='s',
755
65
                         out_signature='as')
64
                         out_signature='aa{sv}')
756
66
    def search(self, search_string):
65
    def search(self, search_string):
757
67
        log.debug("search('{}') called".format(search_string))
66
        log.debug("search('{}') called".format(search_string))
760
68
        cache = apt.get_apt_cache(self.config)
67
        return self.cache.search(search_string)
761
69
        return {k: cache[k] for k in cache.keys() if re.match(search_string, k)}
68
762
69
    @dbus.service.method(LIBERTINE_STORE_INTERFACE,
763
70
                         in_signature='s',
764
71
                         out_signature='a{sv}')
765
72
    def app_info(self, app_id):
766
73
        log.debug("app_info('{}') called".format(app_id))
767
74
        return self.cache.app_info(app_id)
768
70
75
769
71
    @dbus.service.signal(LIBERTINE_STORE_INTERFACE,
76
    @dbus.service.signal(LIBERTINE_STORE_INTERFACE,
770
72
                         signature='su')
77
                         signature='su')
771
73
78
772
=== modified file 'tests/scope/apps/test_preview.cpp'
773
--- tests/scope/apps/test_preview.cpp	2016-07-18 13:53:20 +0000
774
+++ tests/scope/apps/test_preview.cpp	2016-09-15 17:01:59 +0000
775
@@ -22,7 +22,6 @@
776
22
#include <unity/scopes/testing/MockPreviewReply.h>
22
#include <unity/scopes/testing/MockPreviewReply.h>
777
23
#include <unity/scopes/PreviewWidget.h>
23
#include <unity/scopes/PreviewWidget.h>
778
24
#include <memory>
24
#include <memory>
779
25
#include <QDir>
780
26
25
781
27
26
782
28
TEST(TestPreview, pushesWidgetsWithAppInformation)
27
TEST(TestPreview, pushesWidgetsWithAppInformation)
783
29
28
784
=== modified file 'tests/scope/store/CMakeLists.txt'
785
--- tests/scope/store/CMakeLists.txt	2016-07-19 14:18:12 +0000
786
+++ tests/scope/store/CMakeLists.txt	2016-09-15 17:01:59 +0000
787
@@ -1,5 +1,6 @@
788
1
function(create_test test_name test_file)
1
function(create_test test_name test_file)
789
2
  add_executable(${test_name}_exe
2
  add_executable(${test_name}_exe
790
3
    mock_service_manager.h
791
3
    ${test_file}.cpp
4
    ${test_file}.cpp
792
4
  )
5
  )
793
5
6
794
@@ -15,3 +16,5 @@
795
15
endfunction(create_test)
16
endfunction(create_test)
796
16
17
797
17
create_test(test_store_query test_query)
18
create_test(test_store_query test_query)
798
19
create_test(test_store_preview test_preview)
799
20
create_test(test_store_package test_package)
800
18
21
801
=== added file 'tests/scope/store/mock_service_manager.h'
802
--- tests/scope/store/mock_service_manager.h	1970-01-01 00:00:00 +0000
803
+++ tests/scope/store/mock_service_manager.h	2016-09-15 17:01:59 +0000
804
@@ -0,0 +1,46 @@
805
1
/*
806
2
 * Copyright 2016 Canonical Ltd.
807
3
 *
808
4
 * This program is free software: you can redistribute it and/or modify it under
809
5
 * the terms of the GNU General Public License, version 3, as published by the
810
6
 * Free Software Foundation.
811
7
 *
812
8
 * This program is distributed in the hope that it will be useful,
813
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
814
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
815
11
 * GNU General Public License for more details.
816
12
 *
817
13
 * You should have received a copy of the GNU General Public License
818
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
819
15
 */
820
16
821
17
#ifndef _MOCK_SERVICE_MANAGER_H
822
18
#define _MOCK_SERVICE_MANAGER_H
823
19
824
20
#include "scope/store/service_manager.h"
825
21
#include <gmock/gmock.h>
826
22
827
23
828
24
namespace Libertine
829
25
{
830
26
namespace Store
831
27
{
832
28
833
29
834
30
class MockServiceManager : public ServiceManager
835
31
{
836
32
public:
837
33
  MockServiceManager()
838
34
    : ServiceManager()
839
35
  {
840
36
  }
841
37
842
38
  MOCK_CONST_METHOD1(search_cache, QList<Package>(QString const&));
843
39
  MOCK_CONST_METHOD1(app_info, Package(QString const&));
844
40
};
845
41
846
42
847
43
} // namesapce Store
848
44
} // namesapce Libertine
849
45
850
46
#endif // _MOCK_SERVICE_MANAGER_H
851
0
47
852
=== added file 'tests/scope/store/test_package.cpp'
853
--- tests/scope/store/test_package.cpp	1970-01-01 00:00:00 +0000
854
+++ tests/scope/store/test_package.cpp	2016-09-15 17:01:59 +0000
855
@@ -0,0 +1,107 @@
856
1
/*
857
2
 * Copyright 2016 Canonical Ltd.
858
3
 *
859
4
 * This program is free software: you can redistribute it and/or modify it under
860
5
 * the terms of the GNU General Public License, version 3, as published by the
861
6
 * Free Software Foundation.
862
7
 *
863
8
 * This program is distributed in the hope that it will be useful,
864
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
865
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
866
11
 * GNU General Public License for more details.
867
12
 *
868
13
 * You should have received a copy of the GNU General Public License
869
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
870
15
 */
871
16
#include "scope/store/package.h"
872
17
873
18
#include <gtest/gtest.h>
874
19
#include <gmock/gmock.h>
875
20
876
21
877
22
namespace
878
23
{
879
24
using namespace Libertine::Store;
880
25
881
26
882
27
static QVariantMap
883
28
attribute_map(QString const& name, QString const& summary, QString const& description,
884
29
              QString const& icon, QString const& publisher, QString const& website,
885
30
              QString const& license, QString const& id, QStringList screenshots)
886
31
{
887
32
  QVariantMap attributes;
888
33
  attributes["name"] = name;
889
34
  attributes["summary"] = summary;
890
35
  attributes["description"] = description;
891
36
  attributes["icon"] = icon;
892
37
  attributes["publisher"] = publisher;
893
38
  attributes["website"] = website;
894
39
  attributes["license"] = license;
895
40
  attributes["id"] = id;
896
41
  attributes["screenshots"] = screenshots;
897
42
  return attributes;
898
43
}
899
44
900
45
901
46
static void
902
47
package_matches_attributes(Package actual, std::string const& name, std::string const& summary,
903
48
                           std::string const& description, std::string const& icon, std::string const& publisher,
904
49
                           std::string const& website, std::string const& license, std::string const& id,
905
50
                           QStringList screenshots)
906
51
{
907
52
  EXPECT_EQ(name, actual.name);
908
53
  EXPECT_EQ(summary, actual.summary);
909
54
  EXPECT_EQ(description, actual.description);
910
55
  EXPECT_EQ(icon, actual.icon);
911
56
  EXPECT_EQ(publisher, actual.publisher);
912
57
  EXPECT_EQ(website, actual.website);
913
58
  EXPECT_EQ(license, actual.license);
914
59
  EXPECT_EQ(id, actual.id);
915
60
916
61
  ASSERT_EQ(actual.screenshots.size(), screenshots.size());
917
62
  for (auto i = 0u; i < actual.screenshots.size(); ++i)
918
63
  {
919
64
    EXPECT_EQ(screenshots[i], QString::fromStdString(actual.screenshots[i]));
920
65
  }
921
66
}
922
67
923
68
924
69
TEST(PackageTest, FromMapCreatesSinglePackage)
925
70
{
926
71
  QStringList screenshots{"file:///some/image.png", "file:///some/other/image.jpg"};
927
72
  auto attributeMap = attribute_map("Harry", "The Philosopher's Stone",
928
73
                                    "Boy with head injury seeks magic rock",
929
74
                                    "harry.png", "JK", "pottermore.com", "Private",
930
75
                                    "com.pottermore.harry", screenshots);
931
76
  auto package = Package::from_map(attributeMap);
932
77
  package_matches_attributes(package, "Harry", "The Philosopher's Stone",
933
78
                             "Boy with head injury seeks magic rock",
934
79
                             "harry.png", "JK", "pottermore.com", "Private",
935
80
                             "com.pottermore.harry", screenshots);
936
81
}
937
82
938
83
939
84
TEST(PackageTest, FromMapCreatesListOfPackages)
940
85
{
941
86
  QStringList screenshots{"file:///some/image.png", "file:///some/other/image.jpg"};
942
87
  auto attributePkg1Map = attribute_map("Harry", "The Philosopher's Stone",
943
88
                                    "Boy with head injury seeks magic rock",
944
89
                                    "harry.png", "JK", "pottermore.com", "Private",
945
90
                                    "com.pottermore.harry", screenshots);
946
91
  QStringList screenshots2{"file://imageFor2.png"};
947
92
  auto attributePkg2Map = attribute_map("Dune", "Classic science fiction",
948
93
                                    "The spice must flow", "worms.png",
949
94
                                    "Herbert", "dunebook.net", "Other",
950
95
                                    "net.dunebook.dune", screenshots2);
951
96
  auto packages = Package::from_map(QList<QVariantMap>{attributePkg1Map, attributePkg2Map});
952
97
  ASSERT_EQ(2, packages.size());
953
98
  package_matches_attributes(packages[0], "Harry", "The Philosopher's Stone",
954
99
                             "Boy with head injury seeks magic rock",
955
100
                             "harry.png", "JK", "pottermore.com", "Private",
956
101
                             "com.pottermore.harry", screenshots);
957
102
  package_matches_attributes(packages[1], "Dune", "Classic science fiction",
958
103
                             "The spice must flow", "worms.png",
959
104
                             "Herbert", "dunebook.net", "Other",
960
105
                             "net.dunebook.dune", screenshots2);
961
106
}
962
107
}
963
0
108
964
=== added file 'tests/scope/store/test_preview.cpp'
965
--- tests/scope/store/test_preview.cpp	1970-01-01 00:00:00 +0000
966
+++ tests/scope/store/test_preview.cpp	2016-09-15 17:01:59 +0000
967
@@ -0,0 +1,196 @@
968
1
/*
969
2
 * Copyright 2016 Canonical Ltd.
970
3
 *
971
4
 * This program is free software: you can redistribute it and/or modify it under
972
5
 * the terms of the GNU General Public License, version 3, as published by the
973
6
 * Free Software Foundation.
974
7
 *
975
8
 * This program is distributed in the hope that it will be useful,
976
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
977
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
978
11
 * GNU General Public License for more details.
979
12
 *
980
13
 * You should have received a copy of the GNU General Public License
981
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
982
15
 */
983
16
#include "scope/store/preview.h"
984
17
#include "tests/scope/store/mock_service_manager.h"
985
18
986
19
#include <unity/scopes/ActionMetadata.h>
987
20
#include <unity/scopes/PreviewWidget.h>
988
21
#include <unity/scopes/testing/MockPreviewReply.h>
989
22
#include <unity/scopes/testing/Result.h>
990
23
#include <gtest/gtest.h>
991
24
#include <gmock/gmock.h>
992
25
993
26
namespace
994
27
{
995
28
using namespace Libertine::Store;
996
29
997
30
998
31
static void
999
32
verifyHeader(Package const& package, unity::scopes::PreviewWidget const& header)
1000
33
{
1001
34
  EXPECT_EQ("hdr", header.id());
1002
35
  EXPECT_EQ("header", header.widget_type());
1003
36
1004
37
  EXPECT_EQ(package.name, header.attribute_values()["title"].get_string());
1005
38
  EXPECT_EQ(package.summary, header.attribute_values()["subtitle"].get_string());
1006
39
  EXPECT_EQ(package.icon, header.attribute_values()["mascot"].get_string());
1007
40
}
1008
41
1009
42
1010
43
static void
1011
44
verifyButtons(unity::scopes::PreviewWidget const& buttons)
1012
45
{
1013
46
  EXPECT_EQ("buttons", buttons.id());
1014
47
  EXPECT_EQ("actions", buttons.widget_type());
1015
48
  auto buttons_actions = buttons.attribute_values()["actions"].get_array();
1016
49
  ASSERT_EQ(1, buttons_actions.size());
1017
50
  EXPECT_EQ("install_xapp", buttons_actions[0].get_dict()["id"].get_string());
1018
51
  EXPECT_EQ("Install", buttons_actions[0].get_dict()["label"].get_string());
1019
52
}
1020
53
1021
54
1022
55
static void
1023
56
verifyMetadata(Package const& package, unity::scopes::PreviewWidget const& props)
1024
57
{
1025
58
  EXPECT_EQ("other_metadata", props.id());
1026
59
  EXPECT_EQ("table", props.widget_type());
1027
60
1028
61
  auto propValues = props.attribute_values()["values"].get_array();
1029
62
  ASSERT_EQ(3, propValues.size());
1030
63
  ASSERT_EQ(2, propValues[0].get_array().size());
1031
64
  EXPECT_EQ("Publisher/Creator", propValues[0].get_array()[0].get_string());
1032
65
  EXPECT_EQ(package.publisher, propValues[0].get_array()[1].get_string());
1033
66
  ASSERT_EQ(2, propValues[1].get_array().size());
1034
67
  EXPECT_EQ("Website", propValues[1].get_array()[0].get_string());
1035
68
  EXPECT_EQ(package.website, propValues[1].get_array()[1].get_string());
1036
69
  ASSERT_EQ(2, propValues[2].get_array().size());
1037
70
  EXPECT_EQ("License", propValues[2].get_array()[0].get_string());
1038
71
  EXPECT_EQ(package.license, propValues[2].get_array()[1].get_string());
1039
72
}
1040
73
1041
74
1042
75
static void
1043
76
verifyDescription(Package const& package, unity::scopes::PreviewWidget const& description)
1044
77
{
1045
78
  EXPECT_EQ("summary", description.id());
1046
79
  EXPECT_EQ("text", description.widget_type());
1047
80
  EXPECT_EQ("Info", description.attribute_values()["title"].get_string());
1048
81
  EXPECT_EQ(package.description, description.attribute_values()["text"].get_string());
1049
82
}
1050
83
1051
84
1052
85
static void
1053
86
verifyScreenshots(Package const& package, unity::scopes::PreviewWidget const& screenshots)
1054
87
{
1055
88
  EXPECT_EQ("screenshots", screenshots.id());
1056
89
  EXPECT_EQ("gallery", screenshots.widget_type());
1057
90
1058
91
  auto sources = screenshots.attribute_values()["sources"].get_array();
1059
92
  ASSERT_EQ(package.screenshots.size(), sources.size());
1060
93
1061
94
  for (auto i = 0u; i < package.screenshots.size(); ++i)
1062
95
  {
1063
96
    EXPECT_EQ(package.screenshots[i], sources[i].get_string());
1064
97
  }
1065
98
1066
99
}
1067
100
1068
101
1069
102
class StorePreviewTest : public testing::Test
1070
103
{
1071
104
protected:
1072
105
  StorePreviewTest()
1073
106
    : testing::Test()
1074
107
    , result()
1075
108
    , metadata("en_US", "phone")
1076
109
    , list(new unity::scopes::PreviewWidgetList())
1077
110
    , reply()
1078
111
    , proxy(&reply, [](unity::scopes::PreviewReply*) {})
1079
112
    , service(new testing::NiceMock<MockServiceManager>())
1080
113
  {
1081
114
  }
1082
115
1083
116
  virtual void
1084
117
  SetUp()
1085
118
  {
1086
119
    EXPECT_CALL(reply, push(testing::_)).WillOnce(testing::SaveArg<0>(list.get()));
1087
120
  }
1088
121
1089
122
  void usePackage(Package const& package)
1090
123
  {
1091
124
    result["id"] = unity::scopes::Variant(package.id);
1092
125
    EXPECT_CALL(*service, app_info(QString::fromStdString(package.id))).WillOnce(testing::Return(package));
1093
126
  }
1094
127
1095
128
  unity::scopes::testing::Result result;
1096
129
  unity::scopes::ActionMetadata metadata;
1097
130
  std::unique_ptr<unity::scopes::PreviewWidgetList> list;
1098
131
  testing::NiceMock<unity::scopes::testing::MockPreviewReply> reply;
1099
132
  unity::scopes::PreviewReplyProxy proxy;
1100
133
  std::shared_ptr<testing::NiceMock<MockServiceManager> > service;
1101
134
};
1102
135
1103
136
1104
137
TEST_F(StorePreviewTest, ShowsDetailedInformationForPackage)
1105
138
{
1106
139
  Package package;
1107
140
  package.name = "vim";
1108
141
  package.summary = "classic text editor";
1109
142
  package.description = "this or emacs";
1110
143
  package.icon = "file:///test/file.png";
1111
144
  package.publisher = "Woody Boyd";
1112
145
  package.website = "http://canonical.com/";
1113
146
  package.license = "GPLv8+";
1114
147
  package.id = "vim.desktop";
1115
148
  usePackage(package);
1116
149
1117
150
  Preview preview(result, metadata, service);
1118
151
  preview.run(proxy);
1119
152
1120
153
  ASSERT_NE(nullptr, list);
1121
154
  ASSERT_EQ(4, list->size());
1122
155
1123
156
  verifyHeader(package, list->front());
1124
157
  list->pop_front();
1125
158
  verifyButtons(list->front());
1126
159
  list->pop_front();
1127
160
  verifyMetadata(package, list->front());
1128
161
  list->pop_front();
1129
162
  verifyDescription(package, list->front());
1130
163
}
1131
164
1132
165
1133
166
TEST_F(StorePreviewTest, ShowsScreenshotsWhenAvailable)
1134
167
{
1135
168
  Package package;
1136
169
  package.name = "vim";
1137
170
  package.summary = "classic text editor";
1138
171
  package.description = "this or emacs";
1139
172
  package.icon = "file:///test/file.png";
1140
173
  package.publisher = "Woody Boyd";
1141
174
  package.website = "http://canonical.com/";
1142
175
  package.license = "GPLv8+";
1143
176
  package.id = "vim.desktop";
1144
177
  package.screenshots = std::vector<std::string>{"file:///some/string/uri.png", "file:///some/other/string/uri.jpg"};
1145
178
  usePackage(package);
1146
179
1147
180
  Preview preview(result, metadata, service);
1148
181
  preview.run(proxy);
1149
182
1150
183
  ASSERT_NE(nullptr, list);
1151
184
  ASSERT_EQ(5, list->size());
1152
185
1153
186
  verifyHeader(package, list->front());
1154
187
  list->pop_front();
1155
188
  verifyButtons(list->front());
1156
189
  list->pop_front();
1157
190
  verifyMetadata(package, list->front());
1158
191
  list->pop_front();
1159
192
  verifyScreenshots(package, list->front());
1160
193
  list->pop_front();
1161
194
  verifyDescription(package, list->front());
1162
195
}
1163
196
}
1164
0
197
1165
=== modified file 'tests/scope/store/test_query.cpp'
1166
--- tests/scope/store/test_query.cpp	2016-07-20 13:35:09 +0000
1167
+++ tests/scope/store/test_query.cpp	2016-09-15 17:01:59 +0000
1168
@@ -13,9 +13,10 @@
1169
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU General Public License
1170
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1171
15
 */
15
 */
1172
16
1173
17
#include "scope/store/query.h"
16
#include "scope/store/query.h"
1175
18
#include "scope/store/service_manager.h"
17
1176
18
1177
19
#include "tests/scope/store/mock_service_manager.h"
1178
19
#include <unity/scopes/SearchMetadata.h>
20
#include <unity/scopes/SearchMetadata.h>
1179
20
#include <unity/scopes/CannedQuery.h>
21
#include <unity/scopes/CannedQuery.h>
1180
21
#include <unity/scopes/testing/MockSearchReply.h>
22
#include <unity/scopes/testing/MockSearchReply.h>
1181
@@ -41,24 +42,20 @@
1182
41
};
42
};
1183
42
43
1184
43
44
1185
44
class MockServiceManager : public ServiceManager
1186
45
{
1187
46
public:
1188
47
  MockServiceManager()
1189
48
    : ServiceManager()
1190
49
  {
1191
50
  }
1192
51
1193
52
  MOCK_CONST_METHOD1(search_cache, QStringList(QString const&));
1194
53
};
1195
54
1196
55
1197
56
MATCHER_P(ResultTitleMatch, title, "")
45
MATCHER_P(ResultTitleMatch, title, "")
1198
57
{
46
{
1199
58
  return arg.contains("title") && arg["title"] == unity::scopes::Variant(title);
47
  return arg.contains("title") && arg["title"] == unity::scopes::Variant(title);
1200
59
}
48
}
1201
60
49
1202
61
50
1203
51
MATCHER_P3(ResultPackageMatch, title, subtitle, id, "")
1204
52
{
1205
53
  return arg.contains("title") && arg["title"].get_string() == title &&
1206
54
      arg.contains("subtitle") && arg["subtitle"].get_string() == subtitle &&
1207
55
      arg.contains("id") && arg["id"].get_string() == id;
1208
56
}
1209
57
1210
58
1211
62
class TestStoreQuery : public ::testing::Test
59
class TestStoreQuery : public ::testing::Test
1212
63
{
60
{
1213
64
protected:
61
protected:
1214
@@ -72,6 +69,21 @@
1215
72
  {
69
  {
1216
73
  }
70
  }
1217
74
71
1218
72
  Package create_package(std::string name, std::string summary, std::string id)
1219
73
  {
1220
74
    Package package;
1221
75
    package.name = name;
1222
76
    package.summary = summary;
1223
77
    package.id = id;
1224
78
1225
79
    return package;
1226
80
  }
1227
81
1228
82
  void expect_push(std::string title, std::string subtitle, std::string id, bool result = true)
1229
83
  {
1230
84
    EXPECT_CALL(reply_, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultPackageMatch(title, subtitle, id)))).WillOnce(testing::Return(result));
1231
85
  }
1232
86
1233
75
  unity::scopes::SearchMetadata metadata_;
87
  unity::scopes::SearchMetadata metadata_;
1234
76
  unity::scopes::CannedQuery canned_query_;
88
  unity::scopes::CannedQuery canned_query_;
1235
77
  testing::NiceMock<unity::scopes::testing::MockSearchReply> reply_;
89
  testing::NiceMock<unity::scopes::testing::MockSearchReply> reply_;
1236
@@ -95,7 +107,7 @@
1237
95
{
107
{
1238
96
  EXPECT_CALL(reply_, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category_));
108
  EXPECT_CALL(reply_, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category_));
1239
97
  EXPECT_CALL(reply_, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::NO_SEARCH_RESULTS_HINT)))).WillOnce(testing::Return(true));
109
  EXPECT_CALL(reply_, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::NO_SEARCH_RESULTS_HINT)))).WillOnce(testing::Return(true));
1241
98
  EXPECT_CALL(*service_, search_cache(testing::_)).WillOnce(testing::Return(QStringList{}));
110
  EXPECT_CALL(*service_, search_cache(testing::_)).WillOnce(testing::Return(QList<Package>{}));
1242
99
  canned_query_.set_query_string("foobar");
111
  canned_query_.set_query_string("foobar");
1243
100
112
1244
101
  Query q(canned_query_, metadata_, service_);
113
  Query q(canned_query_, metadata_, service_);
1245
@@ -106,8 +118,11 @@
1246
106
TEST_F(TestStoreQuery, ShowSingleSearchResult)
118
TEST_F(TestStoreQuery, ShowSingleSearchResult)
1247
107
{
119
{
1248
108
  EXPECT_CALL(reply_, register_category("aptcache", "1 result found", "Application", testing::_)).WillOnce(testing::Return(category_));
120
  EXPECT_CALL(reply_, register_category("aptcache", "1 result found", "Application", testing::_)).WillOnce(testing::Return(category_));
1251
109
  EXPECT_CALL(reply_, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch("vim")))).WillOnce(testing::Return(true));
121
1252
110
  EXPECT_CALL(*service_, search_cache(testing::_)).WillOnce(testing::Return(QStringList{"vim"}));
122
  auto package = create_package("vim", "Writin' stuff", "vim.desktop");
1253
123
  expect_push("vim", "Writin' stuff", "vim.desktop");
1254
124
1255
125
  EXPECT_CALL(*service_, search_cache(testing::_)).WillOnce(testing::Return(QList<Package>{package}));
1256
111
  canned_query_.set_query_string("vim");
126
  canned_query_.set_query_string("vim");
1257
112
127
1258
113
  Query q(canned_query_, metadata_, service_);
128
  Query q(canned_query_, metadata_, service_);
1259
@@ -118,10 +133,35 @@
1260
118
TEST_F(TestStoreQuery, ShowMultipleSearchResults)
133
TEST_F(TestStoreQuery, ShowMultipleSearchResults)
1261
119
{
134
{
1262
120
  EXPECT_CALL(reply_, register_category("aptcache", "3 results found", "Application", testing::_)).WillOnce(testing::Return(category_));
135
  EXPECT_CALL(reply_, register_category("aptcache", "3 results found", "Application", testing::_)).WillOnce(testing::Return(category_));
1267
121
  EXPECT_CALL(reply_, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch("vim")))).WillOnce(testing::Return(true));
136
1268
122
  EXPECT_CALL(reply_, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch("vim-common")))).WillOnce(testing::Return(true));
137
  auto vim = create_package("vim", "Writin' stuff", "vim.desktop");
1269
123
  EXPECT_CALL(reply_, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch("vim-uncommon")))).WillOnce(testing::Return(true));
138
  auto gedit = create_package("gedit", "Writin' gui stuff", "gedit.desktop");
1270
124
  EXPECT_CALL(*service_, search_cache(testing::_)).WillOnce(testing::Return(QStringList{"vim", "vim-common", "vim-uncommon"}));
139
  auto ed = create_package("ed", "Writin' simple stuff", "ed.desktop");
1271
140
1272
141
  expect_push("vim", "Writin' stuff", "vim.desktop");
1273
142
  expect_push("gedit", "Writin' gui stuff", "gedit.desktop");
1274
143
  expect_push("ed", "Writin' simple stuff", "ed.desktop");
1275
144
1276
145
  EXPECT_CALL(*service_, search_cache(testing::_)).WillOnce(testing::Return(QList<Package>{vim, gedit, ed}));
1277
146
  canned_query_.set_query_string("vim");
1278
147
1279
148
  Query q(canned_query_, metadata_, service_);
1280
149
  q.run(proxy_);
1281
150
}
1282
151
1283
152
1284
153
TEST_F(TestStoreQuery, FailureToPushEndsQueryPrematurely)
1285
154
{
1286
155
  EXPECT_CALL(reply_, register_category("aptcache", "3 results found", "Application", testing::_)).WillOnce(testing::Return(category_));
1287
156
1288
157
  auto vim = create_package("vim", "Writin' stuff", "vim.desktop");
1289
158
  auto gedit = create_package("gedit", "Writin' gui stuff", "gedit.desktop");
1290
159
  auto ed = create_package("ed", "Writin' simple stuff", "ed.desktop");
1291
160
1292
161
  expect_push("vim", "Writin' stuff", "vim.desktop");
1293
162
  expect_push("gedit", "Writin' gui stuff", "gedit.desktop", false);
1294
163
1295
164
  EXPECT_CALL(*service_, search_cache(testing::_)).WillOnce(testing::Return(QList<Package>{vim, gedit, ed}));
1296
125
  canned_query_.set_query_string("vim");
165
  canned_query_.set_query_string("vim");
1297
126
166
1298
127
  Query q(canned_query_, metadata_, service_);
167
  Query q(canned_query_, metadata_, service_);
Status:	Merged
Approved by:	Larry Price on 2016-09-16
Approved revision:	105
Merged at revision:	101
Proposed branch:	lp:~larryprice/libertine-scope/preview-2
Merge into:	lp:~larryprice/libertine-scope/libertine-store-search
Diff against target:	1298 lines (+909/-82) 18 files modified scope/store/i18n.h (+0/-1) scope/store/package.cpp (+52/-0) scope/store/package.h (+57/-0) scope/store/preview.cpp (+220/-0) scope/store/preview.h (+74/-0) scope/store/query.cpp (+13/-37) scope/store/query.h (+3/-1) scope/store/scope.cpp (+5/-3) scope/store/service_manager.cpp (+18/-6) scope/store/service_manager.h (+7/-3) service/libertine_service/apt.py (+37/-4) service/libertine_service/dbus.py (+10/-5) tests/scope/apps/test_preview.cpp (+0/-1) tests/scope/store/CMakeLists.txt (+3/-0) tests/scope/store/mock_service_manager.h (+46/-0) tests/scope/store/test_package.cpp (+107/-0) tests/scope/store/test_preview.cpp (+196/-0) tests/scope/store/test_query.cpp (+61/-21)
To merge this branch:	bzr merge lp:~larryprice/libertine-scope/preview-2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)			Approve on 2016-09-15
Christopher Townsend (community)		2016-08-12	Approve on 2016-09-15
Libertine CI Bot (community)	continuous-integration	2016-08-12	Approve on 2016-08-30
Review via email: mp+302839@code.launchpad.net