PICARD-2422: Removed packaging of AB streaming extractor

.github/workflows/package.yml

@@ -32,8 +32,6 @@ jobs:
       DISCID_SHA256SUM: f9e443ac4c0dd4819c2841fcc82169a46fb9a626352cdb9c7f65dd3624cd31b9
       FPCALC_VERSION: 1.5.1
       FPCALC_SHA256SUM: c6c2797c4f087cf139eedd71554bc59ef8f26a783dc00c7f3ad5ae71d3a616fe
-      ABEXTRACTOR_VERSION: v2.1_beta2-4
-      ABEXTRACTOR_SHA256SUM: 00650e89541b9f0fd25d5335c564b133b7d8457449829fcfca8abeab66583260
       PYTHON_VERSION: 3.9.10
       PYTHON_SHA256SUM: 732bc5c95ae127dfb6fb1bcf683509ad20c558152b63b8d5f651246f6bdfc8da
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-deployment-version }}
@@ -133,8 +131,7 @@ jobs:
       run: |
         & .\scripts\package\win-setup.ps1 `
           -DiscidVersion $Env:DISCID_VERSION -DiscidSha256Sum $Env:DISCID_SHA256SUM `
-          -FpcalcVersion $Env:FPCALC_VERSION -FpcalcSha256Sum $Env:FPCALC_SHA256SUM `
-          -AbextractorVersion $Env:ABEXTRACTOR_VERSION -AbextractorSha256Sum $Env:ABEXTRACTOR_SHA256SUM
+          -FpcalcVersion $Env:FPCALC_VERSION -FpcalcSha256Sum $Env:FPCALC_SHA256SUM
         Write-Output "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
         $ReleaseTag = $(git describe --match "release-*" --abbrev=0 --always HEAD)
         $BuildNumber = $(git rev-list --count "$ReleaseTag..HEAD")
@@ -145,8 +142,6 @@ jobs:
         DISCID_SHA256SUM: 9fd815f6bd0c624f0f41dd81209aeaa3f2129dcd1d617f88b844b4503d12598e
         FPCALC_VERSION: 1.5.1
         FPCALC_SHA256SUM: 36b478e16aa69f757f376645db0d436073a42c0097b6bb2677109e7835b59bbc
-        ABEXTRACTOR_VERSION: v2.1_beta2-1-ge3940c0
-        ABEXTRACTOR_SHA256SUM: eb4e64e4334ae5c63962fdc6b8bdfbdb53ba11e4705373feeb89503c08ee2688
     - name: Patch build version
       if: startsWith(github.ref, 'refs/tags/') != true
       run: |

picard.spec

@@ -47,10 +47,8 @@ binaries = []
 data_files = get_locale_messages()
 
 fpcalc_name = 'fpcalc'
-ab_extractor_name = 'streaming_extractor_music'
 if os_name == 'Windows':
     fpcalc_name = 'fpcalc.exe'
-    ab_extractor_name = 'streaming_extractor_music.exe'
     binaries += [('discid.dll', '.')]
     data_files.append((os.path.join('resources', 'win10', '*'), '.'))
 
@@ -60,9 +58,6 @@ if os_name == 'Darwin':
 if os.path.isfile(fpcalc_name):
     binaries += [(fpcalc_name, '.')]
 
-if os.path.isfile(ab_extractor_name):
-    binaries += [(ab_extractor_name, '.')]
-
 runtime_hooks = []
 if os_name == 'Windows':
     runtime_hooks.append('scripts/pyinstaller/win-startup-hook.py')

scripts/package/macos-setup.sh

@@ -35,12 +35,3 @@ if [ -n "$FPCALC_VERSION" ]; then
   tar -xf "$FPCALC_FILENAME"
   cp "chromaprint-fpcalc-$FPCALC_VERSION-macos-x86_64/fpcalc" .
 fi
-
-# Install AcousticBrainz extractor
-if [ -n "$ABEXTRACTOR_VERSION" ]; then
-  ABEXTRACTOR_FILENAME="essentia-extractor-$ABEXTRACTOR_VERSION-macos.tar.gz"
-  wget "https://github.com/phw/essentia-extractor-builds/releases/download/$ABEXTRACTOR_VERSION/$ABEXTRACTOR_FILENAME"
-  echo "$ABEXTRACTOR_SHA256SUM  $ABEXTRACTOR_FILENAME" | shasum --algorithm 256 --check --status
-  tar -xf "$ABEXTRACTOR_FILENAME"
-  cp "essentia-extractor-$ABEXTRACTOR_VERSION-macos/streaming_extractor_music" .
-fi

scripts/package/win-setup.ps1

@@ -10,13 +10,7 @@ Param(
   $FpcalcVersion,
   [Parameter(Mandatory=$true)]
   [String]
-  $FpcalcSha256Sum,
-  [Parameter(Mandatory=$true)]
-  [String]
-  $AbextractorVersion,
-  [Parameter(Mandatory=$true)]
-  [String]
-  $AbextractorSha256Sum
+  $FpcalcSha256Sum
 )
 
 $ErrorActionPreference = "Stop"
@@ -65,11 +59,3 @@ DownloadFile -Url "https://github.com/acoustid/chromaprint/releases/download/v$F
 VerifyHash -FileName $ArchiveFile -Sha256Sum $FpcalcSha256Sum
 Expand-Archive -Path $ArchiveFile -DestinationPath .\build\fpcalc -Force
 Copy-Item .\build\fpcalc\chromaprint-fpcalc-$FpcalcVersion-windows-x86_64\fpcalc.exe .
-
-$ArchiveFile = ".\build\abz.zip"
-Write-Output "Downloading AcousticBrainz extractor $AbextractorVersion to $ArchiveFile..."
-DownloadFile -Url "https://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-$AbextractorVersion-win-i686.zip" `
-  -FileName $ArchiveFile
-VerifyHash -FileName $ArchiveFile -Sha256Sum $AbextractorSha256Sum
-Expand-Archive -Path $ArchiveFile -DestinationPath .\build\abz -Force
-Copy-Item .\build\abz\streaming_extractor_music.exe .