Merge lp:~townsend/libertine-scope/release-1.3 into lp:libertine-scope/release

[Christopher Townsend]

* Use wildcard matching for allowing reading any puritine click package paths that have the name "puritine" anywhere in the Click package name. (LP: #1590453)
* 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.
* Hide 'Help' by default for all containers. (LP: #1591511)
* Removed Settings. (LP: #1591494)
* Refactor Query class for consistent style and extract some functionality to helper classes.
* Show a message when no apps are available due to filters or no apps installed. (LP: #1589699)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2016-02-29 18:49:55 +0000
+++ .bzrignore	2016-06-16 14:35:35 +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-16 14:35:35 +0000
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(libertine-scope
-        VERSION 1.2
+        VERSION 1.3
         LANGUAGES CXX)
 
 # We require at least g++ 4.9, to avoid ABI breakage with earlier versions.
@@ -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)
@@ -76,9 +81,7 @@
 # Set up the tests
 enable_testing()
 add_subdirectory(tests)
-add_custom_target(check
-                 ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
-)
+add_custom_target(check ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure)
 
 set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
 add_custom_target(dist
 
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-06-02 16:56:29 +0000
+++ data/CMakeLists.txt	2016-06-16 14:35:35 +0000
@@ -1,4 +1,3 @@
-
 # Put the ini files in the build directory next to the scope
 # .so file so that the test tools can find them.
 intltool_merge_translations(
@@ -7,18 +6,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 +23,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-16 14:35:35 +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 'debian/changelog'
--- debian/changelog	2016-06-02 18:45:10 +0000
+++ debian/changelog	2016-06-16 14:35:35 +0000
@@ -1,3 +1,26 @@
+libertine-scope (1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Use wildcard matching for allowing reading any puritine click package paths
+    that have the name "puritine" anywhere in the Click package name. (LP: #1590453)
+
+  [ 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.
+  * Hide 'Help' by default for all containers. (LP: #1591511)
+  * Removed Settings. (LP: #1591494)
+
+  [ Larry Price ]
+  * Refactor Query class for consistent style and extract some functionality to
+    helper classes.
+  * Show a message when no apps are available due to filters or no apps installed.
+    (LP: #1589699)
+
+ -- Chris Townsend <[e-mail]>  Thu, 16 Jun 2016 08:47:40 -0400
+
 libertine-scope (1.2+16.10.20160602.1-0ubuntu1) yakkety; urgency=medium
 
   [ Chris Townsend ]
 
=== modified file 'libertine-scope.apparmor'
--- libertine-scope.apparmor	2016-06-01 16:09:43 +0000
+++ libertine-scope.apparmor	2016-06-16 14:35:35 +0000
@@ -5,7 +5,7 @@
     "read_path": [
         "@{HOME}/.local/share/libertine/",
         "@{HOME}/.cache/libertine-container/",
-        "@{CLICK_DIR}/com.ubuntu.puritine/"
+        "@{CLICK_DIR}/*puritine*/"
     ],
     "write_path": [
         "/{dev,run}/shm/lttng-ust-wait-5*"
 
=== modified file 'libertine-scope/CMakeLists.txt'
--- libertine-scope/CMakeLists.txt	2016-05-20 20:55:47 +0000
+++ libertine-scope/CMakeLists.txt	2016-06-16 14:35:35 +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-16 14:35:35 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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 "libertine-scope/hidden_apps.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(usc::Result const& result,
+       usc::ActionMetadata const& metadata,
+       std::string const& action_id, 
+       std::shared_ptr<HiddenApps> hidden)
+    : usc::ActivationQueryBase(result, metadata),
+      action_id_(action_id),
+      hidden_(hidden)
+{
+}
+
+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")
+  {
+    hidden_->add(QString::fromStdString(result()["app_id"].get_string()));
+
+    usc::CannedQuery cq(SCOPE_PKG + "_" + SCOPE_APP);
+    return usc::ActivationResponse(cq);
+  }
+  else if (action_id_ == "show")
+  {
+    hidden_->remove(QString::fromStdString(result()["app_id"].get_string()));
+
+    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-16 14:35:35 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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 HiddenApps;
+
+class Action : public unity::scopes::ActivationQueryBase {
+  public:
+    Action(unity::scopes::Result const&         result,
+           unity::scopes::ActionMetadata const& metadata,
+           std::string const&                   action_id, 
+           std::shared_ptr<HiddenApps>          hidden);
+
+    virtual ~Action() = default;
+    virtual unity::scopes::ActivationResponse activate() override;
+
+  private:
+    std::string action_id_;
+    std::string cache_dir_;
+    std::shared_ptr<HiddenApps> hidden_;
+};
+#endif
 
=== added file 'libertine-scope/blacklist.cpp'
--- libertine-scope/blacklist.cpp	1970-01-01 00:00:00 +0000
+++ libertine-scope/blacklist.cpp	2016-06-16 14:35:35 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright 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/>.
+ */
+#include "libertine-scope/blacklist.h"
+
+#include <QFile>
+#include <QTextStream>
+
+namespace
+{
+inline QString
+parse_whitelist_key(QString const& line)
+{
+  QStringList props = line.split("/");
+  return props.length() == 3 ? QString("%1/%2").arg(props[1]).arg(props[2]) : "";
+}
+}
+
+
+Blacklist::
+Blacklist(std::string const& data_directory)
+{
+  parse_blacklist(QString("%1/blacklist").arg(QString::fromStdString(data_directory)));
+}
+
+
+void Blacklist::
+parse_blacklist(QString const& blacklist_file_name)
+{
+  QFile blacklist_file(blacklist_file_name);
+  if (blacklist_file.open(QIODevice::ReadOnly | QIODevice::Text))
+  {
+    QTextStream in(&blacklist_file);
+    while (!in.atEnd())
+    {
+      QString line(in.readLine());
+      if (!line.startsWith("#"))
+      {
+        if (line.startsWith("whitelist"))
+        {
+          auto whitelisted_app = parse_whitelist_key(line);
+          if (!whitelisted_app.isEmpty())
+          {
+            whitelist_.append(parse_whitelist_key(line));
+          }
+        }
+        else
+        {
+          blacklist_.append(line.trimmed());
+        }
+      }
+    }
+    blacklist_file.close();
+  }
+}
+
+
+bool Blacklist::
+app_is_blacklisted(QString const& app_id, std::string const& container_id) const
+{
+  auto global_app_id = QString("all/%1").arg(app_id);
+  auto local_app_id = QString("%1/%2").arg(QString::fromStdString(container_id)).arg(app_id);
+
+  return !(whitelist_.contains(global_app_id) || whitelist_.contains(local_app_id)) &&
+          (blacklist_.contains(global_app_id) || blacklist_.contains(local_app_id));
+}
 
=== added file 'libertine-scope/blacklist.h'
--- libertine-scope/blacklist.h	1970-01-01 00:00:00 +0000
+++ libertine-scope/blacklist.h	2016-06-16 14:35:35 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 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 BLACKLIST_H
+#define BLACKLIST_H
+
+#include <QStringList>
+
+class Blacklist
+{
+public:
+  explicit Blacklist(std::string const& data_directory);
+  virtual ~Blacklist() = default;
+
+  virtual bool app_is_blacklisted(QString const& app_id, std::string const& container_id) const;
+
+private:
+  void parse_blacklist(QString const& blacklist_file_name);
+
+  QStringList blacklist_;
+  QStringList whitelist_;
+};
+
+#endif // BLACKLIST_H
 
=== 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-16 14:35:35 +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_
+
+
 
=== added file 'libertine-scope/hidden_apps.cpp'
--- libertine-scope/hidden_apps.cpp	1970-01-01 00:00:00 +0000
+++ libertine-scope/hidden_apps.cpp	2016-06-16 14:35:35 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright 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/>.
+ */
+#include "libertine-scope/hidden_apps.h"
+
+#include <QFile>
+#include <QTextStream>
+
+
+namespace
+{
+QStringList
+get_hidden_apps(const QString& hidden_file_name)
+{
+  QFile hidden_file(hidden_file_name);
+  if (!hidden_file.open(QIODevice::ReadOnly | QIODevice::Text))
+  {
+    return QStringList{};
+  }
+
+  return QString(hidden_file.readAll()).split('\n', QString::SkipEmptyParts);
+}
+}
+
+
+HiddenApps::
+HiddenApps(const std::string &cache_directory)
+  : hidden_file_name_(QString("%1/hidden").arg(QString::fromStdString(cache_directory)))
+  , apps_(get_hidden_apps(hidden_file_name_))
+{
+}
+
+
+bool HiddenApps::
+app_is_hidden(QString const& app_id) const
+{
+  return apps_.contains(app_id);
+}
+
+
+bool HiddenApps::
+empty() const
+{
+  return apps_.empty();
+}
+
+
+void HiddenApps::
+add(const QString &app_id)
+{
+  if (!app_is_hidden(app_id))
+  {
+    QFile hidden_file(hidden_file_name_);
+    if (hidden_file.open(QIODevice::Append | QIODevice::Text))
+    {
+      hidden_file.write(app_id.toUtf8() + "\n");
+    }
+
+    apps_.append(app_id);
+  }
+}
+
+
+void HiddenApps::
+remove(const QString &app_id)
+{
+  if (app_is_hidden(app_id))
+  {
+    apps_.removeAll(app_id);
+
+    QFile hidden_file(hidden_file_name_);
+    if (hidden_file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+      for (auto const& app : apps_)
+      {
+        hidden_file.write(app.toUtf8() + "\n");
+      }
+    }
+  }
+}
 
=== added file 'libertine-scope/hidden_apps.h'
--- libertine-scope/hidden_apps.h	1970-01-01 00:00:00 +0000
+++ libertine-scope/hidden_apps.h	2016-06-16 14:35:35 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 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 HIDDEN_APPS_H
+#define HIDDEN_APPS_H
+
+#include <string>
+#include <QStringList>
+
+class HiddenApps
+{
+public:
+  explicit HiddenApps(const std::string& cache_directory);
+  virtual ~HiddenApps() = default;
+
+  virtual bool app_is_hidden(QString const& app_id) const;
+  virtual bool empty() const;
+  virtual void add(QString const& app_id);
+  virtual void remove(QString const& app_id);
+
+private:
+  QString hidden_file_name_;
+  QStringList apps_;
+};
+
+#endif // HIDDEN_APPS_H
 
=== modified file 'libertine-scope/preview.cpp'
--- libertine-scope/preview.cpp	2016-05-03 13:25:14 +0000
+++ libertine-scope/preview.cpp	2016-06-16 14:35:35 +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,25 @@
     {"id",    usc::Variant("open")},
     {"label", usc::Variant("Open")},
   });
+
+  if (result().contains("department_id"))
+  {
+    if (result()["department_id"].get_string() == ROOT_DEPT_ID)
+    {
+        vb.add_tuple({
+          {"id",    usc::Variant("hide")},
+          {"label", usc::Variant("Hide")},
+        });
+    }
+    else
+    {
+        vb.add_tuple({
+          {"id",    usc::Variant("show")},
+          //Translators: Users tap "Show" button to remove an app from the hidden list 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/preview.h'
--- libertine-scope/preview.h	2016-01-04 23:05:30 +0000
+++ libertine-scope/preview.h	2016-06-16 14:35:35 +0000
@@ -33,8 +33,6 @@
 
   void
   run(unity::scopes::PreviewReplyProxy const& reply) override;
-
-private:
 };
 
 #endif /* LIBERTINE_SCOPE_PREVIEW_H */
 
=== modified file 'libertine-scope/query.cpp'
--- libertine-scope/query.cpp	2016-05-04 17:56:13 +0000
+++ libertine-scope/query.cpp	2016-06-16 14:35:35 +0000
@@ -16,26 +16,66 @@
 
 #include "libertine-scope/query.h"
 #include "libertine-scope/container.h"
+#include "libertine-scope/config.h"
+#include "libertine-scope/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 <QTextStream>
 
 namespace usc = unity::scopes;
 
-
 namespace
 {
-
-/**
- * A custom rendering layout brazenly stolen from the click scope, so they look
- * sorta similar.  At least until they change theirs.
- */
-std::string const CATEGORY_APPS_DISPLAY = R"(
+static const auto ROOT_DEPT_TITLE = _("X Apps");
+static const auto HIDDEN_DEPT_TITLE = _("Hidden X Apps");
+static const auto DESCRIPTION_FIELD = "description";
+static const auto APP_ID_FIELD = "app_id";
+static const auto DEPARTMENT_ID_FIELD = "department_id";
+static const auto EXCLUDED_APPS_FILTER_TITLE = _("Exclude Apps: ");
+
+struct AppInfo
+{
+  QString container;
+  QString app_id;
+  QString key;
+};
+
+static AppInfo
+parse_app_info(std::string const& uri)
+{
+  QStringList uri_split = QString::fromStdString(uri).split("/");
+  if (uri_split.size() < 4)
+  {
+    return  AppInfo{};
+  }
+
+  return AppInfo{uri_split[2], uri_split[3], QString("%1/%2").arg(uri_split[2]).arg(uri_split[3])};
+}
+
+static void
+register_departments(usc::SearchReplyProxy const& reply)
+{
+  usc::CannedQuery departments("libertine-scope.ubuntu");
+  departments.set_department_id(ROOT_DEPT_ID);
+  departments.set_department_id(HIDDEN_DEPT_ID);
+
+  usc::Department::SPtr root_dept{std::move(usc::Department::create("", departments, ROOT_DEPT_TITLE))};
+  root_dept->add_subdepartment(std::move(usc::Department::create(HIDDEN_DEPT_ID, departments, HIDDEN_DEPT_TITLE)));
+
+  reply->register_departments(root_dept);
+}
+
+
+static const auto CATEGORY_APPS_DISPLAY = R"(
     {
         "schema-version" : 1,
         "template" : {
@@ -53,15 +93,37 @@
     }
 )";
 
+
+static const auto CATEGORY_HINT = R"(
+    {
+        "schema-version": 1,
+        "template": {
+            "category-layout": "grid",
+            "card-size": "large",
+            "card-layout": "horizontal"
+        },
+        "components": {
+            "title": "title"
+        }
+    }
+)";
 } // anonymous namespace
 
 
+std::string const Query::NO_RESULTS_HINT = _("No XApps available. Install new applications with the Libertine Manager.");
+std::string const Query::ALL_RESULTS_FILTERED_HINT = _("All XApps hidden. Reset filters or check the Hidden XApps department.");
+
+
 Query::
 Query(usc::CannedQuery const&    query,
       usc::SearchMetadata const& metadata,
-      Libertine::Factory const&  libertine_factory)
-: usc::SearchQueryBase(query, metadata)
-, libertine_factory_(libertine_factory)
+      Libertine::Factory const&  libertine_factory,
+      std::shared_ptr<HiddenApps> hidden,
+      std::shared_ptr<Blacklist> blacklist)
+  : usc::SearchQueryBase(query, metadata)
+  , libertine_(libertine_factory())
+  , hidden_(hidden)
+  , blacklist_(blacklist)
 {
 }
 
@@ -72,44 +134,127 @@
 }
 
 
-unity::scopes::VariantMap
-Query::settings() const
+QStringList Query::
+make_filters(usc::SearchReplyProxy const& reply) const
 {
-  return SearchQueryBase::settings();
+  auto filter_state = query().filter_state();
+  QStringList excludes_by_filter;
+  std::list<usc::FilterBase::SCPtr> app_filters;
+
+  //make exclude scope filter for apps
+  for (auto const& container: libertine_->get_container_list())
+  {
+    usc::OptionSelectorFilter::SPtr filter{usc::OptionSelectorFilter::create(container->id(),
+                                                                             EXCLUDED_APPS_FILTER_TITLE + container->name(),
+                                                                             true)};
+    // filter apps from blacklist
+    for (auto const& app: container->app_launchers())
+    {
+      auto app_info = parse_app_info(app.uri());
+
+      if (hidden_->app_is_hidden(app_info.key))
+      {
+        continue;
+      }
+
+      if (!blacklist_->app_is_blacklisted(app_info.app_id, container->id()))
+      {
+        filter->add_option(app_info.key.toStdString(), app.name());
+      }
+    }
+
+    // get apps manually filtered by user
+    if (filter->has_active_option(filter_state))
+    {
+      auto filteredApps = filter->active_options(filter_state);
+      for (auto const &app: filteredApps)
+      {
+        excludes_by_filter.append(QString::fromStdString(app->id()));
+      }
+    }
+
+    if (!filter->options().empty())
+    {
+      app_filters.push_back(filter);
+    }
+  }
+
+  if (!app_filters.empty())
+  {
+    reply->push(app_filters, filter_state);
+  }
+
+  return excludes_by_filter;
 }
 
 
-QStringList
-Query::blacklist() const
+void Query::
+show_hint(usc::SearchReplyProxy const& reply,
+          std::string           const& reason) const
 {
-  QStringList blacklistedApps;
-  auto blacklist = settings()["blacklist"];
-  if (!blacklist.is_null()) {
-    blacklistedApps = QString::fromStdString(blacklist.get_string())
-        .remove("\"")
-        .split(";", QString::SkipEmptyParts);
-  }
-  return blacklistedApps;
+  auto hint_category = reply->register_category("hint", "", "", usc::CategoryRenderer(CATEGORY_HINT));
+  usc::CategorisedResult res(hint_category);
+  res.set_uri(usc::CannedQuery(query()).to_uri());
+  res.set_title(reason);
+  reply->push(res);
 }
 
 
 void Query::
 run(usc::SearchReplyProxy const& reply)
 {
-  auto blacklistedApps = blacklist();
-  QRegExp re(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
-  Libertine::UPtr libertine = libertine_factory_();
-
-  for (auto const& container: libertine->get_container_list())
+  if (!hidden_->empty())
+  {
+    register_departments(reply);
+  }
+
+  // only provide filters in root department
+  QStringList excludes_by_filter;
+  if (query().department_id().empty())
+  {
+    excludes_by_filter = make_filters(reply);
+  }
+
+  QRegExp search_query(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
+  bool has_no_apps = true,
+       all_filtered = true;
+
+  for (auto const& container: libertine_->get_container_list())
   {
     auto category = reply->register_category(container->id(),
                                              container->name(),
                                              "Application",
                                              usc::CategoryRenderer(CATEGORY_APPS_DISPLAY));
+
     for (auto const& app: container->app_launchers())
     {
-      if (!(re.isEmpty() || QString::fromStdString(app.name()).contains(re))
-          || blacklistedApps.contains(QString::fromStdString(app.name())))
+      has_no_apps = false;
+      if (!(search_query.isEmpty() || QString::fromStdString(app.name()).contains(search_query)))
+      {
+        continue;
+      }
+
+      auto app_info = parse_app_info(app.uri());
+
+      if (blacklist_->app_is_blacklisted(app_info.app_id, container->id()))
+      {
+        continue;
+      }
+
+      if (excludes_by_filter.contains(app_info.key))
+      {
+        continue;
+      }
+
+      // ignore hidden apps in root department
+      if (query().department_id().empty() || query().department_id() == ROOT_DEPT_ID)
+      {
+        if (hidden_->app_is_hidden(app_info.key))
+        {
+          continue;
+        }
+      }
+      else if (!hidden_->app_is_hidden(app_info.key))
       {
         continue;
       }
@@ -118,12 +263,25 @@
       result.set_title(app.name());
       result.set_art(app.icon());
       result.set_uri(app.uri());
-      result["description"] = app.description();
+      result[DESCRIPTION_FIELD] = app.description();
+      result[APP_ID_FIELD] = app_info.key.toStdString();
+      result[DEPARTMENT_ID_FIELD] = (query().department_id().empty() || query().department_id() == ROOT_DEPT_ID) ? ROOT_DEPT_ID : HIDDEN_DEPT_ID;
+
       if (!reply->push(result))
       {
-        break;
+        return;
       }
+
+      all_filtered = false;
     }
   }
+
+  if (has_no_apps)
+  {
+    show_hint(reply, NO_RESULTS_HINT);
+  }
+  else if (all_filtered)
+  {
+    show_hint(reply, ALL_RESULTS_FILTERED_HINT);
+  }
 }
-
 
=== modified file 'libertine-scope/query.h'
--- libertine-scope/query.h	2016-05-04 17:56:13 +0000
+++ libertine-scope/query.h	2016-06-16 14:35:35 +0000
@@ -17,10 +17,11 @@
 #define LIBERTINE_SCOPE_QUERY_H_
 
 #include "libertine-scope/libertine.h"
+#include "libertine-scope/blacklist.h"
+#include "libertine-scope/hidden_apps.h"
 #include <unity/scopes/ReplyProxyFwd.h>
 #include <unity/scopes/SearchQueryBase.h>
-
-class QStringList;
+#include <QStringList>
 
 
 /**
@@ -30,25 +31,32 @@
 : public unity::scopes::SearchQueryBase
 {
 public:
-    Query(unity::scopes::CannedQuery const&    query,
-          unity::scopes::SearchMetadata const& metadata,
-          Libertine::Factory const&            libertine_factory);
-
-    ~Query() = default;
-
-    void
-    cancelled() override;
-
-    void
-    run(unity::scopes::SearchReplyProxy const& reply) override;
-
-    // Overriding base class method to add ability to test
-    virtual unity::scopes::VariantMap settings() const;
+  Query(unity::scopes::CannedQuery const&    query,
+        unity::scopes::SearchMetadata const& metadata,
+        Libertine::Factory const&            libertine_factory,
+        std::shared_ptr<HiddenApps>          hidden_apps,
+        std::shared_ptr<Blacklist>           blacklist);
+
+  ~Query() = default;
+
+  virtual void
+  cancelled() override;
+
+  void
+  run(unity::scopes::SearchReplyProxy const& reply) override;
+
+  static std::string const NO_RESULTS_HINT;
+  static std::string const ALL_RESULTS_FILTERED_HINT;
 
 private:
-    QStringList blacklist() const;
+  QStringList get_hidden_department() const;
+  QStringList make_filters(unity::scopes::SearchReplyProxy const& reply) const;
+  void show_hint(unity::scopes::SearchReplyProxy const& reply, std::string const& reason) const;
+  void parse_blacklist(const std::string& data_dir);
 
-    Libertine::Factory libertine_factory_;
+  Libertine::UPtr libertine_;
+  std::shared_ptr<HiddenApps> hidden_;
+  std::shared_ptr<Blacklist> blacklist_;
 };
 
 #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-16 14:35:35 +0000
@@ -17,40 +17,17 @@
 
 #include "libertine-scope/preview.h"
 #include "libertine-scope/query.h"
-#include <localization.h>
+#include "libertine-scope/action.h"
+#include "libertine-scope/localization.h"
 #include <sstream>
-#include <unity/scopes/ActivationResponse.h>
 #include <url-dispatcher.h>
+#include <QFile>
+#include <QTextStream>
+#include <QString>
 
 
 namespace usc = unity::scopes;
 
-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;
-};
-
-} // anonymous namespace
-
 
 Scope::
 Scope(Libertine::Factory const& libertine_factory)
@@ -79,7 +56,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_,
+                                              std::make_shared<HiddenApps>(cache_directory()),
+                                              std::make_shared<Blacklist>(scope_directory())));
 }
 
 
@@ -97,14 +78,10 @@
                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,
+                                                   std::make_shared<HiddenApps>(cache_directory())));
 }
 
 
 
=== modified file 'po/en_AU.po'
--- po/en_AU.po	2016-06-09 06:33:15 +0000
+++ po/en_AU.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-05-21 11:19+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
 
=== modified file 'po/en_GB.po'
--- po/en_GB.po	2016-06-09 06:33:15 +0000
+++ po/en_GB.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-05-20 16:47+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
 
=== modified file 'po/es.po'
--- po/es.po	2016-06-09 06:33:15 +0000
+++ po/es.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-06-04 22:37+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
@@ -23,5 +24,8 @@
 
 #: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
-msgstr ""
-"Mostrar y ejecutar aplicaciones basadas en X11 y empaquetadas en DEB."
+msgstr "Mostrar y ejecutar aplicaciones basadas en X11 y empaquetadas en DEB."
+
+#, fuzzy
+#~ msgid "X Apps"
+#~ msgstr "XApps"
 
=== modified file 'po/fi.po'
--- po/fi.po	2016-06-09 06:33:15 +0000
+++ po/fi.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-05-30 07:34+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <[e-mail]>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
 
=== modified file 'po/fr.po'
--- po/fr.po	2016-06-09 06:33:15 +0000
+++ po/fr.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-05-21 12:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
 
=== modified file 'po/gl.po'
--- po/gl.po	2016-06-09 06:33:15 +0000
+++ po/gl.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-06-06 23:23+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <[e-mail]>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
@@ -25,3 +26,7 @@
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
 "Inicia e executa aplicativos baseados en X11 empaquetados en formato DEB."
+
+#, fuzzy
+#~ msgid "X Apps"
+#~ msgstr "XApps"
 
=== modified file 'po/libertine-scope.pot'
--- po/libertine-scope.pot	2016-06-02 17:13:50 +0000
+++ po/libertine-scope.pot	2016-06-16 14:35:35 +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-16 08:41-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -24,3 +24,25 @@
 #: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
+
+#: ../libertine-scope/query.cpp:38
+msgid "X Apps"
+msgstr ""
+
+#: ../libertine-scope/query.cpp:39
+msgid "Hidden X Apps"
+msgstr ""
+
+#: ../libertine-scope/query.cpp:43
+msgid "Exclude Apps: "
+msgstr ""
+
+#. anonymous namespace
+#: ../libertine-scope/query.cpp:113
+msgid ""
+"No XApps available. Install new applications with the Libertine Manager."
+msgstr ""
+
+#: ../libertine-scope/query.cpp:114
+msgid "All XApps hidden. Reset filters or check the Hidden XApps department."
+msgstr ""
 
=== modified file 'po/ms.po'
--- po/ms.po	2016-06-09 06:33:15 +0000
+++ po/ms.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-05-22 00:24+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <[e-mail]>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
 
=== modified file 'po/pt.po'
--- po/pt.po	2016-06-09 06:33:15 +0000
+++ po/pt.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-05-20 16:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
 
=== modified file 'po/uk.po'
--- po/uk.po	2016-06-09 06:33:15 +0000
+++ po/uk.po	2016-06-16 14:35:35 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-06-08 19:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-02 13:05-0400\n"
 "PO-Revision-Date: 2016-05-20 15:56+0000\n"
 "Last-Translator: Yuri Chornoivan <[e-mail]>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-09 06:33+0000\n"
+"X-Launchpad-Export-Date: 2016-06-07 05:45+0000\n"
 "X-Generator: Launchpad (build 18097)\n"
 
 #: ../data/libertine-scope.ini.in.h:1
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-05-03 13:25:14 +0000
+++ tests/CMakeLists.txt	2016-06-16 14:35:35 +0000
@@ -3,24 +3,27 @@
 set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
 add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
 
-add_executable(libertine_scope_tests
-  fake_container.cpp
-  fake_libertine.cpp
-
-  # tests
-  test_scope.cpp
-  test_preview.cpp
-  test_query.cpp
-)
-
-target_link_libraries(libertine_scope_tests
-  scope
-  Qt5::Core
-  gmock
-  gmock_main
-)
-
-add_test(test_scope libertine_scope_tests)
-add_test(test_preview libertine_scope_tests)
-add_test(test_query libertine_scope_tests)
-
+function(create_test test_name)
+  add_executable(${test_name}_exe
+    fake_container.cpp
+    fake_libertine.cpp
+    ${test_name}.cpp
+  )
+
+  target_link_libraries(${test_name}_exe
+    scope
+    Qt5::Core
+    gmock
+    gmock_main
+  )
+
+  add_test(${test_name} ${test_name}_exe)
+endfunction(create_test)
+
+create_test(test_scope)
+create_test(test_preview)
+create_test(test_query)
+create_test(test_hidden_apps)
+create_test(test_blacklist)
+
+file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
=== modified file 'tests/TypedScopeFixture.h'
--- tests/TypedScopeFixture.h	2016-01-19 05:10:54 +0000
+++ tests/TypedScopeFixture.h	2016-06-16 14:35:35 +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");
     }
 
 
=== added directory 'tests/data'
=== added file 'tests/data/blacklist'
--- tests/data/blacklist	1970-01-01 00:00:00 +0000
+++ tests/data/blacklist	2016-06-16 14:35:35 +0000
@@ -0,0 +1,9 @@
+# simple blacklisting`
+container1/app1
+all/app2
+
+# blacklisted but overriden by whitelisting
+all/app3
+all/app4
+whitelist/container1/app3
+whitelist/all/app4
 
=== added file 'tests/data/hidden'
--- tests/data/hidden	1970-01-01 00:00:00 +0000
+++ tests/data/hidden	2016-06-16 14:35:35 +0000
@@ -0,0 +1,1 @@
+container1/app1
 
=== modified file 'tests/fake_container.cpp'
--- tests/fake_container.cpp	2016-04-27 17:53:30 +0000
+++ tests/fake_container.cpp	2016-06-16 14:35:35 +0000
@@ -42,10 +42,9 @@
   }
 };
 
-
 FakeContainer::
 FakeContainer(std::string const& json_string)
-: Container("fakeId", "fakeName")
+: Container("fake-container", "fake-container")
 {
   QJsonDocument json = QJsonDocument::fromJson(QByteArray::fromStdString(json_string), nullptr);
   QJsonObject object = json.object();
 
=== 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-16 14:35:35 +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/fake_libertine.cpp'
--- tests/fake_libertine.cpp	2016-01-19 00:16:56 +0000
+++ tests/fake_libertine.cpp	2016-06-16 14:35:35 +0000
@@ -25,12 +25,6 @@
 }
 
 
-FakeLibertine::
-~FakeLibertine()
-{
-}
-
-
 Libertine::ContainerList const& FakeLibertine::
 get_container_list() const
 {
 
=== modified file 'tests/fake_libertine.h'
--- tests/fake_libertine.h	2016-01-19 21:10:09 +0000
+++ tests/fake_libertine.h	2016-06-16 14:35:35 +0000
@@ -27,9 +27,9 @@
 : public Libertine
 {
 public:
-  ~FakeLibertine();
+  virtual ~FakeLibertine() = default;
 
-  Libertine::ContainerList const&
+  virtual Libertine::ContainerList const&
   get_container_list() const override;
 
   static Libertine::UPtr
 
=== added file 'tests/test_blacklist.cpp'
--- tests/test_blacklist.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_blacklist.cpp	2016-06-16 14:35:35 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 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/>.
+ */
+#include "libertine-scope/blacklist.h"
+#include <gtest/gtest.h>
+#include <QDir>
+#include <QTemporaryDir>
+
+
+namespace
+{
+class TestBlacklistFixture : public ::testing::Test
+{
+public:
+  TestBlacklistFixture()
+    : blacklist(QString("%1/data").arg(QDir::currentPath()).toStdString())
+  {
+  }
+
+protected:
+  Blacklist blacklist;
+};
+
+TEST_F(TestBlacklistFixture, ReturnsFalseWhenFileDoesNotExist)
+{
+  EXPECT_FALSE(Blacklist(QTemporaryDir().path().toStdString()).app_is_blacklisted("app1", "container1"));
+}
+
+TEST_F(TestBlacklistFixture, ReturnsFalseWhenAppIsNotInTheList)
+{
+  EXPECT_FALSE(blacklist.app_is_blacklisted("app5", "container1"));
+}
+
+TEST_F(TestBlacklistFixture, ReturnsTrueWhenAppIsBlacklistedLocally)
+{
+  EXPECT_TRUE(blacklist.app_is_blacklisted("app1", "container1"));
+}
+
+TEST_F(TestBlacklistFixture, ReturnsTrueWhenAppIsBlacklistedGlobally)
+{
+  EXPECT_TRUE(blacklist.app_is_blacklisted("app2", "container2"));
+}
+
+TEST_F(TestBlacklistFixture, ReturnsFalseWhenAppIsWhitelistedLocally)
+{
+  EXPECT_FALSE(blacklist.app_is_blacklisted("app3", "container1"));
+}
+
+TEST_F(TestBlacklistFixture, ReturnsFalseWhenAppIsWhitelistedGlobally)
+{
+  EXPECT_FALSE(blacklist.app_is_blacklisted("app4", "container2"));
+}
+}
 
=== added file 'tests/test_hidden_apps.cpp'
--- tests/test_hidden_apps.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_hidden_apps.cpp	2016-06-16 14:35:35 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright 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/>.
+ */
+#include "libertine-scope/hidden_apps.h"
+#include <gtest/gtest.h>
+#include <QDir>
+#include <QTemporaryDir>
+
+namespace
+{
+class TestHiddenAppsFixture : public ::testing::Test
+{
+public:
+  TestHiddenAppsFixture()
+    : hidden(QString("%1/data").arg(QDir::currentPath()).toStdString())
+  {
+  }
+
+  virtual void SetUp()
+  {
+    QFile file(QString("%1/data/hidden").arg(QDir::currentPath()));
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+      original_file_contents = file.readAll();
+    }
+  }
+
+  virtual void TearDown()
+  {
+    QFile file(QString("%1/data/hidden").arg(QDir::currentPath()));
+    if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+      file.write(original_file_contents);
+    }
+  }
+
+protected:
+  HiddenApps hidden;
+  QByteArray original_file_contents;
+};
+
+
+TEST_F(TestHiddenAppsFixture, HiddenReturnsFalseWhenFileDoesNotExist)
+{
+  EXPECT_FALSE(HiddenApps(QTemporaryDir().path().toStdString()).app_is_hidden("container1/app1"));
+}
+
+TEST_F(TestHiddenAppsFixture, HiddenReturnsFalseWhenAppNotListed)
+{
+  EXPECT_FALSE(hidden.app_is_hidden("container2/app1"));
+}
+
+TEST_F(TestHiddenAppsFixture, HiddenReturnsFalseWhenAppIsListed)
+{
+  EXPECT_TRUE(hidden.app_is_hidden("container1/app1"));
+}
+
+TEST_F(TestHiddenAppsFixture, AddAppendsAppToFile)
+{
+  ASSERT_FALSE(hidden.app_is_hidden("container1/app6"));
+  hidden.add("container1/app6");
+  ASSERT_TRUE(hidden.app_is_hidden("container1/app6"));
+
+  QFile file(QString("%1/data/hidden").arg(QDir::currentPath()));
+  ASSERT_TRUE(file.open(QIODevice::ReadOnly | QIODevice::Text));
+  auto contents = QString(file.readAll()).split('\n', QString::SkipEmptyParts);
+  EXPECT_EQ("container1/app6", contents.last());
+}
+
+TEST_F(TestHiddenAppsFixture, AddDoesNotAppendWhenAppAlreadyInFile)
+{
+  ASSERT_TRUE(hidden.app_is_hidden("container1/app1"));
+  hidden.add("container1/app1");
+
+  QFile file(QString("%1/data/hidden").arg(QDir::currentPath()));
+  ASSERT_TRUE(file.open(QIODevice::ReadOnly | QIODevice::Text));
+  auto contents = QString(file.readAll()).split('\n', QString::SkipEmptyParts);
+  EXPECT_EQ(1, contents.count("container1/app1"));
+}
+
+TEST_F(TestHiddenAppsFixture, RemoveDeletesLineFromFile)
+{
+  ASSERT_FALSE(hidden.app_is_hidden("container1/app6"));
+  hidden.add("container1/app6");
+  ASSERT_TRUE(hidden.app_is_hidden("container1/app6"));
+
+  hidden.remove("container1/app6");
+  ASSERT_FALSE(hidden.app_is_hidden("container1/app6"));
+
+  QFile file(QString("%1/data/hidden").arg(QDir::currentPath()));
+  ASSERT_TRUE(file.open(QIODevice::ReadOnly | QIODevice::Text));
+  auto contents = QString(file.readAll()).split('\n', QString::SkipEmptyParts);
+  EXPECT_NE("container1/app6", contents.last());
+}
+}
 
=== modified file 'tests/test_preview.cpp'
--- tests/test_preview.cpp	2016-04-27 17:53:30 +0000
+++ tests/test_preview.cpp	2016-06-16 14:35:35 +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-16 14:35:35 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "libertine-scope/query.h"
+#include "libertine-scope/config.h"
 #include "tests/fake_libertine.h"
 #include <unity/scopes/SearchMetadata.h>
 #include <unity/scopes/CannedQuery.h>
@@ -34,19 +35,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!"
     }]
@@ -66,6 +67,30 @@
 };
 
 
+class MockHiddenApps : public HiddenApps
+{
+public:
+  MockHiddenApps()
+    : HiddenApps("")
+  {
+  }
+
+  MOCK_CONST_METHOD1(app_is_hidden, bool(QString const&));
+  MOCK_CONST_METHOD0(empty, bool());
+};
+
+class MockBlacklist : public Blacklist
+{
+public:
+  MockBlacklist()
+    : Blacklist("")
+  {
+  }
+
+  MOCK_CONST_METHOD2(app_is_blacklisted, bool(QString const&, std::string const&));
+};
+
+
 MATCHER_P4(ResultPropertiesMatch, title, art, description, uri, "")
 {
   return arg.contains("title") && arg.contains("art") && arg.contains("description") && arg.contains("uri") &&
@@ -76,6 +101,12 @@
 }
 
 
+MATCHER_P(ResultTitleMatch, title, "")
+{
+  return arg.contains("title") && arg["title"] == unity::scopes::Variant(title);
+}
+
+
 class TestQueryFixture : public ::testing::Test
 {
 public:
@@ -84,13 +115,25 @@
     , canned_query("libertine-scope")
     , reply()
     , proxy(&reply, [](unity::scopes::SearchReply*) {})
-    , category(std::make_shared<FakeCategory>("fakeId", "fake-container", "Application", unity::scopes::CategoryRenderer()))
-  {
+    , category(std::make_shared<FakeCategory>("fake-container", "fake-container", "Application", unity::scopes::CategoryRenderer()))
+    , hidden(new testing::NiceMock<MockHiddenApps>())
+    , blacklist(new testing::NiceMock<MockBlacklist>())
+  {
+  }
+
+  virtual void SetUp()
+  {
+    EXPECT_CALL(*blacklist, app_is_blacklisted(testing::_, "fake-container"))
+        .WillRepeatedly(testing::Return(false));
+    EXPECT_CALL(*hidden, empty())
+        .WillRepeatedly(testing::Return(true));
+    EXPECT_CALL(*hidden, app_is_hidden(testing::_))
+        .WillRepeatedly(testing::Return(false));
   }
 
   void expect_registry()
   {
-    EXPECT_CALL(reply, register_category("fakeId", "fake-container", "Application", testing::_)).WillOnce(testing::Return(category));
+    EXPECT_CALL(reply, register_category("fake-container", "fake-container", "Application", testing::_)).WillOnce(testing::Return(category));
   }
 
   void expect_push(std::string title, std::string art, std::string description, std::string appId, bool success = true)
@@ -100,17 +143,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;
@@ -118,10 +161,12 @@
   testing::NiceMock<unity::scopes::testing::MockSearchReply> reply;
   unity::scopes::SearchReplyProxy proxy;
   std::shared_ptr<FakeCategory> category;
+  std::shared_ptr<MockHiddenApps> hidden;
+  std::shared_ptr<MockBlacklist> blacklist;
 };
 
 
-TEST_F(TestQueryFixture, returnsAllDisplayableAppsWithoutFilters)
+TEST_F(TestQueryFixture, pushesAllDisplayableAppsWithoutFilters)
 {
   expect_registry();
   expect_push_libreoffice();
@@ -130,12 +175,12 @@
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  });
+  }, hidden, blacklist);
   query.run(proxy);
 }
 
 
-TEST_F(TestQueryFixture, returnsRegularExpressionFilteredListOfApps)
+TEST_F(TestQueryFixture, pushesRegularExpressionFilteredListOfApps)
 {
   expect_registry();
   expect_push_libreoffice();
@@ -143,7 +188,7 @@
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  });
+  }, hidden, blacklist);
   query.run(proxy);
 }
 
@@ -155,56 +200,90 @@
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  });
-  query.run(proxy);
-}
-
-
-// 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_library();
-
-  QueryWithFakeSettings query(canned_query, metadata, []() {
-    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  });
-  query.settings_["blacklist"] = "LibreOffice;Linux";
-  query.run(proxy);
-}
-
-
-TEST_F(TestQueryFixture, stripsQuotationMarksFromBlacklist)
-{
-  expect_registry();
-  expect_push_linux();
-  expect_push_library();
-
-  QueryWithFakeSettings query(canned_query, metadata, []() {
-    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  });
-  query.settings_["blacklist"] = "\"LibreOffice\"";
-  query.run(proxy);
-}
-
+  }, hidden, blacklist);
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, ignoresBlacklistedApps)
+{
+  expect_registry();
+  expect_push_linux();
+  expect_push_library();
+
+  EXPECT_CALL(*blacklist, app_is_blacklisted(QString("libreoffice"), "fake-container"))
+      .WillRepeatedly(testing::Return(true));
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  }, hidden, blacklist);
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, ignoresHiddenAppsInRootDepartment)
+{
+  expect_registry();
+  expect_push_linux();
+  expect_push_libreoffice();
+
+  EXPECT_CALL(*hidden, app_is_hidden(QString("fake-container/library")))
+              .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(*hidden, empty())
+      .WillOnce(testing::Return(false));
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  }, hidden, blacklist);
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, ignoresNonHiddenAppsInHiddenDepartment)
+{
+  expect_registry();
+  expect_push_library();
+
+  EXPECT_CALL(*hidden, app_is_hidden(QString("fake-container/library")))
+              .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(*hidden, empty())
+      .WillOnce(testing::Return(false));
+
+  canned_query.set_department_id(HIDDEN_DEPT_ID);
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  }, hidden, blacklist);
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, showsHintWhenAllAppsFiltered)
+{
+  expect_registry();
+
+  EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
+  EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::ALL_RESULTS_FILTERED_HINT)))).WillOnce(testing::Return(true));
+
+  EXPECT_CALL(*hidden, app_is_hidden(testing::_)).WillRepeatedly(testing::Return(true));
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  }, hidden, blacklist);
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, showsHintWhenNoAppsInContainer)
+{
+  expect_registry();
+
+  EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
+  EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::NO_RESULTS_HINT)))).WillOnce(testing::Return(true));
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake("");
+  }, hidden, blacklist);
+  query.run(proxy);
+}
 } // anonymous namespace