Merge lp:~mvo/software-center/apt-url-multiarch-support into lp:software-center

[Michael Vogt]

This branch adds support for apt:pkgname links guessing for non-native pkgnames.

It will e.g. show "software-center apt:absmahjong" correctly on amd64

[dobey (dobey)]

Can you re-merge with trunk and fix the conflicts? I see two of them when I try a merge. Thanks.

review: Needs Fixing

[dobey (dobey)]

Also, can you use bzr commit --fixes= to link the bug, if it does fix it? Thanks.

Unmerged revisions

3265. By Michael Vogt on 2012-12-12

trivial pep8 fix

3264. By Michael Vogt on 2012-12-12

refactor a bit to make it easier to read (hopefully)

3263. By Michael Vogt on 2012-12-12

move multiarch adjustment code for pkgs into its own function

3262. By Michael Vogt on 2012-12-12

add support for apt:$pkgname to multiarch transition

3261. By Michael Vogt on 2012-12-12

add support for finding multiarch pkgs from apt: links

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2012-11-28 17:36:38 +0000
+++ softwarecenter/db/application.py	2012-12-12 16:00:39 +0000
@@ -206,35 +206,71 @@
             self._app.request = self._app.request.replace(
                 "$distro", self._distro.get_codename())
 
+        # adjust for multiarch if needed
+        self._adjust_apturl_for_multiarch_pkgname_if_needed()
+
         # load pkg cache
         self._pkg = None
         if (self._app.pkgname in self._cache and
             self._cache[self._app.pkgname].candidate):
             self._pkg = self._cache[self._app.pkgname]
 
-        # load xapian document
-        self._doc = doc
+        # load xapian document either from parent or try to get it
+        # from the database
+        self._doc = doc or self._get_xapian_document_for_app()
         if not self._doc:
+            # if there is no document and no apturl request,
+            # set error state
+            debfile_matches = re.findall(r'/', self._app.request)
+            channel_matches = re.findall(r'channel=[a-z,-]*',
+                                         self._app.request)
+            section_matches = re.findall(r'section=[a-z]*',
+                                         self._app.request)
+            if (not self._pkg and
+                not debfile_matches and
+                not channel_matches and
+                not section_matches):
+                self._error = _("Not found")
+                self._error_not_found = utf8(
+                    _(u"There isn\u2019t a "
+                      u"software package called \u201c%s\u201D in your "
+                      u"current software sources.")) % utf8(self.pkgname)
+
+    def _adjust_apturl_for_multiarch_pkgname_if_needed(self):
+        """If this is a apt: url request, adjust to foreign pkgnames if
+           there is no native package
+        """
+        if (self._app.request.startswith("apt:") and
+                not self._app.pkgname in self._cache):
+            for arch in self._distro.get_foreign_architectures():
+                foreign_pkg = "%s:%s" % (self._app.pkgname, arch)
+                if foreign_pkg in self._cache:
+                    self._app.pkgname += ":" + arch
+
+    def _get_xapian_document_for_app(self):
+        """Try to get the xapian document for the given app, adjust multiarch
+           as needed
+        """
+        try:
+            doc = self._db.get_xapian_document(
+                self._app.appname, self._app.pkgname)
+        except IndexError:
+            doc = self._try_adjust_apturl_for_multiarch_doc()
+        return doc
+
+    def _try_adjust_apturl_for_multiarch_doc(self):
+        if not self._app.request.startswith("apt:"):
+            return None
+        for arch in self._distro.get_foreign_architectures():
+            foreign_pkg = "%s:%s" % (self._app.pkgname, arch)
             try:
-                self._doc = self._db.get_xapian_document(
-                    self._app.appname, self._app.pkgname)
+                doc = self._db.get_xapian_document(
+                    self._app.appname, foreign_pkg)
+                self._app.pkgname = foreign_pkg
+                return doc
             except IndexError:
-                # if there is no document and no apturl request,
-                # set error state
-                debfile_matches = re.findall(r'/', self._app.request)
-                channel_matches = re.findall(r'channel=[a-z,-]*',
-                                             self._app.request)
-                section_matches = re.findall(r'section=[a-z]*',
-                                             self._app.request)
-                if (not self._pkg and
-                    not debfile_matches and
-                    not channel_matches and
-                    not section_matches):
-                    self._error = _("Not found")
-                    self._error_not_found = utf8(
-                        _(u"There isn\u2019t a "
-                          u"software package called \u201c%s\u201D in your "
-                          u"current software sources.")) % utf8(self.pkgname)
+                continue
+        return None
 
     def same_app(self, other):
         return self.pkgname == other.pkgname

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-12-06 16:16:49 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-12-12 16:00:39 +0000
@@ -205,7 +205,8 @@
             # e.g. unity
             (pkgname, sep, appname) = request.partition("/")
             if pkgname or appname:
-                app = Application(appname, pkgname)
+                # add the unaltered request
+                app = Application(appname, pkgname, request=packages[0])
             else:
                 LOG.warning('show_available_packages: received %r but '
                     'can not build an Application from it.', request)

=== modified file 'tests/test_database.py'
--- tests/test_database.py	2012-11-28 15:43:49 +0000
+++ tests/test_database.py	2012-12-12 16:00:39 +0000
@@ -20,6 +20,8 @@
     make_software_center_agent_subscription_dict,
     make_software_center_agent_app_dict,
     setup_test_env,
+    FakeDatabase,
+    FakeDocument,
 )
 setup_test_env()
 
@@ -907,6 +909,54 @@
         self.assertEqual(len(self.enquire._matches), 2)
 
 
+class TestMultiarchAptUrlLp1052920(unittest.TestCase):
+
+    def test_multiarch_doc_pkgname_transition(self):
+        """Test that if a package is only available for a foreign
+           architecture, the pkgname is automatically adjuested
+           if there is a apt requests
+        """
+        mock_doc = FakeDocument(values={XapianValues.PRICE: '2.99'})
+        db = FakeDatabase(documents={'pkgname:i386': mock_doc})
+        app = Application("Multiarch app", "pkgname", request="apt:pkgname")
+        details = app.get_details(db)
+        self.assertEqual(details.pkg_state, PkgStates.NEEDS_PURCHASE)
+        self.assertEqual(details._app.pkgname, "pkgname:i386")
+
+    def test_multiarch_no_request_no_transition(self):
+        """Ensure that the details are not modified if there is no 
+           "apt:" app.request 
+        """
+        mock_doc = FakeDocument(values={XapianValues.PRICE: '2.99'})
+        db = FakeDatabase(documents={'pkgname:i386': mock_doc})
+        app = Application("Multiarch app", "pkgname", request="")
+        details = app.get_details(db)
+        self.assertEqual(details.pkg_state, PkgStates.NOT_FOUND)
+        self.assertEqual(details._app.pkgname, "pkgname")
+
+    def test_multiarch_pkg_transition(self):
+        """Ensure that for apt: urls with a multiarch package is found"""
+        mock_pkg = Mock()
+        mock_pkg.is_installed = False
+        db = FakeDatabase(cache={'pkgname:i386': mock_pkg})
+        app = Application("Multiarch app", "pkgname", request="apt:pkgname")
+        details = app.get_details(db)
+        self.assertEqual(details.pkg_state, PkgStates.UNINSTALLED)
+        self.assertEqual(details._app.pkgname, "pkgname:i386")
+
+    def test_multiarch_pkg_no_request_no_transition(self):
+        """Ensure that the details are not modified if there is no 
+           "apt:" app.request 
+        """
+        mock_pkg = Mock()
+        mock_pkg.is_installed = False
+        db = FakeDatabase(cache={'pkgname:i386': mock_pkg})
+        app = Application("Multiarch app", "pkgname", request="")
+        details = app.get_details(db)
+        self.assertEqual(details.pkg_state, PkgStates.NOT_FOUND)
+        self.assertEqual(details._app.pkgname, "pkgname")
+
+
 if __name__ == "__main__":
     #import logging
     #logging.basicConfig(level=logging.DEBUG)

=== modified file 'tests/utils.py'
--- tests/utils.py	2012-11-28 15:43:49 +0000
+++ tests/utils.py	2012-12-12 16:00:39 +0000
@@ -478,3 +478,28 @@
                                   addons_to_remove, archive_suite):
         """Emit a fake signal "query-total-size-on-install-done" """
         self.emit("query-total-size-on-install-done", None, "", 0, 0)
+
+
+class FakeDocument(object):
+    
+    def __init__(self, values={}):
+        self._values = values
+
+    def get_value(self, value):
+        return self._values.get(value, "")
+
+class FakeDatabase(ObjectWithSignals):
+    
+    def __init__(self, cache={}, documents={}):
+        super(FakeDatabase, self).__init__()
+        self._aptcache = cache
+        self._mock_documents = documents
+
+    def connect(self, *args, **kwargs):
+        pass
+    
+    def get_xapian_document(self, appname, pkgname):
+        if not pkgname in self._mock_documents:
+            raise IndexError
+        return self._mock_documents[pkgname]
+