From 0572e09a3e39354be560862e3b3c75b7fba78b1b Mon Sep 17 00:00:00 2001 From: amd64fox <62529699+amd64fox@users.noreply.github.com> Date: Wed, 7 Oct 2026 20:55:31 +0300 Subject: [PATCH] fix: support variable-length hashes in spotify versions --- .github/workflows/check_spotx.yml | 4 ++-- run.ps1 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check_spotx.yml b/.github/workflows/check_spotx.yml index 3cc31cb..5ef32cb 100644 --- a/.github/workflows/check_spotx.yml +++ b/.github/workflows/check_spotx.yml @@ -34,7 +34,7 @@ jobs: } $spotifyVersion = [string]$latestEntry.Value.fullversion - if ([string]::IsNullOrWhiteSpace($spotifyVersion) -or $spotifyVersion -notmatch '^\d+\.\d+\.\d+\.\d+\.g[0-9a-f]{8}$') { + if ([string]::IsNullOrWhiteSpace($spotifyVersion) -or $spotifyVersion -notmatch '^\d+\.\d+\.\d+\.\d+\.g[0-9a-f]+$') { throw "Invalid Spotify fullversion for $($latestEntry.Name)" } } @@ -93,7 +93,7 @@ jobs: if (-not $installer.url -or $installer.size -le 0) { throw "No ARM64 installer found for Spotify $checkVersion" } - if ($entry.Value.fullversion -notmatch '^\d+\.\d+\.\d+\.\d+\.g[0-9a-f]{8}$') { + if ($entry.Value.fullversion -notmatch '^\d+\.\d+\.\d+\.\d+\.g[0-9a-f]+$') { throw "Invalid Spotify fullversion for $checkVersion" } diff --git a/run.ps1 b/run.ps1 index 441195c..2ec7c8c 100644 --- a/run.ps1 +++ b/run.ps1 @@ -489,7 +489,7 @@ function Get-SpotifyVersionNumber { [string]$SpotifyVersion ) - return [Version]($SpotifyVersion -replace '\.g[0-9a-f]{8}$', '') + return [Version]($SpotifyVersion -replace '\.g[0-9a-f]+$', '') } function Get-SpotifyInstallerArchitecture { @@ -579,7 +579,7 @@ function Resolve-SpotifyInstallerVersionFromManifest { $entry = $selectedVersion.Value $fullVersion = [string]$entry.fullversion - if ($fullVersion -notmatch '^\d+\.\d+\.\d+\.\d+\.g[0-9a-f]{8}$') { + if ($fullVersion -notmatch '^\d+\.\d+\.\d+\.\d+\.g[0-9a-f]+$') { throw "Spotify version $($selectedVersion.Name) has invalid fullversion in versions manifest" } @@ -621,7 +621,7 @@ $spotifyTemporaryDownloadVersion = "1.2.86.502.g8cd7fb22" $spotifyVersionsManifestUrl = Get-Link -e "/table/versions.json" -Owner "LoaderSpot" -Repository "table" $systemArchitecture = Get-SystemArchitecture -$match_v = "^(?\d+\.\d+\.\d+(?:\.\d+(?:\.g[0-9a-f]{8})?)?)(?:-\d+)?$" +$match_v = "^(?\d+\.\d+\.\d+(?:\.\d+(?:\.g[0-9a-f]+)?)?)(?:-\d+)?$" $versionIsSupported = $false if ($version) { if ($version -match $match_v) {