Merge lp:~alecu/unity-scope-click/uninstallable-scopes into lp:unity-scope-click/devel
- uninstallable-scopes
- Merge into devel
Proposed by
Alejandro J. Cura
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 297 |
| Merged at revision: | 293 |
| Proposed branch: | lp:~alecu/unity-scope-click/uninstallable-scopes |
| Merge into: | lp:unity-scope-click/devel |
| Prerequisite: | lp:~alecu/unity-scope-click/a-few-renames |
| Diff against target: |
851 lines (+419/-85) 10 files modified
libclickscope/click/interface.cpp (+56/-6) libclickscope/click/interface.h (+9/-0) libclickscope/click/package.cpp (+5/-4) libclickscope/click/package.h (+9/-0) libclickscope/click/preview.cpp (+39/-17) libclickscope/tests/fake_json.h (+72/-0) libclickscope/tests/test_interface.cpp (+96/-0) scope/clickstore/store-query.cpp (+36/-24) scope/clickstore/store-query.h (+5/-3) scope/tests/test_query.cpp (+92/-31) |
| To merge this branch: | bzr merge lp:~alecu/unity-scope-click/uninstallable-scopes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| dobey (community) | Approve | ||
| Paweł Stołowski (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- label installed packages as such in results
- tweak icon size in surfacing to align with added subtitle
- allow launching installed scopes from package preview
- no longer filter out installed packages in store scope
Description of the change
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Approve
(continuous-integration)
- 292. By Alejandro J. Cura
-
Show debugging information when creating uri to open scope
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:292
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
- 293. By Alejandro J. Cura
-
Add more debugging logs
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:293
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Alejandro J. Cura (alecu) wrote : | # |
Clicking on the "Search" button is not working due to bug #1329890 in unity-scope-shell
Once that's fixed it should work with no changes needed here.
Revision history for this message
| dobey (dobey) wrote : | # |
/home/phablet/
/home/phablet/
libclickscope/
These compilation errors with gcc 4.9 seem to be a result of the changes in this branch. Can we have some plan to fix them before we get upgraded to 4.9 again, even though this compiles ok under 4.8?
review:
Needs Information
Revision history for this message
| dobey (dobey) : | # |
review:
Needs Information
- 294. By Alejandro J. Cura
-
Merged from prereq branch
- 295. By Alejandro J. Cura
-
Move the hashing inside the Package class
- 296. By Alejandro J. Cura
-
Handle multiple apps and scopes in the same package, caps for ✔ INSTALLED label, misc code renamings
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:295
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:296
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Paweł Stołowski (stolowski) wrote : | # |
619 +#include <unordered_set>
This doesn't seem to be required in the context of this file?
240 + if (error == click::
241 + uri = "application:///" + val;
242 + }
Can you log an error here, if any?
13 +#include <streambuf>
Is this needed?
review:
Needs Fixing
- 297. By Alejandro J. Cura
-
Removed unused includes and added error messages requested in Pawel's review
Revision history for this message
| Paweł Stołowski (stolowski) wrote : | # |
Thanks, LGTM!
review:
Approve
Revision history for this message
| dobey (dobey) wrote : | # |
I still have a concern about the version not being used in the operator== for Package, as in its current state it can result in the store showing "INSTALLED" for a newer version of the package than is installed, which, when the new preview design is implemented, can result in the change log showing disparate information in the preview, resulting in the app running without any new changes, when the update has not been installed. However, this is a new issue, primarily with a design that is not yet implemented, so I don't think we should block this branch on that.
Also, the po/POTFILES.in will need updated, but I will do that in a separate branch.
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:297
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'libclickscope/click/interface.cpp' | |||
| 2 | --- libclickscope/click/interface.cpp 2014-06-13 20:44:52 +0000 | |||
| 3 | +++ libclickscope/click/interface.cpp 2014-06-16 14:09:25 +0000 | |||
| 4 | @@ -33,9 +33,11 @@ | |||
| 5 | 33 | #include <QStandardPaths> | 33 | #include <QStandardPaths> |
| 6 | 34 | #include <QTimer> | 34 | #include <QTimer> |
| 7 | 35 | 35 | ||
| 8 | 36 | #include <cstdio> | ||
| 9 | 36 | #include <list> | 37 | #include <list> |
| 10 | 37 | #include <sys/stat.h> | 38 | #include <sys/stat.h> |
| 11 | 38 | #include <map> | 39 | #include <map> |
| 12 | 40 | #include <sstream> | ||
| 13 | 39 | 41 | ||
| 14 | 40 | #include <boost/locale/collator.hpp> | 42 | #include <boost/locale/collator.hpp> |
| 15 | 41 | #include <boost/locale/generator.hpp> | 43 | #include <boost/locale/generator.hpp> |
| 16 | @@ -47,7 +49,6 @@ | |||
| 17 | 47 | 49 | ||
| 18 | 48 | #include <unity/UnityExceptions.h> | 50 | #include <unity/UnityExceptions.h> |
| 19 | 49 | #include <unity/util/IniParser.h> | 51 | #include <unity/util/IniParser.h> |
| 20 | 50 | #include <sstream> | ||
| 21 | 51 | 52 | ||
| 22 | 52 | #include "interface.h" | 53 | #include "interface.h" |
| 23 | 53 | #include <click/key_file_locator.h> | 54 | #include <click/key_file_locator.h> |
| 24 | @@ -368,10 +369,16 @@ | |||
| 25 | 368 | 369 | ||
| 26 | 369 | BOOST_FOREACH(ptree::value_type &sv, pt.get_child("hooks")) | 370 | BOOST_FOREACH(ptree::value_type &sv, pt.get_child("hooks")) |
| 27 | 370 | { | 371 | { |
| 32 | 371 | // FIXME: "primary app" for a package is not defined, we just | 372 | // FIXME: "primary app or scope" for a package is not defined, |
| 33 | 372 | // use first one here: | 373 | // we just use first one here: |
| 34 | 373 | manifest.first_app_name = sv.first; | 374 | auto app_name = sv.second.get("desktop", ""); |
| 35 | 374 | break; | 375 | if (manifest.first_app_name.empty() && !app_name.empty()) { |
| 36 | 376 | manifest.first_app_name = sv.first; | ||
| 37 | 377 | } | ||
| 38 | 378 | auto scope_id = sv.second.get("scope", ""); | ||
| 39 | 379 | if (manifest.first_scope_id.empty() && !scope_id.empty()) { | ||
| 40 | 380 | manifest.first_scope_id = manifest.name; // need to change this for more than one scope per click | ||
| 41 | 381 | } | ||
| 42 | 375 | } | 382 | } |
| 43 | 376 | qDebug() << "adding manifest: " << manifest.name.c_str() << manifest.version.c_str() << manifest.first_app_name.c_str(); | 383 | qDebug() << "adding manifest: " << manifest.name.c_str() << manifest.version.c_str() << manifest.first_app_name.c_str(); |
| 44 | 377 | 384 | ||
| 45 | @@ -398,20 +405,63 @@ | |||
| 46 | 398 | }); | 405 | }); |
| 47 | 399 | } | 406 | } |
| 48 | 400 | 407 | ||
| 49 | 408 | PackageSet package_names_from_stdout(const std::string& stdout_data) | ||
| 50 | 409 | { | ||
| 51 | 410 | const char TAB='\t', NEWLINE='\n'; | ||
| 52 | 411 | std::istringstream iss(stdout_data); | ||
| 53 | 412 | PackageSet installed_packages; | ||
| 54 | 413 | |||
| 55 | 414 | while (iss.peek() != EOF) { | ||
| 56 | 415 | Package p; | ||
| 57 | 416 | std::getline(iss, p.name, TAB); | ||
| 58 | 417 | std::getline(iss, p.version, NEWLINE); | ||
| 59 | 418 | if (iss.eof() || p.name.empty() || p.version.empty()) { | ||
| 60 | 419 | throw std::runtime_error("Error encountered parsing 'click list' output"); | ||
| 61 | 420 | } | ||
| 62 | 421 | installed_packages.insert(p); | ||
| 63 | 422 | } | ||
| 64 | 423 | |||
| 65 | 424 | return installed_packages; | ||
| 66 | 425 | } | ||
| 67 | 426 | |||
| 68 | 427 | void Interface::get_installed_packages(std::function<void(PackageSet, InterfaceError)> callback) | ||
| 69 | 428 | { | ||
| 70 | 429 | std::string command = "click list"; | ||
| 71 | 430 | qDebug() << "Running command:" << command.c_str(); | ||
| 72 | 431 | run_process(command, [callback](int code, const std::string& stdout_data, const std::string& stderr_data) { | ||
| 73 | 432 | if (code == 0) { | ||
| 74 | 433 | try { | ||
| 75 | 434 | PackageSet package_names = package_names_from_stdout(stdout_data); | ||
| 76 | 435 | callback(package_names, InterfaceError::NoError); | ||
| 77 | 436 | } catch (...) { | ||
| 78 | 437 | qWarning() << "Can't parse 'click list' output: " << QString::fromStdString(stdout_data); | ||
| 79 | 438 | callback({}, InterfaceError::ParseError); | ||
| 80 | 439 | } | ||
| 81 | 440 | } else { | ||
| 82 | 441 | qWarning() << "Error" << code << "running 'click list': " << QString::fromStdString(stderr_data); | ||
| 83 | 442 | callback({}, InterfaceError::CallError); | ||
| 84 | 443 | } | ||
| 85 | 444 | }); | ||
| 86 | 445 | } | ||
| 87 | 446 | |||
| 88 | 401 | void Interface::get_manifest_for_app(const std::string &app_id, | 447 | void Interface::get_manifest_for_app(const std::string &app_id, |
| 89 | 402 | std::function<void(Manifest, InterfaceError)> callback) | 448 | std::function<void(Manifest, InterfaceError)> callback) |
| 90 | 403 | { | 449 | { |
| 91 | 404 | std::string command = "click info " + app_id; | 450 | std::string command = "click info " + app_id; |
| 92 | 405 | qDebug() << "Running command:" << command.c_str(); | 451 | qDebug() << "Running command:" << command.c_str(); |
| 94 | 406 | run_process(command, [callback](int code, const std::string& stdout_data, const std::string&) { | 452 | run_process(command, [callback, app_id](int code, const std::string& stdout_data, const std::string& stderr_data) { |
| 95 | 407 | if (code == 0) { | 453 | if (code == 0) { |
| 96 | 408 | try { | 454 | try { |
| 97 | 409 | Manifest manifest = manifest_from_json(stdout_data); | 455 | Manifest manifest = manifest_from_json(stdout_data); |
| 98 | 410 | callback(manifest, InterfaceError::NoError); | 456 | callback(manifest, InterfaceError::NoError); |
| 99 | 411 | } catch (...) { | 457 | } catch (...) { |
| 100 | 458 | qWarning() << "Can't parse 'click info" << QString::fromStdString(app_id) | ||
| 101 | 459 | << "' output: " << QString::fromStdString(stdout_data); | ||
| 102 | 412 | callback(Manifest(), InterfaceError::ParseError); | 460 | callback(Manifest(), InterfaceError::ParseError); |
| 103 | 413 | } | 461 | } |
| 104 | 414 | } else { | 462 | } else { |
| 105 | 463 | qWarning() << "Error" << code << "running 'click info" << QString::fromStdString(app_id) | ||
| 106 | 464 | << "': " << QString::fromStdString(stderr_data); | ||
| 107 | 415 | callback(Manifest(), InterfaceError::CallError); | 465 | callback(Manifest(), InterfaceError::CallError); |
| 108 | 416 | } | 466 | } |
| 109 | 417 | }); | 467 | }); |
| 110 | 418 | 468 | ||
| 111 | === modified file 'libclickscope/click/interface.h' | |||
| 112 | --- libclickscope/click/interface.h 2014-06-13 20:44:52 +0000 | |||
| 113 | +++ libclickscope/click/interface.h 2014-06-16 14:09:25 +0000 | |||
| 114 | @@ -38,6 +38,7 @@ | |||
| 115 | 38 | #include <unordered_set> | 38 | #include <unordered_set> |
| 116 | 39 | 39 | ||
| 117 | 40 | #include "application.h" | 40 | #include "application.h" |
| 118 | 41 | #include "package.h" | ||
| 119 | 41 | 42 | ||
| 120 | 42 | namespace click | 43 | namespace click |
| 121 | 43 | { | 44 | { |
| 122 | @@ -59,7 +60,14 @@ | |||
| 123 | 59 | std::string name; | 60 | std::string name; |
| 124 | 60 | std::string version; | 61 | std::string version; |
| 125 | 61 | std::string first_app_name; | 62 | std::string first_app_name; |
| 126 | 63 | std::string first_scope_id; | ||
| 127 | 62 | bool removable = false; | 64 | bool removable = false; |
| 128 | 65 | bool has_any_apps() const { | ||
| 129 | 66 | return !first_app_name.empty(); | ||
| 130 | 67 | } | ||
| 131 | 68 | bool has_any_scopes() const { | ||
| 132 | 69 | return !first_scope_id.empty(); | ||
| 133 | 70 | } | ||
| 134 | 63 | }; | 71 | }; |
| 135 | 64 | 72 | ||
| 136 | 65 | enum class InterfaceError {NoError, CallError, ParseError}; | 73 | enum class InterfaceError {NoError, CallError, ParseError}; |
| 137 | @@ -89,6 +97,7 @@ | |||
| 138 | 89 | static bool is_icon_identifier(const std::string &icon_id); | 97 | static bool is_icon_identifier(const std::string &icon_id); |
| 139 | 90 | static std::string add_theme_scheme(const std::string &filename); | 98 | static std::string add_theme_scheme(const std::string &filename); |
| 140 | 91 | virtual void get_manifests(std::function<void(ManifestList, InterfaceError)> callback); | 99 | virtual void get_manifests(std::function<void(ManifestList, InterfaceError)> callback); |
| 141 | 100 | virtual void get_installed_packages(std::function<void(PackageSet, InterfaceError)> callback); | ||
| 142 | 92 | virtual void get_manifest_for_app(const std::string &app_id, std::function<void(Manifest, InterfaceError)> callback); | 101 | virtual void get_manifest_for_app(const std::string &app_id, std::function<void(Manifest, InterfaceError)> callback); |
| 143 | 93 | virtual void get_dotdesktop_filename(const std::string &app_id, | 102 | virtual void get_dotdesktop_filename(const std::string &app_id, |
| 144 | 94 | std::function<void(std::string filename, InterfaceError)> callback); | 103 | std::function<void(std::string filename, InterfaceError)> callback); |
| 145 | 95 | 104 | ||
| 146 | === modified file 'libclickscope/click/package.cpp' | |||
| 147 | --- libclickscope/click/package.cpp 2014-06-12 21:05:25 +0000 | |||
| 148 | +++ libclickscope/click/package.cpp 2014-06-16 14:09:25 +0000 | |||
| 149 | @@ -41,10 +41,11 @@ | |||
| 150 | 41 | } | 41 | } |
| 151 | 42 | 42 | ||
| 152 | 43 | bool operator==(const Package& lhs, const Package& rhs) { | 43 | bool operator==(const Package& lhs, const Package& rhs) { |
| 157 | 44 | return lhs.name == rhs.name && | 44 | // We can't include the version in the comparison here, because this |
| 158 | 45 | lhs.title == rhs.title && | 45 | // comparison is used by the sorted_set, that we use to compare a package |
| 159 | 46 | lhs.price == rhs.price && | 46 | // installed locally on the device with a (possibly updated) package available in the store. |
| 160 | 47 | lhs.icon_url == rhs.icon_url; | 47 | return lhs.name == rhs.name; |
| 161 | 48 | |||
| 162 | 48 | } | 49 | } |
| 163 | 49 | 50 | ||
| 164 | 50 | bool operator==(const PackageDetails& lhs, const PackageDetails& rhs) { | 51 | bool operator==(const PackageDetails& lhs, const PackageDetails& rhs) { |
| 165 | 51 | 52 | ||
| 166 | === modified file 'libclickscope/click/package.h' | |||
| 167 | --- libclickscope/click/package.h 2014-06-13 19:58:45 +0000 | |||
| 168 | +++ libclickscope/click/package.h 2014-06-16 14:09:25 +0000 | |||
| 169 | @@ -92,9 +92,18 @@ | |||
| 170 | 92 | std::string url; | 92 | std::string url; |
| 171 | 93 | std::string version; | 93 | std::string version; |
| 172 | 94 | void matches (std::string query, std::function<bool> callback); | 94 | void matches (std::string query, std::function<bool> callback); |
| 173 | 95 | |||
| 174 | 96 | struct hash_name { | ||
| 175 | 97 | public : | ||
| 176 | 98 | size_t operator()(const Package &package ) const | ||
| 177 | 99 | { | ||
| 178 | 100 | return std::hash<std::string>()(package.name); | ||
| 179 | 101 | } | ||
| 180 | 102 | }; | ||
| 181 | 95 | }; | 103 | }; |
| 182 | 96 | 104 | ||
| 183 | 97 | typedef std::vector<Package> Packages; | 105 | typedef std::vector<Package> Packages; |
| 184 | 106 | typedef std::unordered_set<Package, Package::hash_name> PackageSet; | ||
| 185 | 98 | 107 | ||
| 186 | 99 | Package package_from_json_node(const Json::Value& item); | 108 | Package package_from_json_node(const Json::Value& item); |
| 187 | 100 | Packages package_list_from_json(const std::string& json); | 109 | Packages package_list_from_json(const std::string& json); |
| 188 | 101 | 110 | ||
| 189 | === modified file 'libclickscope/click/preview.cpp' | |||
| 190 | --- libclickscope/click/preview.cpp 2014-06-12 21:05:25 +0000 | |||
| 191 | +++ libclickscope/click/preview.cpp 2014-06-16 14:09:25 +0000 | |||
| 192 | @@ -36,6 +36,7 @@ | |||
| 193 | 36 | #include <boost/algorithm/string/replace.hpp> | 36 | #include <boost/algorithm/string/replace.hpp> |
| 194 | 37 | 37 | ||
| 195 | 38 | #include <unity/UnityExceptions.h> | 38 | #include <unity/UnityExceptions.h> |
| 196 | 39 | #include <unity/scopes/CannedQuery.h> | ||
| 197 | 39 | #include <unity/scopes/PreviewReply.h> | 40 | #include <unity/scopes/PreviewReply.h> |
| 198 | 40 | #include <unity/scopes/Variant.h> | 41 | #include <unity/scopes/Variant.h> |
| 199 | 41 | #include <unity/scopes/VariantBuilder.h> | 42 | #include <unity/scopes/VariantBuilder.h> |
| 200 | @@ -500,14 +501,23 @@ | |||
| 201 | 500 | scopes::PreviewWidgetList widgets; | 501 | scopes::PreviewWidgetList widgets; |
| 202 | 501 | scopes::PreviewWidget buttons("buttons", "actions"); | 502 | scopes::PreviewWidget buttons("buttons", "actions"); |
| 203 | 502 | scopes::VariantBuilder builder; | 503 | scopes::VariantBuilder builder; |
| 204 | 504 | |||
| 205 | 505 | std::string open_label = _("Open"); | ||
| 206 | 506 | |||
| 207 | 507 | if (!manifest.has_any_apps() && manifest.has_any_scopes()) { | ||
| 208 | 508 | open_label = _("Search"); | ||
| 209 | 509 | } | ||
| 210 | 510 | |||
| 211 | 503 | if (!uri.empty()) | 511 | if (!uri.empty()) |
| 212 | 504 | { | 512 | { |
| 213 | 505 | builder.add_tuple( | 513 | builder.add_tuple( |
| 214 | 506 | { | 514 | { |
| 215 | 507 | {"id", scopes::Variant(click::Preview::Actions::OPEN_CLICK)}, | 515 | {"id", scopes::Variant(click::Preview::Actions::OPEN_CLICK)}, |
| 217 | 508 | {"label", scopes::Variant(_("Open"))}, | 516 | {"label", scopes::Variant(open_label)}, |
| 218 | 509 | {"uri", scopes::Variant(uri)} | 517 | {"uri", scopes::Variant(uri)} |
| 219 | 510 | }); | 518 | }); |
| 220 | 519 | qDebug() << "Adding button" << QString::fromStdString(open_label) << "-" | ||
| 221 | 520 | << QString::fromStdString(uri); | ||
| 222 | 511 | } | 521 | } |
| 223 | 512 | if (manifest.removable) | 522 | if (manifest.removable) |
| 224 | 513 | { | 523 | { |
| 225 | @@ -523,30 +533,42 @@ | |||
| 226 | 523 | return widgets; | 533 | return widgets; |
| 227 | 524 | } | 534 | } |
| 228 | 525 | 535 | ||
| 230 | 526 | void InstalledPreview::getApplicationUri(const Manifest& /*manifest*/, std::function<void(const std::string&)> callback) | 536 | void InstalledPreview::getApplicationUri(const Manifest& manifest, std::function<void(const std::string&)> callback) |
| 231 | 527 | { | 537 | { |
| 232 | 528 | std::string uri; | ||
| 233 | 529 | QString app_url = QString::fromStdString(result.uri()); | 538 | QString app_url = QString::fromStdString(result.uri()); |
| 234 | 530 | 539 | ||
| 235 | 531 | // asynchronously get application uri based on app name, if the uri is not application://. | 540 | // asynchronously get application uri based on app name, if the uri is not application://. |
| 236 | 532 | // this can happen if the app was just installed and we have its http uri from the Result. | 541 | // this can happen if the app was just installed and we have its http uri from the Result. |
| 237 | 533 | if (!app_url.startsWith("application:///")) { | 542 | if (!app_url.startsWith("application:///")) { |
| 238 | 534 | const std::string name = result["name"].get_string(); | 543 | const std::string name = result["name"].get_string(); |
| 251 | 535 | qt::core::world::enter_with_task([this, name, callback] () | 544 | |
| 252 | 536 | { | 545 | if (manifest.has_any_apps()) { |
| 253 | 537 | click::Interface().get_dotdesktop_filename(name, | 546 | qt::core::world::enter_with_task([this, name, callback] () |
| 254 | 538 | [callback] (std::string val, click::InterfaceError error) { | 547 | { |
| 255 | 539 | std::string uri; | 548 | click::Interface().get_dotdesktop_filename(name, |
| 256 | 540 | if (error == click::InterfaceError::NoError) { | 549 | [callback, name] (std::string val, click::InterfaceError error) { |
| 257 | 541 | uri = "application:///" + val; | 550 | std::string uri; |
| 258 | 542 | } | 551 | if (error == click::InterfaceError::NoError) { |
| 259 | 543 | callback(uri); | 552 | uri = "application:///" + val; |
| 260 | 544 | } | 553 | } else { |
| 261 | 545 | ); | 554 | qWarning() << "Can't get .desktop filename for" |
| 262 | 546 | }); | 555 | << QString::fromStdString(name); |
| 263 | 556 | } | ||
| 264 | 557 | callback(uri); | ||
| 265 | 558 | } | ||
| 266 | 559 | ); | ||
| 267 | 560 | }); | ||
| 268 | 561 | } else { | ||
| 269 | 562 | if (manifest.has_any_scopes()) { | ||
| 270 | 563 | unity::scopes::CannedQuery cq(manifest.first_scope_id); | ||
| 271 | 564 | auto scope_uri = cq.to_uri(); | ||
| 272 | 565 | qDebug() << "Found uri for scope" << QString::fromStdString(manifest.first_scope_id) | ||
| 273 | 566 | << "-" << QString::fromStdString(scope_uri); | ||
| 274 | 567 | callback(scope_uri); | ||
| 275 | 568 | } | ||
| 276 | 569 | } | ||
| 277 | 547 | } else { | 570 | } else { |
| 280 | 548 | uri = app_url.toStdString(); | 571 | callback(result.uri()); |
| 279 | 549 | callback(uri); | ||
| 281 | 550 | } | 572 | } |
| 282 | 551 | } | 573 | } |
| 283 | 552 | 574 | ||
| 284 | 553 | 575 | ||
| 285 | === modified file 'libclickscope/tests/fake_json.h' | |||
| 286 | --- libclickscope/tests/fake_json.h 2014-05-26 14:27:31 +0000 | |||
| 287 | +++ libclickscope/tests/fake_json.h 2014-06-16 14:09:25 +0000 | |||
| 288 | @@ -176,4 +176,76 @@ | |||
| 289 | 176 | } | 176 | } |
| 290 | 177 | )foo"; | 177 | )foo"; |
| 291 | 178 | 178 | ||
| 292 | 179 | const std::string FAKE_JSON_MANIFEST_ONE_APP = R"foo( | ||
| 293 | 180 | { | ||
| 294 | 181 | "_removable": 1, | ||
| 295 | 182 | "name": "com.example.fake-app", | ||
| 296 | 183 | "version": "0.1", | ||
| 297 | 184 | "hooks": { | ||
| 298 | 185 | "fake-app": { | ||
| 299 | 186 | "apparmor": "fake-app.json", | ||
| 300 | 187 | "desktop": "fake-app.desktop" | ||
| 301 | 188 | } | ||
| 302 | 189 | } | ||
| 303 | 190 | } | ||
| 304 | 191 | )foo"; | ||
| 305 | 192 | |||
| 306 | 193 | const std::string FAKE_JSON_MANIFEST_ONE_SCOPE = R"foo( | ||
| 307 | 194 | { | ||
| 308 | 195 | "_removable": 1, | ||
| 309 | 196 | "name": "com.example.fake-scope", | ||
| 310 | 197 | "version": "0.1", | ||
| 311 | 198 | "hooks": { | ||
| 312 | 199 | "fake-scope": { | ||
| 313 | 200 | "apparmor": "scope-security.json", | ||
| 314 | 201 | "scope": "fake-scope" | ||
| 315 | 202 | } | ||
| 316 | 203 | } | ||
| 317 | 204 | } | ||
| 318 | 205 | )foo"; | ||
| 319 | 206 | |||
| 320 | 207 | const std::string FAKE_JSON_MANIFEST_ONE_APP_ONE_SCOPE = R"foo( | ||
| 321 | 208 | { | ||
| 322 | 209 | "_removable": 1, | ||
| 323 | 210 | "name": "com.example.fake-1app-1scope", | ||
| 324 | 211 | "version": "0.1", | ||
| 325 | 212 | "hooks": { | ||
| 326 | 213 | "fake-app": { | ||
| 327 | 214 | "apparmor": "fake-app.json", | ||
| 328 | 215 | "desktop": "fake-app.desktop" | ||
| 329 | 216 | }, | ||
| 330 | 217 | "fake-scope": { | ||
| 331 | 218 | "apparmor": "scope-security.json", | ||
| 332 | 219 | "scope": "fake-scope" | ||
| 333 | 220 | } | ||
| 334 | 221 | } | ||
| 335 | 222 | } | ||
| 336 | 223 | )foo"; | ||
| 337 | 224 | |||
| 338 | 225 | const std::string FAKE_JSON_MANIFEST_TWO_APPS_TWO_SCOPES = R"foo( | ||
| 339 | 226 | { | ||
| 340 | 227 | "_removable": 1, | ||
| 341 | 228 | "name": "com.example.fake-2apps-2scopes", | ||
| 342 | 229 | "version": "0.1", | ||
| 343 | 230 | "hooks": { | ||
| 344 | 231 | "fake-app1": { | ||
| 345 | 232 | "apparmor": "fake-app1.json", | ||
| 346 | 233 | "desktop": "fake-app1.desktop" | ||
| 347 | 234 | }, | ||
| 348 | 235 | "fake-app2": { | ||
| 349 | 236 | "apparmor": "fake-app2.json", | ||
| 350 | 237 | "desktop": "fake-app2.desktop" | ||
| 351 | 238 | }, | ||
| 352 | 239 | "fake-scope1": { | ||
| 353 | 240 | "apparmor": "scope-security1.json", | ||
| 354 | 241 | "scope": "fake-scope1" | ||
| 355 | 242 | }, | ||
| 356 | 243 | "fake-scope2": { | ||
| 357 | 244 | "apparmor": "scope-security1.json", | ||
| 358 | 245 | "scope": "fake-scope2" | ||
| 359 | 246 | } | ||
| 360 | 247 | } | ||
| 361 | 248 | } | ||
| 362 | 249 | )foo"; | ||
| 363 | 250 | |||
| 364 | 179 | #endif // FAKE_JSON_H | 251 | #endif // FAKE_JSON_H |
| 365 | 180 | 252 | ||
| 366 | === modified file 'libclickscope/tests/test_interface.cpp' | |||
| 367 | --- libclickscope/tests/test_interface.cpp 2014-06-13 20:44:52 +0000 | |||
| 368 | +++ libclickscope/tests/test_interface.cpp 2014-06-16 14:09:25 +0000 | |||
| 369 | @@ -119,6 +119,7 @@ | |||
| 370 | 119 | public: | 119 | public: |
| 371 | 120 | MOCK_METHOD2(manifest_callback, void(Manifest, InterfaceError)); | 120 | MOCK_METHOD2(manifest_callback, void(Manifest, InterfaceError)); |
| 372 | 121 | MOCK_METHOD2(manifests_callback, void(ManifestList, InterfaceError)); | 121 | MOCK_METHOD2(manifests_callback, void(ManifestList, InterfaceError)); |
| 373 | 122 | MOCK_METHOD2(installed_callback, void(PackageSet, InterfaceError)); | ||
| 374 | 122 | }; | 123 | }; |
| 375 | 123 | 124 | ||
| 376 | 124 | } | 125 | } |
| 377 | @@ -447,6 +448,40 @@ | |||
| 378 | 447 | EXPECT_FALSE(iface.show_desktop_apps()); | 448 | EXPECT_FALSE(iface.show_desktop_apps()); |
| 379 | 448 | } | 449 | } |
| 380 | 449 | 450 | ||
| 381 | 451 | TEST(ClickInterface, testManifestFromJsonOneApp) | ||
| 382 | 452 | { | ||
| 383 | 453 | Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_ONE_APP); | ||
| 384 | 454 | ASSERT_EQ(m.first_app_name, "fake-app"); | ||
| 385 | 455 | ASSERT_TRUE(m.has_any_apps()); | ||
| 386 | 456 | ASSERT_FALSE(m.has_any_scopes()); | ||
| 387 | 457 | } | ||
| 388 | 458 | |||
| 389 | 459 | TEST(ClickInterface, testManifestFromJsonOneScope) | ||
| 390 | 460 | { | ||
| 391 | 461 | Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_ONE_SCOPE); | ||
| 392 | 462 | ASSERT_EQ(m.first_scope_id, "com.example.fake-scope"); | ||
| 393 | 463 | ASSERT_FALSE(m.has_any_apps()); | ||
| 394 | 464 | ASSERT_TRUE(m.has_any_scopes()); | ||
| 395 | 465 | } | ||
| 396 | 466 | |||
| 397 | 467 | TEST(ClickInterface, testManifestFromJsonOneAppOneScope) | ||
| 398 | 468 | { | ||
| 399 | 469 | Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_ONE_APP_ONE_SCOPE); | ||
| 400 | 470 | ASSERT_EQ(m.first_app_name, "fake-app"); | ||
| 401 | 471 | ASSERT_EQ(m.first_scope_id, "com.example.fake-1app-1scope"); | ||
| 402 | 472 | ASSERT_TRUE(m.has_any_apps()); | ||
| 403 | 473 | ASSERT_TRUE(m.has_any_scopes()); | ||
| 404 | 474 | } | ||
| 405 | 475 | |||
| 406 | 476 | TEST(ClickInterface, testManifestFromJsonTwoAppsTwoScopes) | ||
| 407 | 477 | { | ||
| 408 | 478 | Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_TWO_APPS_TWO_SCOPES); | ||
| 409 | 479 | ASSERT_EQ(m.first_app_name, "fake-app1"); | ||
| 410 | 480 | ASSERT_EQ(m.first_scope_id, "com.example.fake-2apps-2scopes"); | ||
| 411 | 481 | ASSERT_TRUE(m.has_any_apps()); | ||
| 412 | 482 | ASSERT_TRUE(m.has_any_scopes()); | ||
| 413 | 483 | } | ||
| 414 | 484 | |||
| 415 | 450 | TEST(ClickInterface, testGetManifestForAppCorrectCommand) | 485 | TEST(ClickInterface, testGetManifestForAppCorrectCommand) |
| 416 | 451 | { | 486 | { |
| 417 | 452 | FakeClickInterface iface; | 487 | FakeClickInterface iface; |
| 418 | @@ -584,3 +619,64 @@ | |||
| 419 | 584 | ASSERT_TRUE(manifests.size() == expected.size()); | 619 | ASSERT_TRUE(manifests.size() == expected.size()); |
| 420 | 585 | }); | 620 | }); |
| 421 | 586 | } | 621 | } |
| 422 | 622 | |||
| 423 | 623 | TEST(ClickInterface, testGetInstalledPackagesCorrectCommand) | ||
| 424 | 624 | { | ||
| 425 | 625 | FakeClickInterface iface; | ||
| 426 | 626 | std::string command = "click list"; | ||
| 427 | 627 | EXPECT_CALL(iface, run_process(command, _)). | ||
| 428 | 628 | Times(1); | ||
| 429 | 629 | iface.get_installed_packages([](PackageSet, InterfaceError){}); | ||
| 430 | 630 | } | ||
| 431 | 631 | |||
| 432 | 632 | TEST_F(ClickInterfaceTest, testGetInstalledPackagesParseError) | ||
| 433 | 633 | { | ||
| 434 | 634 | FakeClickInterface iface; | ||
| 435 | 635 | EXPECT_CALL(iface, run_process(_, _)). | ||
| 436 | 636 | Times(1). | ||
| 437 | 637 | WillOnce(Invoke([&](const std::string&, | ||
| 438 | 638 | std::function<void(int, const std::string&, | ||
| 439 | 639 | const std::string&)> callback){ | ||
| 440 | 640 | callback(0, "valid.package\t1.0\nINVALID LINE", ""); | ||
| 441 | 641 | })); | ||
| 442 | 642 | EXPECT_CALL(*this, installed_callback(_, InterfaceError::ParseError)); | ||
| 443 | 643 | iface.get_installed_packages([this](PackageSet package_names, InterfaceError error){ | ||
| 444 | 644 | installed_callback(package_names, error); | ||
| 445 | 645 | }); | ||
| 446 | 646 | } | ||
| 447 | 647 | |||
| 448 | 648 | TEST_F(ClickInterfaceTest, testGetInstalledPackagesCommandFailed) | ||
| 449 | 649 | { | ||
| 450 | 650 | FakeClickInterface iface; | ||
| 451 | 651 | EXPECT_CALL(iface, run_process(_, _)). | ||
| 452 | 652 | Times(1). | ||
| 453 | 653 | WillOnce(Invoke([&](const std::string&, | ||
| 454 | 654 | std::function<void(int, const std::string&, | ||
| 455 | 655 | const std::string&)> callback){ | ||
| 456 | 656 | callback(-1, "", "CRITICAL: FAIL"); | ||
| 457 | 657 | })); | ||
| 458 | 658 | EXPECT_CALL(*this, installed_callback(_, InterfaceError::CallError)); | ||
| 459 | 659 | iface.get_installed_packages([this](PackageSet package_names, InterfaceError error){ | ||
| 460 | 660 | installed_callback(package_names, error); | ||
| 461 | 661 | }); | ||
| 462 | 662 | } | ||
| 463 | 663 | |||
| 464 | 664 | TEST_F(ClickInterfaceTest, testGetInstalledPackagesParsed) | ||
| 465 | 665 | { | ||
| 466 | 666 | FakeClickInterface iface; | ||
| 467 | 667 | std::string sample_stdout = "ABC\t0.1\nDEF\t0.2\n"; | ||
| 468 | 668 | PackageSet expected{{"ABC", "0.1"}, {"DEF", "0.2"}}; | ||
| 469 | 669 | |||
| 470 | 670 | EXPECT_CALL(iface, run_process(_, _)). | ||
| 471 | 671 | Times(1). | ||
| 472 | 672 | WillOnce(Invoke([&](const std::string&, | ||
| 473 | 673 | std::function<void(int, const std::string&, | ||
| 474 | 674 | const std::string&)> callback){ | ||
| 475 | 675 | callback(0, sample_stdout, ""); | ||
| 476 | 676 | })); | ||
| 477 | 677 | iface.get_installed_packages([expected](PackageSet package_names, InterfaceError error){ | ||
| 478 | 678 | ASSERT_EQ(error, InterfaceError::NoError); | ||
| 479 | 679 | ASSERT_EQ(package_names, expected); | ||
| 480 | 680 | }); | ||
| 481 | 681 | } | ||
| 482 | 682 | |||
| 483 | 587 | 683 | ||
| 484 | === modified file 'scope/clickstore/store-query.cpp' | |||
| 485 | --- scope/clickstore/store-query.cpp 2014-06-12 21:05:25 +0000 | |||
| 486 | +++ scope/clickstore/store-query.cpp 2014-06-16 14:09:25 +0000 | |||
| 487 | @@ -48,6 +48,8 @@ | |||
| 488 | 48 | 48 | ||
| 489 | 49 | #include <click/click-i18n.h> | 49 | #include <click/click-i18n.h> |
| 490 | 50 | 50 | ||
| 491 | 51 | using namespace click; | ||
| 492 | 52 | |||
| 493 | 51 | namespace | 53 | namespace |
| 494 | 52 | { | 54 | { |
| 495 | 53 | 55 | ||
| 496 | @@ -60,10 +62,10 @@ | |||
| 497 | 60 | }, | 62 | }, |
| 498 | 61 | "components" : { | 63 | "components" : { |
| 499 | 62 | "title" : "title", | 64 | "title" : "title", |
| 500 | 65 | "subtitle": "subtitle", | ||
| 501 | 63 | "art" : { | 66 | "art" : { |
| 502 | 64 | "field": "art", | 67 | "field": "art", |
| 505 | 65 | "aspect-ratio": 1.6, | 68 | "aspect-ratio": 1.13 |
| 504 | 66 | "fill-mode": "fit" | ||
| 506 | 67 | } | 69 | } |
| 507 | 68 | } | 70 | } |
| 508 | 69 | } | 71 | } |
| 509 | @@ -82,7 +84,7 @@ | |||
| 510 | 82 | "mascot" : { | 84 | "mascot" : { |
| 511 | 83 | "field": "art" | 85 | "field": "art" |
| 512 | 84 | }, | 86 | }, |
| 514 | 85 | "subtitle": "publisher" | 87 | "subtitle": "subtitle" |
| 515 | 86 | } | 88 | } |
| 516 | 87 | } | 89 | } |
| 517 | 88 | )"; | 90 | )"; |
| 518 | @@ -119,9 +121,7 @@ | |||
| 519 | 119 | impl->search_operation.cancel(); | 121 | impl->search_operation.cancel(); |
| 520 | 120 | } | 122 | } |
| 521 | 121 | 123 | ||
| 525 | 122 | namespace | 124 | click::Interface& click::Query::clickInterfaceInstance() |
| 523 | 123 | { | ||
| 524 | 124 | click::Interface& clickInterfaceInstance() | ||
| 526 | 125 | { | 125 | { |
| 527 | 126 | static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator()); | 126 | static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator()); |
| 528 | 127 | static click::Interface iface(keyFileLocator); | 127 | static click::Interface iface(keyFileLocator); |
| 529 | @@ -129,8 +129,6 @@ | |||
| 530 | 129 | return iface; | 129 | return iface; |
| 531 | 130 | } | 130 | } |
| 532 | 131 | 131 | ||
| 533 | 132 | } | ||
| 534 | 133 | |||
| 535 | 134 | bool click::Query::push_result(scopes::SearchReplyProxy const& searchReply, const scopes::CategorisedResult &res) | 132 | bool click::Query::push_result(scopes::SearchReplyProxy const& searchReply, const scopes::CategorisedResult &res) |
| 536 | 135 | { | 133 | { |
| 537 | 136 | return searchReply->push(res); | 134 | return searchReply->push(res); |
| 538 | @@ -158,7 +156,7 @@ | |||
| 539 | 158 | } | 156 | } |
| 540 | 159 | 157 | ||
| 541 | 160 | void click::Query::add_available_apps(scopes::SearchReplyProxy const& searchReply, | 158 | void click::Query::add_available_apps(scopes::SearchReplyProxy const& searchReply, |
| 543 | 161 | const std::set<std::string>& locallyInstalledApps, | 159 | const PackageSet& installedPackages, |
| 544 | 162 | const std::string& categoryTemplate) | 160 | const std::string& categoryTemplate) |
| 545 | 163 | { | 161 | { |
| 546 | 164 | scopes::CategoryRenderer categoryRenderer(categoryTemplate); | 162 | scopes::CategoryRenderer categoryRenderer(categoryTemplate); |
| 547 | @@ -166,7 +164,7 @@ | |||
| 548 | 166 | 164 | ||
| 549 | 167 | run_under_qt([=]() | 165 | run_under_qt([=]() |
| 550 | 168 | { | 166 | { |
| 552 | 169 | auto search_cb = [this, searchReply, category, locallyInstalledApps](click::Packages packages) { | 167 | auto search_cb = [this, searchReply, category, installedPackages](Packages packages) { |
| 553 | 170 | qDebug("search callback"); | 168 | qDebug("search callback"); |
| 554 | 171 | 169 | ||
| 555 | 172 | // handle packages data | 170 | // handle packages data |
| 556 | @@ -174,16 +172,20 @@ | |||
| 557 | 174 | qDebug() << "pushing result" << QString::fromStdString(p.name); | 172 | qDebug() << "pushing result" << QString::fromStdString(p.name); |
| 558 | 175 | try { | 173 | try { |
| 559 | 176 | scopes::CategorisedResult res(category); | 174 | scopes::CategorisedResult res(category); |
| 560 | 177 | // TODO: mark as installed | ||
| 561 | 178 | if (locallyInstalledApps.count(p.name) > 0) { | ||
| 562 | 179 | qDebug() << "already installed" << QString::fromStdString(p.name); | ||
| 563 | 180 | continue; | ||
| 564 | 181 | } | ||
| 565 | 182 | res.set_title(p.title); | 175 | res.set_title(p.title); |
| 566 | 183 | res.set_art(p.icon_url); | 176 | res.set_art(p.icon_url); |
| 567 | 184 | res.set_uri(p.url); | 177 | res.set_uri(p.url); |
| 568 | 185 | res[click::Query::ResultKeys::NAME] = p.name; | 178 | res[click::Query::ResultKeys::NAME] = p.name; |
| 570 | 186 | res[click::Query::ResultKeys::INSTALLED] = false; | 179 | auto installed = installedPackages.find(p); |
| 571 | 180 | if (installed != installedPackages.end()) { | ||
| 572 | 181 | res[click::Query::ResultKeys::INSTALLED] = true; | ||
| 573 | 182 | res["subtitle"] = _("✔ INSTALLED"); | ||
| 574 | 183 | res[click::Query::ResultKeys::VERSION] = installed->version; | ||
| 575 | 184 | } else { | ||
| 576 | 185 | res[click::Query::ResultKeys::INSTALLED] = false; | ||
| 577 | 186 | // TODO: get the real price from the webservice (upcoming branch) | ||
| 578 | 187 | res["subtitle"] = _("FREE"); | ||
| 579 | 188 | } | ||
| 580 | 187 | 189 | ||
| 581 | 188 | this->push_result(searchReply, res); | 190 | this->push_result(searchReply, res); |
| 582 | 189 | } catch(const std::exception& e){ | 191 | } catch(const std::exception& e){ |
| 583 | @@ -201,6 +203,23 @@ | |||
| 584 | 201 | }); | 203 | }); |
| 585 | 202 | } | 204 | } |
| 586 | 203 | 205 | ||
| 587 | 206 | PackageSet click::Query::get_installed_packages() | ||
| 588 | 207 | { | ||
| 589 | 208 | std::promise<PackageSet> installed_promise; | ||
| 590 | 209 | std::future<PackageSet> installed_future = installed_promise.get_future(); | ||
| 591 | 210 | |||
| 592 | 211 | run_under_qt([&]() | ||
| 593 | 212 | { | ||
| 594 | 213 | clickInterfaceInstance().get_installed_packages( | ||
| 595 | 214 | [&installed_promise](PackageSet installedPackages, InterfaceError){ | ||
| 596 | 215 | installed_promise.set_value(installedPackages); | ||
| 597 | 216 | }); | ||
| 598 | 217 | }); | ||
| 599 | 218 | |||
| 600 | 219 | return installed_future.get(); | ||
| 601 | 220 | } | ||
| 602 | 221 | |||
| 603 | 222 | |||
| 604 | 204 | void click::Query::run(scopes::SearchReplyProxy const& searchReply) | 223 | void click::Query::run(scopes::SearchReplyProxy const& searchReply) |
| 605 | 205 | { | 224 | { |
| 606 | 206 | auto query = impl->query.query_string(); | 225 | auto query = impl->query.query_string(); |
| 607 | @@ -208,12 +227,6 @@ | |||
| 608 | 208 | if (query.empty()) { | 227 | if (query.empty()) { |
| 609 | 209 | categoryTemplate = CATEGORY_APPS_DISPLAY; | 228 | categoryTemplate = CATEGORY_APPS_DISPLAY; |
| 610 | 210 | } | 229 | } |
| 611 | 211 | auto localResults = clickInterfaceInstance().find_installed_apps(query); | ||
| 612 | 212 | |||
| 613 | 213 | std::set<std::string> locallyInstalledApps; | ||
| 614 | 214 | for(const auto& app : localResults) { | ||
| 615 | 215 | locallyInstalledApps.insert(app.name); | ||
| 616 | 216 | } | ||
| 617 | 217 | 230 | ||
| 618 | 218 | static const std::string no_net_hint("no-internet"); | 231 | static const std::string no_net_hint("no-internet"); |
| 619 | 219 | if (impl->meta.contains_hint(no_net_hint)) | 232 | if (impl->meta.contains_hint(no_net_hint)) |
| 620 | @@ -223,8 +236,7 @@ | |||
| 621 | 223 | { | 236 | { |
| 622 | 224 | return; | 237 | return; |
| 623 | 225 | } | 238 | } |
| 624 | 226 | |||
| 625 | 227 | } | 239 | } |
| 626 | 228 | 240 | ||
| 628 | 229 | add_available_apps(searchReply, locallyInstalledApps, categoryTemplate); | 241 | add_available_apps(searchReply, get_installed_packages(), categoryTemplate); |
| 629 | 230 | } | 242 | } |
| 630 | 231 | 243 | ||
| 631 | === modified file 'scope/clickstore/store-query.h' | |||
| 632 | --- scope/clickstore/store-query.h 2014-05-27 06:57:52 +0000 | |||
| 633 | +++ scope/clickstore/store-query.h 2014-06-16 14:09:25 +0000 | |||
| 634 | @@ -36,8 +36,7 @@ | |||
| 635 | 36 | namespace scopes = unity::scopes; | 36 | namespace scopes = unity::scopes; |
| 636 | 37 | 37 | ||
| 637 | 38 | #include <QSharedPointer> | 38 | #include <QSharedPointer> |
| 640 | 39 | #include <set> | 39 | #include <click/interface.h> |
| 639 | 40 | |||
| 641 | 41 | 40 | ||
| 642 | 42 | namespace click | 41 | namespace click |
| 643 | 43 | { | 42 | { |
| 644 | @@ -78,7 +77,10 @@ | |||
| 645 | 78 | virtual void run(scopes::SearchReplyProxy const& reply) override; | 77 | virtual void run(scopes::SearchReplyProxy const& reply) override; |
| 646 | 79 | 78 | ||
| 647 | 80 | protected: | 79 | protected: |
| 649 | 81 | virtual void add_available_apps(const scopes::SearchReplyProxy &searchReply, const std::set<std::string> &locallyInstalledApps, const std::string &category); | 80 | virtual void add_available_apps(const scopes::SearchReplyProxy &searchReply, |
| 650 | 81 | const PackageSet &installedPackages, const std::string &category); | ||
| 651 | 82 | virtual click::Interface& clickInterfaceInstance(); | ||
| 652 | 83 | virtual PackageSet get_installed_packages(); | ||
| 653 | 82 | virtual bool push_result(const scopes::SearchReplyProxy &searchReply, scopes::CategorisedResult const& res); | 84 | virtual bool push_result(const scopes::SearchReplyProxy &searchReply, scopes::CategorisedResult const& res); |
| 654 | 83 | virtual void finished(const scopes::SearchReplyProxy &searchReply); | 85 | virtual void finished(const scopes::SearchReplyProxy &searchReply); |
| 655 | 84 | virtual scopes::Category::SCPtr register_category(scopes::SearchReplyProxy const& searchReply, | 86 | virtual scopes::Category::SCPtr register_category(scopes::SearchReplyProxy const& searchReply, |
| 656 | 85 | 87 | ||
| 657 | === modified file 'scope/tests/test_query.cpp' | |||
| 658 | --- scope/tests/test_query.cpp 2014-06-12 21:05:25 +0000 | |||
| 659 | +++ scope/tests/test_query.cpp 2014-06-16 14:09:25 +0000 | |||
| 660 | @@ -47,6 +47,7 @@ | |||
| 661 | 47 | #include <unity/scopes/SearchReply.h> | 47 | #include <unity/scopes/SearchReply.h> |
| 662 | 48 | 48 | ||
| 663 | 49 | using namespace ::testing; | 49 | using namespace ::testing; |
| 664 | 50 | using namespace click; | ||
| 665 | 50 | 51 | ||
| 666 | 51 | namespace | 52 | namespace |
| 667 | 52 | { | 53 | { |
| 668 | @@ -98,18 +99,20 @@ | |||
| 669 | 98 | 99 | ||
| 670 | 99 | } | 100 | } |
| 671 | 100 | void wrap_add_available_apps(const scopes::SearchReplyProxy &searchReply, | 101 | void wrap_add_available_apps(const scopes::SearchReplyProxy &searchReply, |
| 673 | 101 | const std::set<std::string> &locallyInstalledApps, | 102 | const PackageSet &installedPackages, |
| 674 | 102 | const std::string& categoryTemplate) | 103 | const std::string& categoryTemplate) |
| 675 | 103 | { | 104 | { |
| 677 | 104 | add_available_apps(searchReply, locallyInstalledApps, categoryTemplate); | 105 | add_available_apps(searchReply, installedPackages, categoryTemplate); |
| 678 | 105 | } | 106 | } |
| 679 | 106 | MOCK_METHOD2(push_result, bool(scopes::SearchReplyProxy const&, scopes::CategorisedResult const&)); | 107 | MOCK_METHOD2(push_result, bool(scopes::SearchReplyProxy const&, scopes::CategorisedResult const&)); |
| 680 | 108 | MOCK_METHOD0(clickInterfaceInstance, click::Interface&()); | ||
| 681 | 107 | MOCK_METHOD1(finished, void(scopes::SearchReplyProxy const&)); | 109 | MOCK_METHOD1(finished, void(scopes::SearchReplyProxy const&)); |
| 682 | 108 | MOCK_METHOD5(register_category, scopes::Category::SCPtr(const scopes::SearchReplyProxy &searchReply, | 110 | MOCK_METHOD5(register_category, scopes::Category::SCPtr(const scopes::SearchReplyProxy &searchReply, |
| 683 | 109 | const std::string &id, | 111 | const std::string &id, |
| 684 | 110 | const std::string &title, | 112 | const std::string &title, |
| 685 | 111 | const std::string &icon, | 113 | const std::string &icon, |
| 686 | 112 | const scopes::CategoryRenderer &renderer_template)); | 114 | const scopes::CategoryRenderer &renderer_template)); |
| 687 | 115 | using click::Query::get_installed_packages; // allow tests to access protected method | ||
| 688 | 113 | }; | 116 | }; |
| 689 | 114 | 117 | ||
| 690 | 115 | class MockQueryRun : public MockQueryBase { | 118 | class MockQueryRun : public MockQueryBase { |
| 691 | @@ -121,11 +124,12 @@ | |||
| 692 | 121 | } | 124 | } |
| 693 | 122 | MOCK_METHOD3(add_available_apps, | 125 | MOCK_METHOD3(add_available_apps, |
| 694 | 123 | void(scopes::SearchReplyProxy const&searchReply, | 126 | void(scopes::SearchReplyProxy const&searchReply, |
| 696 | 124 | const std::set<std::string> &locallyInstalledApps, | 127 | const PackageSet &locallyInstalledApps, |
| 697 | 125 | const std::string& categoryTemplate)); | 128 | const std::string& categoryTemplate)); |
| 698 | 126 | MOCK_METHOD3(push_local_results, void(scopes::SearchReplyProxy const &replyProxy, | 129 | MOCK_METHOD3(push_local_results, void(scopes::SearchReplyProxy const &replyProxy, |
| 699 | 127 | std::vector<click::Application> const &apps, | 130 | std::vector<click::Application> const &apps, |
| 700 | 128 | std::string& categoryTemplate)); | 131 | std::string& categoryTemplate)); |
| 701 | 132 | MOCK_METHOD0(get_installed_packages, PackageSet()); | ||
| 702 | 129 | }; | 133 | }; |
| 703 | 130 | 134 | ||
| 704 | 131 | class FakeCategory : public scopes::Category | 135 | class FakeCategory : public scopes::Category |
| 705 | @@ -144,7 +148,7 @@ | |||
| 706 | 144 | { | 148 | { |
| 707 | 145 | MockIndex mock_index; | 149 | MockIndex mock_index; |
| 708 | 146 | scopes::SearchMetadata metadata("en_EN", "phone"); | 150 | scopes::SearchMetadata metadata("en_EN", "phone"); |
| 710 | 147 | std::set<std::string> no_installed_packages; | 151 | PackageSet no_installed_packages; |
| 711 | 148 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); | 152 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); |
| 712 | 149 | MockQuery q(query, mock_index, metadata); | 153 | MockQuery q(query, mock_index, metadata); |
| 713 | 150 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(1); | 154 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(1); |
| 714 | @@ -163,7 +167,7 @@ | |||
| 715 | 163 | }; | 167 | }; |
| 716 | 164 | MockIndex mock_index(packages); | 168 | MockIndex mock_index(packages); |
| 717 | 165 | scopes::SearchMetadata metadata("en_EN", "phone"); | 169 | scopes::SearchMetadata metadata("en_EN", "phone"); |
| 719 | 166 | std::set<std::string> no_installed_packages; | 170 | PackageSet no_installed_packages; |
| 720 | 167 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); | 171 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); |
| 721 | 168 | MockQuery q(query, mock_index, metadata); | 172 | MockQuery q(query, mock_index, metadata); |
| 722 | 169 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)); | 173 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)); |
| 723 | @@ -185,7 +189,7 @@ | |||
| 724 | 185 | }; | 189 | }; |
| 725 | 186 | MockIndex mock_index(packages); | 190 | MockIndex mock_index(packages); |
| 726 | 187 | scopes::SearchMetadata metadata("en_EN", "phone"); | 191 | scopes::SearchMetadata metadata("en_EN", "phone"); |
| 728 | 188 | std::set<std::string> no_installed_packages; | 192 | PackageSet no_installed_packages; |
| 729 | 189 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); | 193 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); |
| 730 | 190 | MockQuery q(query, mock_index, metadata); | 194 | MockQuery q(query, mock_index, metadata); |
| 731 | 191 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)); | 195 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)); |
| 732 | @@ -206,37 +210,94 @@ | |||
| 733 | 206 | }; | 210 | }; |
| 734 | 207 | MockIndex mock_index(packages); | 211 | MockIndex mock_index(packages); |
| 735 | 208 | scopes::SearchMetadata metadata("en_EN", "phone"); | 212 | scopes::SearchMetadata metadata("en_EN", "phone"); |
| 736 | 213 | PackageSet no_installed_packages; | ||
| 737 | 209 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); | 214 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); |
| 738 | 210 | MockQueryRun q(query, mock_index, metadata); | 215 | MockQueryRun q(query, mock_index, metadata); |
| 739 | 211 | auto reply = scopes::SearchReplyProxy(); | 216 | auto reply = scopes::SearchReplyProxy(); |
| 741 | 212 | EXPECT_CALL(q, add_available_apps(reply, _, _)); | 217 | EXPECT_CALL(q, get_installed_packages()).WillOnce(Return(no_installed_packages)); |
| 742 | 218 | EXPECT_CALL(q, add_available_apps(reply, no_installed_packages, _)); | ||
| 743 | 213 | 219 | ||
| 744 | 214 | q.run(reply); | 220 | q.run(reply); |
| 745 | 215 | } | 221 | } |
| 746 | 216 | 222 | ||
| 747 | 217 | MATCHER_P(HasPackageName, n, "") { return arg[click::Query::ResultKeys::NAME].get_string() == n; } | 223 | MATCHER_P(HasPackageName, n, "") { return arg[click::Query::ResultKeys::NAME].get_string() == n; } |
| 772 | 218 | 224 | MATCHER_P(IsInstalled, b, "") { return arg[click::Query::ResultKeys::INSTALLED].get_bool() == b; } | |
| 773 | 219 | TEST(QueryTest, testDuplicatesFilteredOnPackageName) | 225 | |
| 774 | 220 | { | 226 | TEST(QueryTest, testDuplicatesNotFilteredAnymore) |
| 775 | 221 | click::Packages packages { | 227 | { |
| 776 | 222 | {"org.example.app1", "app title1", 0.0, "icon", "uri"}, | 228 | click::Packages packages { |
| 777 | 223 | {"org.example.app2", "app title2", 0.0, "icon", "uri"} | 229 | {"org.example.app1", "app title1", 0.0, "icon", "uri"}, |
| 778 | 224 | }; | 230 | {"org.example.app2", "app title2", 0.0, "icon", "uri"} |
| 779 | 225 | MockIndex mock_index(packages); | 231 | }; |
| 780 | 226 | scopes::SearchMetadata metadata("en_EN", "phone"); | 232 | MockIndex mock_index(packages); |
| 781 | 227 | std::set<std::string> one_installed_package { | 233 | scopes::SearchMetadata metadata("en_EN", "phone"); |
| 782 | 228 | "org.example.app2" | 234 | PackageSet one_installed_package { |
| 783 | 229 | }; | 235 | {"org.example.app2", "0.2"} |
| 784 | 230 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); | 236 | }; |
| 785 | 231 | MockQuery q(query, mock_index, metadata); | 237 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); |
| 786 | 232 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)); | 238 | MockQuery q(query, mock_index, metadata); |
| 787 | 233 | 239 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)); | |
| 788 | 234 | scopes::CategoryRenderer renderer("{}"); | 240 | |
| 789 | 235 | auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer); | 241 | scopes::CategoryRenderer renderer("{}"); |
| 790 | 236 | EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat)); | 242 | auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer); |
| 791 | 237 | 243 | EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat)); | |
| 792 | 238 | scopes::SearchReplyProxy reply; | 244 | |
| 793 | 239 | auto expected_name = packages.front().name; | 245 | scopes::SearchReplyProxy reply; |
| 794 | 240 | EXPECT_CALL(q, push_result(_, HasPackageName(expected_name))); | 246 | auto expected_name1 = packages.front().name; |
| 795 | 241 | q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE); | 247 | EXPECT_CALL(q, push_result(_, HasPackageName(expected_name1))); |
| 796 | 248 | auto expected_name2 = packages.back().name; | ||
| 797 | 249 | EXPECT_CALL(q, push_result(_, HasPackageName(expected_name2))); | ||
| 798 | 250 | q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE); | ||
| 799 | 251 | } | ||
| 800 | 252 | |||
| 801 | 253 | TEST(QueryTest, testInstalledPackagesFlaggedAsSuch) | ||
| 802 | 254 | { | ||
| 803 | 255 | click::Packages packages { | ||
| 804 | 256 | {"org.example.app1", "app title1", 0.0, "icon", "uri"}, | ||
| 805 | 257 | {"org.example.app2", "app title2", 0.0, "icon", "uri"} | ||
| 806 | 258 | }; | ||
| 807 | 259 | MockIndex mock_index(packages); | ||
| 808 | 260 | scopes::SearchMetadata metadata("en_EN", "phone"); | ||
| 809 | 261 | PackageSet one_installed_package { | ||
| 810 | 262 | {"org.example.app2", "0.2"} | ||
| 811 | 263 | }; | ||
| 812 | 264 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); | ||
| 813 | 265 | MockQuery q(query, mock_index, metadata); | ||
| 814 | 266 | EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)); | ||
| 815 | 267 | |||
| 816 | 268 | scopes::CategoryRenderer renderer("{}"); | ||
| 817 | 269 | auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer); | ||
| 818 | 270 | EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(ptrCat)); | ||
| 819 | 271 | |||
| 820 | 272 | scopes::SearchReplyProxy reply; | ||
| 821 | 273 | EXPECT_CALL(q, push_result(_, IsInstalled(true))); | ||
| 822 | 274 | EXPECT_CALL(q, push_result(_, IsInstalled(false))); | ||
| 823 | 275 | q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE); | ||
| 824 | 276 | } | ||
| 825 | 277 | |||
| 826 | 278 | class FakeInterface : public click::Interface | ||
| 827 | 279 | { | ||
| 828 | 280 | public: | ||
| 829 | 281 | MOCK_METHOD1(get_installed_packages, void(std::function<void(PackageSet, click::InterfaceError)> callback)); | ||
| 830 | 282 | }; | ||
| 831 | 283 | |||
| 832 | 284 | TEST(QueryTest, testGetInstalledPackages) | ||
| 833 | 285 | { | ||
| 834 | 286 | click::Packages uninstalled_packages { | ||
| 835 | 287 | {"name", "title", 0.0, "icon", "uri"} | ||
| 836 | 288 | }; | ||
| 837 | 289 | MockIndex mock_index(uninstalled_packages); | ||
| 838 | 290 | scopes::SearchMetadata metadata("en_EN", "phone"); | ||
| 839 | 291 | const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, ""); | ||
| 840 | 292 | MockQuery q(query, mock_index, metadata); | ||
| 841 | 293 | PackageSet installed_packages{{"package_1", "0.1"}}; | ||
| 842 | 294 | |||
| 843 | 295 | FakeInterface fake_interface; | ||
| 844 | 296 | EXPECT_CALL(q, clickInterfaceInstance()).WillOnce(ReturnRef(fake_interface)); | ||
| 845 | 297 | EXPECT_CALL(fake_interface, get_installed_packages(_)).WillOnce(Invoke( | ||
| 846 | 298 | [&](std::function<void(PackageSet, click::InterfaceError)> callback){ | ||
| 847 | 299 | callback(installed_packages, click::InterfaceError::NoError); | ||
| 848 | 300 | })); | ||
| 849 | 301 | |||
| 850 | 302 | ASSERT_EQ(q.get_installed_packages(), installed_packages); | ||
| 851 | 242 | } | 303 | } |
PASSED: Continuous integration, rev:291
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://