Introduce DISPLAY_NAME constant for use in metadata

This allows us to use the same value on multiple places where we need to specify a product display name for Picard.

appxmanifest.xml.in

@@ -9,7 +9,7 @@
     Publisher="CN=Metabrainz Foundation Inc., O=Metabrainz Foundation Inc., L=San Luis Obispo, S=California, C=US"
     ProcessorArchitecture="x64"/>
   <Properties>
-    <DisplayName>MusicBrainz Picard</DisplayName>
+    <DisplayName>%(display-name)s</DisplayName>
     <PublisherDisplayName>MetaBrainz Foundation</PublisherDisplayName>
     <Description>Picard is an open-source cross-platform music tagger by MusicBrainz. It has the ability to identify audio files even without any existing metadata.</Description>
     <Logo>Square70x70Logo.png</Logo>
@@ -26,12 +26,12 @@
   <Applications>
     <Application Id="Picard" Executable="picard.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
-        DisplayName="MusicBrainz Picard"
+        DisplayName="%(display-name)s"
         Description="Tag your music with the next generation MusicBrainz tagger"
         Square150x150Logo="Square150x150Logo.png"
         Square44x44Logo="Square44x44Logo.png"
         BackgroundColor="#736DAB">
-        <uap:DefaultTile ShortName="Picard" Square71x71Logo="Square70x70Logo.png">
+        <uap:DefaultTile ShortName="%(short-name)s" Square71x71Logo="Square70x70Logo.png">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="square150x150Logo"/>
           </uap:ShowNameOnTiles>

installer/picard-setup.nsi.in

@@ -2,7 +2,7 @@
 
 !define PROJECT_PATH ".."
 
-!define PRODUCT_NAME "%(name)s"
+!define PRODUCT_NAME "%(display-name)s"
 !define PRODUCT_VERSION "%(version)s"
 !define PRODUCT_PUBLISHER "MusicBrainz"
 !define PRODUCT_DESCRIPTION "%(description)s"
@@ -114,7 +114,7 @@ ReserveFile "${NSISDIR}\Plugins\x86-unicode\InstallOptions.dll"
 ; !insertmacro LOAD_LANGUAGE "Ukrainian"
 
 ; Adds info to installer
-VIProductVersion "%(file_version)s"
+VIProductVersion "%(file-version)s"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "${PRODUCT_DESCRIPTION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"

org.musicbrainz.Picard.appdata.xml.in

@@ -3,7 +3,7 @@
   <id>%(app-id)s</id>
   <project_license>GPL-2.0-or-later</project_license>
   <metadata_license>CC0-1.0</metadata_license>
-  <name>Picard</name>
+  <name>%(display-name)s</name>
   <summary>MusicBrainz's music tagger</summary>
 
   <description>

picard.spec

@@ -11,6 +11,7 @@ sys.path.append('.')
 from picard import (
     PICARD_APP_ID,
     PICARD_APP_NAME,
+    PICARD_DISPLAY_NAME,
     PICARD_ORG_NAME,
     PICARD_VERSION,
     __version__,
@@ -145,8 +146,7 @@ else:
             'NSHighResolutionCapable': 'True',
             'NSPrincipalClass': 'NSApplication',
             'CFBundleName': PICARD_APP_NAME,
-            'CFBundleDisplayName': '{} {}'.format(PICARD_ORG_NAME,
-                                                  PICARD_APP_NAME),
+            'CFBundleDisplayName': PICARD_DISPLAY_NAME,
             'CFBundleIdentifier': PICARD_APP_ID,
             'CFBundleVersion': macos_picard_version,
             'CFBundleShortVersionString': macos_picard_short_version,

picard/__init__.py

@@ -22,6 +22,7 @@ import re
 
 PICARD_ORG_NAME = "MusicBrainz"
 PICARD_APP_NAME = "Picard"
+PICARD_DISPLAY_NAME = "MusicBrainz Picard"
 PICARD_APP_ID = "org.musicbrainz.Picard"
 PICARD_DESKTOP_NAME = PICARD_APP_ID + ".desktop"
 PICARD_VERSION = (2, 3, 0, 'dev', 1)

setup.py

@@ -24,7 +24,9 @@ from setuptools.dist import Distribution
 
 from picard import (
     PICARD_APP_ID,
+    PICARD_APP_NAME,
     PICARD_DESKTOP_NAME,
+    PICARD_DISPLAY_NAME,
     PICARD_VERSION,
     __version__,
 )
@@ -230,21 +232,23 @@ class picard_build(build):
             file_version = PICARD_VERSION[0:3] + (self.build_number,)
             file_version_str = '.'.join([str(v) for v in file_version])
 
-            # Temporarily setting it to this value to generate a nice name for Windows app
-            args['name'] = 'MusicBrainz Picard'
-            args['file_version'] = file_version_str
+            installer_args = {
+                'display-name': PICARD_DISPLAY_NAME,
+                'file-version': file_version_str,
+            }
             if os.path.isfile('installer/picard-setup.nsi.in'):
-                generate_file('installer/picard-setup.nsi.in', 'installer/picard-setup.nsi', args)
+                generate_file('installer/picard-setup.nsi.in', 'installer/picard-setup.nsi', {**args, **installer_args})
             version_args = {
                 'filevers': str(file_version),
                 'prodvers': str(file_version),
             }
             generate_file('win-version-info.txt.in', 'win-version-info.txt', {**args, **version_args})
-            args['name'] = 'picard'
 
             generate_file('appxmanifest.xml.in', 'appxmanifest.xml', {
                 'app-id': PICARD_APP_ID,
-                'version': file_version_str
+                'display-name': PICARD_DISPLAY_NAME,
+                'short-name': PICARD_APP_NAME,
+                'version': file_version_str,
             })
         elif sys.platform == 'linux':
             self.run_command('build_appdata')
@@ -393,6 +397,7 @@ class picard_build_appdata(Command):
             args = {
                 'app-id': PICARD_APP_ID,
                 'desktop-id': PICARD_DESKTOP_NAME,
+                'display-name': PICARD_DISPLAY_NAME,
                 'releases': '\n    '.join(releases)
             }
             generate_file(source_file, APPDATA_FILE, args)