1
=== modified file 'libertine-scope/query.cpp'
2
--- libertine-scope/query.cpp	2016-06-13 21:11:38 +0000
3
+++ libertine-scope/query.cpp	2016-06-14 16:50:00 +0000
4
@@ -35,8 +35,6 @@
5
35
35
6
36
namespace
36
namespace
7
37
{
37
{
8
38
static const auto NO_X_APPS_DESCRIPTION = _("Update filters or use the Libertine GUI to install applications.");
9
39
static const auto NO_X_APPS_TITLE = _("No X Apps available");
10
40
static const auto ROOT_DEPT_TITLE = _("X Apps");
38
static const auto ROOT_DEPT_TITLE = _("X Apps");
11
41
static const auto HIDDEN_DEPT_TITLE = _("Hidden X Apps");
39
static const auto HIDDEN_DEPT_TITLE = _("Hidden X Apps");
12
42
static const auto DESCRIPTION_FIELD = "description";
40
static const auto DESCRIPTION_FIELD = "description";
13
@@ -94,9 +92,28 @@
14
94
        }
92
        }
15
95
    }
93
    }
16
96
)";
94
)";
17
95
18
96
19
97
static const auto CATEGORY_HINT = R"(
20
98
    {
21
99
        "schema-version": 1,
22
100
        "template": {
23
101
            "category-layout": "grid",
24
102
            "card-size": "large",
25
103
            "card-layout": "horizontal"
26
104
        },
27
105
        "components": {
28
106
            "title": "title"
29
107
        }
30
108
    }
31
109
)";
32
97
} // anonymous namespace
110
} // anonymous namespace
33
98
111
34
99
112
35
113
std::string const Query::NO_RESULTS_HINT = _("No XApps available. Install new applications with the Libertine Manager.");
36
114
std::string const Query::ALL_RESULTS_FILTERED_HINT = _("All XApps hidden. Reset filters or check the Hidden XApps department.");
37
115
38
116
39
100
Query::
117
Query::
40
101
Query(usc::CannedQuery const&    query,
118
Query(usc::CannedQuery const&    query,
41
102
      usc::SearchMetadata const& metadata,
119
      usc::SearchMetadata const& metadata,
42
@@ -172,6 +189,18 @@
43
172
189
44
173
190
45
174
void Query::
191
void Query::
46
192
show_hint(usc::SearchReplyProxy const& reply,
47
193
          std::string           const& reason) const
48
194
{
49
195
  auto hint_category = reply->register_category("hint", "", "", usc::CategoryRenderer(CATEGORY_HINT));
50
196
  usc::CategorisedResult res(hint_category);
51
197
  res.set_uri(usc::CannedQuery(query()).to_uri());
52
198
  res.set_title(reason);
53
199
  reply->push(res);
54
200
}
55
201
56
202
57
203
void Query::
58
175
run(usc::SearchReplyProxy const& reply)
204
run(usc::SearchReplyProxy const& reply)
59
176
{
205
{
60
177
  if (!hidden_->empty())
206
  if (!hidden_->empty())
61
@@ -187,6 +216,8 @@
62
187
  }
216
  }
63
188
217
64
189
  QRegExp search_query(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
218
  QRegExp search_query(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
65
219
  bool has_no_apps = true,
66
220
       all_filtered = true;
67
190
221
68
191
  for (auto const& container: libertine_->get_container_list())
222
  for (auto const& container: libertine_->get_container_list())
69
192
  {
223
  {
70
@@ -197,6 +228,7 @@
71
197
228
72
198
    for (auto const& app: container->app_launchers())
229
    for (auto const& app: container->app_launchers())
73
199
    {
230
    {
74
231
      has_no_apps = false;
75
200
      if (!(search_query.isEmpty() || QString::fromStdString(app.name()).contains(search_query)))
232
      if (!(search_query.isEmpty() || QString::fromStdString(app.name()).contains(search_query)))
76
201
      {
233
      {
77
202
        continue;
234
        continue;
78
@@ -239,6 +271,17 @@
79
239
      {
271
      {
80
240
        return;
272
        return;
81
241
      }
273
      }
82
274
83
275
      all_filtered = false;
84
242
    }
276
    }
85
243
  }
277
  }
86
278
87
279
  if (has_no_apps)
88
280
  {
89
281
    show_hint(reply, NO_RESULTS_HINT);
90
282
  }
91
283
  else if (all_filtered)
92
284
  {
93
285
    show_hint(reply, ALL_RESULTS_FILTERED_HINT);
94
286
  }
95
244
}
287
}
96
245
288
97
=== modified file 'libertine-scope/query.h'
98
--- libertine-scope/query.h	2016-06-13 21:11:38 +0000
99
+++ libertine-scope/query.h	2016-06-14 16:50:00 +0000
100
@@ -45,9 +45,13 @@
101
45
  void
45
  void
102
46
  run(unity::scopes::SearchReplyProxy const& reply) override;
46
  run(unity::scopes::SearchReplyProxy const& reply) override;
103
47
47
104
48
  static std::string const NO_RESULTS_HINT;
105
49
  static std::string const ALL_RESULTS_FILTERED_HINT;
106
50
107
48
private:
51
private:
108
49
  QStringList get_hidden_department() const;
52
  QStringList get_hidden_department() const;
109
50
  QStringList make_filters(unity::scopes::SearchReplyProxy const& reply) const;
53
  QStringList make_filters(unity::scopes::SearchReplyProxy const& reply) const;
110
54
  void show_hint(unity::scopes::SearchReplyProxy const& reply, std::string const& reason) const;
111
51
  void parse_blacklist(const std::string& data_dir);
55
  void parse_blacklist(const std::string& data_dir);
112
52
56
113
53
  Libertine::UPtr libertine_;
57
  Libertine::UPtr libertine_;
114
54
58
115
=== modified file 'tests/fake_container.cpp'
116
--- tests/fake_container.cpp	2016-06-09 15:07:27 +0000
117
+++ tests/fake_container.cpp	2016-06-14 16:50:00 +0000
118
@@ -42,7 +42,6 @@
119
42
  }
42
  }
120
43
};
43
};
121
44
44
122
45
123
46
FakeContainer::
45
FakeContainer::
124
47
FakeContainer(std::string const& json_string)
46
FakeContainer(std::string const& json_string)
125
48
: Container("fake-container", "fake-container")
47
: Container("fake-container", "fake-container")
126
49
48
127
=== modified file 'tests/fake_libertine.cpp'
128
--- tests/fake_libertine.cpp	2016-01-19 00:16:56 +0000
129
+++ tests/fake_libertine.cpp	2016-06-14 16:50:00 +0000
130
@@ -25,12 +25,6 @@
131
25
}
25
}
132
26
26
133
27
27
134
28
FakeLibertine::
135
29
~FakeLibertine()
136
30
{
137
31
}
138
32
139
33
140
34
Libertine::ContainerList const& FakeLibertine::
28
Libertine::ContainerList const& FakeLibertine::
141
35
get_container_list() const
29
get_container_list() const
142
36
{
30
{
143
37
31
144
=== modified file 'tests/fake_libertine.h'
145
--- tests/fake_libertine.h	2016-01-19 21:10:09 +0000
146
+++ tests/fake_libertine.h	2016-06-14 16:50:00 +0000
147
@@ -27,9 +27,9 @@
148
27
: public Libertine
27
: public Libertine
149
28
{
28
{
150
29
public:
29
public:
152
30
  ~FakeLibertine();
30
  virtual ~FakeLibertine() = default;
153
31
31
155
32
  Libertine::ContainerList const&
32
  virtual Libertine::ContainerList const&
156
33
  get_container_list() const override;
33
  get_container_list() const override;
157
34
34
158
35
  static Libertine::UPtr
35
  static Libertine::UPtr
159
36
36
160
=== modified file 'tests/test_query.cpp'
161
--- tests/test_query.cpp	2016-06-13 18:06:36 +0000
162
+++ tests/test_query.cpp	2016-06-14 16:50:00 +0000
163
@@ -101,6 +101,12 @@
164
101
}
101
}
165
102
102
166
103
103
167
104
MATCHER_P(ResultTitleMatch, title, "")
168
105
{
169
106
  return arg.contains("title") && arg["title"] == unity::scopes::Variant(title);
170
107
}
171
108
172
109
173
104
class TestQueryFixture : public ::testing::Test
110
class TestQueryFixture : public ::testing::Test
174
105
{
111
{
175
106
public:
112
public:
176
@@ -250,4 +256,34 @@
177
250
  }, hidden, blacklist);
256
  }, hidden, blacklist);
178
251
  query.run(proxy);
257
  query.run(proxy);
179
252
}
258
}
180
259
181
260
182
261
TEST_F(TestQueryFixture, showsHintWhenAllAppsFiltered)
183
262
{
184
263
  expect_registry();
185
264
186
265
  EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
187
266
  EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::ALL_RESULTS_FILTERED_HINT)))).WillOnce(testing::Return(true));
188
267
189
268
  EXPECT_CALL(*hidden, app_is_hidden(testing::_)).WillRepeatedly(testing::Return(true));
190
269
191
270
  Query query(canned_query, metadata, []() {
192
271
    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
193
272
  }, hidden, blacklist);
194
273
  query.run(proxy);
195
274
}
196
275
197
276
198
277
TEST_F(TestQueryFixture, showsHintWhenNoAppsInContainer)
199
278
{
200
279
  expect_registry();
201
280
202
281
  EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
203
282
  EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::NO_RESULTS_HINT)))).WillOnce(testing::Return(true));
204
283
205
284
  Query query(canned_query, metadata, []() {
206
285
    return FakeLibertine::make_fake("");
207
286
  }, hidden, blacklist);
208
287
  query.run(proxy);
209
288
}
210
253
} // anonymous namespace
289
} // anonymous namespace
Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2016-06-13	Approve on 2016-06-15
Libertine CI Bot	continuous-integration		Approve on 2016-06-14
Review via email: mp+297244@code.launchpad.net
1	=== modified file 'libertine-scope/query.cpp'
2	--- libertine-scope/query.cpp 2016-06-13 21:11:38 +0000
3	+++ libertine-scope/query.cpp 2016-06-14 16:50:00 +0000
4	@@ -35,8 +35,6 @@
5	35		35
6	36	namespace	36	namespace
7	37	{	37	{
8	38	static const auto NO_X_APPS_DESCRIPTION = _("Update filters or use the Libertine GUI to install applications.");
9	39	static const auto NO_X_APPS_TITLE = _("No X Apps available");
10	40	static const auto ROOT_DEPT_TITLE = _("X Apps");	38	static const auto ROOT_DEPT_TITLE = _("X Apps");
11	41	static const auto HIDDEN_DEPT_TITLE = _("Hidden X Apps");	39	static const auto HIDDEN_DEPT_TITLE = _("Hidden X Apps");
12	42	static const auto DESCRIPTION_FIELD = "description";	40	static const auto DESCRIPTION_FIELD = "description";
13	@@ -94,9 +92,28 @@
14	94	}	92	}
15	95	}	93	}
16	96	)";	94	)";
17			95
18			96
19			97	static const auto CATEGORY_HINT = R"(
20			98	{
21			99	"schema-version": 1,
22			100	"template": {
23			101	"category-layout": "grid",
24			102	"card-size": "large",
25			103	"card-layout": "horizontal"
26			104	},
27			105	"components": {
28			106	"title": "title"
29			107	}
30			108	}
31			109	)";
32	97	} // anonymous namespace	110	} // anonymous namespace
33	98		111
34	99		112
35			113	std::string const Query::NO_RESULTS_HINT = _("No XApps available. Install new applications with the Libertine Manager.");
36			114	std::string const Query::ALL_RESULTS_FILTERED_HINT = _("All XApps hidden. Reset filters or check the Hidden XApps department.");
37			115
38			116
39	100	Query::	117	Query::
40	101	Query(usc::CannedQuery const& query,	118	Query(usc::CannedQuery const& query,
41	102	usc::SearchMetadata const& metadata,	119	usc::SearchMetadata const& metadata,
42	@@ -172,6 +189,18 @@
43	172		189
44	173		190
45	174	void Query::	191	void Query::
46			192	show_hint(usc::SearchReplyProxy const& reply,
47			193	std::string const& reason) const
48			194	{
49			195	auto hint_category = reply->register_category("hint", "", "", usc::CategoryRenderer(CATEGORY_HINT));
50			196	usc::CategorisedResult res(hint_category);
51			197	res.set_uri(usc::CannedQuery(query()).to_uri());
52			198	res.set_title(reason);
53			199	reply->push(res);
54			200	}
55			201
56			202
57			203	void Query::
58	175	run(usc::SearchReplyProxy const& reply)	204	run(usc::SearchReplyProxy const& reply)
59	176	{	205	{
60	177	if (!hidden_->empty())	206	if (!hidden_->empty())
61	@@ -187,6 +216,8 @@
62	187	}	216	}
63	188		217
64	189	QRegExp search_query(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);	218	QRegExp search_query(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
65			219	bool has_no_apps = true,
66			220	all_filtered = true;
67	190		221
68	191	for (auto const& container: libertine_->get_container_list())	222	for (auto const& container: libertine_->get_container_list())
69	192	{	223	{
70	@@ -197,6 +228,7 @@
71	197		228
72	198	for (auto const& app: container->app_launchers())	229	for (auto const& app: container->app_launchers())
73	199	{	230	{
74			231	has_no_apps = false;
75	200	if (!(search_query.isEmpty() \|\| QString::fromStdString(app.name()).contains(search_query)))	232	if (!(search_query.isEmpty() \|\| QString::fromStdString(app.name()).contains(search_query)))
76	201	{	233	{
77	202	continue;	234	continue;
78	@@ -239,6 +271,17 @@
79	239	{	271	{
80	240	return;	272	return;
81	241	}	273	}
82			274
83			275	all_filtered = false;
84	242	}	276	}
85	243	}	277	}
86			278
87			279	if (has_no_apps)
88			280	{
89			281	show_hint(reply, NO_RESULTS_HINT);
90			282	}
91			283	else if (all_filtered)
92			284	{
93			285	show_hint(reply, ALL_RESULTS_FILTERED_HINT);
94			286	}
95	244	}	287	}
96	245		288
97	=== modified file 'libertine-scope/query.h'
98	--- libertine-scope/query.h 2016-06-13 21:11:38 +0000
99	+++ libertine-scope/query.h 2016-06-14 16:50:00 +0000
100	@@ -45,9 +45,13 @@
101	45	void	45	void
102	46	run(unity::scopes::SearchReplyProxy const& reply) override;	46	run(unity::scopes::SearchReplyProxy const& reply) override;
103	47		47
104			48	static std::string const NO_RESULTS_HINT;
105			49	static std::string const ALL_RESULTS_FILTERED_HINT;
106			50
107	48	private:	51	private:
108	49	QStringList get_hidden_department() const;	52	QStringList get_hidden_department() const;
109	50	QStringList make_filters(unity::scopes::SearchReplyProxy const& reply) const;	53	QStringList make_filters(unity::scopes::SearchReplyProxy const& reply) const;
110			54	void show_hint(unity::scopes::SearchReplyProxy const& reply, std::string const& reason) const;
111	51	void parse_blacklist(const std::string& data_dir);	55	void parse_blacklist(const std::string& data_dir);
112	52		56
113	53	Libertine::UPtr libertine_;	57	Libertine::UPtr libertine_;
114	54		58
115	=== modified file 'tests/fake_container.cpp'
116	--- tests/fake_container.cpp 2016-06-09 15:07:27 +0000
117	+++ tests/fake_container.cpp 2016-06-14 16:50:00 +0000
118	@@ -42,7 +42,6 @@
119	42	}	42	}
120	43	};	43	};
121	44		44
122	45
123	46	FakeContainer::	45	FakeContainer::
124	47	FakeContainer(std::string const& json_string)	46	FakeContainer(std::string const& json_string)
125	48	: Container("fake-container", "fake-container")	47	: Container("fake-container", "fake-container")
126	49		48
127	=== modified file 'tests/fake_libertine.cpp'
128	--- tests/fake_libertine.cpp 2016-01-19 00:16:56 +0000
129	+++ tests/fake_libertine.cpp 2016-06-14 16:50:00 +0000
130	@@ -25,12 +25,6 @@
131	25	}	25	}
132	26		26
133	27		27
134	28	FakeLibertine::
135	29	~FakeLibertine()
136	30	{
137	31	}
138	32
139	33
140	34	Libertine::ContainerList const& FakeLibertine::	28	Libertine::ContainerList const& FakeLibertine::
141	35	get_container_list() const	29	get_container_list() const
142	36	{	30	{
143	37		31
144	=== modified file 'tests/fake_libertine.h'
145	--- tests/fake_libertine.h 2016-01-19 21:10:09 +0000
146	+++ tests/fake_libertine.h 2016-06-14 16:50:00 +0000
147	@@ -27,9 +27,9 @@
148	27	: public Libertine	27	: public Libertine
149	28	{	28	{
150	29	public:	29	public:
152	30	~FakeLibertine();	30	virtual ~FakeLibertine() = default;
153	31		31
155	32	Libertine::ContainerList const&	32	virtual Libertine::ContainerList const&
156	33	get_container_list() const override;	33	get_container_list() const override;
157	34		34
158	35	static Libertine::UPtr	35	static Libertine::UPtr
159	36		36
160	=== modified file 'tests/test_query.cpp'
161	--- tests/test_query.cpp 2016-06-13 18:06:36 +0000
162	+++ tests/test_query.cpp 2016-06-14 16:50:00 +0000
163	@@ -101,6 +101,12 @@
164	101	}	101	}
165	102		102
166	103		103
167			104	MATCHER_P(ResultTitleMatch, title, "")
168			105	{
169			106	return arg.contains("title") && arg["title"] == unity::scopes::Variant(title);
170			107	}
171			108
172			109
173	104	class TestQueryFixture : public ::testing::Test	110	class TestQueryFixture : public ::testing::Test
174	105	{	111	{
175	106	public:	112	public:
176	@@ -250,4 +256,34 @@
177	250	}, hidden, blacklist);	256	}, hidden, blacklist);
178	251	query.run(proxy);	257	query.run(proxy);
179	252	}	258	}
180			259
181			260
182			261	TEST_F(TestQueryFixture, showsHintWhenAllAppsFiltered)
183			262	{
184			263	expect_registry();
185			264
186			265	EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
187			266	EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::ALL_RESULTS_FILTERED_HINT)))).WillOnce(testing::Return(true));
188			267
189			268	EXPECT_CALL(*hidden, app_is_hidden(testing::_)).WillRepeatedly(testing::Return(true));
190			269
191			270	Query query(canned_query, metadata, []() {
192			271	return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
193			272	}, hidden, blacklist);
194			273	query.run(proxy);
195			274	}
196			275
197			276
198			277	TEST_F(TestQueryFixture, showsHintWhenNoAppsInContainer)
199			278	{
200			279	expect_registry();
201			280
202			281	EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
203			282	EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::NO_RESULTS_HINT)))).WillOnce(testing::Return(true));
204			283
205			284	Query query(canned_query, metadata, []() {
206			285	return FakeLibertine::make_fake("");
207			286	}, hidden, blacklist);
208			287	query.run(proxy);
209			288	}
210	253	} // anonymous namespace	289	} // anonymous namespace