Merge lp:~mvo/unity-lens-applications/add-software-center-agent-db into lp:unity-lens-applications

[Michael Vogt]

This should add the software-center-agent database to the searches. This will include purchase applications.

Please note that I was not able to test this as when I run it I get a:
$ src/unity-applications-daemon bzr diff
GLib-GIO-ERROR **: Settings schema 'com.canonical.Unity.ApplicationsLens' is not installed

Trace/breakpoint trap (core dumped)

(that is unreleated to my change)

[Mikkel Kamstrup Erlandsen (kamstrup)]

wrt the schema error, then sorry :-) We're going through a gsettings schema transition and it is a bit bumpy...

Is there any design feedback on this? I mean; should for-pay apps be listed differently - in their own category or with a money-emblem overlay or something? Or are all apps made equal? ;-)

review: Needs Information

[Michael Vogt (mvo)]

On Mon, Jan 16, 2012 at 08:41:22AM -0000, Mikkel Kamstrup Erlandsen wrote:
> Review: Needs Information
>
> wrt the schema error, then sorry :-) We're going through a gsettings schema transition and it is a bit bumpy...

Sure, no worries. It was mostly meant as a applogy why I did not test
it :)

> Is there any design feedback on this? I mean; should for-pay apps be listed differently - in their own category or with a money-emblem overlay or something? Or are all apps made equal? ;-)

No feedback on this so far, but a really interessting question. What
process is needed for this in unity? Do I need to subscribe a group or
tag in some way?

Cheers,
 Michael

[Mikkel Kamstrup Erlandsen (kamstrup)]

You can add a task for ayatana-design and open a unity task with state Incomplete. That'll trigger the design queue. Otherwise pinging John Lea on IRC if you want to fast path it.

[Mikkel Kamstrup Erlandsen (kamstrup)]

No worries, I created the unity task and set the states myself. I don't know why I didn't just do that :-)

[Michael Vogt (mvo)]

On Mon, Jan 16, 2012 at 02:56:23PM -0000, Mikkel Kamstrup Erlandsen wrote:
> No worries, I created the unity task and set the states myself. I don't know why I didn't just do that :-)

Haha! Thanks a bunch! Still useful for me to know the process behind
it :)

Cheers,
 Michael

[Mikkel Kamstrup Erlandsen (kamstrup)]

I tried running the branch but I don't results for any of the examples from the bug report (world of goo, valleybrawl, or 7zip). Seems odd because there are no warnings or anything... Any ideas?

review: Needs Information

[Omer Akram (om26er)]

Hey mvo, any updates? ;-)

[Michal Hruby (mhr3)]

Updating the state - John said we're not going to use any emblems atm to distinguish the paid apps, Mikkel's issue can be fixed by setting `export SOFTWARE_CENTER_DISTRO_CODENAME='oneiric'` and then running the SC.

One issue I'm seeing is that we aren't getting proper icons for the paid apps, but we can tackle that in a separate branch.

Thanks for this! :)

review: Approve

[Michael Vogt (mvo)]

On Mon, Feb 20, 2012 at 11:11:39AM -0000, <email address hidden> wrote:
> The proposal to merge lp:~mvo/unity-lens-applications/add-software-center-agent-db into lp:unity-lens-applications has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
> https://code.launchpad.net/~mvo/unity-lens-applications/add-software-center-agent-db/+merge/88556
> --
> https://code.launchpad.net/~mvo/unity-lens-applications/add-software-center-agent-db/+merge/88556
> You are the owner of lp:~mvo/unity-lens-applications/add-software-center-agent-db.

Thanks a bunch! And sorry that I did not reply earlier, I unavailalbe
for a couple of days.

Cheers,
 Michael

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2011-09-27 12:22:51 +0000
+++ src/unity-package-search.cc	2012-01-13 21:02:23 +0000
@@ -30,6 +30,7 @@
 #include <xapian.h>
 #include <iostream>
 #include <gmenu-tree.h>
+#include <glib.h>
 #include <unity.h>
 #include <string.h>
 
@@ -285,18 +286,31 @@
 unity_package_searcher_new ()
 {
   UnityPackageSearcher *searcher;
+  gchar *agent = NULL;
 
   searcher = g_new0 (UnityPackageSearcher, 1);
 
   // Xapian initialization
   try {
     searcher->db = new Xapian::Database (SOFTWARE_CENTER_INDEX);
-    init_searcher (searcher);
   } catch(const Xapian::Error &error) {
     cerr << "Error loading package indexes: "  << error.get_msg() << endl;
     return NULL;
   }
-  
+
+  // add software-center-agent.db
+  try {
+    agent = g_strdup_printf("%s/software-center/software-center-agent.db",
+                            g_get_user_cache_dir());
+    if (g_file_test(agent, G_FILE_TEST_IS_DIR))
+       searcher->db->add_database (Xapian::Database (agent));
+    g_free(agent);
+  } catch(const Xapian::Error &error) {
+    cerr << "Error loading agent indexes: "  << error.get_msg() << endl;
+  }
+
+  init_searcher (searcher);
+
   return searcher;
 }