Merge lp:~mvo/software-center/fix-gmenu-searcher into lp:software-center

[Michael Vogt]

This branch fixes the menu searcher after the app-install-data-ubuntu file layout changed to "pkgname:filename.desktop". It also adds a regression test.

To test do not log into unity (e.g. gnome-panel, xfce, gnome-shell) and run "software-center gedit".
In current trunk you will see no indication where it is and with this branch the information is
there in the details page directly under the "Installed" label.

[lp:~mvo/software-center/fix-gmenu-searcher]

2983. By Michael Vogt on 2012-04-18

pep8 fixes

[Gary Lasker (gary-lasker)]

Thanks mvo!

review: Approve

=== modified file 'softwarecenter/db/pkginfo_impl/aptcache.py'
--- softwarecenter/db/pkginfo_impl/aptcache.py	2012-04-16 09:22:12 +0000
+++ softwarecenter/db/pkginfo_impl/aptcache.py	2012-04-18 08:54:18 +0000
@@ -234,6 +234,7 @@
     def open(self):
         """ (re)open the cache, this sends cache-invalid, cache-ready signals
         """
+        LOG.info("aptcache.open()")
         self._ready = False
         self.emit("cache-invalid")
         from softwarecenter.utils import ExecutionTime

=== modified file 'softwarecenter/ui/gtk3/gmenusearch.py'
--- softwarecenter/ui/gtk3/gmenusearch.py	2012-03-15 09:32:18 +0000
+++ softwarecenter/ui/gtk3/gmenusearch.py	2012-04-18 08:54:18 +0000
@@ -82,8 +82,14 @@
             root = tree.get_root_directory()
             self._search_gmenu_dir([root],
                                    os.path.basename(desktop_file))
-            if self._found:
-                return self._found
+            # retry search for app-install-data desktop files
+            if not self._found and ":" in os.path.basename(desktop_file):
+                # the desktop files in app-install-data have a layout
+                # like "pkg:file.desktop" so we need to take that into
+                # account when searching
+                desktop_file = os.path.basename(desktop_file).split(":")[1]
+                self._search_gmenu_dir([root], desktop_file)
+            return self._found
 
 
 # these are the old static bindinds that are no longer required

=== modified file 'test/test_where_is_it.py'
--- test/test_where_is_it.py	2012-01-16 14:42:49 +0000
+++ test/test_where_is_it.py	2012-04-18 08:54:18 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+import logging
 import os
 import unittest
 
@@ -10,7 +11,7 @@
 from softwarecenter.db.pkginfo import get_pkg_info
 from softwarecenter.db.database import StoreDatabase
 from softwarecenter.db.application import Application
-
+from softwarecenter.enums import PkgStates
 
 class TestWhereIsit(unittest.TestCase):
     """ tests the "where is it in the menu" code """
@@ -74,8 +75,20 @@
         self.assertEqual(found[1].get_icon().get_names()[0], 
                          "applications-utilities")
         
+    def test_where_is_it_real_system(self):
+        app = Application("", "gedit")
+        details = app.get_details(self.db)
+        if details.pkg_state != PkgStates.INSTALLED:
+            logging.warn("gedit not installed, skipping real menu test")
+            self.skipTest("gedit not installed")
+            return
+        self.assertEqual(details.desktop_file, 
+                         "/usr/share/app-install/desktop/gedit:gedit.desktop")
+        # search the *real* menu
+        searcher = GMenuSearcher()
+        found = searcher.get_main_menu_path(details.desktop_file)
+        self.assertNotEqual(found, None)
 
 if __name__ == "__main__":
-    import logging
-    logging.basicConfig(level=logging.DEBUG)
+    #logging.basicConfig(level=logging.DEBUG)
     unittest.main()