Unity Online Music Scope

Merge lp:~stolowski/unity-scope-onlinemusic/use-new-api-3.0 into lp:~unity-team/unity-scope-onlinemusic/use-new-api

  1. use-new-api-3.0
  2. Merge into use-new-api
Proposed by Paweł Stołowski
Status: Merged
Merged at revision: 67
Proposed branch: lp:~stolowski/unity-scope-onlinemusic/use-new-api-3.0
Merge into: lp:~unity-team/unity-scope-onlinemusic/use-new-api
Diff against target: 137 lines (+14/-12)
7 files modified
CMakeLists.txt (+1/-1)
data/renderer.json (+1/-1)
debian/control (+1/-1)
src/OnlineMusicQuery.cpp (+2/-2)
src/OnlineMusicQuery.h (+3/-2)
src/OnlineMusicScope.cpp (+3/-3)
src/OnlineMusicScope.h (+3/-2)
To merge this branch: bzr merge lp:~stolowski/unity-scope-onlinemusic/use-new-api-3.0
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+205571@code.launchpad.net

Commit message

Updated for API 0.3.1

Description of the change

Updated for API 0.3.1

To post a comment you must log in.
lp:~stolowski/unity-scope-onlinemusic/use-new-api-3.0 updated
66. By Paweł Stołowski

Require 0.3.1.

67. By Paweł Stołowski

Use 'small' card-size.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-01-20 10:32:00 +0000
3+++ CMakeLists.txt 2014-02-10 18:13:26 +0000
4@@ -12,7 +12,7 @@
5 FIND_PACKAGE(Qt5Test REQUIRED)
6 FIND_PACKAGE(PkgConfig REQUIRED)
7 PKG_CHECK_MODULES(UUID REQUIRED uuid>=2.20.0)
8-PKG_CHECK_MODULES(SCOPESLIB REQUIRED libunity-scopes>=0.2.0)
9+PKG_CHECK_MODULES(SCOPESLIB REQUIRED libunity-scopes>=0.3.1)
10
11 IF(${INTLTOOL_MERGE} MATCHES "INTLTOOL_MERGE-NOTFOUND")
12 MESSAGE(FATAL_ERROR "xxx")
13
14=== modified file 'data/renderer.json'
15--- data/renderer.json 2013-12-18 17:03:27 +0000
16+++ data/renderer.json 2014-02-10 18:13:26 +0000
17@@ -2,7 +2,7 @@
18 "schema-version": 1,
19 "template": {
20 "category-layout": "grid",
21- "card-size": "medium"
22+ "card-size": "small"
23 },
24 "components": {
25 "title": "title",
26
27=== modified file 'debian/control'
28--- debian/control 2014-01-20 10:32:00 +0000
29+++ debian/control 2014-02-10 18:13:26 +0000
30@@ -4,7 +4,7 @@
31 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
32 Build-Depends: cmake,
33 debhelper (>= 9),
34- libunity-scopes-dev (>= 0.2.0~),
35+ libunity-scopes-dev (>= 0.3.1~),
36 uuid-dev,
37 gettext,
38 intltool,
39
40=== modified file 'src/OnlineMusicQuery.cpp'
41--- src/OnlineMusicQuery.cpp 2014-01-20 10:32:00 +0000
42+++ src/OnlineMusicQuery.cpp 2014-02-10 18:13:26 +0000
43@@ -27,7 +27,7 @@
44 using namespace std;
45 using namespace unity::scopes;
46
47-OnlineMusicQuery::OnlineMusicQuery(std::string const& query, QStringList const& scopes, QString const& locale)
48+OnlineMusicQuery::OnlineMusicQuery(Query const& query, QStringList const& scopes, QString const& locale)
49 : SearchQuery(),
50 query_(query),
51 scopes_(scopes),
52@@ -43,7 +43,7 @@
53 QString serverSid;
54 QString sessionId = randomizedTimeUuid();
55
56- const QString query = QString::fromStdString(query_).trimmed();
57+ const QString query = QString::fromStdString(query_.query_string()).trimmed();
58 CategoryRenderer renderer = CategoryRenderer::from_file("/usr/share/unity/scopes/scope-onlinemusic/renderer.json");
59 auto cat = query.isEmpty() ? reply->register_category("popular", _("Popular online"), "", renderer)
60 : reply->register_category("online", _("Online"), "", renderer);
61
62=== modified file 'src/OnlineMusicQuery.h'
63--- src/OnlineMusicQuery.h 2014-01-20 10:32:00 +0000
64+++ src/OnlineMusicQuery.h 2014-02-10 18:13:26 +0000
65@@ -20,6 +20,7 @@
66 #define ONLINEMUSICQUERY_H
67
68 #include <unity/scopes/ScopeBase.h>
69+#include <unity/scopes/Query.h>
70 #include <QStringList>
71 #include <string>
72 #include <memory>
73@@ -29,13 +30,13 @@
74 class OnlineMusicQuery: public unity::scopes::SearchQuery
75 {
76 public:
77- OnlineMusicQuery(std::string const& query, QStringList const& scopes, QString const& locale);
78+ OnlineMusicQuery(unity::scopes::Query const& query, QStringList const& scopes, QString const& locale);
79
80 virtual void run(unity::scopes::SearchReplyProxy const& reply) override;
81 virtual void cancelled() override;
82
83 private:
84- std::string query_;
85+ unity::scopes::Query query_;
86 QStringList scopes_;
87 std::unique_ptr<SmartScopesClient> sss_client_;
88 };
89
90=== modified file 'src/OnlineMusicScope.cpp'
91--- src/OnlineMusicScope.cpp 2014-01-20 10:32:00 +0000
92+++ src/OnlineMusicScope.cpp 2014-02-10 18:13:26 +0000
93@@ -72,10 +72,10 @@
94 return VERSION;
95 }
96
97-QueryBase::UPtr OnlineMusicScope::create_query(string const& query, VariantMap const&)
98+QueryBase::UPtr OnlineMusicScope::create_query(Query const& query, SearchMetadata const&)
99 {
100 QStringList scopes;
101- if (query.empty()) {
102+ if (query.query_string().empty()) {
103 appendIfEnabled(scopes, "more_suggestions-populartracks.scope");
104 } else {
105 appendIfEnabled(scopes, "more_suggestions-u1ms.scope");
106@@ -87,7 +87,7 @@
107 return q;
108 }
109
110-QueryBase::UPtr OnlineMusicScope::preview(Result const&, VariantMap const&)
111+QueryBase::UPtr OnlineMusicScope::preview(Result const&, ActionMetadata const&)
112 {
113 return nullptr;
114 }
115
116=== modified file 'src/OnlineMusicScope.h'
117--- src/OnlineMusicScope.h 2014-01-20 10:32:00 +0000
118+++ src/OnlineMusicScope.h 2014-02-10 18:13:26 +0000
119@@ -21,6 +21,7 @@
120 #define ONLINEMUSICSCOPE_H
121
122 #include <unity/scopes/ScopeBase.h>
123+#include <unity/scopes/Query.h>
124 #include <string>
125 #include <QString>
126 #include <QStringList>
127@@ -37,8 +38,8 @@
128 virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;
129 virtual void stop() override {}
130 virtual void run() override {}
131- virtual unity::scopes::QueryBase::UPtr create_query(std::string const& query, unity::scopes::VariantMap const&) override;
132- virtual unity::scopes::QueryBase::UPtr preview(unity::scopes::Result const&, unity::scopes::VariantMap const&) override;
133+ virtual unity::scopes::QueryBase::UPtr create_query(unity::scopes::Query const& query, unity::scopes::SearchMetadata const&) override;
134+ virtual unity::scopes::QueryBase::UPtr preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&) override;
135
136 private:
137 void appendIfEnabled(QStringList &scopeToQuery, const QString &scopeId) const;

Subscribers

People subscribed via source and target branches

to all changes: