Merge lp:~james-w/pkgme-devportal/add-path-to-desktop into lp:pkgme-devportal

[James Westby]

Make the install basedir the working dir in the install file.

Hi,

This is the other half of the fix for https://bugs.launchpad.net/pkgme-devportal/+bug/1025174

It makes binary applications have the Path set to the /opt/package_name dir
in the .desktop file.

Thanks,

James

[Michael Vogt (mvo)]

Thanks, looks good.

review: Approve

=== modified file 'devportalbinary/metadata.py'
--- devportalbinary/metadata.py	2012-07-10 08:11:50 +0000
+++ devportalbinary/metadata.py	2012-07-17 18:54:19 +0000
@@ -38,6 +38,7 @@
     Homepage,
     TagLine,
     Version,
+    WorkingDirectory,
     )
 from pkgme.package_files import (
     DEBIAN_DIR,
@@ -99,10 +100,16 @@
     return value
 
 
+def get_install_basedir(package_name):
+    return '/opt/%s' % package_name
+
+
 def get_install_map(package_name, path, include_desktop=False, icons=None):
     if not icons:
         icons = {}
     installation = {}
+    # Make it a relative path to fit with the standard for install files
+    basedir = get_install_basedir(package_name).lstrip('/')
     # Sorting not actually needed for functionality, but makes the tests more
     # reliable.
     for filename in sorted(os.listdir(path)):
@@ -110,7 +117,7 @@
             # We don't want to install the 'debian/' directory or the metadata
             # file.
             continue
-        installation[filename] = 'opt/%s' % (package_name,)
+        installation[filename] = basedir
     for resolution, path in icons.items():
         # XXX: This means that the basename of 'path' has to match the value
         # of the Icon field in the desktop file.  Seems fragile.
@@ -138,7 +145,8 @@
 
 
 def get_desktop_file(package_name, application_name, executable,
-                     tagline=None, categories=None, icon=None):
+                     tagline=None, categories=None, icon=None,
+                     working_directory=None):
     """Get the desktop file for the package.
 
     :return: A ``Desktop``.
@@ -150,6 +158,7 @@
         TagLine.name: tagline,
         Categories.name: categories,
         Icon.name: icon,
+        WorkingDirectory.name: working_directory,
         }
     return Desktop.from_info(DictInfo(info))
 
@@ -290,7 +299,8 @@
             executable,
             tagline=metadata.get(self.TAGLINE, ''),
             categories=metadata.get(self.CATEGORIES, ''),
-            icon=icon)
+            icon=icon,
+            working_directory=get_install_basedir(package_name))
         lintian_override_content = self._get_lintian_overrides(package_name)
         return {
             # XXX: Hardcoded literal attack!

=== modified file 'devportalbinary/tests/test_metadata.py'
--- devportalbinary/tests/test_metadata.py	2012-07-10 08:11:50 +0000
+++ devportalbinary/tests/test_metadata.py	2012-07-17 18:54:19 +0000
@@ -33,6 +33,7 @@
 from devportalbinary.metadata import (
     format_install_map,
     get_desktop_file,
+    get_install_basedir,
     get_install_file,
     get_install_map,
     get_metadata,
@@ -236,7 +237,9 @@
         expected_desktop_file = get_desktop_file(
             package_name, backend.get_application_name(metadata),
             backend.get_executable(package_name),
-            tagline=tagline, categories=categories).get_contents()
+            tagline=tagline, categories=categories,
+            working_directory=get_install_basedir(package_name),
+            ).get_contents()
         extra_files = backend.get_extra_files(metadata, package_name)
         desktop = extra_files['debian/%s.desktop' % (package_name,)]
         self.assertEqual(expected_desktop_file, desktop)
@@ -254,7 +257,9 @@
             backend.get_application_name(metadata),
             backend.get_executable(package_name),
             icon=package_name,
-            tagline=metadata[MetadataBackend.TAGLINE]).get_contents()
+            tagline=metadata[MetadataBackend.TAGLINE],
+            working_directory=get_install_basedir(package_name),
+            ).get_contents()
         extra_files = backend.get_extra_files(metadata, package_name)
         desktop = extra_files['debian/%s.desktop' % (package_name,)]
         self.assertEqual(expected_desktop_file, desktop)
@@ -402,12 +407,14 @@
         tagline = self.getUniqueString()
         categories = self.getUniqueString()
         icon = self.getUniqueString()
+        working_directory = self.getUniqueString()
         desktop_file = get_desktop_file(
             package_name, app_name, executable, tagline=tagline,
-            categories=categories, icon=icon)
+            categories=categories, icon=icon,
+            working_directory=working_directory)
         self.assertThat(
             {'Name': app_name, 'Comment': tagline, 'Categories': categories,
-             'Exec': executable, 'Icon': icon},
+             'Exec': executable, 'Icon': icon, 'Path': working_directory},
             AreDesktopValuesFor(desktop_file))
 
 
@@ -598,4 +605,12 @@
         self.assertEqual('bar', package_name)
 
 
+class GetInstallBasedirTests(TestCase):
+
+    def test_path(self):
+        package_name = self.getUniqueString()
+        self.assertEqual('/opt/%s' % package_name,
+                get_install_basedir(package_name))
+
+
 # XXX: Assuming icon name in desktop == package name