Merge lp:~mvo/software-center/update-sc-cmdline-flexibility into lp:software-center

[Michael Vogt]

This branch adds some flexiblity to the update-software-center and update-software-center-agent commandline tools:

update-software-center-agent has a new --target-db-path to allow writing the xapian db that is generated from the software-center-agent.ubuntu.com data to a non-default location

update-software-center has --target-db-path as above and also --app-install-desktop-dir that can point to a directory like /usr/share/app-install/desktop or a custom test directory.

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-09-28 10:11:34 +0000
+++ softwarecenter/db/update.py	2012-10-18 09:18:22 +0000
@@ -1103,7 +1103,8 @@
     return sca.good_data
 
 
-def rebuild_database(pathname, debian_sources=True, appstream_sources=False):
+def rebuild_database(pathname, debian_sources=True, appstream_sources=False,
+                     appinfo_dir=None):
     #cache = apt.Cache(memonly=True)
     cache = get_pkg_info()
     cache.open()
@@ -1140,7 +1141,7 @@
     db = xapian.WritableDatabase(rebuild_path, xapian.DB_CREATE_OR_OVERWRITE)
 
     if debian_sources:
-        update(db, cache)
+        update(db, cache, appinfo_dir)
     if appstream_sources:
         if os.path.exists('./data/app-stream/appdata.xml'):
             update_from_appstream_xml(db, cache,

=== modified file 'utils/update-software-center'
--- utils/update-software-center	2012-07-23 11:48:24 +0000
+++ utils/update-software-center	2012-10-18 09:18:22 +0000
@@ -99,13 +99,18 @@
     parser.add_option("--use-packagekit", action="store_true",
                       help="use PackageKit backend (experimental)", 
                       default=False)
+    parser.add_option("--app-install-desktop-dir", "", default=None)
+    parser.add_option("--target-db-path", "", default=None)
     (options, args) = parser.parse_args()
 
     #logging.basicConfig(level=logging.INFO)
     if options.debug:
         LOG.setLevel(logging.DEBUG)
 
-    if options.local:
+    # setup directories
+    if options.target_db_path:
+        xapian_base_path = options.target_db_path
+    elif options.local:
         if not os.path.exists('./data'):
             LOG.error("trying to update local database, ./data does not exist")
             sys.exit(-1)
@@ -167,7 +172,8 @@
         if options.appstream_only:
             result = rebuild_database(pathname, debian_sources=False, appstream_sources=True)
         else:
-            result = rebuild_database(pathname)
+            result = rebuild_database(
+                pathname, appinfo_dir=options.app_install_desktop_dir)
         if result:
             print "Software catalog update was successful."
         else:

=== modified file 'utils/update-software-center-agent'
--- utils/update-software-center-agent	2012-10-10 11:30:37 +0000
+++ utils/update-software-center-agent	2012-10-18 09:18:22 +0000
@@ -58,6 +58,7 @@
                       help="ignore the local cache when updating")
     parser.add_option("--datadir", "", default=None)
     parser.add_option("--pretend-distro", "", default=None)
+    parser.add_option("--target-db-path", "", default=None)
     (options, args) = parser.parse_args()
 
     logging.basicConfig(level=logging.INFO)
@@ -78,7 +79,10 @@
     cache = apt.Cache(memonly=True)
 
     # setup path
-    pathname = XAPIAN_BASE_PATH_SOFTWARE_CENTER_AGENT+".tmp"
+    pathname = options.target_db_path + ".tmp"
+    if not pathname:
+        pathname = XAPIAN_BASE_PATH_SOFTWARE_CENTER_AGENT+".tmp"
+
     if not os.path.exists(pathname):
         try:
             os.makedirs(pathname)