Merge branch 'metabrainz:master' into path-metadata

.github/workflows/package-macos.yml

@@ -6,7 +6,7 @@ permissions: {}
 
 jobs:
   package-macos:
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         setup:

.github/workflows/package-pypi.yml

@@ -76,7 +76,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, windows-2019]
+        os: [macos-13, windows-2019]
         python-version: ['3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v4

.github/workflows/package-windows.yml

@@ -9,14 +9,15 @@ jobs:
     runs-on: windows-2019
     strategy:
       matrix:
-        type:
-        - store-app
-        - signed-app
-        - installer
-        - portable
+        setup:
+          - type: installer
+          - type: portable
+            build-portable: 1
+          - type: store-app
+            disable-autoupdate: 1
       fail-fast: false
     env:
-      CODESIGN: 0
+      CODESIGN: ${{ !!secrets.AZURE_CERT_PROFILE_NAME }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -32,9 +33,6 @@ jobs:
           -DiscidVersion $Env:DISCID_VERSION -DiscidSha256Sum $Env:DISCID_SHA256SUM `
           -FpcalcVersion $Env:FPCALC_VERSION -FpcalcSha256Sum $Env:FPCALC_SHA256SUM
         Add-Content $env:GITHUB_PATH "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64"
-        $ReleaseTag = $(git describe --match "release-*" --abbrev=0 --always HEAD)
-        $BuildNumber = $(git rev-list --count "$ReleaseTag..HEAD")
-        Add-Content $env:GITHUB_ENV "BUILD_NUMBER=$BuildNumber"
         New-Item -Name .\artifacts -ItemType Directory
       env:
         DISCID_VERSION: 0.6.4
@@ -57,80 +55,73 @@ jobs:
     - name: Patch build version
       if: startsWith(github.ref, 'refs/tags/') != true
       run: |
+        $ReleaseTag = $(git describe --match "release-*" --abbrev=0 --always HEAD)
+        $BuildNumber = $(git rev-list --count "$ReleaseTag..HEAD")
         python setup.py patch_version --platform=$Env:BUILD_NUMBER.$(git rev-parse --short HEAD)
     - name: Run tests
       timeout-minutes: 30
       run: pytest --verbose
-    - name: Prepare code signing certificate
-      if: matrix.type != 'store-app'
+    - name: Prepare clean build environment
       run: |
-        If ($Env:CODESIGN_P12_URL -And $Env:AWS_ACCESS_KEY_ID) {
-          pip install awscli
-          aws s3 cp "$Env:CODESIGN_P12_URL" .\codesign.pfx
-          Add-Content $env:GITHUB_ENV "CODESIGN=1"
-        } Else {
-          Write-Output "::warning::No code signing certificate available, skipping code signing."
-        }
-      env:
-        AWS_DEFAULT_REGION: eu-central-1
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        CODESIGN_P12_URL: ${{ secrets.CODESIGN_P12_URL }}
-    - name: Build Windows 10 store app package
-      if: matrix.type == 'store-app'
+        Remove-Item -Path build,dist/picard,locale -Recurse -ErrorAction Ignore
+        python setup.py clean
+    - name: Build
       run: |
-        & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER
-        Move-Item .\dist\*.msix .\artifacts
+        python setup.py build --build-number=$BuildNumber
+        python setup.py build_ext
+        pyinstaller --noconfirm --clean picard.spec
+        If ($env:PICARD_BUILD_PORTABLE -ne "1") {
+          dist\picard\_internal\fpcalc -version
+        }
       env:
         PICARD_APPX_PUBLISHER: CN=0A9169B7-05A3-4ED9-8876-830F17846709
-    - name: Build Windows 10 signed app package
-      if: matrix.type == 'signed-app' && env.CODESIGN == '1'
-      run: |
-        $CertificateFile = ".\codesign.pfx"
-        $CertificatePassword = ConvertTo-SecureString -String $Env:CODESIGN_P12_PASSWORD -Force -AsPlainText
-        & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER `
-          -CertificateFile $CertificateFile -CertificatePassword $CertificatePassword
-        Move-Item .\dist\*.msix .\artifacts
-      env:
-        CODESIGN_P12_PASSWORD: ${{ secrets.CODESIGN_P12_PASSWORD }}
+        PICARD_BUILD_PORTABLE: ${{ matrix.setup.build-portable }}
+        PICARD_DISABLE_AUTOUPDATE: ${{ matrix.setup.disable-autoupdate }}
+    - name: Sign picard.exe
+      uses: azure/[email protected]
+      if: matrix.setup.type != 'portable' && env.CODESIGN == 'true'
+      with:
+        azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+        endpoint: ${{ secrets.AZURE_ENDPOINT }}
+        trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
+        certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
+        files-folder: dist\picard
+        files-folder-filter: exe
+        files-folder-recurse: true
+        timestamp-rfc3161: http://timestamp.acs.microsoft.com
+        timestamp-digest: SHA256
     - name: Build Windows installer
-      if: matrix.type == 'installer'
+      if: matrix.setup.type == 'installer'
       run: |
-        # choco install nsis
-        If ($Env:CODESIGN -eq "1") {
-          $CertificateFile = ".\codesign.pfx"
-          $CertificatePassword = ConvertTo-SecureString -String $Env:CODESIGN_P12_PASSWORD -Force -AsPlainText
-        } Else {
-          $CertificateFile = $null
-          $CertificatePassword = $null
-        }
-        & .\scripts\package\win-package-installer.ps1 -BuildNumber $Env:BUILD_NUMBER `
-          -CertificateFile $CertificateFile -CertificatePassword $CertificatePassword
+        makensis.exe /INPUTCHARSET UTF8 installer\picard-setup.nsi
         Move-Item .\installer\*.exe .\artifacts
-        dist\picard\_internal\fpcalc -version
-      env:
-        CODESIGN_P12_PASSWORD: ${{ secrets.CODESIGN_P12_PASSWORD }}
     - name: Build Windows portable app
-      if: matrix.type == 'portable'
+      if: matrix.setup.type == 'portable'
       run: |
-        If ($Env:CODESIGN -eq "1") {
-          $CertificateFile = ".\codesign.pfx"
-          $CertificatePassword = ConvertTo-SecureString -String $Env:CODESIGN_P12_PASSWORD -Force -AsPlainText
-        } Else {
-          $CertificateFile = $null
-          $CertificatePassword = $null
-        }
-        & .\scripts\package\win-package-portable.ps1 -BuildNumber $Env:BUILD_NUMBER `
-          -CertificateFile $CertificateFile -CertificatePassword $CertificatePassword
         Move-Item .\dist\*.exe .\artifacts
-      env:
-        CODESIGN_P12_PASSWORD: ${{ secrets.CODESIGN_P12_PASSWORD }}
-    - name: Cleanup
-      if: env.CODESIGN == '1'
-      run: Remove-Item .\codesign.pfx
+    - name: Build Windows 10 store app package
+      if: matrix.setup.type == 'store-app'
+      run: |
+        & .\scripts\package\win-package-appx.ps1 dist\picard
+        Move-Item .\dist\*.msix .\artifacts
+    - name: Sign final executable
+      uses: azure/[email protected]
+      if: matrix.setup.type != 'store-app' && env.CODESIGN == 'true'
+      with:
+        azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+        endpoint: ${{ secrets.AZURE_ENDPOINT }}
+        trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
+        certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
+        files-folder: artifacts
+        files-folder-filter: exe
+        timestamp-rfc3161: http://timestamp.acs.microsoft.com
+        timestamp-digest: SHA256
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4
-      if: matrix.type != 'signed-app' || env.CODESIGN == '1'
       with:
-        name: windows-${{ matrix.type }}
+        name: windows-${{ matrix.setup.type }}
         path: artifacts/

.github/workflows/run-tests.yml

@@ -8,10 +8,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-12, ubuntu-latest, windows-2019]
+        os: [macos-13, ubuntu-latest, windows-2019]
         python-version: ['3.9', '3.10', '3.11', '3.12']
         include:
-        - os: macos-12
+        - os: macos-13
           python-version: '3.9'
     env:
       CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
@@ -102,7 +102,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-12, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
         python-version: ['3.9', '3.12']
 
     steps:

picard/ui/scripteditor.py

@@ -173,7 +173,7 @@ def _example_to_filename(self, file):
             if not self.settings['move_files']:
                 return os.path.basename(filename_before), os.path.basename(filename_after)
             return filename_before, filename_after
-        except (ScriptError, TypeError, WinPathTooLong):
+        except (FileNotFoundError, PermissionError, ScriptError, TypeError, WinPathTooLong):
             return "", ""
 
     def update_example_listboxes(self, before_listbox, after_listbox):

picard/util/__init__.py

@@ -946,7 +946,7 @@ def extract_year_from_date(dt):
             return int(dt.get('year'))
         else:
             return parse(dt).year
-    except (TypeError, ValueError):
+    except (OverflowError, TypeError, ValueError):
         return None
 
 

picard/util/filenaming.py

@@ -29,6 +29,7 @@
 from enum import IntEnum
 import math
 import os
+from pathlib import Path
 import re
 import shutil
 import struct
@@ -326,14 +327,21 @@ def _get_filename_limit(target):
         limit = limits[target]
     except KeyError:
         # we need to call statvfs on an existing target
-        d = target
-        while not os.path.exists(d):
-            d = os.path.dirname(d)
+        p = Path(target)
+        while not p.exists():
+            p = p.parent
         # XXX http://bugs.python.org/issue18695
-        try:
-            limit = os.statvfs(d).f_namemax
-        except UnicodeEncodeError:
-            limit = os.statvfs(d.encode(_io_encoding)).f_namemax
+        limit = 0
+        while not limit:
+            try:
+                try:
+                    limit = os.statvfs(p).f_namemax
+                except UnicodeEncodeError:
+                    limit = os.statvfs(str(p).encode(_io_encoding)).f_namemax
+            except (FileNotFoundError, PermissionError):
+                if p == p.parent:  # we reached the root
+                    raise
+                p = p.parent
         limits[target] = limit
     return limit
 

picard/util/textencoding.py

@@ -81,7 +81,7 @@
 # Various bugs and mistakes in this have been ironed out during testing.
 
 
-_additional_compatibility = {
+_ADDITIONAL_COMPATIBILITY = {
     "\u0276": "Œ",  # LATIN LETTER SMALL CAPITAL OE
     "\u1D00": "A",  # LATIN LETTER SMALL CAPITAL A
     "\u1D01": "Æ",  # LATIN LETTER SMALL CAPITAL AE
@@ -107,11 +107,14 @@
 
 
 def unicode_simplify_compatibility(string, pathsave=False, win_compat=False):
-    interim = ''.join(_replace_char(_additional_compatibility, ch, pathsave, win_compat) for ch in string)
+    interim = ''.join(
+        _replace_char(_ADDITIONAL_COMPATIBILITY, ch, pathsave, win_compat)
+        for ch in string
+    )
     return unicodedata.normalize("NFKC", interim)
 
 
-_simplify_punctuation = {
+_SIMPLIFY_PUNCTUATION = {
     "\u013F": "L",  # LATIN CAPITAL LETTER L WITH MIDDLE DOT (compat)
     "\u0140": "l",  # LATIN SMALL LETTER L WITH MIDDLE DOT (compat)
     "\u2018": "'",  # LEFT SINGLE QUOTATION MARK (from ‹character-fallback›)
@@ -185,10 +188,13 @@ def unicode_simplify_compatibility(string, pathsave=False, win_compat=False):
 
 
 def unicode_simplify_punctuation(string, pathsave=False, win_compat=False):
-    return ''.join(_replace_char(_simplify_punctuation, ch, pathsave, win_compat) for ch in string)
+    return ''.join(
+        _replace_char(_SIMPLIFY_PUNCTUATION, ch, pathsave, win_compat)
+        for ch in string
+    )
 
 
-_simplify_combinations = {
+_SIMPLIFY_COMBINATIONS = {
     "\u00C6": "AE",  # LATIN CAPITAL LETTER AE (from ‹character-fallback›)
     "\u00D0": "D",  # LATIN CAPITAL LETTER ETH
     "\u00D8": "OE",  # LATIN CAPITAL LETTER O WITH STROKE (see https://en.wikipedia.org/wiki/%C3%98)
@@ -416,7 +422,7 @@ def unicode_simplify_punctuation(string, pathsave=False, win_compat=False):
 
 
 def _replace_unicode_simplify_combinations(char, pathsave, win_compat):
-    result = _simplify_combinations.get(char)
+    result = _SIMPLIFY_COMBINATIONS.get(char)
     if result is None:
         return char
     elif not pathsave:
@@ -427,12 +433,17 @@ def _replace_unicode_simplify_combinations(char, pathsave, win_compat):
 
 def unicode_simplify_combinations(string, pathsave=False, win_compat=False):
     return ''.join(
-        _replace_unicode_simplify_combinations(c, pathsave, win_compat) for c in string)
+        _replace_unicode_simplify_combinations(c, pathsave, win_compat)
+        for c in string
+    )
 
 
 def unicode_simplify_accents(string):
-    result = ''.join(c for c in unicodedata.normalize('NFKD', string) if not unicodedata.combining(c))
-    return result
+    return ''.join(
+        c
+        for c in unicodedata.normalize('NFKD', string)
+        if not unicodedata.combining(c)
+    )
 
 
 def asciipunct(string):
@@ -454,14 +465,15 @@ def replace_non_ascii(string, repl="_", pathsave=False, win_compat=False):
 
     def error_repl(e, repl="_"):
         return (repl, e.start + 1)
+
     codecs.register_error('repl', partial(error_repl, repl=repl))
     # Decoding and encoding to allow replacements
     return interim.encode('ascii', 'repl').decode('ascii')
 
 
-def _replace_char(map, ch, pathsave=False, win_compat=False):
+def _replace_char(mapping, ch, pathsave=False, win_compat=False):
     try:
-        result = map[ch]
+        result = mapping[ch]
         if ch != result and pathsave:
             result = sanitize_filename(result, win_compat=win_compat)
         return result