Merge lp:~libertine-team/libertine-scope/filters-replace-settings into lp:libertine-scope

[Kyle Nitzsche]

* Replace the scope settings approach to suppress display of apps with a scope filter based approach. This provides a blacklist file for permanent suppression and filters for user suppression.
* Provide a "Hidden X Apps" department for a place to store the apps hidden in the main scope view, so they can be unhidden later if desired.

Replace the scope settings approach to suppress display of apps with a scope filter based approach. This provides a
blacklist file for permanent supression and filters for user supression.

# Filters
A scope multiselect option filter (accessible from scope search magnifying glass icon) is created for each container.
* Title is "Exclude Apps: <container name>".
* Each app appears by name.
* Checking an app refreshes the scope with the app excluded.
* Blacklisted apps do not appear

# Blacklist apps:
* Blacklisted apps are completely supressed
* To blacklist an app, add it to data/blacklist file
* One app per line, leading "#" is a comment
* Line is: containerID/desktop (without the .desktop extension)
Example for two containers (puritine * testc):
puritine/openjdk-7-java
puritine/openjdk-7-policytool
puritine/debian-uxterm
puritine/mb-panel-manager
puritine/yelp
testc/mb-panel-manager

== ADDED THE FOLLOWING
Implement departments in order to provide persistent app hiding. Now, there are:
two departments:
 * The default surfacing dept (title: "X Apps") is the same as
 when there were no departments: It shows containers and their apps. Tap an
 app and the preview now has a "Hide" button. Tapping that puts the (by fully
 qualified name) app into the Hidden X Apps department.
 * We now also have "Hidden X Apps" Department. This shows containers & apps for
 all apps the user has hidden. Tap an app, the preview shows "Show" button.
 * App hiding is persistent with hidden apps written to "hidden" file in scope
 cache directory. As such, we now pass cache dir to query constructor.

Address MP (most) comments, notably:
 * fix test_query.cpp's ignoresAnyBlacklistedApps test. Note: this required
 adding a Query method to set the blacklist QStringList since at normal
 runtime, this is set by reading a file in cache directory, which is not
 present during testing. So now we read that file and set in Query constructor
 and then, in the case of the test, set again via the method (set_blacklist())

[lp:~libertine-team/libertine-scope/filters-replace-settings]

46. By Kyle Nitzsche on 2016-05-25

Filter title uses contianer name (instead of container id)

47. By Kyle Nitzsche on 2016-05-31

merge latest trunk to pick up cmake-fixes MP final changes.

[Christopher Townsend (townsend)]

A couple of things on my first pass of this.

One, the tests segfault with this MP, so the package won't build. That definitely needs fixing.

Two, I'd like to see some sort of global filter that applies to all containers by default with some way to override that on a per container basis. For example, in the previous settings blacklist, we are setting those particular apps as hidden and would like to keep it that way with this method.

review: Needs Fixing

[Kyle Nitzsche (knitzsche)]

one: odd about the test segfault. I fixed a test segfault with line 305 below. I will try to reproduce.

two: I'll check into this

[Kyle Nitzsche (knitzsche)]

re one: building the click works (except for the install dir being wrong as discussed in previous MP), and tests pass. So it must be an issue with building the debian package.

[Christopher Townsend (townsend)]

How are you building the click in such a way that the tests are run?

[Christopher Townsend (townsend)]

Also of note is that I'm building this on an amd64 system.

[lp:~libertine-team/libertine-scope/filters-replace-settings]

48. By Kyle Nitzsche on 2016-06-02

* Reverted Query constructer signature:
  * The query run() method needs the scope directory to get the blacklist file. I had previously passed that to the query on construction from the scope class. But this meant that some other cases where the query was constructed (tests) needed to be changed as well. So I reverted this, and the related changes in test_query.cpp in which I had created the Query with "fake" scope dir.
  * Instead, the query now has set_scope_dir() method and scope_dir_ var. Scope now calls this, setting the scope dir in the query for its use.

* Fixed googletest failures:
  * TestQueryFixture's expect_registery() EXPECT_CALL expects that the register_category() arg three is "Application". I had set that an empty string (in query.cpp run()) because the third arg is for an icon, but this caused test failure, so it is back to "Application".
  * This MP's new query.cpp app_keys(app.uri) method expects the uri when split on "/" to be four items in length (which is it at runtime). In testing though, it is not always that long. So I changed the method to simply return an empty map if the uri is too short, and this should not cause run time misbehavior. Related: in tests/fake_container_json.h I made the uris longer, so, for example, instead of some/uri it is now some/uri/pad1/pad2.

* New feature: blacklist from all containers:
  * in data/blacklist file, use containerID of "all", like so: all/yelp
  * Result: the yelp app is excluded from display in the scope, both as an app in results for all containers and in corresponding filters

* New feature: added whitelist capabilities. If you have blacklisted an app from all containers, you can add it back to specified containers like so: whitelist/containerID/app

Feature Example: In the following blacklsit file mp-panel-manager is blacklisted from all containers, but then added back (whitelisted) in testc container.

# containerIDqq/desktop file name (without .desktop extension)
# use containerID "all" to blacklist app from all containers
# examples:
all/mb-panel-manager
puritine/openjdk-7-java
puritine/openjdk-7-policytool
puritine/debian-uxterm
# include apps per continaer that are blacklisted for "all" by prepending "whitelist/"
whitelist/testc/mb-panel-manager
testc/yelp

[Christopher Townsend (townsend)]

Hey Kyle,

Could you please merge lp:libertine-scope to pick up the latest changes and fix the conflicts?

Thanks!

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:48
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~libertine-team/libertine-scope/filters-replace-settings/+merge/295732/+edit-commit-message

https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/10/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/6/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/10/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/6/rebuild

review: Needs Fixing (continuous-integration)

[lp:~libertine-team/libertine-scope/filters-replace-settings]

49. By Kyle Nitzsche on 2016-06-03

[ Chris Townsend ]
* Use the "unconfined" apparmor template to allow the scope to access user
  data (lp: #1558738).
[ Larry Price ]
* Redesigned preview pane with reasonably-sized image, title, and description.
* Filtered app launchers based on a user-input regular expression.
* Added a setting for listing app launcher names which should be excluded
  from the scope view.
[ Stephen M. Webb ]
* Added internationalization support.
[ CI Train Bot ]
* No-change rebuild.
[ Kyle Nitzsche ]
* bzr merge from trunk to pick up diverged bits

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:49
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~libertine-team/libertine-scope/filters-replace-settings/+merge/295732/+edit-commit-message

https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/12/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/8/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/12
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/13
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial/13
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/6
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/6/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial/6/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/6
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/6/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial/6/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[Larry Price (larryprice)]

Works well! I've made a few diff comments below, but I still need to dive into the thick logic before I'm finished.

review: Needs Fixing

[Christopher Townsend (townsend)]

Couple of inline comments as well.

Also, as Larry mentioned we shouldn't comment out the tests. Let's either fix them or just remove them.

[Larry Price (larryprice)]

A few more minor inline comments.

[lp:~libertine-team/libertine-scope/filters-replace-settings]

50. By Kyle Nitzsche on 2016-06-04

interim commit towards revisions for MR

51. By Kyle Nitzsche on 2016-06-06

implement departments to:
* allow the user to Hide an app, in which case it no longer displays in
  root dept, instead it displays in hidden dept.
* all the user to undo the hide (look at hidden department, tap a result,
  tap the Show button

52. By Kyle Nitzsche on 2016-06-06

add activate.h and activate.cpp

53. By Kyle Nitzsche on 2016-06-06

Implement departments in order to provide persistent app hiding. Now, there are:
two departments:
 * The default surfacing dept (title: "X Apps") is the same as
   when there were no departments: It shows containers and their apps. Tap an
   app and the preview now has a "Hide" button. Tapping that puts the (by fully
   qualified name) app into the Hidden X Apps department.
 * We now also have "Hidden X Apps" Department. This shows containers & apps for
   all apps the user has hidden. Tap an app, the preview shows "Show" button.
 * App hiding is persistent with hidden apps written to "hidden" file in scope
   cache directory. As such, we now pass cache dir to query constructor.

Address MP (most) comments, notably:
 * fix test_query.cpp's ignoresAnyBlacklistedApps test. Note: this required
   adding a Query method to set the blacklist QStringList since at normal
   runtime, this is set by reading a file in cache directory, which is not
   present during testing. So now we read that file and set in Query constructor
   and then, in the case of the test, set again via the method (set_blacklist())

54. By Kyle Nitzsche on 2016-06-06

delete debug msg in libertine-scope/CMakeLists.txt

55. By Kyle Nitzsche on 2016-06-06

fix typo in data/blacklist

56. By Kyle Nitzsche on 2016-06-06

typo fix

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:56
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~libertine-team/libertine-scope/filters-replace-settings/+merge/295732/+edit-commit-message

https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/17
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=None/3
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=None/3
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=None/3
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=None/3
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/13/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/17
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/18
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/18
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/11
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/11/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/11
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/11/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/11
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/11/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/11
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/11/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Thanks! Just a very quick first pass- please see inline comments.

I'll build this and try it out soon as well as review the meat of code some more.

review: Needs Fixing

[lp:~libertine-team/libertine-scope/filters-replace-settings]

57. By Kyle Nitzsche on 2016-06-07

* cmake project ver: 1.2
* revert cmake dirs to not break debian build, and leave cmake variant for
building clicks in but commented out

58. By Kyle Nitzsche on 2016-06-07

complete change of scope FQ name to use "ubuntu" in cpp files.

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:58
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~libertine-team/libertine-scope/filters-replace-settings/+merge/295732/+edit-commit-message

https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/14/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/18
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=None/4
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=None/4
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=None/4
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=None/4
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/14/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/18
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/19
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/19
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/12
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/12/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/12
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/12/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/12
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/12/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/12
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/12/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[Larry Price (larryprice)]

i made some syntax comments below, i'll try to check out the functionality and details later.

also, you should set the Commit Message so that CI is fixed.

review: Needs Fixing

[lp:~libertine-team/libertine-scope/filters-replace-settings]

59. By Kyle Nitzsche on 2016-06-07

if an app is hidden, do not display it in filters

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:59
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/19
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=None/5
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=None/5
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=None/5
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=None/5
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/15/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/19
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/20
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/20
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/13
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/13/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/13
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/13/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/13
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/13/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/13
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/13/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/15/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

See inline comments. Make sure the formatting is consistent with the rest of the project code.

review: Needs Fixing

[lp:~libertine-team/libertine-scope/filters-replace-settings]

60. By Kyle Nitzsche on 2016-06-07

use project style in action.cpp and remove two unused functions (qstr and sstr)

61. By Kyle Nitzsche on 2016-06-07

use out(QTextStream) instead of out << std::endl;

62. By Kyle Nitzsche on 2016-06-07

address mp comments

63. By Kyle Nitzsche on 2016-06-07

address mp comments on scope.cpp

64. By Kyle Nitzsche on 2016-06-07

per mp comment, make destructor virtual

65. By Kyle Nitzsche on 2016-06-07

address mp comments in query.cpp and query.h except for the bit about
dropping set_blacklist(), which will be committed separately.

66. By Kyle Nitzsche on 2016-06-07

fix blacklist file yelp whitelist example (commented out)

67. By Kyle Nitzsche on 2016-06-07

first commit of addressing mp request to drop Query's public set_blacklist()
and instead pass the pair of b/w lists to query constructor. This part works,
that is, the scope works. But the test_query.cpp ignoresAnyBlacklistedApps
has not yet been fixed and is here commented out.

68. By Kyle Nitzsche on 2016-06-07

add libertine-scope/config.h.in file to pick up subs vars from root CMakeLists.txt
and add other const vars.

generate config.h via cmake

bzr ignore generated libertine-scope/config.h

69. By Kyle Nitzsche on 2016-06-07

address another set of MP comments around style issue and tuple&tie vs
pair

70. By Kyle Nitzsche on 2016-06-07

one final MP comment fix.

[Kyle Nitzsche (knitzsche)]

On 06/07/2016 02:09 PM, Stephen M. Webb wrote:
> Review: Needs Fixing
>
> See inline comments. Make sure the formatting is consistent with the rest of the project code.
>
> Diff comments:
>
>>
>> === added file 'libertine-scope/action.cpp'
>> --- libertine-scope/action.cpp 1970-01-01 00:00:00 +0000
>> +++ libertine-scope/action.cpp 2016-06-07 14:33:41 +0000
>> @@ -0,0 +1,87 @@
>> +/*
>> + * Copyright (C) 2016 Canonical Ltd
>> + *
>> + * This program is free software: you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 3 as
>> + * published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
>> + * * Authored by:
>> + * Kyle Nitzsche <email address hidden>
>> + */
>> +
>> +#include <action.h>
>
> #include "libertine-scope/action.h"

of course! :)

>
>> +#include <unity/scopes/ActivationResponse.h>
>> +#include <unity/scopes/CannedQuery.h>
>> +#include <url-dispatcher.h>
>> +#include <QString>
>> +#include <QFile>
>> +#include <QTextStream>
>> +
>> +namespace usc = unity::scopes;
>> +using namespace std;
>
> Is there a point to this if all the ats:: names are fully qualified?
copy paste error. removed.

>
>> +
>> +extern QString qstr(const std::string &s);
>> +extern std::string sstr(const QString &qstring);
>> +
>> +Action::Action(const usc::Result &result,
>
> ctor name should be aligned left
done
>
>> + const usc::ActionMetadata &metadata,
>> + const std::string &action_id,
>> + const std::string &cache_dir)
>
> should be type const& not const type &
>
fixed
>> + : usc::ActivationQueryBase(result, metadata),
>> + action_id_(action_id),
>> + cache_dir_(cache_dir){
>> +}
>> +
>> +usc::ActivationResponse Action::activate() {
>
> newline before { and function name aligned left
Got it!
>
>> +
>> + if (action_id_ == "open"){
>
> newline before {
yes
>
>> + url_dispatch_send(result().uri().c_str() , NULL, NULL);
>> + return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
>> + } else if (action_id_ == "hide"){
>
> newlines
fixed
>
>> + QFile file(QString("%1/%2").arg(QString::fromStdString(cache_dir_),"hidden"));
>> + file.open(QIODevice::Append | QIODevice::Text);
>> + QTextStream out(&file);
>> + out << QString::fromStdString(result()["app_id"].get_string()) << "\n";
>> + file.flush();
>> + file.close();
>> + usc::CannedQuery cq("libertine-scope.ubuntu_libertine-scope");
>
> Isn't that scope-id string available as a defined constant somewhere?
Not here. I would have to pass it in constructor.
Instead, I've implemented an approach we've used a lot: get the scope
FQN (PKG_APP) from a new header file (config.h.in > config.h) whose vars
de...

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:69
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/20
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/6
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/6
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/6
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/6
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/16/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/20
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/21
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/21
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/14
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/14/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/14
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/14/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/14
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/14/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/14
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/14/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/16/rebuild

review: Approve (continuous-integration)

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:70
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/17/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/21
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/7
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/7
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/7
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/7
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/17/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/21
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/22
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/22
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/15
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/15/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/15
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/15/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/15
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/15/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/15
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/15/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/17/rebuild

review: Approve (continuous-integration)

[lp:~libertine-team/libertine-scope/filters-replace-settings]

71. By Kyle Nitzsche on 2016-06-07

update the pot file

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:71
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/18/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/22
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/8
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/8
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/8
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/8
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/18/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/22
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/23
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/23
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/16
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/16/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/16
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/16/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/16
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/16/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/16
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/16/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/18/rebuild

review: Approve (continuous-integration)

[lp:~libertine-team/libertine-scope/filters-replace-settings]

72. By Kyle Nitzsche on 2016-06-07

found another instance of pair and changed to tuple per MP
comment

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:72
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/19/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/23
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/9
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/9
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/9
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/9
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/19/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/23
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/24
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/24
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/17
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/17/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/17
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/17/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/17
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/17/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/17
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/17/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/19/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Got a few inline comments again.

review: Needs Fixing

[Kyle Nitzsche (knitzsche)]

Addressed all points. click works fine. comments inline. will soon MP
branch after ensuring gtests still pass.

thx.

On 06/08/2016 10:18 AM, Stephen M. Webb wrote:
> Review: Needs Fixing
>
> Got a few inline comments again.
>
> Diff comments:
>
>>
>> === added file 'libertine-scope/action.cpp'
>> --- libertine-scope/action.cpp 1970-01-01 00:00:00 +0000
>> +++ libertine-scope/action.cpp 2016-06-07 21:40:03 +0000
>> @@ -0,0 +1,96 @@
>> +/*
>> + * Copyright (C) 2016 Canonical Ltd
>> + *
>> + * This program is free software: you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 3 as
>> + * published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
>> + * * Authored by:
>> + * Kyle Nitzsche <email address hidden>
>> + */
>> +
>> +#include "libertine-scope/action.h"
>> +#include "libertine-scope/config.h"
>> +#include <unity/scopes/ActivationResponse.h>
>> +#include <unity/scopes/CannedQuery.h>
>> +#include <url-dispatcher.h>
>> +#include <QString>
>> +#include <QFile>
>> +#include <QTextStream>
>> +
>> +namespace usc = unity::scopes;
>> +
>> +Action::
>> +Action(const usc::Result &result,
>> + usc::ActionMetadata const& metadata,
>> + std::string const& action_id,
>> + std::string const &cache_dir)
>> + : usc::ActivationQueryBase(result, metadata),
>> + action_id_(action_id),
>> + cache_dir_(cache_dir){
>
> newline before {
fixed
>
>> +}
>> +
>> +usc::ActivationResponse
>> +Action::activate()
>> +{
>> +
>> + if (action_id_ == "open")
>> + {
>> + url_dispatch_send(result().uri().c_str() , NULL, NULL);
>> + return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
>> + }
>> + else if (action_id_ == "hide")
>> + {
>> + QFile file(QString("%1/%2").arg(QString::fromStdString(cache_dir_),"hidden"));
>> + file.open(QIODevice::Append | QIODevice::Text);
>> + QTextStream out(&file);
>> + out << QString::fromStdString(result()["app_id"].get_string());
>> + endl(out);
>> + file.close();
>> + usc::CannedQuery cq(SCOPE_PKG + "_" + SCOPE_APP);
>> + cq.set_department_id(ROOT_DEPT_ID_NULL);
>> + return usc::ActivationResponse(cq);
>> + }
>> + else if (action_id_ == "show")
>> + {
>> + QStringList hidden;
>> + QFile hidden_f(QString("%1/%2").arg(QString::fromStdString(cache_dir_), QString::fromStdString("hidden")));
>> + if (hidden_f.exists()) {
>> + QStringList hidden;
>> + if (hidden_f.open(QIODevice::ReadOnly | QIODevice::Text))
>> + {
>> + QTextStream in(&hidden_f);
>> + while (!in.atEnd())
>> + {
>> + QString line(in.readLine());
>> + hidden.append(line.trimmed());
>> + }
>> + hidden_f.close();
>> + }
>...

[lp:~libertine-team/libertine-scope/filters-replace-settings]

73. By Kyle Nitzsche on 2016-06-08

address another set of MP comments

[Stephen M. Webb (bregma)]

OK, good enough for me.

review: Approve

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:73
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/20/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/24
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/10
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/10
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/10
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/10
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/20/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/24
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/25
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/25
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/18
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/18/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/18
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/18/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/18
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/18/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/18
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/18/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/20/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

Submitted another round of comments. We're getting close.

review: Needs Fixing

[lp:~libertine-team/libertine-scope/filters-replace-settings]

74. By Kyle Nitzsche on 2016-06-08

addressed another batch of MP comments.

The only one I did not address is adding a test for whitelisting. I tried,
it does not work, yet whitelisting itself does work. I have not yet seen
what the issue is. here's the test: https://pastebin.canonical.com/158344/

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:74
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/21/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/25
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/11
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/11
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/11
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/11
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/21/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/25
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/26
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/26
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/19
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/19/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/19
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/19/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/19
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/19/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/19
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/19/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/21/rebuild

review: Approve (continuous-integration)

[Kyle Nitzsche (knitzsche)]

On 06/08/2016 12:23 PM, Larry Price wrote:
> Review: Needs Fixing
>
> Submitted another round of comments. We're getting close.
>
> Diff comments:
>
>>
>> === added file 'libertine-scope/action.cpp'
>> --- libertine-scope/action.cpp 1970-01-01 00:00:00 +0000
>> +++ libertine-scope/action.cpp 2016-06-08 15:46:18 +0000
>> @@ -0,0 +1,95 @@
>> +/*
>> + * Copyright (C) 2016 Canonical Ltd
>> + *
>> + * This program is free software: you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 3 as
>> + * published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
>> + * * Authored by:
>> + * Kyle Nitzsche <email address hidden>
>> + */
>> +
>> +#include "libertine-scope/action.h"
>> +#include "libertine-scope/config.h"
>> +#include <unity/scopes/ActivationResponse.h>
>> +#include <unity/scopes/CannedQuery.h>
>> +#include <url-dispatcher.h>
>> +#include <QString>
>> +#include <QFile>
>> +#include <QTextStream>
>> +
>> +namespace usc = unity::scopes;
>> +
>> +Action::
>> +Action(const usc::Result &result,
>> + usc::ActionMetadata const& metadata,
>
> the spacing on this parameter list should be lined up, which would also mean moving const to the other side of usc::Result to match the other params
done
>
>> + std::string const& action_id,
>> + std::string const &cache_dir)
>> + : usc::ActivationQueryBase(result, metadata),
>> + action_id_(action_id),
>> + cache_dir_(cache_dir)
>> +{
>> +}
>> +
>> +usc::ActivationResponse
>> +Action::activate()
>> +{
>> +
>
> delete
done
>
>> + if (action_id_ == "open")
>> + {
>> + url_dispatch_send(result().uri().c_str() , NULL, NULL);
>> + return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
>> + }
>> + else if (action_id_ == "hide")
>> + {
>> + QFile file(QString("%1/%2").arg(QString::fromStdString(cache_dir_),"hidden"));
>> + file.open(QIODevice::Append | QIODevice::Text);
>> + QTextStream out(&file);
>> + out << QString::fromStdString(result()["app_id"].get_string());
>> + endl(out);
>> + file.close();
>> + usc::CannedQuery cq(SCOPE_PKG + "_" + SCOPE_APP);
>> + return usc::ActivationResponse(cq);
>> + }
>> + else if (action_id_ == "show")
>
> this method is a bit long for me - extends more than 1 screen of my laptop. could you extract some of this logic to another function?

done.

>
>> + {
>> + QStringList hidden;
>
> unused variable - delete
right - deleted
>
>> + QFile hidden_f(QString("%1/%2").arg(QString::fromStdString(cache_dir_), QString::fromStdString("hidden")));
>> + if (hidden_f.exists()) {
>> + QStringList hidden;
>> + if (hidden_f.open(QIODevice::ReadOnly | QIODevice::Text))
>> + {
>> + QTextStream in...

[Larry Price (larryprice)]

I've included some quick inline comments.

In regards to the test you mentioned in the pastebin (https://pastebin.canonical.com/158344/), it looks like you are including libreoffice in both the blacklist and the whitelist which is probably why it's failing. Do you mind taking another look at it?

review: Needs Fixing

[Christopher Townsend (townsend)]

Ok, I'm good with this. +1

Thanks!

review: Approve

[lp:~libertine-team/libertine-scope/filters-replace-settings]

75. By Kyle Nitzsche on 2016-06-08

addressed another set of MP comments.

76. By Kyle Nitzsche on 2016-06-08

move make_departments() and make_filters() to anon namespace as static

77. By Kyle Nitzsche on 2016-06-08

revert accidental commit of click centric CMakeLists.txt

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:75
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/22/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/26
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/12
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/12
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/12
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/12
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/22/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/26
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/27
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/27
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/20
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/20/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/20
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/20/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/20
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/20/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/20
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/20/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~libertine-team/libertine-scope/filters-replace-settings]

78. By Kyle Nitzsche on 2016-06-08

remove errant qDebug() statement

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:78
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/23/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/27
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/13
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/13
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/13
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/13
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/23/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/27
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/28
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/28
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/21
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/21/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/21
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/21/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/21
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/21/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/21
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/21/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~libertine-team/libertine-scope/filters-replace-settings]

79. By Kyle Nitzsche on 2016-06-08

add displayWhitelistedApps test_query.cpp test.

[Kyle Nitzsche (knitzsche)]

On 06/08/2016 02:04 PM, Larry Price wrote:
> Review: Needs Fixing
>
> I've included some quick inline comments.
>
> In regards to the test you mentioned in the pastebin (https://pastebin.canonical.com/158344/), it looks like you are including libreoffice in both the blacklist and the whitelist which is probably why it's failing. Do you mind taking another look at it?
>
whitelisting only applies to apps that were blacklisted.

> Diff comments:
>
>>
>> === modified file 'libertine-scope/preview.cpp'
>> --- libertine-scope/preview.cpp 2016-05-03 13:25:14 +0000
>> +++ libertine-scope/preview.cpp 2016-06-08 17:17:49 +0000
>> @@ -57,6 +57,21 @@
>> {"id", usc::Variant("open")},
>> {"label", usc::Variant("Open")},
>> });
>> + if (result()["department_id"].get_string() == "root_dept")
>
> should this be ROOT_DEPT_ID?
yes -thx
>
>> + {
>> + vb.add_tuple({
>> + {"id", usc::Variant("hide")},
>> + {"label", usc::Variant("Hide")},
>> + });
>> + }
>> + else
>> + { //is hidden department
>> + vb.add_tuple({
>> + {"id", usc::Variant("show")},
>> + //Translators: Users tap "Show" button to remove an app from the hidden lis of apps: so the meaning is to undo a hide
>> + {"label", usc::Variant("Show")},
>> + });
>> + }
>> buttons.add_attribute_value("actions", vb.end());
>>
>> usc::PreviewWidget desc("desc", "text");
>>
>> === modified file 'libertine-scope/query.cpp'
>> --- libertine-scope/query.cpp 2016-05-04 17:56:13 +0000
>> +++ libertine-scope/query.cpp 2016-06-08 17:17:49 +0000
>> @@ -71,59 +120,140 @@
>> {
>> }
>>
>> -
>> unity::scopes::VariantMap
>> Query::settings() const
>> {
>> return SearchQueryBase::settings();
>> }
>>
>> -
>> -QStringList
>> -Query::blacklist() const
>> -{
>> - QStringList blacklistedApps;
>> - auto blacklist = settings()["blacklist"];
>> - if (!blacklist.is_null()) {
>> - blacklistedApps = QString::fromStdString(blacklist.get_string())
>> - .remove("\"")
>> - .split(";", QString::SkipEmptyParts);
>> - }
>> - return blacklistedApps;
>> -}
>> -
>> -
>> void Query::
>> run(usc::SearchReplyProxy const& reply)
>> {
>> - auto blacklistedApps = blacklist();
>> + auto hidden = get_hidden(cache_dir_);
>> + // make scope departments
>
> This function is really long to try to take in all at once. A lot of these places where there is a comment could be made into a well-named function.
done. added make_departments() and make_filters()

>
>> + if (hidden.size() > 0 )
>> + {
>> + usc::Department::SPtr root_dept;
>> + usc::Department::SPtr hidden_apps_dept;
>> + usc::CannedQuery myquery("libertine-scope.ubuntu");
>> + myquery.set_department_id(ROOT_DEPT_ID);
>> + root_dept = std::move(usc::Department::create("", myquery, _("X Apps")));
>> + myquery.set_department_id(HIDDEN_DEPT_ID);
>> + hidden_apps_dept = std::move(usc::Department::create("hidden", myquery, _("Hidden X Apps")));
>> + root_dept->add_subdepartment(hidden_apps_dept);
>> + reply->register_departments(root_dept);
>> + }
>> +
>> + std::pair<QStringList,QStringList> bwlists;
>> + std::map<QString,QString> exclude...

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:79
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/28
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/14
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/14
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/14
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/14
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/24/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/28
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/29
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/29
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/22
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/22/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/22
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/22/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/22
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/22/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/22
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/22/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-scope-ci/24/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

OK, let's get this merged for now.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2016-02-29 18:49:55 +0000
+++ .bzrignore	2016-06-08 19:55:17 +0000
@@ -1,2 +1,3 @@
 po/POTFILES.in
 po/Makefile.in.in
+config.h

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-01 20:28:54 +0000
+++ CMakeLists.txt	2016-06-08 19:55:17 +0000
@@ -46,7 +46,10 @@
 set(APP ${PROJECT})
 
 # Important project paths
+# Use this SCOPE_INSTALL_DIR when building the debian
 set(SCOPE_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
+# USE this when building the click
+#set(SCOPE_INSTALL_DIR "/libertine-scope")
 set(SCOPE_NAME "libertine-scope")
 set(GETTEXT_PACKAGE "${SCOPE_NAME}")
 
@@ -63,10 +66,12 @@
 
 # Configure and install the click manifest and apparmor files
 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
-        DESTINATION ${SCOPE_INSTALL_DIR})
-install(FILES "libertine-scope.apparmor"
-        DESTINATION ${SCOPE_INSTALL_DIR})
+install(FILES 
+        ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
+        "libertine-scope.apparmor"
+        DESTINATION ${SCOPE_INSTALL_DIR})
+#Use this DESTINATION when building click
+#        DESTINATION "/")
 
 # Add our main directories
 add_subdirectory(libertine-scope)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-06-02 16:56:29 +0000
+++ data/CMakeLists.txt	2016-06-08 19:55:17 +0000
@@ -7,18 +7,11 @@
   ALL
   UTF8
 )
-intltool_merge_translations(
-  "libertine-scope-settings.ini.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}-settings.ini"
-  ALL
-  UTF8
-)
 
 # Install the scope ini files
 install(
   FILES
     "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}.ini"
-    "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}-settings.ini"
   DESTINATION
     ${SCOPE_INSTALL_DIR}
 )
@@ -31,4 +24,9 @@
     ${SCOPE_INSTALL_DIR}
 )
 
-
+install(
+  FILES
+    "blacklist"
+  DESTINATION
+    ${SCOPE_INSTALL_DIR}
+)

=== added file 'data/blacklist'
--- data/blacklist	1970-01-01 00:00:00 +0000
+++ data/blacklist	2016-06-08 19:55:17 +0000
@@ -0,0 +1,11 @@
+# containerID/desktop file name (without .desktop extension)
+# use containerID "all" to blacklist app from all containers
+# examples:
+all/mb-panel-manager
+all/openjdk-7-java
+all/openjdk-7-policytool
+all/debian-uxterm
+all/yelp
+# include apps per container that are blacklisted for "all" by prepending "whitelist/"
+#whitelist/testc/yelp    
+#whitelist/testc/mb-panel-manager

=== removed file 'data/libertine-scope-settings.ini.in'
--- data/libertine-scope-settings.ini.in	2016-04-21 16:25:00 +0000
+++ data/libertine-scope-settings.ini.in	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-[blacklist]
-type = string
-_displayName = Excluded Apps
-defaultValue = Panel Manager;OpenJDK Java 7 Policy Tool;OpenJDK Java 8 Policy Tool;
-
-# Below are some example settings. You can access your scope's
-# settings by calling settings() from the Query::run() method.
-# E.g. auto location = settings().at("location").get_string();
-
-#[location]
-#type = string
-#defaultValue = London,uk
-#_displayName = Default Location
-
-#[units]
-#type = list
-#_displayName = Temperature Units
-#_displayValues = Metric;Imperial
-#defaultValue = 0
-
-#[forecast]
-#type = boolean
-#defaultValue = true
-#_displayName = Show Forecast

=== modified file 'libertine-scope/CMakeLists.txt'
--- libertine-scope/CMakeLists.txt	2016-05-20 20:55:47 +0000
+++ libertine-scope/CMakeLists.txt	2016-06-08 19:55:17 +0000
@@ -24,12 +24,15 @@
   ${URL_DISPATCHER_LIBRARIES}
 )
 
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
+  "${CMAKE_CURRENT_SOURCE_DIR}/config.h"
+)
 
 set_target_properties(scope
   PROPERTIES
     OUTPUT_NAME "${PACKAGE_NAME}_${SCOPE_NAME}"
 )
-
 install(TARGETS scope
   LIBRARY DESTINATION ${SCOPE_INSTALL_DIR}
 )

=== added file 'libertine-scope/action.cpp'
--- libertine-scope/action.cpp	1970-01-01 00:00:00 +0000
+++ libertine-scope/action.cpp	2016-06-08 19:55:17 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * * Authored by:
+ *	Kyle Nitzsche <[e-mail]>
+ */
+
+#include "libertine-scope/action.h"
+#include "libertine-scope/config.h"
+#include <unity/scopes/ActivationResponse.h>
+#include <unity/scopes/CannedQuery.h>
+#include <url-dispatcher.h>
+#include <QString>
+#include <QFile>
+#include <QTextStream>
+
+namespace usc = unity::scopes;
+
+namespace
+{
+
+static void
+write_apps_to_hidden(QFile &hidden_f, QStringList const& hidden)
+{ 
+  hidden_f.open(QIODevice::WriteOnly | QIODevice::Text);	
+  QTextStream out(&hidden_f);
+  for (auto const& app : hidden)
+  {
+    out << app << "\n";
+  }
+  hidden_f.flush();
+  hidden_f.close();
+}
+
+} //anonymous namespace
+
+
+Action::
+Action(usc::Result const& result,
+       usc::ActionMetadata const& metadata,
+       std::string const& action_id, 
+       std::string const& cache_dir)
+    : usc::ActivationQueryBase(result, metadata),
+      action_id_(action_id),
+      cache_dir_(cache_dir)
+{
+}
+
+usc::ActivationResponse
+Action::activate()
+{
+  if (action_id_ == "open")
+  {
+    url_dispatch_send(result().uri().c_str() , NULL, NULL);
+    return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
+  }
+  else if (action_id_ == "hide")
+  {
+    QFile file(QString("%1/%2").arg(QString::fromStdString(cache_dir_),"hidden"));
+    file.open(QIODevice::Append | QIODevice::Text);	
+    QTextStream out(&file);
+    out << QString::fromStdString(result()["app_id"].get_string());
+    endl(out);
+    file.close();
+    usc::CannedQuery cq(SCOPE_PKG + "_" + SCOPE_APP);
+    return usc::ActivationResponse(cq);
+  }
+  else if (action_id_ == "show")
+  {
+    QFile hidden_f(QString("%1/%2").arg(QString::fromStdString(cache_dir_), QString::fromStdString("hidden")));
+    if (hidden_f.exists()) {
+      QStringList hidden;
+      if (hidden_f.open(QIODevice::ReadOnly | QIODevice::Text))
+      {
+        QTextStream in(&hidden_f);
+        while (!in.atEnd())
+        {
+          QString line(in.readLine());
+          hidden.append(line.trimmed());
+        }
+        hidden_f.close();
+      }
+      QString app_id = QString::fromStdString(result()["app_id"].get_string());
+      if (hidden.contains(app_id))
+      {
+        hidden.removeAll(app_id);
+        write_apps_to_hidden(hidden_f, hidden);
+      }
+    }
+    usc::CannedQuery cq(SCOPE_PKG + "_" + SCOPE_APP);
+    return usc::ActivationResponse(cq);
+  }
+  return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
+}

=== added file 'libertine-scope/action.h'
--- libertine-scope/action.h	1970-01-01 00:00:00 +0000
+++ libertine-scope/action.h	2016-06-08 19:55:17 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * * Authored by:
+ *	Kyle Nitzsche <[e-mail]>
+ */
+
+#ifndef SCOPE_ACTION_H_
+#define SCOPE_ACTION_H_
+
+#include "libertine-scope/scope.h"
+#include <unity/scopes/ActionMetadata.h>
+#include <unity/scopes/ActivationQueryBase.h>
+#include <unity/scopes/ActivationResponse.h>
+#include <unity/scopes/Result.h>
+
+class Action : public unity::scopes::ActivationQueryBase {
+  public:
+    Action(unity::scopes::Result const&         result,
+           unity::scopes::ActionMetadata const& metadata,
+           std::string const&                   action_id, 
+           std::string const&                   cache_dir);
+
+    virtual ~Action() = default;
+    virtual unity::scopes::ActivationResponse activate() override;
+
+  private:
+    std::string action_id_;
+    std::string cache_dir_;
+};
+#endif

=== added file 'libertine-scope/config.h.in'
--- libertine-scope/config.h.in	1970-01-01 00:00:00 +0000
+++ libertine-scope/config.h.in	2016-06-08 19:55:17 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015-2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef LIBERTINE_SCOPE_CONFIG_H_
+#define LIBERTINE_SCOPE_CONFIG_H_
+
+const std::string SCOPE_PKG = "@PACKAGE_NAME@";
+const std::string SCOPE_APP = "@SCOPE_NAME@";
+const std::string ROOT_DEPT_ID = "root_dept";
+const std::string HIDDEN_DEPT_ID = "hidden_dept";
+
+#endif // LIBERTINE_SCOPE_CONFIG_H_
+
+

=== modified file 'libertine-scope/preview.cpp'
--- libertine-scope/preview.cpp	2016-05-03 13:25:14 +0000
+++ libertine-scope/preview.cpp	2016-06-08 19:55:17 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "libertine-scope/preview.h"
+#include "libertine-scope/config.h"
 #include <unity/scopes/PreviewReply.h>
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/VariantBuilder.h>
@@ -57,6 +58,21 @@
     {"id",    usc::Variant("open")},
     {"label", usc::Variant("Open")},
   });
+  if (result()["department_id"].get_string() == ROOT_DEPT_ID)
+  {
+      vb.add_tuple({
+        {"id",    usc::Variant("hide")},
+        {"label", usc::Variant("Hide")},
+      });
+  }
+  else
+  { //is hidden department
+      vb.add_tuple({
+        {"id",    usc::Variant("show")},
+        //Translators: Users tap "Show" button to remove an app from the hidden lis of apps: so the meaning is to undo a hide
+        {"label", usc::Variant("Show")},
+      });
+  }
   buttons.add_attribute_value("actions", vb.end());
 
   usc::PreviewWidget desc("desc", "text");

=== modified file 'libertine-scope/query.cpp'
--- libertine-scope/query.cpp	2016-05-04 17:56:13 +0000
+++ libertine-scope/query.cpp	2016-06-08 19:55:17 +0000
@@ -16,21 +16,137 @@
 
 #include "libertine-scope/query.h"
 #include "libertine-scope/container.h"
+#include "libertine-scope/config.h"
+#include "localization.h"
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/SearchReply.h>
+#include <unity/scopes/Department.h>
+#include <unity/scopes/OptionSelectorFilter.h>
+#include <unity/scopes/FilterOption.h>
 #include <QString>
 #include <QStringList>
 #include <QRegExp>
-
+#include <QFile>
+#include <QDebug>
+#include <QTextStream>
 
 namespace usc = unity::scopes;
 
-
 namespace
 {
 
+//returns map of apps with keys: container, app, name
+static std::map<QString,QString>
+app_keys(std::string const& uri)
+{
+  std::map<QString,QString> parts;
+  QStringList uri_parts = QString::fromStdString(uri).split("/");
+  if (uri_parts.size() < 4)
+  {
+    return parts;
+  }
+  parts["container"] = uri_parts[2];
+  parts["name"] = uri_parts[3];
+  parts["key"] = QString("%1/%2").arg(parts["container"],parts["name"]);
+  return parts;
+}
+
+static QStringList
+get_hidden(std::string const& cache_dir)
+{
+  QStringList hidden;
+  QFile hidden_f(QString("%1/%2").arg(QString::fromStdString(cache_dir), QString::fromStdString("hidden")));
+  if (hidden_f.exists())
+  {
+    if (hidden_f.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+      QTextStream in(&hidden_f);
+      while (!in.atEnd())
+      {
+        QString line(in.readLine());
+        hidden.append(line.trimmed());
+      }   
+      hidden_f.close();
+    }   
+  }
+  return hidden;
+}
+
+static void
+make_departments(usc::SearchReplyProxy const& reply)
+{
+  usc::Department::SPtr root_dept; 
+  usc::Department::SPtr hidden_apps_dept; 
+  usc::CannedQuery myquery("libertine-scope.ubuntu");
+  myquery.set_department_id(ROOT_DEPT_ID);
+  root_dept = std::move(usc::Department::create("", myquery, _("X Apps")));
+  myquery.set_department_id(HIDDEN_DEPT_ID);
+  hidden_apps_dept = std::move(usc::Department::create("hidden", myquery, _("Hidden X Apps")));
+  root_dept->add_subdepartment(hidden_apps_dept);
+  reply->register_departments(root_dept);
+}
+
+static void
+make_filters(usc::SearchReplyProxy const& reply,
+             Libertine::UPtr              libertine,
+             QStringList           const& hidden,
+             QStringList           const& whitelist_,
+             QStringList           const& blacklist_,
+             QStringList                & excludes_by_filter,
+             usc::FilterState      const& filter_state
+            )
+{
+  std::map<std::string,unity::scopes::OptionSelectorFilter::SPtr> filters;
+  //make exclude scope filter for apps
+  for (auto const& container: libertine->get_container_list())
+  {
+    std::string filter_title = std::string(_("Exclude Apps")) + ": " + container->name();
+    filters[container->id()] = unity::scopes::OptionSelectorFilter::create(container->id(), filter_title, true);
+    unity::scopes::OptionSelectorFilter::SPtr filter = filters[container->id()];
+    // add exclude filter checkable items for each app that pass blacklisting + whitelisting
+    for (auto const& app: container->app_launchers())
+    {
+      auto excludes_map = app_keys(app.uri());
+      //only exlcude through blacklisting if not explicitly whitelisted
+      QString app_id = QString::fromStdString(app.uri()).split("/")[3];
+      QString key = QString::fromStdString(container->id()) + "/" + app_id;
+      if (hidden.contains(key))
+      {
+        continue;
+      }
+      if (whitelist_.contains(key))
+      {
+        filter->add_option(excludes_map["key"].toStdString(), app.name());
+      }
+      else if (!blacklist_.contains(excludes_map["key"]) && !blacklist_.contains("all/" + excludes_map["name"]))
+      {
+        filter->add_option(excludes_map["key"].toStdString(), app.name());
+      }
+    }
+    //get exclude filter checked items
+    if (filter->has_active_option(filter_state))
+    {
+      auto excludeTypes = filter->active_options(filter_state);
+      for (auto const &opt: excludeTypes)
+      {
+        excludes_by_filter.append(QString::fromStdString(opt->id()));
+      }
+    }
+  }
+  //push filters
+  std::list<unity::scopes::FilterBase::SCPtr> filters_v;
+  for (const auto& filter: filters)
+  {
+    if (filter.second->options().size() > 0 )
+    {
+      filters_v.push_back(filter.second);
+    }
+  }
+  reply->push(filters_v, filter_state); 
+}
+
 /**
  * A custom rendering layout brazenly stolen from the click scope, so they look
  * sorta similar.  At least until they change theirs.
@@ -59,9 +175,15 @@
 Query::
 Query(usc::CannedQuery const&    query,
       usc::SearchMetadata const& metadata,
-      Libertine::Factory const&  libertine_factory)
+      Libertine::Factory const&  libertine_factory,
+      std::string const& cache_dir,
+      std::tuple<QStringList,QStringList> const& blackwhiteLists
+      )
 : usc::SearchQueryBase(query, metadata)
 , libertine_factory_(libertine_factory)
+, cache_dir_(cache_dir)
+, blacklist_(std::get<0>(blackwhiteLists))
+, whitelist_(std::get<1>(blackwhiteLists))
 {
 }
 
@@ -70,7 +192,7 @@
 cancelled()
 {
 }
-
+ 
 
 unity::scopes::VariantMap
 Query::settings() const
@@ -79,51 +201,102 @@
 }
 
 
-QStringList
-Query::blacklist() const
-{
-  QStringList blacklistedApps;
-  auto blacklist = settings()["blacklist"];
-  if (!blacklist.is_null()) {
-    blacklistedApps = QString::fromStdString(blacklist.get_string())
-        .remove("\"")
-        .split(";", QString::SkipEmptyParts);
-  }
-  return blacklistedApps;
-}
-
-
 void Query::
 run(usc::SearchReplyProxy const& reply)
 {
-  auto blacklistedApps = blacklist();
+  auto hidden = get_hidden(cache_dir_);
+  // make scope departments
+  if (hidden.size() > 0 )
+  { 
+    make_departments(reply);
+  }
+
+  std::pair<QStringList,QStringList> bwlists;
+  std::map<QString,QString> excludes_map;
+  QStringList excludes_by_filter;
   QRegExp re(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
   Libertine::UPtr libertine = libertine_factory_();
 
+  //only provide filters in root department: X Apps
+  if (query().department_id().empty())
+  { 
+    make_filters(reply, libertine_factory_(), hidden, whitelist_, blacklist_, excludes_by_filter, query().filter_state());
+  }
+
+  //make and push results
   for (auto const& container: libertine->get_container_list())
   {
     auto category = reply->register_category(container->id(),
                                              container->name(),
                                              "Application",
                                              usc::CategoryRenderer(CATEGORY_APPS_DISPLAY));
+    bool breaking = false;
     for (auto const& app: container->app_launchers())
     {
-      if (!(re.isEmpty() || QString::fromStdString(app.name()).contains(re))
-          || blacklistedApps.contains(QString::fromStdString(app.name())))
-      {
-        continue;
-      }
-
+      //search
+      if (!(re.isEmpty() || QString::fromStdString(app.name()).contains(re)))
+        continue;
+
+      excludes_map = app_keys(app.uri());
+      //only check for blacklisted if not whitelisted
+      QString app_id;
+      if (QString::fromStdString(app.uri()).split("/").size() >= 4)
+        app_id = QString::fromStdString(app.uri()).split("/")[3];
+      QString key = QString::fromStdString(container->id()) + "/" + app_id;
+      //don't display if blacklisted
+      if (!whitelist_.contains(key))
+      {
+        if (blacklist_.contains(excludes_map["key"]) || blacklist_.contains("all/" + excludes_map["name"]))
+        {
+          continue;
+        }
+      }
+      //don't display apps excluded by filter
+      if (excludes_by_filter.contains(excludes_map["key"]))
+      {
+        continue;
+      }
+
+      //if root department, don't display if it's a hidden app
+      if (query().department_id().empty() || query().department_id() == ROOT_DEPT_ID)
+      {
+        if (hidden.contains(key))
+        {
+          continue;
+        }
+      }
+      else
+      {
+        //don't display non hidden apps in hidden dept
+        if (!hidden.contains(key))
+        {
+          continue;
+        }
+      }
       usc::CategorisedResult result(category);
       result.set_title(app.name());
       result.set_art(app.icon());
       result.set_uri(app.uri());
       result["description"] = app.description();
+      result["app_id"] = key.toStdString();
+      //add department id so we know which buttons to display on preview
+      if (query().department_id().empty() || query().department_id() == ROOT_DEPT_ID)
+      {
+        result["department_id"] = ROOT_DEPT_ID;
+      }
+      else
+      {
+        result["department_id"] = "hidden";
+      }
       if (!reply->push(result))
       {
+        breaking = true;
         break;
       }
     }
+    if (breaking)
+    {
+      break;
+    }
   }
 }
-

=== modified file 'libertine-scope/query.h'
--- libertine-scope/query.h	2016-05-04 17:56:13 +0000
+++ libertine-scope/query.h	2016-06-08 19:55:17 +0000
@@ -19,8 +19,7 @@
 #include "libertine-scope/libertine.h"
 #include <unity/scopes/ReplyProxyFwd.h>
 #include <unity/scopes/SearchQueryBase.h>
-
-class QStringList;
+#include <QStringList>
 
 
 /**
@@ -32,7 +31,10 @@
 public:
     Query(unity::scopes::CannedQuery const&    query,
           unity::scopes::SearchMetadata const& metadata,
-          Libertine::Factory const&            libertine_factory);
+          Libertine::Factory const&            libertine_factory,
+          std::string const&                   cache_dir = "", 
+          std::tuple<QStringList,QStringList> const& = std::tuple<QStringList,QStringList>()
+          );
 
     ~Query() = default;
 
@@ -46,9 +48,11 @@
     virtual unity::scopes::VariantMap settings() const;
 
 private:
-    QStringList blacklist() const;
-
     Libertine::Factory libertine_factory_;
+    std::string scope_dir_;
+    std::string cache_dir_;
+    QStringList blacklist_;
+    QStringList whitelist_;
 };
 
 #endif // LIBERTINE_SCOPE_QUERY_H_

=== modified file 'libertine-scope/scope.cpp'
--- libertine-scope/scope.cpp	2016-01-19 21:10:09 +0000
+++ libertine-scope/scope.cpp	2016-06-08 19:55:17 +0000
@@ -17,10 +17,13 @@
 
 #include "libertine-scope/preview.h"
 #include "libertine-scope/query.h"
+#include "libertine-scope/action.h"
 #include <localization.h>
 #include <sstream>
-#include <unity/scopes/ActivationResponse.h>
 #include <url-dispatcher.h>
+#include <QFile>
+#include <QTextStream>
+#include <QString>
 
 
 namespace usc = unity::scopes;
@@ -28,26 +31,59 @@
 namespace
 {
 
-/**
- * @todo move this class into its own source file.
- */
-class ScopeActivation
-: public usc::ActivationQueryBase
-{
-public:
-  ScopeActivation(usc::Result const& result,
-                  usc::ActionMetadata const& metadata)
-  : ActivationQueryBase(result, metadata)
-  { }
-
-  usc::ActivationResponse
-  activate() override
-  {
-    return usc::ActivationResponse(status);
-  }
-
-  usc::ActivationResponse::Status status = usc::ActivationResponse::Status::NotHandled;
-};
+static bool
+is_whitelist(QString const& line)
+{
+  if (line.startsWith("whitelist"))
+  {
+    if (line.split("/").size() < 3)
+    {
+      return false;
+    }
+    else
+    {
+      return true;
+    }
+  }
+  else
+  {
+    return false;
+  } 
+}
+
+static QString
+get_whitelist_key(QString const& line)
+{
+  QStringList parts = line.split("/");
+  return parts[1] + "/" + parts[2].trimmed();
+}
+
+static std::tuple<QStringList,QStringList>
+get_bwlists(std::string scope_dir)
+{
+  //Get blacklisted and whitelisted apps from "blacklist" file in scope dir
+  QStringList blacklist;
+  QStringList whitelist;
+  QFile blacklist_f(QString("%1/%2").arg(QString::fromStdString(scope_dir), QString::fromStdString("blacklist")));
+  if (blacklist_f.exists()) {
+    if (blacklist_f.open(QIODevice::ReadOnly | QIODevice::Text)){
+      QTextStream in(&blacklist_f);
+      while (!in.atEnd()) {
+        QString line(in.readLine());
+        if (!line.startsWith("#") && !line.startsWith("whitelist"))
+        {
+          blacklist.append(line.trimmed());
+        }
+        if (is_whitelist(line))
+        {
+          whitelist.append(get_whitelist_key(line));
+        }
+      }
+      blacklist_f.close();
+    }
+  }
+  return std::tie(blacklist,whitelist);
+}
 
 } // anonymous namespace
 
@@ -79,7 +115,11 @@
 search(usc::CannedQuery const&    query,
        usc::SearchMetadata const& metadata)
 {
-  return usc::SearchQueryBase::UPtr(new Query(query, metadata, libertine_factory_));
+  return usc::SearchQueryBase::UPtr(new Query(query,
+                                              metadata,
+                                              libertine_factory_,
+                                              cache_directory(),
+                                              get_bwlists(scope_directory())));
 }
 
 
@@ -97,14 +137,7 @@
                std::string const&         /* widget_id */,
                std::string const&         action_id)
 {
-  auto activation = new ScopeActivation(result, metadata);
-
-  if (action_id == "open")
-  {
-    url_dispatch_send(result.uri().c_str() , NULL, NULL);
-  }
-
-  return usc::ActivationQueryBase::UPtr(activation);
+  return usc::ActivationQueryBase::UPtr(new Action(result, metadata, action_id, cache_directory()));
 }
 
 

=== modified file 'po/libertine-scope.pot'
--- po/libertine-scope.pot	2016-06-02 17:13:50 +0000
+++ po/libertine-scope.pot	2016-06-08 19:55:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-02 13:05-0400\n"
+"POT-Creation-Date: 2016-06-08 19:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'tests/TypedScopeFixture.h'
--- tests/TypedScopeFixture.h	2016-01-19 05:10:54 +0000
+++ tests/TypedScopeFixture.h	2016-06-08 19:55:17 +0000
@@ -85,6 +85,7 @@
     {
         TypedScopeFixtureHelper::set_registry(scope, registry_proxy);
         TypedScopeFixtureHelper::set_scope_directory(scope, "/tmp");
+        TypedScopeFixtureHelper::set_cache_directory(scope, "/tmp");
         TypedScopeFixtureHelper::set_app_directory(scope, "/tmp");
     }
 

=== modified file 'tests/fake_container_json.h'
--- tests/fake_container_json.h	2016-04-27 17:53:30 +0000
+++ tests/fake_container_json.h	2016-06-08 19:55:17 +0000
@@ -32,7 +32,7 @@
             "name": "Panel Manager",
             "no_display": false,
             "description": "some description",
-            "uri": "some/uri"
+            "uri": "some/uri/pad1/pad2/"
         },
         {
             "desktop_file_name": "/home/someuser/.cache/libertine-container/fake1/rootfs/usr/share/applications/sakura.desktop",
@@ -44,7 +44,7 @@
             "name": "Sakura",
             "no_display": false,
             "description": "some other description",
-            "uri": "some/other/uri"
+            "uri": "some/other/uri/pad"
         }
     ]
 }

=== modified file 'tests/test_preview.cpp'
--- tests/test_preview.cpp	2016-04-27 17:53:30 +0000
+++ tests/test_preview.cpp	2016-06-08 19:55:17 +0000
@@ -28,6 +28,7 @@
 TEST(TestPreview, pushesWidgetsWithAppInformation)
 {
   unity::scopes::testing::Result result;
+  result["department_id"] = "";
   unity::scopes::ActionMetadata metadata("en_US", "phone");
 
   std::unique_ptr<unity::scopes::PreviewWidgetList> list(new unity::scopes::PreviewWidgetList());
@@ -57,7 +58,7 @@
   EXPECT_EQ("actions", buttons.widget_type());
 
   auto buttons_actions = buttons.attribute_values()["actions"].get_array();
-  ASSERT_EQ(1, buttons_actions.size());
+  ASSERT_EQ(2, buttons_actions.size());
   EXPECT_EQ("open", buttons_actions[0].get_dict()["id"].get_string());
   EXPECT_EQ("Open", buttons_actions[0].get_dict()["label"].get_string());
 }

=== modified file 'tests/test_query.cpp'
--- tests/test_query.cpp	2016-04-27 18:37:46 +0000
+++ tests/test_query.cpp	2016-06-08 19:55:17 +0000
@@ -34,19 +34,19 @@
     "app_launchers": [{
       "name": "LibreOffice",
       "no_display": false,
-      "uri": "appid://fake/libreoffice/0.0",
+      "uri": "appid://fake-container/libreoffice/0.0",
       "icons": ["file:///lo.png"],
       "description": "libreoffice!"
     }, {
       "name": "Linux",
       "no_display": true,
-      "uri": "appid://fake/linux/0.0",
+      "uri": "appid://fake-container/linux/0.0",
       "icons": ["file:///nix.png"],
       "description": "linux!"
     }, {
       "name": "Library",
       "no_display": false,
-      "uri": "appid://fake/library/0.0",
+      "uri": "appid://fake-container/library/0.0",
       "icons": ["file:///lib.png"],
       "description": "library!"
     }]
@@ -100,17 +100,17 @@
 
   void expect_push_libreoffice(bool success = true)
   {
-    expect_push("LibreOffice", "file:///lo.png", "libreoffice!", "appid://fake/libreoffice/0.0", success);
+    expect_push("LibreOffice", "file:///lo.png", "libreoffice!", "appid://fake-container/libreoffice/0.0", success);
   }
 
   void expect_push_library(bool success = true)
   {
-    expect_push("Library", "file:///lib.png", "library!", "appid://fake/library/0.0", success);
+    expect_push("Library", "file:///lib.png", "library!", "appid://fake-container/library/0.0", success);
   }
 
   void expect_push_linux(bool success = true)
   {
-    expect_push("Linux", "file:///nix.png", "linux!", "appid://fake/linux/0.0", success);
+    expect_push("Linux", "file:///nix.png", "linux!", "appid://fake-container/linux/0.0", success);
   }
 
   unity::scopes::SearchMetadata metadata;
@@ -127,7 +127,6 @@
   expect_push_libreoffice();
   expect_push_linux();
   expect_push_library();
-
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
   });
@@ -160,50 +159,32 @@
 }
 
 
-// Query class with faked out Settings
-class QueryWithFakeSettings : public Query
-{
-public:
-  QueryWithFakeSettings(unity::scopes::CannedQuery const& query,
-        unity::scopes::SearchMetadata const&  metadata,
-        Libertine::Factory const&   libertine_factory)
-  : Query(query, metadata, libertine_factory)
-    , settings_()
-  {
-  }
-
-  unity::scopes::VariantMap settings() const override
-  {
-    return settings_;
-  }
-
-  unity::scopes::VariantMap settings_;
-};
-
-
 TEST_F(TestQueryFixture, ignoresAnyBlacklistedApps)
 {
   expect_registry();
+  expect_push_linux();
   expect_push_library();
-
-  QueryWithFakeSettings query(canned_query, metadata, []() {
+  QStringList blacklist = {"fake-container/libreoffice"};
+  QStringList whitelist = {};
+  std::tuple<QStringList,QStringList> lists(blacklist, whitelist);
+  Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  });
-  query.settings_["blacklist"] = "LibreOffice;Linux";
+  }, "/tmp", lists);
   query.run(proxy);
 }
 
 
-TEST_F(TestQueryFixture, stripsQuotationMarksFromBlacklist)
+TEST_F(TestQueryFixture, displayWhitelistedApps)
 {
   expect_registry();
   expect_push_linux();
   expect_push_library();
-
-  QueryWithFakeSettings query(canned_query, metadata, []() {
+  QStringList blacklist = {"all/libreoffice"};
+  QStringList whitelist = {"fakeId/liberoffice"};
+  std::tuple<QStringList,QStringList> lists(blacklist, whitelist);
+  Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  });
-  query.settings_["blacklist"] = "\"LibreOffice\"";
+  }, "/tmp", lists);
   query.run(proxy);
 }