Merge lp:~stolowski/unity-scope-click/provide-default-db into lp:unity-scope-click/devel

[Paweł Stołowski]

Provide default departments db and an upstart job that copies it to user's home directory (unless it's there already). Added new deb packages.

Provide default departments db and an upstart job that copies it to user's home directory (unless it's there already). Added new deb packages.

[lp:~stolowski/unity-scope-click/provide-default-db]

347. By Paweł Stołowski on 2014-07-15

Merged populate-departments-db.

348. By Paweł Stołowski on 2014-07-17

Merged devel.

Unmerged revisions

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-07-04 13:10:05 +0000
+++ data/CMakeLists.txt	2014-07-15 14:34:54 +0000
@@ -14,6 +14,11 @@
   ${APPS_INI_TARGET}.in
 )
 
+# upstart job for default departments db
+set(DEPARTMENTS_UPSTART_JOB click-scope-departments-db.conf)
+configure_file(${DEPARTMENTS_UPSTART_JOB}.in ${DEPARTMENTS_UPSTART_JOB} @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_UPSTART_JOB} DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
+
 add_custom_target(${STORE_INI_TARGET} ALL
   COMMENT "Merging translations into ${STORE_INI_TARGET}"
   COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${STORE_INI_TARGET}.in ${STORE_INI_TARGET} >/dev/null
@@ -35,6 +40,11 @@
 )
 
 install(
+  FILES departments.db
+  DESTINATION "${APPS_DATA_DIR}"
+)
+
+install(
   FILES "${CMAKE_CURRENT_BINARY_DIR}/${STORE_INI_TARGET}"
   DESTINATION "${STORE_LIB_DIR}"
 )

=== added file 'data/click-scope-departments-db.conf.in'
--- data/click-scope-departments-db.conf.in	1970-01-01 00:00:00 +0000
+++ data/click-scope-departments-db.conf.in	2014-07-15 14:34:54 +0000
@@ -0,0 +1,9 @@
+description "Default Click Departments Database"
+author "Pawel Stolowski <[e-mail]>"
+
+start on starting unity8
+
+script
+    DB_FILE=@APPS_DATA_DIR@/departments.db
+    [ -f $HOME/.cache/click-departments.db ] || cp $DB_FILE $HOME/.cache/click-departments.db
+end script

=== added file 'data/departments.db'
Binary files data/departments.db	1970-01-01 00:00:00 +0000 and data/departments.db	2014-07-15 14:34:54 +0000 differ
=== modified file 'debian/control'
--- debian/control	2014-07-11 21:56:59 +0000
+++ debian/control	2014-07-15 14:34:54 +0000
@@ -30,7 +30,8 @@
          ubuntu-app-launch-tools,
          ubuntu-download-manager,
          ubuntu-sdk-libs,
-         sqlite3 (>= 3.8.5),
+         libsqlite3-0 (>= 3.8.5),
+         unity-scope-click-departmentsdb (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: unity (<< 7.0),
@@ -41,6 +42,30 @@
  .
  This package provides the click scope.
 
+Package: unity-scope-click-init-departments
+Architecture: armhf i386 amd64
+Depends: libsqlite3-0 (>= 3.8.5),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: unity (<< 7.0),
+Description: Click Scope Utility for Initialization of Departments
+ The click scope init-departments initializes or updates the internal database
+ of departments for installed applications. This tool is for click scope developers
+ and for customizations of ubuntu-touch image. It's not meant to be used by end users.
+ .
+ This package provides the helper init-departments tool.
+
+Package: unity-scope-click-departmentsdb
+Architecture: all
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: unity (<< 7.0),
+Description: Click Scope Departments Database
+ The click scope departments database provide the initial departments data for
+ preinstalled (default) applications.
+ .
+ This package provides departments database for preinstalled applications.
+
 Package: unity-scope-click-autopilot
 Architecture: all
 Depends: libautopilot-qt (>= 1.4),

=== added file 'debian/unity-scope-click-departmentsdb.install'
--- debian/unity-scope-click-departmentsdb.install	1970-01-01 00:00:00 +0000
+++ debian/unity-scope-click-departmentsdb.install	2014-07-15 14:34:54 +0000
@@ -0,0 +1,2 @@
+usr/share/unity/scopes/clickapps/departments.db
+usr/share/upstart/sessions/*.conf

=== added file 'debian/unity-scope-click-init-departments.install'
--- debian/unity-scope-click-init-departments.install	1970-01-01 00:00:00 +0000
+++ debian/unity-scope-click-init-departments.install	2014-07-15 14:34:54 +0000
@@ -0,0 +1,1 @@
+usr/sbin/init-departments

=== modified file 'debian/unity-scope-click.install'
--- debian/unity-scope-click.install	2014-07-07 10:32:36 +0000
+++ debian/unity-scope-click.install	2014-07-15 14:34:54 +0000
@@ -1,5 +1,7 @@
 usr/lib/*/unity-scopes/*
 usr/lib/unity-scope-click/*
-usr/share/unity/scopes/*
+usr/share/unity/scopes/clickstore/*
+usr/share/unity/scopes/clickapps/*jpg
+usr/share/unity/scopes/clickapps/*svg
 usr/share/glib-2.0/schemas/*
 usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-07-15 14:34:53 +0000
+++ libclickscope/click/preview.cpp	2014-07-15 14:34:54 +0000
@@ -54,6 +54,39 @@
 
 namespace click {
 
+DepartmentUpdater::DepartmentUpdater(const std::shared_ptr<click::DepartmentsDb>& depts)
+    : depts(depts)
+{
+}
+
+void DepartmentUpdater::store_department(const PackageDetails& details)
+{
+    //
+    // store package -> department mapping in sqlite db
+    if (depts)
+    {
+        if (!details.department.empty())
+        {
+            try
+            {
+                depts->store_package_mapping(details.package.name, details.department);
+                qDebug() << "Storing mapping for" << QString::fromStdString(details.package.name) << ":" << QString::fromStdString(details.department);
+            }
+            catch (const std::exception& e)
+            {
+                qWarning() << "Failed to store package mapping for package '"
+                    << QString::fromStdString(details.package.name)
+                    << "', department '" << QString::fromStdString(details.department)
+                    << "':" << QString::fromStdString(e.what());
+            }
+        }
+        else
+        {
+            qWarning() << "Department is empty for package" << QString::fromStdString(details.package.name);
+        }
+    }
+}
+
 // Preview base class
 
 Preview::Preview(const unity::scopes::Result& result,
@@ -84,7 +117,7 @@
                      << " and close_preview="
                      << metadict.count(click::Preview::Actions::CLOSE_PREVIEW);
 
-            return new InstalledPreview(result, metadata, client);
+            return new InstalledPreview(result, metadata, client, depts);
         } else if (metadict.count("action_id") != 0  && metadict.count("download_url") != 0) {
             std::string action_id = metadict["action_id"].get_string();
             std::string download_url = metadict["download_url"].get_string();
@@ -93,17 +126,17 @@
             } else {
                 qWarning() << "unexpected action id " << QString::fromStdString(action_id)
                            << " given with download_url" << QString::fromStdString(download_url);
-                return new UninstalledPreview(result, client);
+                return new UninstalledPreview(result, client, depts);
             }
         } else if (metadict.count(click::Preview::Actions::UNINSTALL_CLICK) != 0) {
             return new UninstallConfirmationPreview(result);
         } else if (metadict.count(click::Preview::Actions::CONFIRM_UNINSTALL) != 0) {
             return new UninstallingPreview(result, client);
         } else if (metadict.count(click::Preview::Actions::RATED) != 0) {
-            return new InstalledPreview(result, metadata, client);
+            return new InstalledPreview(result, metadata, client, depts);
         } else {
             qWarning() << "preview() called with unexpected metadata. returning uninstalled preview";
-            return new UninstalledPreview(result, client);
+            return new UninstalledPreview(result, client, depts);
         }
     } else {
         // metadata.scope_data() is Null, so we return an appropriate "default" preview:
@@ -112,9 +145,9 @@
             return new InstalledScopePreview(result);
         }
         if (result["installed"].get_bool() == true) {
-            return new InstalledPreview(result, metadata, client);
+            return new InstalledPreview(result, metadata, client, depts);
         } else {
-            return new UninstalledPreview(result, client);
+            return new UninstalledPreview(result, client, depts);
         }
     }
 
@@ -343,7 +376,6 @@
     reply->push(downloadErrorWidgets());
 }
 
-
 // class InstallingPreview
 
 InstallingPreview::InstallingPreview(const std::string &download_url,
@@ -351,7 +383,8 @@
                                      const QSharedPointer<click::web::Client>& client,
                                      const QSharedPointer<click::network::AccessManager> &nam,
                                      std::shared_ptr<click::DepartmentsDb> depts)
-    : PreviewStrategy(result, client), download_url(download_url),
+    : PreviewStrategy(result, client), DepartmentUpdater(depts),
+      download_url(download_url),
       downloader(new click::Downloader(nam)),
       depts_db(depts)
 {
@@ -390,7 +423,6 @@
                   qDebug() << "Successfully created UDM Download.";
                   populateDetails([this, reply, object_path](const PackageDetails &details) {
                           store_department(details);
-
                           reply->push(headerWidgets(details));
                           reply->push(progressBarWidget(object_path));
                           reply->push(descriptionWidgets(details));
@@ -410,38 +442,6 @@
             });
 }
 
-void InstallingPreview::store_department(const PackageDetails& details)
-{
-    //
-    // store package -> department mapping in sqlite db
-    if (depts_db)
-    {
-        if (!details.department.empty())
-        {
-            try
-            {
-                depts_db->store_package_mapping(details.package.name, { details.department });
-                qDebug() << "Storing mapping for" << QString::fromStdString(details.package.name) << ":" << QString::fromStdString(details.department);
-            }
-            catch (const std::exception& e)
-            {
-                qWarning() << "Failed to store package mapping for package '"
-                    << QString::fromStdString(details.package.name)
-                    << "', department '" << QString::fromStdString(details.department)
-                    << "':" << QString::fromStdString(e.what());
-            }
-        }
-        else
-        {
-            qWarning() << "Department is empty for package" << QString::fromStdString(details.package.name);
-        }
-    }
-    else
-    {
-        qWarning() << "Departments database not available";
-    }
-}
-
 scopes::PreviewWidgetList InstallingPreview::progressBarWidget(const std::string& object_path)
 {
     scopes::PreviewWidgetList widgets;
@@ -455,13 +455,14 @@
     return widgets;
 }
 
-
 // class InstalledPreview
 
 InstalledPreview::InstalledPreview(const unity::scopes::Result& result,
                                    const unity::scopes::ActionMetadata& metadata,
-                                   const QSharedPointer<click::web::Client>& client)
+                                   const QSharedPointer<click::web::Client>& client,
+                                   const std::shared_ptr<click::DepartmentsDb>& depts)
     : PreviewStrategy(result, client),
+      DepartmentUpdater(depts),
       metadata(metadata)
 {
 }
@@ -524,6 +525,7 @@
     }
     getApplicationUri(manifest, [this, reply, manifest, app_name, &review](const std::string& uri) {
             populateDetails([this, reply, uri, manifest, app_name, &review](const PackageDetails &details){
+                store_department(details);
                 reply->push(headerWidgets(details));
                 reply->push(createButtons(uri, manifest));
                 reply->push(descriptionWidgets(details));
@@ -724,8 +726,10 @@
 // class UninstalledPreview
 
 UninstalledPreview::UninstalledPreview(const unity::scopes::Result& result,
-                                       const QSharedPointer<click::web::Client>& client)
-    : PreviewStrategy(result, client)
+                                       const QSharedPointer<click::web::Client>& client,
+                                       const std::shared_ptr<click::DepartmentsDb>& depts)
+    : PreviewStrategy(result, client),
+      DepartmentUpdater(depts)
 {
 }
 
@@ -738,6 +742,7 @@
 qDebug() << "in UninstalledPreview::run, about to populate details";
 
     populateDetails([this, reply](const PackageDetails &details){
+            store_department(details);
             reply->push(headerWidgets(details));
             reply->push(uninstalledActionButtonWidgets(details));
             reply->push(descriptionWidgets(details));
@@ -787,7 +792,7 @@
 // TODO: this class should be removed once uninstall() is handled elsewhere.
 UninstallingPreview::UninstallingPreview(const unity::scopes::Result& result,
                                          const QSharedPointer<click::web::Client>& client)
-    : UninstalledPreview(result, client)
+    : UninstalledPreview(result, client, nullptr)
 {
 }
 UninstallingPreview::~UninstallingPreview()

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-07-15 14:34:53 +0000
+++ libclickscope/click/preview.h	2014-07-15 14:34:54 +0000
@@ -51,6 +51,17 @@
 class PreviewStrategy;
 class DepartmentsDb;
 
+class DepartmentUpdater
+{
+protected:
+    DepartmentUpdater(const std::shared_ptr<click::DepartmentsDb>& depts);
+    virtual ~DepartmentUpdater() = default;
+    void store_department(const PackageDetails& pkg);
+
+private:
+    std::shared_ptr<click::DepartmentsDb> depts;
+};
+
 class Preview : public unity::scopes::PreviewQueryBase
 {
 protected:
@@ -137,7 +148,7 @@
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
 };
 
-class InstallingPreview : public PreviewStrategy
+class InstallingPreview : public PreviewStrategy, public DepartmentUpdater
 {
 public:
     InstallingPreview(std::string const& download_url,
@@ -152,19 +163,19 @@
 
 protected:
     virtual scopes::PreviewWidgetList progressBarWidget(const std::string& object_path);
-    void store_department(const PackageDetails& pkg);
     std::string download_url;
     QSharedPointer<click::Downloader> downloader;
     std::shared_ptr<click::DepartmentsDb> depts_db;
     void startLauncherAnimation(const PackageDetails& details);
 };
 
-class InstalledPreview : public PreviewStrategy
+class InstalledPreview : public PreviewStrategy, public DepartmentUpdater
 {
 public:
     InstalledPreview(const unity::scopes::Result& result,
                      const unity::scopes::ActionMetadata& metadata,
-                     const QSharedPointer<click::web::Client>& client);
+                     const QSharedPointer<click::web::Client>& client,
+                     const std::shared_ptr<click::DepartmentsDb>& depts);
 
     virtual ~InstalledPreview();
 
@@ -210,11 +221,12 @@
 
 };
 
-class UninstalledPreview : public PreviewStrategy
+class UninstalledPreview : public PreviewStrategy, public DepartmentUpdater
 {
 public:
     UninstalledPreview(const unity::scopes::Result& result,
-                       const QSharedPointer<click::web::Client>& client);
+                       const QSharedPointer<click::web::Client>& client,
+                       const std::shared_ptr<click::DepartmentsDb>& depts);
 
     virtual ~UninstalledPreview();
 

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-07-15 14:34:53 +0000
+++ scope/tests/test_query.cpp	2014-07-15 14:34:54 +0000
@@ -109,7 +109,6 @@
                                                             const std::string &title,
                                                             const std::string &icon,
                                                             const scopes::CategoryRenderer &renderer_template));
-    //MOCK_METHOD1(store_departments, void(const click::DepartmentList&));
     using click::Query::get_installed_packages; // allow tests to access protected method
 };
 

=== modified file 'tools/init-departments/CMakeLists.txt'
--- tools/init-departments/CMakeLists.txt	2014-07-15 14:34:53 +0000
+++ tools/init-departments/CMakeLists.txt	2014-07-15 14:34:54 +0000
@@ -17,3 +17,5 @@
 target_link_libraries(${INITDEPTS}
         ${SCOPE_LIB_NAME}
     )
+
+install(TARGETS ${INITDEPTS} DESTINATION sbin)