From 880682033c4e81301ac1fc15009924beb1fe9b57 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 29 Nov 2019 12:59:39 +0100 Subject: [PATCH] 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 | 6 +++--- installer/picard-setup.nsi.in | 4 ++-- org.musicbrainz.Picard.appdata.xml.in | 2 +- picard.spec | 4 ++-- picard/__init__.py | 1 + setup.py | 17 +++++++++++------ 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/appxmanifest.xml.in b/appxmanifest.xml.in index 9973f7d2e..6196facb6 100644 --- a/appxmanifest.xml.in +++ b/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"/> - MusicBrainz Picard + %(display-name)s MetaBrainz Foundation Picard is an open-source cross-platform music tagger by MusicBrainz. It has the ability to identify audio files even without any existing metadata. Square70x70Logo.png @@ -26,12 +26,12 @@ - + diff --git a/installer/picard-setup.nsi.in b/installer/picard-setup.nsi.in index 66c083031..016990be4 100644 --- a/installer/picard-setup.nsi.in +++ b/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}" diff --git a/org.musicbrainz.Picard.appdata.xml.in b/org.musicbrainz.Picard.appdata.xml.in index 10da4b13a..c4b09dbe1 100644 --- a/org.musicbrainz.Picard.appdata.xml.in +++ b/org.musicbrainz.Picard.appdata.xml.in @@ -3,7 +3,7 @@ %(app-id)s GPL-2.0-or-later CC0-1.0 - Picard + %(display-name)s MusicBrainz's music tagger diff --git a/picard.spec b/picard.spec index 6362e5660..b507a29d6 100644 --- a/picard.spec +++ b/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, diff --git a/picard/__init__.py b/picard/__init__.py index ca08a9d31..ec59e4a89 100644 --- a/picard/__init__.py +++ b/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) diff --git a/setup.py b/setup.py index ccf6e5446..76623dd55 100644 --- a/setup.py +++ b/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)