Merge lp:~didrocks/software-center/fix-running-standalone-pane into lp:software-center

[Didier Roche-Tolomelli]

Fix running standalone availablepane and installedpane.

=== modified file 'softwarecenter/view/availablepane.py'
--- softwarecenter/view/availablepane.py	2010-07-19 15:00:15 +0000
+++ softwarecenter/view/availablepane.py	2010-07-24 22:30:57 +0000
@@ -132,8 +132,10 @@
                                     gtk.Label(self.NAV_BUTTON_ID_SUBCAT))
 
         # add nav history back/forward buttons
-        self.navhistory_back_action.set_sensitive(False)
-        self.navhistory_forward_action.set_sensitive(False)
+        if self.navhistory_back_action:
+            self.navhistory_back_action.set_sensitive(False)
+        if self.navhistory_forward_action:
+            self.navhistory_forward_action.set_sensitive(False)
         # note:  this is hacky, would be much nicer to make the custom self/right
         # buttons in BackForwardButton to be gtk.Activatable/gtk.Widgets, then wire in the
         # actions using e.g. self.navhistory_back_action.connect_proxy(self.back_forward.left),
@@ -144,10 +146,11 @@
         self.top_hbox.pack_start(self.back_forward, expand=False, padding=self.PADDING)
         # nav buttons first in the panel
         self.top_hbox.reorder_child(self.back_forward, 0)
-        self.nav_history = NavigationHistory(self,
-                                             self.back_forward,
-                                             self.navhistory_back_action,
-                                             self.navhistory_forward_action)
+        if self.navhistory_back_action and self.navhistory_forward_action:
+            self.nav_history = NavigationHistory(self,
+                                                 self.back_forward,
+                                                 self.navhistory_back_action,
+                                                 self.navhistory_forward_action)
 
         # app list
         self.notebook.append_page(self.scroll_app_list,
@@ -646,9 +649,11 @@
         pass
 
 if __name__ == "__main__":
+
+    from softwarecenter.apt.apthistory import get_apt_history
+    from softwarecenter.db.database import StoreDatabase
+
     #logging.basicConfig(level=logging.DEBUG)
-    xapian_base_path = XAPIAN_BASE_PATH
-    pathname = os.path.join(xapian_base_path, "xapian")
 
     if len(sys.argv) > 1:
         datadir = sys.argv[1]
@@ -657,14 +662,47 @@
     else:
         datadir = "/usr/share/software-center"
 
-    db = xapian.Database(pathname)
+    # additional icons come from app-install-data
     icons = gtk.icon_theme_get_default()
-    icons.append_search_path("/usr/share/app-install/icons/")
-
+    icons.append_search_path(ICON_PATH)
+    icons.append_search_path(os.path.join(datadir,"icons"))
+    icons.append_search_path(os.path.join(datadir,"emblems"))
+    # HACK: make it more friendly for local installs (for mpt)
+    icons.append_search_path(datadir+"/icons/32x32/status")
+    gtk.window_set_default_icon_name("softwarecenter")
+    import apt
     cache = apt.Cache(apt.progress.text.OpProgress())
     cache.ready = True
 
-    w = AvailablePane(cache, db, icons, datadir)
+    #apt history
+    history = get_apt_history()
+    # xapian
+    xapian_base_path = XAPIAN_BASE_PATH
+    pathname = os.path.join(xapian_base_path, "xapian")
+    try:
+        db = StoreDatabase(pathname, cache)
+        db.open()
+    except xapian.DatabaseOpeningError:
+        # Couldn't use that folder as a database
+        # This may be because we are in a bzr checkout and that
+        #   folder is empty. If the folder is empty, and we can find the
+        # script that does population, populate a database in it.
+        if os.path.isdir(pathname) and not os.listdir(pathname):
+            from softwarecenter.db.update import rebuild_database
+            logging.info("building local database")
+            rebuild_database(pathname)
+            db = StoreDatabase(pathname, cache)
+            db.open()
+    except xapian.DatabaseCorruptError, e:
+        logging.exception("xapian open failed")
+        view.dialogs.error(None, 
+                           _("Sorry, can not open the software database"),
+                           _("Please re-install the 'software-center' "
+                             "package."))
+        # FIXME: force rebuild by providing a dbus service for this
+        sys.exit(1)
+
+    w = AvailablePane(cache, history, db, 'Ubuntu', icons, datadir, None, None)
     w.show()
 
     win = gtk.Window()

=== modified file 'softwarecenter/view/installedpane.py'
--- softwarecenter/view/installedpane.py	2010-07-08 00:21:25 +0000
+++ softwarecenter/view/installedpane.py	2010-07-24 22:30:57 +0000
@@ -176,9 +176,11 @@
         return False
 
 if __name__ == "__main__":
+
+    from softwarecenter.apt.apthistory import get_apt_history
+    from softwarecenter.db.database import StoreDatabase
+
     #logging.basicConfig(level=logging.DEBUG)
-    xapian_base_path = XAPIAN_BASE_PATH
-    pathname = os.path.join(xapian_base_path, "xapian")
 
     if len(sys.argv) > 1:
         datadir = sys.argv[1]
@@ -187,13 +189,46 @@
     else:
         datadir = "/usr/share/software-center"
 
-    db = xapian.Database(pathname)
+    # additional icons come from app-install-data
     icons = gtk.icon_theme_get_default()
-    icons.append_search_path("/usr/share/app-install/icons/")
+    icons.append_search_path(ICON_PATH)
+    icons.append_search_path(os.path.join(datadir,"icons"))
+    icons.append_search_path(os.path.join(datadir,"emblems"))
+    # HACK: make it more friendly for local installs (for mpt)
+    icons.append_search_path(datadir+"/icons/32x32/status")
+    gtk.window_set_default_icon_name("softwarecenter")
     cache = apt.Cache(apt.progress.text.OpProgress())
     cache.ready = True
 
-    w = InstalledPane(cache, db, icons, datadir)
+    #apt history
+    history = get_apt_history()
+    # xapian
+    xapian_base_path = XAPIAN_BASE_PATH
+    pathname = os.path.join(xapian_base_path, "xapian")
+    try:
+        db = StoreDatabase(pathname, cache)
+        db.open()
+    except xapian.DatabaseOpeningError:
+        # Couldn't use that folder as a database
+        # This may be because we are in a bzr checkout and that
+        #   folder is empty. If the folder is empty, and we can find the
+        # script that does population, populate a database in it.
+        if os.path.isdir(pathname) and not os.listdir(pathname):
+            from softwarecenter.db.update import rebuild_database
+            logging.info("building local database")
+            rebuild_database(pathname)
+            db = StoreDatabase(pathname, cache)
+            db.open()
+    except xapian.DatabaseCorruptError, e:
+        logging.exception("xapian open failed")
+        view.dialogs.error(None, 
+                           _("Sorry, can not open the software database"),
+                           _("Please re-install the 'software-center' "
+                             "package."))
+        # FIXME: force rebuild by providing a dbus service for this
+        sys.exit(1)
+
+    w = InstalledPane(cache, history, db, 'Ubuntu', icons, datadir)
     w.show()
 
     win = gtk.Window()