Merge lp:~larryprice/libertine-scope/fix-desktop-scope-load into lp:libertine-scope

[Larry Price]

Initialize libertine object in Query::run() to allow constructor to execute in time.

Initialize libertine object in Query::run() to allow constructor to execute in time.

This fixes the desktop unity8 libertine-scope requiring a refresh because the ctor was taking to long to finish. I changed Libertine::UPtr to be a shared_ptr so I could pass the object to other functions (the unique_ptr copy ctor is deleted for obvious reasons).

[Christopher Townsend (townsend)]

I was never able to reproduce the bug, so I cannot test for that. However, the code looks good and it still works. +1

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'scope/apps/libertine.cpp'
--- scope/apps/libertine.cpp	2016-07-12 18:26:07 +0000
+++ scope/apps/libertine.cpp	2016-07-28 14:10:06 +0000
@@ -91,6 +91,5 @@
 Libertine::UPtr Libertine::
 from_libertine_cli()
 {
-  return Libertine::UPtr(new LibertineCli());
+  return std::make_shared<LibertineCli>();
 }
-
 
=== modified file 'scope/apps/libertine.h'
--- scope/apps/libertine.h	2016-01-13 00:38:37 +0000
+++ scope/apps/libertine.h	2016-07-28 14:10:06 +0000
@@ -29,7 +29,7 @@
 class Libertine
 {
 public:
-  using UPtr = std::unique_ptr<Libertine>;
+  using UPtr = std::shared_ptr<Libertine>;
   using ContainerList = std::vector<std::unique_ptr<Container>>;
 
   /**
 
=== modified file 'scope/apps/query.cpp'
--- scope/apps/query.cpp	2016-07-19 13:57:43 +0000
+++ scope/apps/query.cpp	2016-07-28 14:10:06 +0000
@@ -121,7 +121,7 @@
       std::shared_ptr<HiddenApps> hidden,
       std::shared_ptr<Blacklist> blacklist)
   : usc::SearchQueryBase(query, metadata)
-  , libertine_(libertine_factory())
+  , libertine_factory_(libertine_factory)
   , hidden_(hidden)
   , blacklist_(blacklist)
 {
@@ -135,14 +135,14 @@
 
 
 QStringList Query::
-make_filters(usc::SearchReplyProxy const& reply) const
+make_filters(usc::SearchReplyProxy const& reply, Libertine::UPtr libertine) const
 {
   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())
+  for (auto const& container: libertine->get_container_list())
   {
     usc::OptionSelectorFilter::SPtr filter{usc::OptionSelectorFilter::create(container->id(),
                                                                              EXCLUDED_APPS_FILTER_TITLE + container->name(),
@@ -208,18 +208,20 @@
     register_departments(reply);
   }
 
+  auto libertine = libertine_factory_();
+
   // only provide filters in root department
   QStringList excludes_by_filter;
   if (query().department_id().empty())
   {
-    excludes_by_filter = make_filters(reply);
+    excludes_by_filter = make_filters(reply, libertine);
   }
 
   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())
+  for (auto const& container: libertine->get_container_list())
   {
     auto category = reply->register_category(container->id(),
                                              container->name(),
 
=== modified file 'scope/apps/query.h'
--- scope/apps/query.h	2016-07-12 18:26:07 +0000
+++ scope/apps/query.h	2016-07-28 14:10:06 +0000
@@ -50,11 +50,11 @@
 
 private:
   QStringList get_hidden_department() const;
-  QStringList make_filters(unity::scopes::SearchReplyProxy const& reply) const;
+  QStringList make_filters(unity::scopes::SearchReplyProxy const& reply, Libertine::UPtr libertine) const;
   void show_hint(unity::scopes::SearchReplyProxy const& reply, std::string const& reason) const;
   void parse_blacklist(const std::string& data_dir);
 
-  Libertine::UPtr libertine_;
+  Libertine::Factory libertine_factory_;
   std::shared_ptr<HiddenApps> hidden_;
   std::shared_ptr<Blacklist> blacklist_;
 };