Release 1.2.3

Fixes #1568

.github/workflows/build.yml

@@ -10,19 +10,15 @@ jobs:
 
   build-opensuse:
     name: Build openSUSE
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         opensuse_version: [ 'tumbleweed', 'leap:15.6' ]
-        qt_version: [ '5', '6' ]
     container:
       image: opensuse/${{matrix.opensuse_version}}
     steps:
-      - name: Add tagparser repo
-        if: matrix.opensuse_version == 'tumbleweed'
-        run: zypper -n ar -c -f -n 'repo-tagparser' https://download.opensuse.org/repositories/home:/mkittler/openSUSE_Tumbleweed/ repo-tagparser
       - name: Refresh repositories
         run: zypper -n --gpg-auto-import-keys ref
       - name: Upgrade packages
@@ -46,22 +42,18 @@ jobs:
             tar
             make
             cmake
-            gettext-tools
             openssh-clients
             glibc-devel
             libboost_headers-devel
             boost-devel
             glib2-devel
             glib2-tools
-            dbus-1-devel
             alsa-devel
             libnotify-devel
-            protobuf-devel
             sqlite3-devel
             libpulse-devel
             gstreamer-devel
             gstreamer-plugins-base-devel
-            vlc-devel
             taglib-devel
             libicu-devel
             libcdio-devel
@@ -74,26 +66,6 @@ jobs:
             update-desktop-files
             appstream-glib
             hicolor-icon-theme
-      - name: Install Qt 5
-        if: matrix.qt_version == '5'
-        run: >
-            zypper -n --gpg-auto-import-keys in
-            libQt5Core-devel
-            libQt5Gui-devel
-            libQt5Widgets-devel
-            libQt5Concurrent-devel
-            libQt5Network-devel
-            libQt5Sql-devel
-            libQt5DBus-devel
-            libQt5Test-devel
-            libqt5-qtbase-common-devel
-            libQt5Sql5-sqlite
-            libqt5-linguist-devel
-            libqt5-qtx11extras-devel
-      - name: Install Qt 6
-        if: matrix.qt_version == '6'
-        run: >
-            zypper -n --gpg-auto-import-keys in
             qt6-core-devel
             qt6-gui-devel
             qt6-widgets-devel
@@ -105,14 +77,8 @@ jobs:
             qt6-base-common-devel
             qt6-sql-sqlite
             qt6-linguist-devel
-      - name: Install tagparser
-        if: matrix.opensuse_version == 'tumbleweed'
-        run: zypper -n --gpg-auto-import-keys in tagparser-devel
-      - name: Install kdsingleapplication-devel
-        if: matrix.opensuse_version == 'tumbleweed' && matrix.qt_version == '5'
-        run: zypper -n --gpg-auto-import-keys in kdsingleapplication-devel
       - name: Install kdsingleapplication-qt6-devel
-        if: matrix.opensuse_version == 'tumbleweed' && matrix.qt_version == '6'
+        if: matrix.opensuse_version == 'tumbleweed'
         run: zypper -n --gpg-auto-import-keys in kdsingleapplication-qt6-devel
       - name: Checkout
         uses: actions/checkout@v4
@@ -124,7 +90,7 @@ jobs:
       - name: Create Build Environment
         run: cmake -E make_directory build
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WERROR=ON -DUSE_TAGLIB=ON -DQT_VERSION_MAJOR=${{matrix.qt_version}}
+        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WERROR=ON
       - name: Create source tarball
         working-directory: build
         run: ../dist/scripts/maketarball.sh
@@ -148,14 +114,14 @@ jobs:
         id: set-subdir
         run: echo "subdir=$(echo ${{matrix.opensuse_version}} | sed 's/leap:/lp/g' | sed 's/\.//g')" > $GITHUB_OUTPUT
       - name: Upload source
-        if: matrix.opensuse_version == 'tumbleweed' && matrix.qt_version == '6'
+        if: matrix.opensuse_version == 'tumbleweed'
         uses: actions/upload-artifact@v4
         with:
           name: source
           path: |
             /usr/src/packages/SOURCES/*.xz
       - name: Upload rpm
-        if: matrix.opensuse_version != 'tumbleweed' && matrix.qt_version == '6'
+        if: matrix.opensuse_version != 'tumbleweed'
         uses: actions/upload-artifact@v4
         with:
           name: opensuse-${{steps.set-subdir.outputs.subdir}}
@@ -166,12 +132,12 @@ jobs:
 
   build-fedora:
     name: Build Fedora
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        fedora_version: [ '39', '40' ]
+        fedora_version: [ '39', '40', '41', '42' ]
     container:
       image: fedora:${{matrix.fedora_version}}
     steps:
@@ -183,7 +149,7 @@ jobs:
         run: >
             dnf -y install
             @development-tools
-            redhat-lsb-core
+            lsb_release
             which
             git
             glibc
@@ -195,13 +161,9 @@ jobs:
             glib
             man
             tar
-            gettext
             openssh
             rsync
             boost-devel
-            dbus-devel
-            protobuf-devel
-            protobuf-compiler
             sqlite-devel
             alsa-lib-devel
             pulseaudio-libs-devel
@@ -281,15 +243,11 @@ jobs:
           make
           cmake
           glib
-          gettext
           lsb-release
           rpmdevtools
           rpm-build
           glibc-devel
           boost-devel
-          dbus-devel
-          protobuf-devel
-          protobuf-compiler
           sqlite-devel
           libasound-devel
           pulseaudio-devel
@@ -357,7 +315,7 @@ jobs:
 
   build-mageia:
     name: Build Mageia
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -388,9 +346,7 @@ jobs:
           man
           tar
           rpmdevtools
-          gettext
           lib64boost-devel
-          lib64protobuf-devel
           lib64sqlite3-devel
           lib64alsa2-devel
           lib64pulseaudio-devel
@@ -415,7 +371,6 @@ jobs:
           lib64qt6dbus-devel
           lib64qt6help-devel
           lib64qt6test-devel
-          protobuf-compiler
           desktop-file-utils
           appstream-util
           hicolor-icon-theme
@@ -455,12 +410,12 @@ jobs:
 
   build-debian:
     name: Build Debian
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        debian_version: [ 'bullseye', 'bookworm', 'trixie' ]
+        debian_version: [ 'bookworm', 'trixie' ]
     container:
       image: debian:${{matrix.debian_version}}
     steps:
@@ -482,14 +437,10 @@ jobs:
             g++
             pkg-config
             fakeroot
-            gettext
             lsb-release
             dpkg-dev
             libglib2.0-dev
-            libdbus-1-dev
             libboost-dev
-            libprotobuf-dev
-            protobuf-compiler
             libsqlite3-dev
             libasound2-dev
             libpulse-dev
@@ -505,16 +456,11 @@ jobs:
             libcdio-dev
             libmtp-dev
             libgpod-dev
-      - name: Install Qt 5
-        if: matrix.debian_version == 'bullseye'
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: apt install -y qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools libqt5x11extras5-dev
-      - name: Install Qt 6
-        if: matrix.debian_version != 'bullseye'
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: apt install -y qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
+            qt6-base-dev
+            qt6-base-dev-tools
+            qt6-tools-dev
+            qt6-tools-dev-tools
+            qt6-l10n-tools
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -539,12 +485,12 @@ jobs:
 
   build-ubuntu:
     name: Build Ubuntu
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: [ 'focal', 'jammy', 'mantic', 'noble' ]
+        ubuntu_version: [ 'noble', 'oracular' ]
     container:
       image: ubuntu:${{matrix.ubuntu_version}}
     steps:
@@ -568,14 +514,10 @@ jobs:
             fakeroot
             wget
             curl
-            gettext
             lsb-release
             dpkg-dev
             libglib2.0-dev
             libboost-dev
-            libdbus-1-dev
-            libprotobuf-dev
-            protobuf-compiler
             libsqlite3-dev
             libasound2-dev
             libpulse-dev
@@ -592,16 +534,11 @@ jobs:
             libcdio-dev
             libmtp-dev
             libgpod-dev
-      - name: Install Qt 5
-        if: matrix.ubuntu_version == 'focal'
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: apt install -y qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools libqt5x11extras5-dev
-      - name: Install Qt 6
-        if: matrix.ubuntu_version != 'focal'
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: apt install -y qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
+            qt6-base-dev
+            qt6-base-dev-tools
+            qt6-tools-dev
+            qt6-tools-dev-tools
+            qt6-l10n-tools
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -628,12 +565,12 @@ jobs:
 
   upload-ubuntu-ppa:
     name: Upload Ubuntu PPA
-    if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && (github.event_name == 'release' || (github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/ci')))
+    if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && (github.event_name == 'release' || (github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/ci' || github.ref == 'refs/heads/1.1'))) && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: [ 'focal', 'jammy', 'mantic', 'noble' ]
+        ubuntu_version: [ 'noble', 'oracular' ]
     container:
       image: ubuntu:${{matrix.ubuntu_version}}
     steps:
@@ -655,15 +592,12 @@ jobs:
             gcc
             g++
             fakeroot
-            gettext
             lsb-release
             gpg
             dput
             dpkg-dev
             libglib2.0-dev
             libboost-dev
-            libdbus-1-dev
-            libprotobuf-dev
             libsqlite3-dev
             libasound2-dev
             libpulse-dev
@@ -678,24 +612,18 @@ jobs:
             libcdio-dev
             libmtp-dev
             libgpod-dev
+            qt6-base-dev
+            qt6-base-dev-tools
+            qt6-tools-dev
+            qt6-tools-dev-tools
+            qt6-l10n-tools
             gstreamer1.0-alsa
             gstreamer1.0-pulseaudio
-            protobuf-compiler
       - name: Install keyboxd
         if: matrix.ubuntu_version == 'noble'
         env:
           DEBIAN_FRONTEND: noninteractive
         run: apt install -y keyboxd
-      - name: Install Qt 5
-        if: matrix.ubuntu_version == 'focal'
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: apt install -y qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools libqt5x11extras5-dev
-      - name: Install Qt 6
-        if: matrix.ubuntu_version != 'focal'
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: apt install -y qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -725,18 +653,32 @@ jobs:
 
   build-macos-public:
     name: Build macOS Public
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
 
     strategy:
       fail-fast: false
       matrix:
-        runner: [ 'macos-12' ]
+        runner: [ 'macos-13', 'macos-14' ]
         buildtype: [ 'release' ]
 
     runs-on: ${{ matrix.runner }}
 
     steps:
 
+      - name: Set MACOSX_DEPLOYMENT_TARGET
+        run: |
+          for i in 12 13 14 15; do
+            if [ -d "/Library/Developer/CommandLineTools/SDKs/MacOSX${i}.sdk" ]; then
+              echo "Using macOS SDK ${i}"
+              echo "MACOSX_DEPLOYMENT_TARGET=${i}.0" >> $GITHUB_ENV
+              break
+            fi
+          done
+
+      - name: Verify MACOSX_DEPLOYMENT_TARGET
+        run: |
+          test "${MACOSX_DEPLOYMENT_TARGET}" = "" && false || echo "MACOSX_DEPLOYMENT_TARGET: ${MACOSX_DEPLOYMENT_TARGET}"
+
       - name: Set arch
         shell: bash
         run: echo "arch=$(uname -m)" >> $GITHUB_ENV
@@ -784,7 +726,6 @@ jobs:
 
       - name: Configure CMake
         env:
-          MACOSX_DEPLOYMENT_TARGET: 12.0
           PKG_CONFIG_PATH: ${{env.prefix_path}}/lib/pkgconfig
           LDFLAGS: -L${{env.prefix_path}}/lib -Wl,-rpath,${{env.prefix_path}}/lib
         run: >
@@ -794,14 +735,12 @@ jobs:
           -B build
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="${{env.prefix_path}}/lib/cmake"
-          -DBUILD_WITH_QT6=ON
-          -DBUILD_WERROR=OFF
+          -DBUILD_WERROR=ON
           -DUSE_BUNDLE=ON
           -DENABLE_DBUS=OFF
           -DICU_ROOT="${{env.prefix_path}}"
-          -DFFTW3_DIR="${{env.prefix_path}}"
           -DAPPLE_DEVELOPER_ID=$(test '${{github.repository}}' = 'strawberrymusicplayer/strawberry' && test '${{github.event.pull_request.base.repo.full_name}}' = '${{github.event.pull_request.head.repo.full_name}}' && echo "383J84DVB6" || echo "")
-          -DENABLE_SPOTIFY=OFF
+          -DENABLE_SPOTIFY=$(test -f "${{env.prefix_path}}/lib/gstreamer-1.0/libgstspotify.dylib" && echo "ON" || echo "OFF")
 
       - name: Build
         run: cmake --build build --config Release --parallel 4
@@ -820,9 +759,14 @@ jobs:
         run: make deploy
 
       - name: Manually Codesign
-        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false
+        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-13'
         working-directory: build
-        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/{libsoup-3.0.0.dylib,libnghttp2.14.dylib,libpsl.5.dylib,libpcre2-8.0.dylib,libpcre2-16.0.dylib,libpng16.16.dylib,libzstd.1.dylib,libfreetype.6.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
+        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/{libpcre2-8.0.dylib,libpcre2-16.0.dylib,libpng16.16.dylib,libfreetype.6.dylib,libzstd.1.dylib} strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
+
+      - name: Manually Codesign
+        if: github.repository == 'strawberrymusicplayer/strawberry' && github.event.pull_request.head.repo.fork == false && matrix.runner == 'macos-14'
+        working-directory: build
+        run: codesign -s 383J84DVB6 -f strawberry.app/Contents/Frameworks/png.framework/png strawberry.app
 
       - name: Deploy check
         working-directory: build
@@ -877,6 +821,20 @@ jobs:
 
     steps:
 
+      - name: Set MACOSX_DEPLOYMENT_TARGET
+        run: |
+          for i in 12 13 14 15; do
+            if [ -d "/Library/Developer/CommandLineTools/SDKs/MacOSX${i}.sdk" ]; then
+              echo "Using macOS SDK ${i}"
+              echo "MACOSX_DEPLOYMENT_TARGET=${i}.0" >> $GITHUB_ENV
+              break
+            fi
+          done
+
+      - name: Verify MACOSX_DEPLOYMENT_TARGET
+        run: |
+          test "${MACOSX_DEPLOYMENT_TARGET}" = "" && false || echo "MACOSX_DEPLOYMENT_TARGET: ${MACOSX_DEPLOYMENT_TARGET}"
+
       - name: Set arch
         shell: bash
         run: echo "arch=$(uname -m)" >> $GITHUB_ENV
@@ -907,7 +865,6 @@ jobs:
 
       - name: Configure CMake
         env:
-          MACOSX_DEPLOYMENT_TARGET: 11.0
           PKG_CONFIG_PATH: ${{env.prefix_path}}/lib/pkgconfig
           LDFLAGS: -L${{env.prefix_path}}/lib -Wl,-rpath,${{env.prefix_path}}/lib
         run: >
@@ -917,14 +874,12 @@ jobs:
           -B build
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="${{env.prefix_path}}/lib/cmake"
-          -DBUILD_WITH_QT6=ON
-          -DBUILD_WERROR=OFF
+          -DBUILD_WERROR=ON
           -DUSE_BUNDLE=ON
           -DENABLE_DBUS=OFF
           -DICU_ROOT="${{env.prefix_path}}"
-          -DFFTW3_DIR="${{env.prefix_path}}"
           -DAPPLE_DEVELOPER_ID="383J84DVB6"
-          -DENABLE_SPOTIFY=OFF
+          -DENABLE_SPOTIFY=$(test -f "${{env.prefix_path}}/lib/gstreamer-1.0/libgstspotify.dylib" && echo "ON" || echo "OFF")
 
       - name: Build
         run: cmake --build build --config Release --parallel 4
@@ -967,21 +922,21 @@ jobs:
             echo "upload_path=${{secrets.DOWNLOADS_PATH}}/development_releases/macos" >> $GITHUB_OUTPUT
           fi
 
-      - name: Create server path
-        run: ssh -p ${{secrets.SSH_PORT}} -o StrictHostKeyChecking=no ${{secrets.SSH_USER}}@${{secrets.SSH_HOST}} mkdir -p ${{steps.set-upload-path.outputs.upload_path}}
+      #- name: Create server path
+        #run: ssh -p ${{secrets.SSH_PORT}} -o StrictHostKeyChecking=no ${{secrets.SSH_USER}}@${{secrets.SSH_HOST}} mkdir -p ${{steps.set-upload-path.outputs.upload_path}}
 
-      - name: rsync
-        run: rsync -e "ssh -p ${{secrets.SSH_PORT}} -o StrictHostKeyChecking=no" -var build/*.dmg ${{secrets.SSH_USER}}@${{secrets.SSH_HOST}}:${{steps.set-upload-path.outputs.upload_path}}/
+      #- name: rsync
+        #run: rsync -e "ssh -p ${{secrets.SSH_PORT}} -o StrictHostKeyChecking=no" -var build/*.dmg ${{secrets.SSH_USER}}@${{secrets.SSH_HOST}}:${{steps.set-upload-path.outputs.upload_path}}/
 
 
   build-windows-mingw:
     name: Build Windows MinGW
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        arch: [ 'x86_64' ]
+        arch: [ 'i686', 'x86_64' ]
         buildtype: [ 'debug', 'release' ]
     container:
       image: jonaski/strawberry-mxe-${{matrix.arch}}-${{matrix.buildtype}}
@@ -1016,16 +971,14 @@ jobs:
           -DCMAKE_TOOLCHAIN_FILE="../cmake/Toolchain-${{matrix.arch}}-w64-mingw32-shared.cmake"
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="/strawberry-mxe/usr/${{matrix.arch}}-w64-mingw32.shared/qt6"
-          -DBUILD_WITH_QT6=ON
-          -DBUILD_WERROR=OFF
+          -DBUILD_WERROR=ON
           -DARCH="${{matrix.arch}}"
           -DENABLE_WIN32_CONSOLE=$(test "${{matrix.buildtype}}" = "debug" && echo "ON" || echo "OFF")
           -DENABLE_DBUS=OFF
-          -DENABLE_LIBGPOD=OFF
-          -DENABLE_LIBMTP=OFF
           -DENABLE_AUDIOCD=OFF
+          -DENABLE_MTP=OFF
+          -DENABLE_GPOD=OFF
           -DENABLE_SPOTIFY=OFF
-          -DProtobuf_PROTOC_EXECUTABLE="/strawberry-mxe/usr/x86_64-pc-linux-gnu/bin/protoc"
 
       - name: Run Make
         run: cmake --build build --config "${{env.cmake_buildtype}}" --parallel $(nproc)
@@ -1098,7 +1051,7 @@ jobs:
 
       - name: Copy nsis files
         working-directory: build
-        run: cp ${GITHUB_WORKSPACE}/dist/windows/*.nsi ${GITHUB_WORKSPACE}/dist/windows/*.nsh ${GITHUB_WORKSPACE}/dist/windows/*.ico .
+        run: cp ${GITHUB_WORKSPACE}/dist/windows/*.nsh ${GITHUB_WORKSPACE}/dist/windows/*.ico .
 
       - name: Copy COPYING license file
         working-directory: build
@@ -1167,12 +1120,12 @@ jobs:
 
   build-windows-msvc:
     name: Build Windows MSVC
-    if: github.repository != 'strawberrymusicplayer/strawberry-private'
+    if: github.repository != 'strawberrymusicplayer/strawberry-private' && (!(github.event.pusher.name == 'strawbsbot' && contains(github.event.head_commit.message, 'New translations')))
     runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
-        arch: [ 'x86_64' ]
+        arch: [ 'x86', 'x86_64' ]
         buildtype: [ 'release' ]
     steps:
 
@@ -1305,14 +1258,11 @@ jobs:
           -G "Ninja"
           -DCMAKE_BUILD_TYPE="${{env.cmake_buildtype}}"
           -DCMAKE_PREFIX_PATH="${{env.prefix_path_forwardslash}}/lib/cmake"
-          -DBUILD_WITH_QT6=ON
           -DARCH="${{matrix.arch}}"
           -DENABLE_WIN32_CONSOLE=${{env.win32_console}}
-          -DUSE_TAGLIB=ON
           -DPKG_CONFIG_EXECUTABLE="${{env.prefix_path_forwardslash}}/bin/pkg-config.exe"
           -DICU_ROOT="${{env.prefix_path_forwardslash}}"
-          -DFFTW3_DIR="${{env.prefix_path_forwardslash}}"
-          -DBoost_INCLUDE_DIR="${{env.prefix_path_forwardslash}}/include"
+          -DENABLE_SPOTIFY=ON
 
       - name: Run Make
         shell: cmd
@@ -1406,7 +1356,6 @@ jobs:
         shell: cmd
         working-directory: build
         run: |
-          copy ..\dist\windows\*.nsi .
           copy ..\dist\windows\*.nsh .
           copy ..\dist\windows\*.ico .
 
@@ -1517,7 +1466,7 @@ jobs:
               upload_path="${{secrets.RELEASES_PATH}}/"
             else
               distro=$(echo "$i" | cut -d '/' -f 2)
-              if [ "$(echo "$i" | grep '-' || true)" = "" ]; then
+              if [ -z "$(echo "${distro}" | grep '-' || true)" ]; then
                 upload_path="${{secrets.BUILDS_PATH}}/${distro}/"
               else
                 distro_name=$(echo "${distro}" | cut -d '-' -f 1)

.gitignore

@@ -1,120 +1,16 @@
-# This file is used to ignore files which are generated
-# ----------------------------------------------------------------------------
-
-# Build
-build/
-bin/
-
-# CMake
-CMakeLists.txt.user
-CMakeCache.txt
-CMakeFiles
-CMakeScripts
-Makefile*
-Testing
-cmake_install.cmake
-install_manifest.txt
-compile_commands.json
-CTestTestfile.cmake
-_deps
-
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.so.*
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Dump files
-*.core
-*.stackdump
-
-# Qt
-*build-*
-moc_*.cpp
-moc_*.h
-qrc_*.cpp
-ui_*.h
-*.moc
-*.qm
-
-# Temporary files
-*~
-*.autosave
-*.orig
-*.rej
-.*.kate-swp
-.swp.*
-.*.swp
-*.flc
-
-# Directory files
-.directory
-.DS_Store
-Thumbs.db
-
-# MinGW generated files
-*.Debug
-*.Release
-
-# Package files
-*.spec
-*.nsi
-*.plist
-
-# Stuff in dist
-maketarball.sh
-changelog
-
-# Translations
-translations.pot
-zanata.xml
-.zanata-cache/
-
-# QtCreator
-CMakeLists.txt.user*
-*.pro.user
-*.pro.user.*
-*creator.user*
-target_wrapper.*
-compile_commands.json
-
-*.kdev4
-*.vscode
-*.code-workspace
-*.sublime-workspace
-
-# MSVC
-CMakeSettings.json
+/build
+/bin
+/CMakeLists.txt.user
+/.kdev4
+/strawberry.kdev4
+/.vscode
+/.code-workspace
+/.sublime-workspace
+/.idea
 /.vs
 /out
-
-# CLion
-/.idea
+/CMakeSettings.json
+/dist/scripts/maketarball.sh
+/dist/unix/strawberry.spec
+/debian/changelog
+/dist/macos/Info.plist

3rdparty/README.md

@@ -2,20 +2,10 @@
 ============================================
 
 KDSingleApplication
------------------
-This is a small static library used by Strawberry to prevent it from starting twice per user session.
+-------------------
+A small library used by Strawberry to prevent it from starting twice per user session.
 If the user tries to start strawberry twice, the main window will maximize instead of starting another instance.
 It is also used to pass command-line options through to the first instance.
+This 3rdparty copy is used only if KDSingleApplication 1.1 or higher is not found on the system.
 
 URL: https://github.com/KDAB/KDSingleApplication/
-
-
-SPMediaKeyTap
--------------
-Used on macOS to exclusively enable strawberry to grab global media shortcuts.
-Can safely be deleted on other platforms.
-
-
-getopt
-------
-getopt included only when compiling on Windows.

3rdparty/SPMediaKeyTap/CMakeLists.txt

@@ -1,11 +0,0 @@
-set(SPMEDIAKEY-SOURCES
-  SPMediaKeyTap.m
-)
-
-set(SPMEDIAKEY-HEADERS
-  SPMediaKeyTap.h
-)
-
-ADD_LIBRARY(SPMediaKeyTap STATIC
-  ${SPMEDIAKEY-SOURCES}
-)

3rdparty/SPMediaKeyTap/LICENSE

@@ -1,8 +0,0 @@
-Copyright (c) 2011, Joachim Bengtsson
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

3rdparty/SPMediaKeyTap/README.md

@@ -1,12 +0,0 @@
-SPMediaKeyTap
-=============
-
-`SPMediaKeyTap` abstracts a `CGEventHook` and other nastiness in order to give you a relatively simple API to receive media key events (prev/next/playpause, on F7 to F9 on modern MacBook Pros) exclusively, without them reaching other applications like iTunes. `SPMediaKeyTap` is clever enough to resign its exclusive lock on media keys by looking for which application was active most recently: if that application is in `SPMediaKeyTap`'s whitelist, it will resign the keys. This is similar to the behavior of Apple's applications collaborating on media key handling exclusivity, but unfortunately, Apple is not exposing any APIs allowing third-parties to join in on this collaboration.
-
-For now, the whitelist is just a hardcoded array in `+[SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers]`. If your app starts using `SPMediaKeyTap`, please [mail me](mailto:nevyn@spotify.com) your bundle ID, and I'll include it in the canonical repository. This is a bad solution; a better solution would be to use distributed notifications to collaborate in creating this whitelist at runtime. Hopefully someone'll have the time and energy to write this soon. 
-
-In `Example/SPMediaKeyTapExampleAppDelegate.m` is an example of both how you use `SPMediaKeyTap`, and how you handle the semi-private `NSEvent` subtypes involved in media keys, including on how to fall back to non-event tap handling of these events.
-
-`SPMediaKeyTap` and other `CGEventHook`s on the event type `NSSystemDefined` is known to interfere with each other and applications doing weird stuff with mouse input, because mouse clicks are also part of the `NSSystemDefined` category. The single issue we have had reported here at Spotify is Adobe Fireworks, in which item selection stops working with `SPMediaKeyTap` is active.
-
-`SPMediaKeyTap` requires 10.5 to work, and disables itself on 10.4.

3rdparty/SPMediaKeyTap/SPMediaKeyTap.h

@@ -1,53 +0,0 @@
-/*
- Copyright (c) 2011, Joachim Bengtsson
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Neither the name of the organization nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-#import <IOKit/hidsystem/ev_keymap.h>
-
-// http://overooped.com/post/2593597587/mediakeys
-
-#define SPSystemDefinedEventMediaKeys 8
-
-@interface SPMediaKeyTap : NSObject
-
-- (id)initWithDelegate:(id)delegate;
-
-+ (BOOL)usesGlobalMediaKeyTap;
-- (BOOL)startWatchingMediaKeys;
-- (void)stopWatchingMediaKeys;
-- (void)handleAndReleaseMediaKeyEvent:(NSEvent *)event;
-@end
-
-@interface NSObject (SPMediaKeyTapDelegate)
-- (void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
-@end
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern NSString *kIgnoreMediaKeysDefaultsKey;
-
-#ifdef __cplusplus
-}
-#endif

3rdparty/SPMediaKeyTap/SPMediaKeyTap.m

@@ -1,361 +0,0 @@
-/*
- Copyright (c) 2011, Joachim Bengtsson
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Neither the name of the organization nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-// Copyright (c) 2010 Spotify AB
-#import "SPMediaKeyTap.h"
-
-// Define to enable app list debug output
-// #define DEBUG_SPMEDIAKEY_APPLIST 1
-
-NSString *kIgnoreMediaKeysDefaultsKey = @"SPIgnoreMediaKeys";
-
-@interface SPMediaKeyTap () {
-    CFMachPortRef _eventPort;
-    CFRunLoopSourceRef _eventPortSource;
-    CFRunLoopRef _tapThreadRL;
-    NSThread *_tapThread;
-    BOOL _shouldInterceptMediaKeyEvents;
-    id _delegate;
-    // The app that is frontmost in this list owns media keys
-    NSMutableArray<NSRunningApplication *> *_mediaKeyAppList;
-}
-
-- (BOOL)shouldInterceptMediaKeyEvents;
-- (void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
-- (void)startWatchingAppSwitching;
-- (void)stopWatchingAppSwitching;
-- (void)eventTapThread;
-@end
-
-static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon);
-
-
-// Inspired by http://gist.github.com/546311
-
-@implementation SPMediaKeyTap
-
-#pragma mark -
-#pragma mark Setup and teardown
-
-- (id)initWithDelegate:(id)delegate
-{
-    self = [super init];
-    if (self) {
-        _delegate = delegate;
-        [self startWatchingAppSwitching];
-        _mediaKeyAppList = [NSMutableArray new];
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [self stopWatchingMediaKeys];
-    [self stopWatchingAppSwitching];
-    [super dealloc];
-}
-
-- (void)startWatchingAppSwitching
-{
-    // Listen to "app switched" event, so that we don't intercept media keys if we
-    // weren't the last "media key listening" app to be active
-
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
-                                                           selector:@selector(frontmostAppChanged:)
-                                                               name:NSWorkspaceDidActivateApplicationNotification
-                                                             object:nil];
-
-
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
-                                                           selector:@selector(appTerminated:)
-                                                               name:NSWorkspaceDidTerminateApplicationNotification
-                                                             object:nil];
-}
-
-- (void)stopWatchingAppSwitching
-{
-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
-}
-
-- (BOOL)startWatchingMediaKeys
-{
-    // Prevent having multiple mediaKeys threads
-    [self stopWatchingMediaKeys];
-
-    [self setShouldInterceptMediaKeyEvents:YES];
-
-    // Add an event tap to intercept the system defined media key events
-    _eventPort = CGEventTapCreate(kCGSessionEventTap,
-                                  kCGHeadInsertEventTap,
-                                  kCGEventTapOptionDefault,
-                                  CGEventMaskBit(NX_SYSDEFINED),
-                                  tapEventCallback,
-                                  (__bridge void * __nullable)(self));
-
-    // Can be NULL if the app has no accessibility access permission
-    if (_eventPort == NULL)
-        return NO;
-
-    _eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
-    assert(_eventPortSource != NULL);
-
-    if (_eventPortSource == NULL)
-        return NO;
-
-    // Let's do this in a separate thread so that a slow app doesn't lag the event tap
-    _tapThread = [[NSThread alloc] initWithTarget:self
-                                         selector:@selector(eventTapThread)
-                                           object:nil];
-    [_tapThread start];
-
-    return YES;
-}
-
-- (void)stopWatchingMediaKeys
-{
-    // Shut down tap thread
-    if(_tapThreadRL){
-        CFRunLoopStop(_tapThreadRL);
-        _tapThreadRL = nil;
-    }
-
-    // Remove tap port
-    if(_eventPort){
-        CFMachPortInvalidate(_eventPort);
-        CFRelease(_eventPort);
-        _eventPort = nil;
-    }
-
-    // Remove tap source
-    if(_eventPortSource){
-        CFRelease(_eventPortSource);
-        _eventPortSource = nil;
-    }
-}
-
-#pragma mark -
-#pragma mark Accessors
-
-+ (BOOL)usesGlobalMediaKeyTap
-{
-#ifdef _DEBUG
-    // breaking in gdb with a key tap inserted sometimes locks up all mouse and keyboard input forever, forcing reboot
-    return NO;
-#else
-    // XXX(nevyn): MediaKey event tap doesn't work on 10.4, feel free to figure out why if you have the energy.
-    return
-        ![[NSUserDefaults standardUserDefaults] boolForKey:kIgnoreMediaKeysDefaultsKey]
-        && floor(NSAppKitVersionNumber) >= 949/*NSAppKitVersionNumber10_5*/;
-#endif
-}
-
-+ (NSArray*)mediaKeyUserBundleIdentifiers
-{
-    return [NSArray arrayWithObjects:
-        [[NSBundle mainBundle] bundleIdentifier], // your app
-        @"com.spotify.client",
-        @"com.apple.iTunes",
-        @"com.apple.QuickTimePlayerX",
-        @"com.apple.quicktimeplayer",
-        @"com.apple.iWork.Keynote",
-        @"com.apple.iPhoto",
-        @"org.videolan.vlc",
-        @"com.apple.Aperture",
-        @"com.plexsquared.Plex",
-        @"com.soundcloud.desktop",
-        @"org.niltsh.MPlayerX",
-        @"com.ilabs.PandorasHelper",
-        @"com.mahasoftware.pandabar",
-        @"com.bitcartel.pandorajam",
-        @"org.clementine-player.clementine",
-        @"fm.last.Last.fm",
-        @"fm.last.Scrobbler",
-        @"com.beatport.BeatportPro",
-        @"com.Timenut.SongKey",
-        @"com.macromedia.fireworks", // the tap messes up their mouse input
-        @"at.justp.Theremin",
-        @"ru.ya.themblsha.YandexMusic",
-        @"com.jriver.MediaCenter18",
-        @"com.jriver.MediaCenter19",
-        @"com.jriver.MediaCenter20",
-        @"co.rackit.mate",
-        @"com.ttitt.b-music",
-        @"com.beardedspice.BeardedSpice",
-        @"com.plug.Plug",
-        @"com.plug.Plug2",
-        @"com.netease.163music",
-        @"org.quodlibet.quodlibet",
-        nil
-    ];
-}
-
-
-- (BOOL)shouldInterceptMediaKeyEvents
-{
-    BOOL shouldIntercept = NO;
-    @synchronized(self) {
-        shouldIntercept = _shouldInterceptMediaKeyEvents;
-    }
-    return shouldIntercept;
-}
-
-- (void)pauseTapOnTapThread:(NSNumber *)yeahno
-{
-    CGEventTapEnable(self->_eventPort, [yeahno boolValue]);
-}
-
-- (void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting
-{
-    BOOL oldSetting;
-    @synchronized(self) {
-        oldSetting = _shouldInterceptMediaKeyEvents;
-        _shouldInterceptMediaKeyEvents = newSetting;
-    }
-    if(_tapThreadRL && oldSetting != newSetting) {
-        [self performSelector:@selector(pauseTapOnTapThread:)
-                     onThread:_tapThread
-                   withObject:@(newSetting)
-                waitUntilDone:NO];
-
-    }
-}
-
-
-#pragma mark -
-#pragma mark Event tap callbacks
-
-// Note: method called on background thread
-
-static CGEventRef tapEventCallback2(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
-{
-    #pragma unused(proxy)
-    SPMediaKeyTap *self = (__bridge SPMediaKeyTap *)refcon;
-
-    if(type == kCGEventTapDisabledByTimeout) {
-        NSLog(@"Media key event tap was disabled by timeout");
-        CGEventTapEnable(self->_eventPort, TRUE);
-        return event;
-    } else if(type == kCGEventTapDisabledByUserInput) {
-        // Was disabled manually by -[pauseTapOnTapThread]
-        return event;
-    }
-    NSEvent *nsEvent = nil;
-    @try {
-        nsEvent = [NSEvent eventWithCGEvent:event];
-    }
-    @catch (NSException * e) {
-        NSLog(@"Strange CGEventType: %d: %@", type, e);
-        assert(0);
-        return event;
-    }
-
-    if (type != NX_SYSDEFINED || [nsEvent subtype] != SPSystemDefinedEventMediaKeys)
-        return event;
-
-    int keyCode = (([nsEvent data1] & 0xFFFF0000) >> 16);
-    if (keyCode != NX_KEYTYPE_PLAY && keyCode != NX_KEYTYPE_FAST && keyCode != NX_KEYTYPE_REWIND && keyCode != NX_KEYTYPE_PREVIOUS && keyCode != NX_KEYTYPE_NEXT)
-        return event;
-
-    if (![self shouldInterceptMediaKeyEvents])
-        return event;
-
-    [self performSelectorOnMainThread:@selector(handleAndReleaseMediaKeyEvent:) withObject:nsEvent waitUntilDone:NO];
-
-    return NULL;
-}
-
-static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
-{
-    @autoreleasepool {
-        CGEventRef ret = tapEventCallback2(proxy, type, event, refcon);
-        return ret;
-    }
-}
-
-- (void)handleAndReleaseMediaKeyEvent:(NSEvent *)event
-{
-    [_delegate mediaKeyTap:self receivedMediaKeyEvent:event];
-}
-
-- (void)eventTapThread
-{
-    _tapThreadRL = CFRunLoopGetCurrent();
-    CFRunLoopAddSource(_tapThreadRL, _eventPortSource, kCFRunLoopCommonModes);
-    CFRunLoopRun();
-}
-
-
-#pragma mark -
-#pragma mark Task switching callbacks
-
-- (void)mediaKeyAppListChanged
-{
-    #ifdef DEBUG_SPMEDIAKEY_APPLIST
-    [self debugPrintAppList];
-    #endif
-
-    if([_mediaKeyAppList count] == 0)
-        return;
-
-    NSRunningApplication *thisApp = [NSRunningApplication currentApplication];
-    NSRunningApplication *otherApp = [_mediaKeyAppList firstObject];
-
-    BOOL isCurrent = [thisApp isEqual:otherApp];
-
-    [self setShouldInterceptMediaKeyEvents:isCurrent];
-}
-
-- (void)frontmostAppChanged:(NSNotification *)notification
-{
-    NSRunningApplication *app = [notification.userInfo objectForKey:NSWorkspaceApplicationKey]; 
-    if (app.bundleIdentifier == nil)
-        return;
-
-    if (![[SPMediaKeyTap mediaKeyUserBundleIdentifiers] containsObject:app.bundleIdentifier])
-        return;
-
-    [_mediaKeyAppList removeObject:app];
-    [_mediaKeyAppList insertObject:app atIndex:0];
-    [self mediaKeyAppListChanged];
-}
-
-- (void)appTerminated:(NSNotification *)notification
-{
-    NSRunningApplication *app = [notification.userInfo objectForKey:NSWorkspaceApplicationKey];
-    [_mediaKeyAppList removeObject:app];
-
-    [self mediaKeyAppListChanged];
-}
-
-#ifdef DEBUG_SPMEDIAKEY_APPLIST
-- (void)debugPrintAppList
-{
-    NSMutableString *list = [NSMutableString stringWithCapacity:255];
-    for (NSRunningApplication *app in _mediaKeyAppList) {
-        [list appendFormat:@"     - %@\n", app.bundleIdentifier];
-    }
-    NSLog(@"List: \n%@", list);
-}
-#endif
-
-@end

3rdparty/getopt/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_library(getopt STATIC getopt.cpp)
-target_compile_definitions(getopt PRIVATE -DSTATIC_GETOPT -D_UNICODE)
-target_include_directories(getopt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

3rdparty/getopt/getopt.cpp

@@ -1,753 +0,0 @@
-/* Getopt for Microsoft C
-This code is a modification of the Free Software Foundation, Inc.
-Getopt library for parsing command line argument the purpose was
-to provide a Microsoft Visual C friendly derivative. This code
-provides functionality for both Unicode and Multibyte builds.
-
-Date: 02/03/2011 - Ludvik Jerabek - Initial Release
-Version: 1.1
-Comment: Supports getopt, getopt_long, and getopt_long_only
-and POSIXLY_CORRECT environment flag
-License: LGPL
-
-Revisions:
-
-02/03/2011 - Ludvik Jerabek - Initial Release
-02/20/2011 - Ludvik Jerabek - Fixed compiler warnings at Level 4
-07/05/2011 - Ludvik Jerabek - Added no_argument, required_argument, optional_argument defs
-08/03/2011 - Ludvik Jerabek - Fixed non-argument runtime bug which caused runtime exception
-08/09/2011 - Ludvik Jerabek - Added code to export functions for DLL and LIB
-02/15/2012 - Ludvik Jerabek - Fixed _GETOPT_THROW definition missing in implementation file
-08/01/2012 - Ludvik Jerabek - Created separate functions for char and wchar_t characters so single dll can do both unicode and ansi
-10/15/2012 - Ludvik Jerabek - Modified to match latest GNU features
-06/19/2015 - Ludvik Jerabek - Fixed maximum option limitation caused by option_a (255) and option_w (65535) structure val variable
-09/24/2022 - Ludvik Jerabek - Updated to match most recent getopt release
-09/25/2022 - Ludvik Jerabek - Fixed memory allocation (malloc call) issue for wchar_t*
-
-**DISCLAIMER**
-THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
-APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
-DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
-USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
-PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
-YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
-EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-*/
-#define _CRT_SECURE_NO_WARNINGS
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <malloc.h>
-#include "getopt.h"
-
-#ifdef __cplusplus
-#  define _GETOPT_THROW throw()
-#else
-#  define _GETOPT_THROW
-#endif
-
-int optind = 1;
-int opterr = 1;
-int optopt = '?';
-enum ENUM_ORDERING {
-  REQUIRE_ORDER,
-  PERMUTE,
-  RETURN_IN_ORDER
-};
-
-//
-//
-// Ansi structures and functions follow
-//
-//
-
-static struct _getopt_data_a {
-  int optind;
-  int opterr;
-  int optopt;
-  char *optarg;
-  int __initialized;
-  char *__nextchar;
-  enum ENUM_ORDERING __ordering;
-  int __first_nonopt;
-  int __last_nonopt;
-} getopt_data_a;
-char *optarg_a;
-
-static void exchange_a(char **argv, struct _getopt_data_a *d) {
-  int bottom = d->__first_nonopt;
-  int middle = d->__last_nonopt;
-  int top = d->optind;
-  char *tem;
-  while (top > middle && middle > bottom) {
-    if (top - middle > middle - bottom) {
-      int len = middle - bottom;
-      int i;
-      for (i = 0; i < len; i++) {
-        tem = argv[bottom + i];
-        argv[bottom + i] = argv[top - (middle - bottom) + i];
-        argv[top - (middle - bottom) + i] = tem;
-      }
-      top -= len;
-    }
-    else {
-      int len = top - middle;
-      int i;
-      for (i = 0; i < len; i++) {
-        tem = argv[bottom + i];
-        argv[bottom + i] = argv[middle + i];
-        argv[middle + i] = tem;
-      }
-      bottom += len;
-    }
-  }
-  d->__first_nonopt += (d->optind - d->__last_nonopt);
-  d->__last_nonopt = d->optind;
-}
-
-static int process_long_option_a(int argc, char **argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int print_errors, const char *prefix);
-static int process_long_option_a(int argc, char **argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int print_errors, const char *prefix) {
-  assert(longopts != NULL);
-  char *nameend;
-  size_t namelen;
-  const struct option_a *p;
-  const struct option_a *pfound = NULL;
-  int n_options;
-  int option_index = 0;
-  for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
-    ;
-  namelen = nameend - d->__nextchar;
-  for (p = longopts, n_options = 0; p->name; p++, n_options++)
-    if (!strncmp(p->name, d->__nextchar, namelen) && namelen == strlen(p->name)) {
-      pfound = p;
-      option_index = n_options;
-      break;
-    }
-  if (pfound == NULL) {
-    unsigned char *ambig_set = NULL;
-    int ambig_fallback = 0;
-    int indfound = -1;
-    for (p = longopts, option_index = 0; p->name; p++, option_index++)
-      if (!strncmp(p->name, d->__nextchar, namelen)) {
-        if (pfound == NULL) {
-          pfound = p;
-          indfound = option_index;
-        }
-        else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val) {
-          if (!ambig_fallback) {
-            if (!print_errors)
-              ambig_fallback = 1;
-
-            else if (!ambig_set) {
-              if ((ambig_set = reinterpret_cast<unsigned char *>(malloc(n_options * sizeof(char)))) == NULL)
-                ambig_fallback = 1;
-
-              if (ambig_set) {
-                memset(ambig_set, 0, n_options * sizeof(char));
-                ambig_set[indfound] = 1;
-              }
-            }
-            if (ambig_set)
-              ambig_set[option_index] = 1;
-          }
-        }
-      }
-    if (ambig_set || ambig_fallback) {
-      if (print_errors) {
-        if (ambig_fallback)
-          fprintf(stderr, "%s: option '%s%s' is ambiguous\n", argv[0], prefix, d->__nextchar);
-        else {
-          _lock_file(stderr);
-          fprintf(stderr, "%s: option '%s%s' is ambiguous; possibilities:", argv[0], prefix, d->__nextchar);
-          for (option_index = 0; option_index < n_options; option_index++)
-            if (ambig_set[option_index])
-              fprintf(stderr, " '%s%s'", prefix, longopts[option_index].name);
-          fprintf(stderr, "\n");
-          _unlock_file(stderr);
-        }
-      }
-      free(ambig_set);
-      d->__nextchar += strlen(d->__nextchar);
-      d->optind++;
-      d->optopt = 0;
-      return '?';
-    }
-    option_index = indfound;
-  }
-  if (pfound == NULL) {
-    if (!long_only || argv[d->optind][1] == '-' || strchr(optstring, *d->__nextchar) == NULL) {
-      if (print_errors)
-        fprintf(stderr, "%s: unrecognized option '%s%s'\n", argv[0], prefix, d->__nextchar);
-      d->__nextchar = NULL;
-      d->optind++;
-      d->optopt = 0;
-      return '?';
-    }
-    return -1;
-  }
-  d->optind++;
-  d->__nextchar = NULL;
-  if (*nameend) {
-    if (pfound->has_arg)
-      d->optarg = nameend + 1;
-    else {
-      if (print_errors)
-        fprintf(stderr, "%s: option '%s%s' doesn't allow an argument\n", argv[0], prefix, pfound->name);
-      d->optopt = pfound->val;
-      return '?';
-    }
-  }
-  else if (pfound->has_arg == 1) {
-    if (d->optind < argc)
-      d->optarg = argv[d->optind++];
-    else {
-      if (print_errors)
-        fprintf(stderr, "%s: option '%s%s' requires an argument\n", argv[0], prefix, pfound->name);
-      d->optopt = pfound->val;
-      return optstring[0] == ':' ? ':' : '?';
-    }
-  }
-  if (longind != NULL)
-    *longind = option_index;
-
-  if (pfound->flag) {
-    *(pfound->flag) = pfound->val;
-    return 0;
-  }
-  return pfound->val;
-}
-
-static const char *_getopt_initialize_a(const char *optstring, struct _getopt_data_a *d, int posixly_correct) {
-  if (d->optind == 0)
-    d->optind = 1;
-
-  d->__first_nonopt = d->__last_nonopt = d->optind;
-  d->__nextchar = NULL;
-
-  if (optstring[0] == '-') {
-    d->__ordering = RETURN_IN_ORDER;
-    ++optstring;
-  }
-  else if (optstring[0] == '+') {
-    d->__ordering = REQUIRE_ORDER;
-    ++optstring;
-  }
-  else if (posixly_correct | !!getenv("POSIXLY_CORRECT"))
-    d->__ordering = REQUIRE_ORDER;
-  else
-    d->__ordering = PERMUTE;
-
-  d->__initialized = 1;
-  return optstring;
-}
-
-int _getopt_internal_r_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int posixly_correct);
-int _getopt_internal_r_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int posixly_correct) {
-  int print_errors = d->opterr;
-  if (argc < 1)
-    return -1;
-  d->optarg = NULL;
-  if (d->optind == 0 || !d->__initialized)
-    optstring = _getopt_initialize_a(optstring, d, posixly_correct);
-  else if (optstring[0] == '-' || optstring[0] == '+')
-    optstring++;
-  if (optstring[0] == ':')
-    print_errors = 0;
-
-  if (d->__nextchar == NULL || *d->__nextchar == '\0') {
-    if (d->__last_nonopt > d->optind)
-      d->__last_nonopt = d->optind;
-    if (d->__first_nonopt > d->optind)
-      d->__first_nonopt = d->optind;
-    if (d->__ordering == PERMUTE) {
-      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-        exchange_a(const_cast<char **>(argv), d);
-      else if (d->__last_nonopt != d->optind)
-        d->__first_nonopt = d->optind;
-      while (d->optind < argc && (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0'))
-        d->optind++;
-      d->__last_nonopt = d->optind;
-    }
-    if (d->optind != argc && !strcmp(argv[d->optind], "--")) {
-      d->optind++;
-      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-        exchange_a(const_cast<char **>(argv), d);
-      else if (d->__first_nonopt == d->__last_nonopt)
-        d->__first_nonopt = d->optind;
-      d->__last_nonopt = argc;
-      d->optind = argc;
-    }
-    if (d->optind == argc) {
-      if (d->__first_nonopt != d->__last_nonopt)
-        d->optind = d->__first_nonopt;
-      return -1;
-    }
-    if (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') {
-      if (d->__ordering == REQUIRE_ORDER)
-        return -1;
-      d->optarg = argv[d->optind++];
-      return 1;
-    }
-    if (longopts) {
-      if (argv[d->optind][1] == '-') {
-        d->__nextchar = argv[d->optind] + 2;
-        return process_long_option_a(argc, const_cast<char **>(argv), optstring, longopts, longind, long_only, d, print_errors, "--");
-      }
-      if (long_only && (argv[d->optind][2] || !strchr(optstring, argv[d->optind][1]))) {
-        int code;
-        d->__nextchar = argv[d->optind] + 1;
-        code = process_long_option_a(argc, const_cast<char **>(argv), optstring, longopts,
-                                     longind, long_only, d,
-                                     print_errors, "-");
-        if (code != -1)
-          return code;
-      }
-    }
-    d->__nextchar = argv[d->optind] + 1;
-  }
-  {
-    char c = *d->__nextchar++;
-    const char *temp = strchr(optstring, c);
-    if (*d->__nextchar == '\0')
-      ++d->optind;
-    if (temp == NULL || c == ':' || c == ';') {
-      if (print_errors)
-        fprintf(stderr, "%s: invalid option -- '%c'\n", argv[0], c);
-      d->optopt = c;
-      return '?';
-    }
-    if (temp[0] == 'W' && temp[1] == ';' && longopts != NULL) {
-      if (*d->__nextchar != '\0')
-        d->optarg = d->__nextchar;
-      else if (d->optind == argc) {
-        if (print_errors)
-          fprintf(stderr, "%s: option requires an argument -- '%c'\n", argv[0], c);
-        d->optopt = c;
-        if (optstring[0] == ':')
-          c = ':';
-        else
-          c = '?';
-        return c;
-      }
-      else
-        d->optarg = argv[d->optind];
-      d->__nextchar = d->optarg;
-      d->optarg = NULL;
-      return process_long_option_a(argc, const_cast<char **>(argv), optstring, longopts, longind, 0, d, print_errors, "-W ");
-    }
-    if (temp[1] == ':') {
-      if (temp[2] == ':') {
-        if (*d->__nextchar != '\0') {
-          d->optarg = d->__nextchar;
-          d->optind++;
-        }
-        else
-          d->optarg = NULL;
-        d->__nextchar = NULL;
-      }
-      else {
-        if (*d->__nextchar != '\0') {
-          d->optarg = d->__nextchar;
-          d->optind++;
-        }
-        else if (d->optind == argc) {
-          if (print_errors)
-            fprintf(stderr, "%s: option requires an argument -- '%c'\n", argv[0], c);
-          d->optopt = c;
-          if (optstring[0] == ':')
-            c = ':';
-          else
-            c = '?';
-        }
-        else
-          d->optarg = argv[d->optind++];
-        d->__nextchar = NULL;
-      }
-    }
-    return c;
-  }
-}
-
-int _getopt_internal_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, int posixly_correct);
-int _getopt_internal_a(int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, int posixly_correct) {
-  int result;
-  getopt_data_a.optind = optind;
-  getopt_data_a.opterr = opterr;
-  result = _getopt_internal_r_a(argc, argv, optstring, longopts, longind, long_only, &getopt_data_a, posixly_correct);
-  optind = getopt_data_a.optind;
-  optarg_a = getopt_data_a.optarg;
-  optopt = getopt_data_a.optopt;
-  return result;
-}
-
-int getopt_a(int argc, char *const *argv, const char *optstring) _GETOPT_THROW {
-  return _getopt_internal_a(argc, argv, optstring, static_cast<const struct option_a *>(0), static_cast<int *>(0), 0, 0);
-}
-
-int getopt_long_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW {
-  return _getopt_internal_a(argc, argv, options, long_options, opt_index, 0, 0);
-}
-
-int getopt_long_only_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW {
-  return _getopt_internal_a(argc, argv, options, long_options, opt_index, 1, 0);
-}
-
-int _getopt_long_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d);
-int _getopt_long_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d) {
-  return _getopt_internal_r_a(argc, argv, options, long_options, opt_index, 0, d, 0);
-}
-
-int _getopt_long_only_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d);
-int _getopt_long_only_r_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d) {
-  return _getopt_internal_r_a(argc, argv, options, long_options, opt_index, 1, d, 0);
-}
-
-//
-//
-// Unicode Structures and Functions
-//
-//
-
-static struct _getopt_data_w {
-  int optind;
-  int opterr;
-  int optopt;
-  wchar_t *optarg;
-  int __initialized;
-  wchar_t *__nextchar;
-  enum ENUM_ORDERING __ordering;
-  int __first_nonopt;
-  int __last_nonopt;
-} getopt_data_w;
-wchar_t *optarg_w;
-
-static void exchange_w(wchar_t **argv, struct _getopt_data_w *d) {
-  int bottom = d->__first_nonopt;
-  int middle = d->__last_nonopt;
-  int top = d->optind;
-  wchar_t *tem;
-  while (top > middle && middle > bottom) {
-    if (top - middle > middle - bottom) {
-      int len = middle - bottom;
-      int i;
-      for (i = 0; i < len; i++) {
-        tem = argv[bottom + i];
-        argv[bottom + i] = argv[top - (middle - bottom) + i];
-        argv[top - (middle - bottom) + i] = tem;
-      }
-      top -= len;
-    }
-    else {
-      int len = top - middle;
-      int i;
-      for (i = 0; i < len; i++) {
-        tem = argv[bottom + i];
-        argv[bottom + i] = argv[middle + i];
-        argv[middle + i] = tem;
-      }
-      bottom += len;
-    }
-  }
-  d->__first_nonopt += (d->optind - d->__last_nonopt);
-  d->__last_nonopt = d->optind;
-}
-
-static int process_long_option_w(int argc, wchar_t **argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int print_errors, const wchar_t *prefix) {
-  assert(longopts != NULL);
-  wchar_t *nameend;
-  size_t namelen;
-  const struct option_w *p;
-  const struct option_w *pfound = NULL;
-  int n_options;
-  int option_index = 0;
-  for (nameend = d->__nextchar; *nameend && *nameend != L'='; nameend++)
-    ;
-  namelen = nameend - d->__nextchar;
-  for (p = longopts, n_options = 0; p->name; p++, n_options++)
-    if (!wcsncmp(p->name, d->__nextchar, namelen) && namelen == wcslen(p->name)) {
-      pfound = p;
-      option_index = n_options;
-      break;
-    }
-  if (pfound == NULL) {
-    wchar_t *ambig_set = NULL;
-    int ambig_fallback = 0;
-    int indfound = -1;
-    for (p = longopts, option_index = 0; p->name; p++, option_index++)
-      if (!wcsncmp(p->name, d->__nextchar, namelen)) {
-        if (pfound == NULL) {
-          pfound = p;
-          indfound = option_index;
-        }
-        else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val) {
-          if (!ambig_fallback) {
-            if (!print_errors)
-              ambig_fallback = 1;
-
-            else if (!ambig_set) {
-              if ((ambig_set = reinterpret_cast<wchar_t *>(malloc(n_options * sizeof(wchar_t)))) == NULL)
-                ambig_fallback = 1;
-
-              if (ambig_set) {
-                memset(ambig_set, 0, n_options * sizeof(wchar_t));
-                ambig_set[indfound] = 1;
-              }
-            }
-            if (ambig_set)
-              ambig_set[option_index] = 1;
-          }
-        }
-      }
-    if (ambig_set || ambig_fallback) {
-      if (print_errors) {
-        if (ambig_fallback)
-          fwprintf(stderr, L"%s: option '%s%s' is ambiguous\n", argv[0], prefix, d->__nextchar);
-        else {
-          _lock_file(stderr);
-          fwprintf(stderr, L"%s: option '%s%s' is ambiguous; possibilities:", argv[0], prefix, d->__nextchar);
-          for (option_index = 0; option_index < n_options; option_index++)
-            if (ambig_set[option_index])
-              fwprintf(stderr, L" '%s%s'", prefix, longopts[option_index].name);
-          fwprintf(stderr, L"\n");
-          _unlock_file(stderr);
-        }
-      }
-      free(ambig_set);
-      d->__nextchar += wcslen(d->__nextchar);
-      d->optind++;
-      d->optopt = 0;
-      return L'?';
-    }
-    option_index = indfound;
-  }
-  if (pfound == NULL) {
-    if (!long_only || argv[d->optind][1] == L'-' || wcschr(optstring, *d->__nextchar) == NULL) {
-      if (print_errors)
-        fwprintf(stderr, L"%s: unrecognized option '%s%s'\n", argv[0], prefix, d->__nextchar);
-      d->__nextchar = NULL;
-      d->optind++;
-      d->optopt = 0;
-      return L'?';
-    }
-    return -1;
-  }
-  d->optind++;
-  d->__nextchar = NULL;
-  if (*nameend) {
-    if (pfound->has_arg)
-      d->optarg = nameend + 1;
-    else {
-      if (print_errors)
-        fwprintf(stderr, L"%s: option '%s%s' doesn't allow an argument\n", argv[0], prefix, pfound->name);
-      d->optopt = pfound->val;
-      return L'?';
-    }
-  }
-  else if (pfound->has_arg == 1) {
-    if (d->optind < argc)
-      d->optarg = argv[d->optind++];
-    else {
-      if (print_errors)
-        fwprintf(stderr, L"%s: option '%s%s' requires an argument\n", argv[0], prefix, pfound->name);
-      d->optopt = pfound->val;
-      return optstring[0] == L':' ? L':' : L'?';
-    }
-  }
-  if (longind != NULL)
-    *longind = option_index;
-  if (pfound->flag) {
-    *(pfound->flag) = pfound->val;
-    return 0;
-  }
-  return pfound->val;
-}
-
-static const wchar_t *_getopt_initialize_w(const wchar_t *optstring, struct _getopt_data_w *d, int posixly_correct) {
-  if (d->optind == 0)
-    d->optind = 1;
-
-  d->__first_nonopt = d->__last_nonopt = d->optind;
-  d->__nextchar = NULL;
-
-  if (optstring[0] == L'-') {
-    d->__ordering = RETURN_IN_ORDER;
-    ++optstring;
-  }
-  else if (optstring[0] == L'+') {
-    d->__ordering = REQUIRE_ORDER;
-    ++optstring;
-  }
-  else if (posixly_correct | !!_wgetenv(L"POSIXLY_CORRECT"))
-    d->__ordering = REQUIRE_ORDER;
-  else
-    d->__ordering = PERMUTE;
-
-  d->__initialized = 1;
-  return optstring;
-}
-
-int _getopt_internal_r_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int posixly_correct);
-int _getopt_internal_r_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int posixly_correct) {
-  int print_errors = d->opterr;
-  if (argc < 1)
-    return -1;
-  d->optarg = NULL;
-  if (d->optind == 0 || !d->__initialized)
-    optstring = _getopt_initialize_w(optstring, d, posixly_correct);
-  else if (optstring[0] == L'-' || optstring[0] == L'+')
-    optstring++;
-  if (optstring[0] == L':')
-    print_errors = 0;
-#define NONOPTION_P (argv[d->optind][0] != L'-' || argv[d->optind][1] == L'\0')
-
-  if (d->__nextchar == NULL || *d->__nextchar == L'\0') {
-    if (d->__last_nonopt > d->optind)
-      d->__last_nonopt = d->optind;
-    if (d->__first_nonopt > d->optind)
-      d->__first_nonopt = d->optind;
-    if (d->__ordering == PERMUTE) {
-      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-        exchange_w(const_cast<wchar_t **>(argv), d);
-      else if (d->__last_nonopt != d->optind)
-        d->__first_nonopt = d->optind;
-      while (d->optind < argc && NONOPTION_P)
-        d->optind++;
-      d->__last_nonopt = d->optind;
-    }
-    if (d->optind != argc && !wcscmp(argv[d->optind], L"--")) {
-      d->optind++;
-      if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
-        exchange_w(const_cast<wchar_t **>(argv), d);
-      else if (d->__first_nonopt == d->__last_nonopt)
-        d->__first_nonopt = d->optind;
-      d->__last_nonopt = argc;
-      d->optind = argc;
-    }
-    if (d->optind == argc) {
-      if (d->__first_nonopt != d->__last_nonopt)
-        d->optind = d->__first_nonopt;
-      return -1;
-    }
-    if (NONOPTION_P) {
-      if (d->__ordering == REQUIRE_ORDER)
-        return -1;
-      d->optarg = argv[d->optind++];
-      return 1;
-    }
-    if (longopts) {
-      if (argv[d->optind][1] == L'-') {
-        d->__nextchar = argv[d->optind] + 2;
-        return process_long_option_w(argc, const_cast<wchar_t **>(argv), optstring, longopts, longind, long_only, d, print_errors, L"--");
-      }
-      if (long_only && (argv[d->optind][2] || !wcschr(optstring, argv[d->optind][1]))) {
-        int code;
-        d->__nextchar = argv[d->optind] + 1;
-        code = process_long_option_w(argc, const_cast<wchar_t **>(argv), optstring, longopts, longind, long_only, d, print_errors, L"-");
-        if (code != -1)
-          return code;
-      }
-    }
-    d->__nextchar = argv[d->optind] + 1;
-  }
-  {
-    wchar_t c = *d->__nextchar++;
-    const wchar_t *temp = wcschr(optstring, c);
-    if (*d->__nextchar == L'\0')
-      ++d->optind;
-    if (temp == NULL || c == L':' || c == L';') {
-      if (print_errors)
-        fwprintf(stderr, L"%s: invalid option -- '%c'\n", argv[0], c);
-      d->optopt = c;
-      return L'?';
-    }
-    if (temp[0] == L'W' && temp[1] == L';' && longopts != NULL) {
-      if (*d->__nextchar != L'\0')
-        d->optarg = d->__nextchar;
-      else if (d->optind == argc) {
-        if (print_errors)
-          fwprintf(stderr, L"%s: option requires an argument -- '%c'\n", argv[0], c);
-        d->optopt = c;
-        if (optstring[0] == L':')
-          c = L':';
-        else
-          c = L'?';
-        return c;
-      }
-      else
-        d->optarg = argv[d->optind];
-      d->__nextchar = d->optarg;
-      d->optarg = NULL;
-      return process_long_option_w(argc, const_cast<wchar_t **>(argv), optstring, longopts, longind,
-                                   0, d, print_errors, L"-W ");
-    }
-    if (temp[1] == L':') {
-      if (temp[2] == L':') {
-        if (*d->__nextchar != L'\0') {
-          d->optarg = d->__nextchar;
-          d->optind++;
-        }
-        else
-          d->optarg = NULL;
-        d->__nextchar = NULL;
-      }
-      else {
-        if (*d->__nextchar != L'\0') {
-          d->optarg = d->__nextchar;
-          d->optind++;
-        }
-        else if (d->optind == argc) {
-          if (print_errors)
-            fwprintf(stderr, L"%s: option requires an argument -- '%c'\n", argv[0], c);
-          d->optopt = c;
-          if (optstring[0] == L':')
-            c = L':';
-          else
-            c = L'?';
-        }
-        else
-          d->optarg = argv[d->optind++];
-        d->__nextchar = NULL;
-      }
-    }
-    return c;
-  }
-}
-
-int _getopt_internal_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, int posixly_correct);
-int _getopt_internal_w(int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, int posixly_correct) {
-  int result;
-  getopt_data_w.optind = optind;
-  getopt_data_w.opterr = opterr;
-  result = _getopt_internal_r_w(argc, argv, optstring, longopts, longind, long_only, &getopt_data_w, posixly_correct);
-  optind = getopt_data_w.optind;
-  optarg_w = getopt_data_w.optarg;
-  optopt = getopt_data_w.optopt;
-  return result;
-}
-
-int getopt_w(int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW {
-  return _getopt_internal_w(argc, argv, optstring, static_cast<const struct option_w *>(0), static_cast<int *>(0), 0, 0);
-}
-
-int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW {
-  return _getopt_internal_w(argc, argv, options, long_options, opt_index, 0, 0);
-}
-
-int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW {
-  return _getopt_internal_w(argc, argv, options, long_options, opt_index, 1, 0);
-}
-
-int _getopt_long_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d);
-int _getopt_long_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d) {
-  return _getopt_internal_r_w(argc, argv, options, long_options, opt_index, 0, d, 0);
-}
-
-int _getopt_long_only_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d);
-int _getopt_long_only_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d) {
-  return _getopt_internal_r_w(argc, argv, options, long_options, opt_index, 1, d, 0);
-}

3rdparty/getopt/getopt.h

@@ -1,135 +0,0 @@
-/* Getopt for Microsoft C
-This code is a modification of the Free Software Foundation, Inc.
-Getopt library for parsing command line argument the purpose was
-to provide a Microsoft Visual C friendly derivative. This code
-provides functionality for both Unicode and Multibyte builds.
-
-Date: 02/03/2011 - Ludvik Jerabek - Initial Release
-Version: 1.1
-Comment: Supports getopt, getopt_long, and getopt_long_only
-and POSIXLY_CORRECT environment flag
-License: LGPL
-
-Revisions:
-
-02/03/2011 - Ludvik Jerabek - Initial Release
-02/20/2011 - Ludvik Jerabek - Fixed compiler warnings at Level 4
-07/05/2011 - Ludvik Jerabek - Added no_argument, required_argument, optional_argument defs
-08/03/2011 - Ludvik Jerabek - Fixed non-argument runtime bug which caused runtime exception
-08/09/2011 - Ludvik Jerabek - Added code to export functions for DLL and LIB
-02/15/2012 - Ludvik Jerabek - Fixed _GETOPT_THROW definition missing in implementation file
-08/01/2012 - Ludvik Jerabek - Created separate functions for char and wchar_t characters so single dll can do both unicode and ansi
-10/15/2012 - Ludvik Jerabek - Modified to match latest GNU features
-06/19/2015 - Ludvik Jerabek - Fixed maximum option limitation caused by option_a (255) and option_w (65535) structure val variable
-09/24/2022 - Ludvik Jerabek - Updated to match most recent getopt release
-09/25/2022 - Ludvik Jerabek - Fixed memory allocation (malloc call) issue for wchar_t*
-
-**DISCLAIMER**
-THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
-APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
-DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
-USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
-PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
-YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
-EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-*/
-#ifndef __GETOPT_H_
-#define __GETOPT_H_
-
-#ifdef _GETOPT_API
-#  undef _GETOPT_API
-#endif
-
-#if defined(EXPORTS_GETOPT) && defined(STATIC_GETOPT)
-#  error "The preprocessor definitions of EXPORTS_GETOPT and STATIC_GETOPT can only be used individually"
-#elif defined(STATIC_GETOPT)
-#  define _GETOPT_API
-#elif defined(EXPORTS_GETOPT)
-#  pragma message("Exporting getopt library")
-#  define _GETOPT_API __declspec(dllexport)
-#else
-#  pragma message("Importing getopt library")
-#  define _GETOPT_API __declspec(dllimport)
-#endif
-
-// Change behavior for C\C++
-#ifdef __cplusplus
-#  define _BEGIN_EXTERN_C extern "C" {
-#  define _END_EXTERN_C   }
-#  define _GETOPT_THROW   throw()
-#else
-#  define _BEGIN_EXTERN_C
-#  define _END_EXTERN_C
-#  define _GETOPT_THROW
-#endif
-
-// Standard GNU options
-#define null_argument     0 /*Argument Null*/
-#define no_argument       0 /*Argument Switch Only*/
-#define required_argument 1 /*Argument Required*/
-#define optional_argument 2 /*Argument Optional*/
-
-// Shorter Options
-#define ARG_NULL 0 /*Argument Null*/
-#define ARG_NONE 0 /*Argument Switch Only*/
-#define ARG_REQ  1 /*Argument Required*/
-#define ARG_OPT  2 /*Argument Optional*/
-
-#include <string.h>
-#include <wchar.h>
-
-_BEGIN_EXTERN_C
-
-extern _GETOPT_API int optind;
-extern _GETOPT_API int opterr;
-extern _GETOPT_API int optopt;
-
-// Ansi
-struct option_a {
-  const char *name;
-  int has_arg;
-  int *flag;
-  int val;
-};
-extern _GETOPT_API char *optarg_a;
-extern _GETOPT_API int getopt_a(int argc, char *const *argv, const char *optstring) _GETOPT_THROW;
-extern _GETOPT_API int getopt_long_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
-extern _GETOPT_API int getopt_long_only_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
-
-// Unicode
-struct option_w {
-  const wchar_t *name;
-  int has_arg;
-  int *flag;
-  int val;
-};
-extern _GETOPT_API wchar_t *optarg_w;
-extern _GETOPT_API int getopt_w(int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW;
-extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
-extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
-
-_END_EXTERN_C
-
-#undef _BEGIN_EXTERN_C
-#undef _END_EXTERN_C
-#undef _GETOPT_THROW
-#undef _GETOPT_API
-
-#ifdef _UNICODE
-#  define getopt           getopt_w
-#  define getopt_long      getopt_long_w
-#  define getopt_long_only getopt_long_only_w
-#  define option           option_w
-#  define optarg           optarg_w
-#else
-#  define getopt           getopt_a
-#  define getopt_long      getopt_long_a
-#  define getopt_long_only getopt_long_only_a
-#  define option           option_a
-#  define optarg           optarg_a
-#endif
-#endif  // __GETOPT_H_

3rdparty/kdsingleapplication/CMakeLists.txt

@@ -1,8 +1,11 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.13)
 set(SOURCES KDSingleApplication/src/kdsingleapplication.cpp KDSingleApplication/src/kdsingleapplication_localsocket.cpp)
 set(HEADERS KDSingleApplication/src/kdsingleapplication.h KDSingleApplication/src/kdsingleapplication_localsocket_p.h)
 qt_wrap_cpp(MOC ${HEADERS})
 add_library(kdsingleapplication STATIC ${SOURCES} ${MOC})
+if(NOT MSVC)
+  target_compile_options(kdsingleapplication PRIVATE -Wno-missing-declarations)
+endif()
 target_compile_definitions(kdsingleapplication PRIVATE -DKDSINGLEAPPLICATION_STATIC_BUILD)
 target_include_directories(kdsingleapplication PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(kdsingleapplication PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network)

Changelog

@@ -2,7 +2,107 @@ Strawberry Music Player
 =======================
 ChangeLog
 
-Version 1.1.0-rc3 (2024.07.09):
+Version 1.2.3 (2024.12.08):
+
+  Bugfixes:
+    * Fixed libcdio NULL related compilation error on FreeBSD (#1610).
+    * Fixed missing seek when starting playback of a CUE song (#1568).
+    * Fixed "QDBusObjectPath: invalid path" error.
+
+Version 1.2.2 (2024.11.23):
+
+  Bugfixes:
+
+    * Fixed crash when creating a new smart playlist (#1609).
+    * Fixed last playlist column being added when dragging a song and switching playlists.
+
+Version 1.2.1 (2024.11.21):
+
+This release features major restructuring of the codebase, moving source files,
+rewriting CMake build files, dropping Qt 5 support, external tagreader,
+and dropping some unmaintained parts such as VLC.
+
+  Bugfixes:
+
+    * Fixed playback of CUE continuing to play from the same file after the song has finished playing (#1568).
+    * Fixed updating collection song sort text when disc is changed.
+    * Fixed current playing file left open when the next track errored (#1582).
+    * Fixed filter search not finding song containing uppercase "A" (#1599).
+    * Fixed crash when removing album from playlist when using shuffle albums (#1588).
+    * Fixed IDv3 MBID's tags with multiple entries being ignored.
+    * Fixed crash when enabling Tidal, Spotify, Qobuz or Subsonic services.
+    * Fixed passing filenames to strawberry on command line not resolving to absolute paths.
+    * (macOS) Fixed program not starting for users with long usernames.
+    * (macoS) Fixed crash when pressing caps lock (#1606).
+    * (macOS) Remove "song progress on taskbar" option in behaviour settings.
+
+  Enhancements:
+
+    * Resolve symbolic links when dragging files to the playlist to match collection song.
+    * Replaced Spotify username/password with access token.
+    * Require Qt 6.4 or higher and drop support for Qt 5.
+    * Require TagLib 1.12 or higher.
+    * Use Qt stringliterals.
+    * Move gstfastspectrum to src.
+    * Use standard user temp location for current album cover.
+    * Removed old MacFSListener.
+    * Removed external tagreader and protobuf dependency.
+    * Removed VLC support.
+    * Ported to Qt translation (.ts) files and removed gettext dependency.
+    * Removed deprecated Gnome/Mate SettingsDaemon global shortcuts.
+
+Version 1.1.3 (2024.09.21):
+
+  Bugfixes:
+    * Fixed gstreamer registry lookup leak in Spotify settings.
+    * Fixed all songs in a CUE sheet starting playback at the zero position (#1549).
+    * Fixed playback going to pause and back to play on song change.
+    * Fixed Genius Lyrics login not working (#1554).
+    * Fixed slow collection filter search.
+
+Version 1.1.2 (2024.09.12):
+
+  Bugfixes:
+    * Fixed Tidal Open API cover provider to only login when needed instead of on startup.
+    * Fixed KDE added keyboard accelerator characters (ampersands) appearing in sidebar (#1400, #1389, #1476).
+    * Fixed KDE added keyboard accelerator characters (ampersands) appearing when editing playlist name (#1499).
+    * Fixed collection "Search for this" adding prefix without value (#1510).
+    * Fixed play (-p) command line option not working on startup (#1465).
+    * Fixed scan transaction being started when "Update the collection when Strawberry starts" option is unchecked (#1469)
+    * Fixed Spotify bitrate being limited 128kbit/s.
+    * Fixed Spotify returning too many artists and albums.
+    * Fixed manually switching Spotify songs blocking UI.
+    * Fixed analyzer not being set.
+    * Fixed context top text being updated causing selected text to be unselected.
+    * Fixed filter search to use filename for songs with empty title.
+    * Fixed missing developer in Appstream appdata file.
+    * Fixed MPRIS2 DesktopEntry to return desktop file entry without ".desktop" (#1516)
+    * Fixed WavPack .wvc accepted as valid audio files (#1525).
+    * Fixed dynamic playlist controls not following system colors (#1483).
+    * Fixed freeze on playlist right click (#1478).
+    * Fixed copying songs to a iPod device keeping too many files open (#1527).
+    * Fixed MBIDs from MP4 being parsed incorrectly causing ListenBrainz errors (#1531).
+    * Fixed playlist sorting after filename (#1538).
+
+  Enhancements:
+    * Improved volume adjustment and track seeking using touchpad (#1498).
+    * Use own thread for lyrics parsing.
+    * Added url and filename columns to collection and playlist filter search.
+    * (macOS) Added Spotify.
+
+Version 1.1.1 (2024.07.22):
+
+  Bugfixes:
+    * Fixed compilation songs being split into different albums when using album grouping.
+    * Fixed adding playlist columns not working when stretch mode is disabled (#1085).
+    * Fixed resetting playlist columns.
+    * Fixed adding songs to playlist adding all songs instead of filtered songs.
+    * Fixed collection filter matching entire text instead of individual words.
+
+  Enhancements:
+    * Use same code for collection and playlist filter search.
+
+Version 1.1.0 (2024.07.14):
 
   Bugfixes:
     * Fixed crash when pressing CTRL + C (#1359).
@@ -28,14 +128,13 @@ Version 1.1.0-rc3 (2024.07.09):
     * Only use playbin3 with GStreamer 1.24 and higher, not with GStreamer 1.22 or lower.
     * (macOS/Windows) Fixed dash and hls streaming, plugins were missing.
     * (Windows) Fixed incorrect colors in smart playlist wizard with Fusion in dark mode (#1399).
+    * (Windows) Fixed update window blocking sponsor window on startup.
 
   Enhancements:
     * Improve error messages when connecting and copying to devices.
     * Allow enter to be used with multiselection to add songs to playlist (#1360)
     * Add song progress to taskbar using D-Bus.
     * Use API to receive Radio Paradise channels.
-    * Added letras lyrics provider.
-    * Added Open Tidal API (openapi.tidal.com) cover provider.
     * Added button for fetching lyrics to tag editor (#1391).
     * Added option not to skip "A", "An" and "The” when sorting artist names in collection (#1393).
     * Improved album and title disc, remastered, etc matching and stripping (#1387).
@@ -54,6 +153,8 @@ Version 1.1.0-rc3 (2024.07.09):
     * (Windows MSVC) Add back WASAPI2.
 
   New features:
+    * Letras lyrics provider.
+    * Open Tidal API (openapi.tidal.com) cover provider.
     * Turbine analyzer.
     * WaveRubber analyzer.
     * Spotify streaming support.

README.md

@@ -14,11 +14,11 @@ Resources:
   * Wiki: https://wiki.strawberrymusicplayer.org/
   * Forum: https://forum.strawberrymusicplayer.org/
   * Github: https://github.com/strawberrymusicplayer/strawberry
-  * Buildbot: https://buildbot.strawberrymusicplayer.org/
   * Latest builds: https://builds.strawberrymusicplayer.org/
   * openSUSE buildservice: https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
   * Ubuntu PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
   * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
+  * Translations: https://crowdin.com/project/strawberrymusicplayer/
 
 ### :bangbang: Opening an issue
 
@@ -33,8 +33,8 @@ Resources:
 The program is free software, released under GPL. If you like this program and can make use of it, consider sponsoring or donating to help fund the project.
 There are currently 4 options for sponsoring:
 
-1. [GitHub](https://github.com/sponsors/jonaski)
-2. [Patreon](https://www.patreon.com/jonaskvinge)
+1. [Patreon](https://www.patreon.com/jonaskvinge)
+2. [GitHub](https://github.com/sponsors/jonaski)
 3. [Ko-fi](https://ko-fi.com/jonaskvinge)
 4. [PayPal](https://paypal.me/jonaskvinge)
 
@@ -64,7 +64,7 @@ Funding developers is a way to contribute to open source projects you appreciate
 
 It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
 
-**macOS releases are currently limited to sponsors. This is because Strawberry mainly has one contributor/developer and supporting macOS requires Apple hardware, building libraries Strawberry depends and a Apple developer account for signing releases. If you are sponsoring strawberry through Patreon, releases are available directly on Patreon, if you are sponsoring through GitHub, Ko-fi or Paypal, please e-mail support@strawberrymusicplayer.org for access to downloads.**
+**Access to macOS and Windows releases are currently restricted to sponsors, a 5 USD monthly sponsorship is required. You can sponsor strawberry through <a href="https://www.patreon.com/jonaskvinge">Patreon</a> for direct access to new releases. If you are sponsoring through GitHub, Ko-fi or PayPal, please e-mail support AT strawberrymusicplayer.org for access to downloads.**
 
 ### :heavy_exclamation_mark: Requirements
 
@@ -75,14 +75,13 @@ To build Strawberry from source you need the following installed on your system
 * [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/) or [pkgconf](https://github.com/pkgconf/pkgconf)
 * [Boost](https://www.boost.org/)
 * [GLib](https://developer.gnome.org/glib/)
-* [Qt 6 or Qt 5.12 or higher with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
+* [Qt 6.4.0 or higher with components Core, Concurrent, Gui, Widgets, Network, Sql and D-Bus](https://www.qt.io/)
 * [SQLite 3.9 or newer](https://www.sqlite.org)
-* [Protobuf](https://developers.google.com/protocol-buffers/)
 * [ALSA (Required on Linux)](https://www.alsa-project.org/)
-* [D-Bus (Required on Linux)](https://www.freedesktop.org/wiki/Software/dbus/)
-* [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org)
-* [TagLib 1.11.1 or higher](https://www.taglib.org/) or [TagParser](https://github.com/Martchus/tagparser)
+* [GStreamer](https://gstreamer.freedesktop.org/)
+* [TagLib 1.12 or higher](https://www.taglib.org/)
 * [ICU](https://unicode-org.github.io/icu/)
+* [KDSingleApplication](https://github.com/KDAB/KDSingleApplication)
 
 Optional dependencies:
 
@@ -107,16 +106,12 @@ You should also install the gstreamer plugins base and good, and optionally bad,
     cd strawberry
     mkdir build
     cd build
-    cmake .. -DBUILD_WITH_QT6=ON
+    cmake ..
     make -j $(nproc)
     sudo make install
 
-Strawberry is backwards compatible with Qt 5, to compile with Qt 5 use:
-
-    cmake .. -DBUILD_WITH_QT5=ON
-
 To compile on Windows with Visual Studio 2019 or 2022, see https://github.com/strawberrymusicplayer/strawberry-msvc
 
 ### :penguin: Packaging status
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?columns=3&header=Strawberry&exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)

cmake/Dmg.cmake

@@ -1,10 +1,17 @@
-find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/bin /usr/local/bin /opt/local/bin /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin REQUIRED)
+find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/bin /usr/local/bin /opt/local/bin /usr/local/opt/qt6/bin REQUIRED)
 if(MACDEPLOYQT_EXECUTABLE)
   message(STATUS "Found macdeployqt: ${MACDEPLOYQT_EXECUTABLE}")
 else()
   message(WARNING "Missing macdeployqt executable.")
 endif()
 
+find_program(MACDEPLOYCHECK_EXECUTABLE NAMES macdeploycheck PATHS /usr/bin /usr/local/bin /opt/local/bin /usr/local/opt/qt6/bin REQUIRED)
+if(MACDEPLOYCHECK_EXECUTABLE)
+  message(STATUS "Found macdeploycheck: ${MACDEPLOYCHECK_EXECUTABLE}")
+else()
+  message(WARNING "Missing macdeploycheck executable.")
+endif()
+
 find_program(CREATEDMG_EXECUTABLE NAMES create-dmg REQUIRED)
 if(CREATEDMG_EXECUTABLE)
   message(STATUS "Found create-dmg: ${CREATEDMG_EXECUTABLE}")
@@ -27,14 +34,15 @@ if(MACDEPLOYQT_EXECUTABLE)
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/strawberry.icns ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources/
     COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh ${CMAKE_BINARY_DIR}/strawberry.app
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner ${MACDEPLOYQT_CODESIGN}
+    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner ${MACDEPLOYQT_CODESIGN}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    DEPENDS strawberry strawberry-tagreader
-  )
-  add_custom_target(deploycheck
-    COMMAND ${CMAKE_BINARY_DIR}/ext/macdeploycheck/macdeploycheck strawberry.app
-    DEPENDS macdeploycheck
+    DEPENDS strawberry
   )
+  if(MACDEPLOYCHECK_EXECUTABLE)
+    add_custom_target(deploycheck
+      COMMAND ${MACDEPLOYCHECK_EXECUTABLE} strawberry.app
+    )
+  endif()
   if(CREATEDMG_EXECUTABLE)
     add_custom_target(dmg
       COMMAND ${CREATEDMG_EXECUTABLE} --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 ${CREATEDMG_CODESIGN} ${CREATEDMG_SKIP_JENKINS_ARG} strawberry-${STRAWBERRY_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app

cmake/FindCppUnit.cmake

@@ -1,69 +0,0 @@
-# - Try to find the libcppunit libraries
-# Once done this will define
-#
-# CppUnit_FOUND - system has libcppunit
-# CPPUNIT_INCLUDE_DIR - the libcppunit include directory
-# CPPUNIT_LIBRARIES - libcppunit library
-
-#include (MacroEnsureVersion)
-
-if(NOT CPPUNIT_MIN_VERSION)
-  SET(CPPUNIT_MIN_VERSION 1.12.0)
-endif(NOT CPPUNIT_MIN_VERSION)
-
-FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE cppunit-config )
-
-IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-    # in cache already
-    SET(CppUnit_FOUND TRUE)
-
-ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-    SET(CPPUNIT_INCLUDE_DIR)
-    SET(CPPUNIT_LIBRARIES)
-
-    IF(CPPUNIT_CONFIG_EXECUTABLE)
-        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
-        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
-        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-        STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS "${CPPUNIT_CFLAGS}")
-    ELSE(CPPUNIT_CONFIG_EXECUTABLE)
-        # in case win32 needs to find it the old way?
-        FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS /usr/include /usr/local/include )
-        FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS /usr/lib /usr/local/lib )
-        # how can we find cppunit version?
-        MESSAGE (STATUS "Ensure you cppunit installed version is at least ${CPPUNIT_MIN_VERSION}")
-        SET (CPPUNIT_INSTALLED_VERSION ${CPPUNIT_MIN_VERSION})
-    ENDIF(CPPUNIT_CONFIG_EXECUTABLE)
-
-    SET(CPPUNIT_INCLUDE_DIR ${CPPUNIT_CFLAGS} "${CPPUNIT_CFLAGS}/cppunit")
-
-ENDIF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-  SET(CppUnit_FOUND TRUE)
-
-  if(NOT CppUnit_FIND_QUIETLY)
-    MESSAGE (STATUS "Found cppunit: ${CPPUNIT_LIBRARIES}")
-  endif(NOT CppUnit_FIND_QUIETLY)
-
-  IF(CPPUNIT_CONFIG_EXECUTABLE)
-    EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-  ENDIF(CPPUNIT_CONFIG_EXECUTABLE)
-
-  #macro_ensure_version( ${CPPUNIT_MIN_VERSION} ${CPPUNIT_INSTALLED_VERSION} CPPUNIT_INSTALLED_VERSION_OK )
-
-  #IF(NOT CPPUNIT_INSTALLED_VERSION_OK)
-  #  MESSAGE ("** CppUnit version is too old: found ${CPPUNIT_INSTALLED_VERSION} installed, ${CPPUNIT_MIN_VERSION} or major is required")
-  #  SET(CppUnit_FOUND FALSE)
-  #ENDIF(NOT CPPUNIT_INSTALLED_VERSION_OK)
-
-ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-  SET(CppUnit_FOUND FALSE CACHE BOOL "Not found cppunit library")
-
-ENDIF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES)

cmake/FindFFTW3.cmake

@@ -1,132 +0,0 @@
-# 
-# Try to find FFTW3  library  
-# (see www.fftw.org)
-# Once run this will define: 
-# 
-# FFTW3_FOUND
-# FFTW3_INCLUDE_DIR 
-# FFTW3_LIBRARIES
-# FFTW3_LINK_DIRECTORIES
-#
-# You may set one of these options before including this file:
-#  FFTW3_USE_SSE2
-#
-#  TODO: _F_ versions.
-#
-# Jan Woetzel 05/2004
-# www.mip.informatik.uni-kiel.de
-# --------------------------------
-
- FIND_PATH(FFTW3_INCLUDE_DIR fftw3.h
-   ${FFTW3_DIR}/include
-   ${FFTW3_HOME}/include
-   ${FFTW3_DIR}
-   ${FFTW3_HOME}
-   $ENV{FFTW3_DIR}/include
-   $ENV{FFTW3_HOME}/include
-   $ENV{FFTW3_DIR}
-   $ENV{FFTW3_HOME}
-   /usr/include
-   /usr/local/include
-   $ENV{SOURCE_DIR}/fftw3
-   $ENV{SOURCE_DIR}/fftw3/include
-   $ENV{SOURCE_DIR}/fftw
-   $ENV{SOURCE_DIR}/fftw/include
- )
-#MESSAGE("DBG FFTW3_INCLUDE_DIR=${FFTW3_INCLUDE_DIR}")  
-
-
-SET(FFTW3_POSSIBLE_LIBRARY_PATH
-  ${FFTW3_DIR}/lib
-  ${FFTW3_HOME}/lib
-  ${FFTW3_DIR}
-  ${FFTW3_HOME}  
-  $ENV{FFTW3_DIR}/lib
-  $ENV{FFTW3_HOME}/lib
-  $ENV{FFTW3_DIR}
-  $ENV{FFTW3_HOME}  
-  /usr/lib
-  /usr/local/lib
-  $ENV{SOURCE_DIR}/fftw3
-  $ENV{SOURCE_DIR}/fftw3/lib
-  $ENV{SOURCE_DIR}/fftw
-  $ENV{SOURCE_DIR}/fftw/lib
-)
-
-  
-# The lib prefix is contained in filename of W32, unfortunately. In the "general" lib:
-FIND_LIBRARY(FFTW3_FFTW_LIBRARY
-  NAMES fftw3 libfftw libfftw3 libfftw3-3
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTW_LIBRARY=${FFTW3_FFTW_LIBRARY}")
-
-FIND_LIBRARY(FFTW3_FFTWF_LIBRARY
-  NAMES fftwf3 fftw3f fftwf libfftwf libfftwf3 libfftw3f-3
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTWF_LIBRARY=${FFTW3_FFTWF_LIBRARY}")
-
-FIND_LIBRARY(FFTW3_FFTWL_LIBRARY
-  NAMES fftwl3 fftw3l fftwl libfftwl libfftwl3 libfftw3l-3
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTWF_LIBRARY=${FFTW3_FFTWL_LIBRARY}")
-
-
-FIND_LIBRARY(FFTW3_FFTW_SSE2_LIBRARY
-  NAMES fftw_sse2 fftw3_sse2 libfftw_sse2 libfftw3_sse2
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTW_SSE2_LIBRARY=${FFTW3_FFTW_SSE2_LIBRARY}")
-
-FIND_LIBRARY(FFTW3_FFTWF_SSE_LIBRARY
-  NAMES fftwf_sse fftwf3_sse libfftwf_sse libfftwf3_sse
-  PATHS 
-  ${FFTW3_POSSIBLE_LIBRARY_PATH}
-  )
-#MESSAGE("DBG FFTW3_FFTWF_SSE_LIBRARY=${FFTW3_FFTWF_SSE_LIBRARY}")
-
-
-# --------------------------------
-# select one of the above
-# default: 
-IF (FFTW3_FFTW_LIBRARY)
-  SET(FFTW3_LIBRARIES ${FFTW3_FFTW_LIBRARY})
-ENDIF (FFTW3_FFTW_LIBRARY)
-# specialized: 
-IF (FFTW3_USE_SSE2 AND FFTW3_FFTW_SSE2_LIBRARY)
-  SET(FFTW3_LIBRARIES ${FFTW3_FFTW_SSE2_LIBRARY})
-ENDIF (FFTW3_USE_SSE2 AND FFTW3_FFTW_SSE2_LIBRARY)
-
-# --------------------------------
-
-IF(FFTW3_LIBRARIES)
-  IF (FFTW3_INCLUDE_DIR)
-
-    # OK, found all we need
-    SET(FFTW3_FOUND TRUE)
-    GET_FILENAME_COMPONENT(FFTW3_LINK_DIRECTORIES ${FFTW3_LIBRARIES} PATH)
-    
-  ELSE (FFTW3_INCLUDE_DIR)
-    MESSAGE("FFTW3 include dir not found. Set FFTW3_DIR to find it.")
-  ENDIF(FFTW3_INCLUDE_DIR)
-ELSE(FFTW3_LIBRARIES)
-  MESSAGE("FFTW3 lib not found. Set FFTW3_DIR to find it.")
-ENDIF(FFTW3_LIBRARIES)
-
-
-MARK_AS_ADVANCED(
-  FFTW3_INCLUDE_DIR
-  FFTW3_LIBRARIES
-  FFTW3_FFTW_LIBRARY
-  FFTW3_FFTW_SSE2_LIBRARY
-  FFTW3_FFTWF_LIBRARY
-  FFTW3_FFTWF_SSE_LIBRARY
-  FFTW3_FFTWL_LIBRARY
-  FFTW3_LINK_DIRECTORIES
-)

cmake/Translations.cmake

@@ -1,92 +0,0 @@
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext REQUIRED)
-find_program(CAT_EXECUTABLE cat REQUIRED)
-
-list(APPEND XGETTEXT_OPTIONS
-  --qt
-  --keyword=tr:1,2c
-  --keyword=tr
-  --flag=tr:1:pass-c-format
-  --flag=tr:1:pass-qt-format
-  --keyword=trUtf8
-  --flag=tr:1:pass-c-format
-  --flag=tr:1:pass-qt-format
-  --keyword=translate:2,3c
-  --keyword=translate:2
-  --flag=translate:2:pass-c-format
-  --flag=translate:2:pass-qt-format
-  --keyword=QT_TR_NOOP
-  --flag=QT_TR_NOOP:1:pass-c-format
-  --flag=QT_TR_NOOP:1:pass-qt-format
-  --keyword=QT_TRANSLATE_NOOP:2
-  --flag=QT_TRANSLATE_NOOP:2:pass-c-format
-  --flag=QT_TRANSLATE_NOOP:2:pass-qt-format
-  --keyword=_
-  --flag=_:1:pass-c-format
-  --flag=_:1:pass-qt-format
-  --keyword=N_
-  --flag=N_:1:pass-c-format
-  --flag=N_:1:pass-qt-format
-  --from-code=utf-8
-)
-
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/translations)
-
-macro(add_pot outfiles header pot)
-  # Make relative filenames for all source files
-  set(add_pot_sources)
-  foreach(_filename ${ARGN})
-    get_filename_component(_absolute_filename ${_filename} ABSOLUTE)
-    file(RELATIVE_PATH _relative_filename ${CMAKE_CURRENT_SOURCE_DIR} ${_absolute_filename})
-    list(APPEND add_pot_sources ${_relative_filename})
-  endforeach(_filename)
-
-  # Generate the .pot
-  add_custom_command(
-    OUTPUT ${pot}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND xgettext ${XGETTEXT_OPTIONS} -s -C --omit-header --output="${CMAKE_CURRENT_BINARY_DIR}/pot.temp" ${add_pot_sources}
-    COMMAND cat ${header} ${CMAKE_CURRENT_BINARY_DIR}/pot.temp > ${pot}
-    DEPENDS ${add_pot_sources} ${header}
-  )
-
-  list(APPEND ${outfiles} ${pot})
-endmacro(add_pot)
-
-# Syntax is:
-#   add_po(sources_var po_prefix LANGUAGES language1 language2 ... DIRECTORY dir)
-
-macro(add_po outfiles po_prefix)
-  parse_arguments(ADD_PO
-    "LANGUAGES;DIRECTORY"
-    ""
-    ${ARGN}
-  )
-
-  foreach (_lang ${ADD_PO_LANGUAGES})
-    set(_po_filename "${_lang}.po")
-    set(_po_filepath "${CMAKE_CURRENT_SOURCE_DIR}/${ADD_PO_DIRECTORY}/${_po_filename}")
-    set(_qm_filename "strawberry_${_lang}.qm")
-    set(_qm_filepath "${CMAKE_CURRENT_BINARY_DIR}/${ADD_PO_DIRECTORY}/${_qm_filename}")
-
-    # Convert the .po files to .qm files
-    add_custom_command(
-      OUTPUT ${_qm_filepath}
-      COMMAND ${QT_LCONVERT_EXECUTABLE} ARGS ${_po_filepath} -o ${_qm_filepath} -of qm -target-language ${_lang}
-      DEPENDS ${_po_filepath} ${_po_filepath}
-    )
-
-    list(APPEND ${outfiles} ${_qm_filepath})
-    list(APPEND INSTALL_TRANSLATIONS_FILES ${_qm_filepath})
-  endforeach (_lang)
-
-  # Generate a qrc file for the translations
-  if(NOT INSTALL_TRANSLATIONS)
-    set(_qrc ${CMAKE_CURRENT_BINARY_DIR}/${ADD_PO_DIRECTORY}/translations.qrc)
-    file(WRITE ${_qrc} "<RCC><qresource prefix=\"/${ADD_PO_DIRECTORY}\">")
-    foreach(_lang ${ADD_PO_LANGUAGES})
-      file(APPEND ${_qrc} "<file>${po_prefix}${_lang}.qm</file>")
-    endforeach(_lang)
-    file(APPEND ${_qrc} "</qresource></RCC>")
-    qt_add_resources(${outfiles} ${_qrc})
-  endif()
-endmacro(add_po)

cmake/Version.cmake

@@ -1,7 +1,7 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
-set(STRAWBERRY_VERSION_MINOR 1)
-set(STRAWBERRY_VERSION_PATCH 0)
-set(STRAWBERRY_VERSION_PRERELEASE rc3)
+set(STRAWBERRY_VERSION_MINOR 2)
+set(STRAWBERRY_VERSION_PATCH 3)
+#set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)
 

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /src/translations/strawberry_en_US.ts
+    translation: /src/translations/strawberry_%locale_with_underscore%.ts

data/data.qrc

@@ -45,5 +45,6 @@
         <file>mood/sample.mood</file>
         <file>text/ghosts.txt</file>
         <file>pictures/sidebar-background.png</file>
+        <file>style/dynamicplaylistcontrols.css</file>
     </qresource>
 </RCC>

data/style/dynamicplaylistcontrols.css

@@ -0,0 +1,13 @@
+#container {
+  background: %background;
+  border-radius: 10px;
+  border: 1px solid rgba(200, 200, 200, 75%);
+}
+
+#label1 {
+  font-weight: bold;
+}
+
+#label2 {
+  font-size: 7.5pt;
+}

debian/CMakeLists.txt

@@ -4,19 +4,7 @@ if(LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
   execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -cs" OUTPUT_VARIABLE DEB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   if(DEB_CODENAME AND DEB_DATE)
-
-    if(QT_VERSION_MAJOR EQUAL 5)
-      set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qtbase5-dev,qtbase5-dev-tools,qttools5-dev,qttools5-dev-tools,libqt5x11extras5-dev)
-      set(DEBIAN_DEPENDS_QT_PACKAGES libqt5sql5-sqlite)
-    endif()
-    if(QT_VERSION_MAJOR EQUAL 6)
-      set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qt6-base-dev,qt6-base-dev-tools,qt6-tools-dev,qt6-tools-dev-tools,qt6-l10n-tools)
-      set(DEBIAN_DEPENDS_QT_PACKAGES libqt6sql6-sqlite,qt6-qpa-plugins)
-    endif()
-
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.in ${CMAKE_CURRENT_SOURCE_DIR}/control @ONLY)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in ${CMAKE_CURRENT_SOURCE_DIR}/changelog)
-  
   endif()
 
 endif()

debian/control

@@ -8,17 +8,18 @@ Build-Depends: debhelper (>= 11),
                cmake,
                gcc,
                g++,
-               protobuf-compiler,
                libglib2.0-dev,
-               libdbus-1-dev,
-               libprotobuf-dev,
                libboost-dev,
                libsqlite3-dev,
                libasound2-dev,
                libpulse-dev,
                libtag1-dev,
                libicu-dev,
-               @DEBIAN_BUILD_DEPENDS_QT_PACKAGES@,
+               qt6-base-dev,
+               qt6-base-dev-tools,
+               qt6-tools-dev,
+               qt6-tools-dev-tools,
+               qt6-l10n-tools,
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
                libcdio-dev,
@@ -33,7 +34,8 @@ Package: strawberry
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         @DEBIAN_DEPENDS_QT_PACKAGES@,
+         libqt6sql6-sqlite,
+         qt6-qpa-plugins,
          gstreamer1.0-plugins-base,
          gstreamer1.0-plugins-good,
          gstreamer1.0-alsa,

debian/copyright

@@ -5,14 +5,12 @@ Source: https://github.com/strawberrymusicplayer/strawberry
 
 Files: *
 Copyright: 2010-2015, David Sansome <me@davidsansome.com>
-           2012-2014, 2017-2023 Jonas Kvinge <jonas@jkvinge.net>
+           2012-2014, 2017-2024 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/utilities/timeconstants.h
-       ext/libstrawberry-common/core/logging.cpp
-       ext/libstrawberry-common/core/logging.h
-       ext/libstrawberry-common/core/messagehandler.cpp
-       ext/libstrawberry-common/core/messagehandler.h
+       src/core/logging.cpp
+       src/core/logging.h
 Copyright: 2011, 2012, David Sansome <me@davidsansome.com>
            2018-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: Apache-2.0
@@ -31,18 +29,20 @@ Files: src/core/main.h
        src/engine/alsapcmdevicefinder.h
        src/engine/mmdevicefinder.cpp
        src/engine/mmdevicefinder.h
+       src/engine/uwpdevicefinder.cpp
+       src/engine/uwpdevicefinder.h
        src/engine/devicefinder.cpp
        src/engine/devicefinder.h
        src/engine/enginedevice.cpp
        src/engine/enginedevice.h
        src/engine/enginemetadata.cpp
        src/engine/enginemetadata.h
-       src/internet/internetservice.cpp
-       src/internet/internetservice.h
-       src/internet/internettabsview.cpp
-       src/internet/internettabsview.h
-       src/internet/internetsongsview.cpp
-       src/internet/internetsongsview.h
+       src/streaming/streamingservice.cpp
+       src/streaming/streamingservice.h
+       src/streaming/streamingtabsview.cpp
+       src/streaming/streamingtabsview.h
+       src/streaming/streamingsongsview.cpp
+       src/streaming/streamingsongsview.h
        src/settings/backendsettingspage.cpp
        src/settings/backendsettingspage.h
        src/settings/coverssettingspage.cpp
@@ -55,6 +55,8 @@ Files: src/core/main.h
        src/settings/subsonicsettingspage.h
        src/settings/tidalsettingspage.cpp
        src/settings/tidalsettingspage.h
+       src/settings/spotifysettingspage.cpp
+       src/settings/spotifysettingspage.h
        src/covermanager/jsoncoverprovider.cpp
        src/covermanager/jsoncoverprovider.h
        src/covermanager/lastfmcoverprovider.cpp
@@ -65,16 +67,16 @@ Files: src/core/main.h
        src/covermanager/deezercoverprovider.h
        src/covermanager/tidalcoverprovider.cpp
        src/covermanager/tidalcoverprovider.h
+       src/covermanager/opentidalcoverprovider.cpp
+       src/covermanager/opentidalcoverprovider.h
        src/covermanager/qobuzcoverprovider.cpp
        src/covermanager/qobuzcoverprovider.h
        src/covermanager/spotifycoverprovider.cpp
        src/covermanager/spotifycoverprovider.h
        src/covermanager/musixmatchcoverprovider.cpp
        src/covermanager/musixmatchcoverprovider.h
-       src/globalshortcuts/globalshortcutsbackend-kde.cpp
-       src/globalshortcuts/globalshortcutsbackend-kde.h
-       src/globalshortcuts/globalshortcutsbackend-mate.cpp
-       src/globalshortcuts/globalshortcutsbackend-mate.h
+       src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp
+       src/globalshortcuts/globalshortcutsbackend-kglobalaccel.h
        src/globalshortcuts/globalshortcutsbackend-x11.cpp
        src/globalshortcuts/globalshortcutsbackend-x11.h
        src/globalshortcuts/globalshortcutsbackend-win.cpp
@@ -91,14 +93,14 @@ Files: src/core/main.h
        src/tidal/*
        src/qobuz/*
        src/radios/*
+       src/spotify/*
        src/transcoder/transcoderoptionswavpack.cpp
        src/transcoder/transcoderoptionswavpack.h
-       ext/libstrawberry-tagreader/tagreadertagparser.cpp
-       ext/libstrawberry-tagreader/tagreadertagparser.h
-       ext/macdeploycheck/*
        src/widgets/resizabletextedit.cpp
        src/widgets/resizabletextedit.h
-Copyright: 2012-2014, 2017-2023, Jonas Kvinge <jonas@jkvinge.net>
+       src/widgets/fancytabdata.cpp
+       src/widgets/fancytabdata.h
+Copyright: 2012-2014, 2017-2024, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/engine/enginebase.cpp
@@ -119,6 +121,8 @@ License: GPL-2+
 
 Files: src/widgets/fancytabwidget.cpp
        src/widgets/fancytabwidget.h
+       src/widgets/fancytabbar.cpp
+       src/widgets/fancytabbar.h
 Copyright: 2018, Vikram Ambrose <ambroseworks@gmail.com>
            2018, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
@@ -208,8 +212,8 @@ Files: src/device/udisks2lister.cpp
 Copyright: 2016, Valeriy Malov <jazzvoid@gmail.com>
 License: GPL-3+
 
-Files: src/internet/localredirectserver.cpp
-       src/internet/localredirectserver.h
+Files: src/core/localredirectserver.cpp
+       src/core/localredirectserver.h
 Copyright: 2012, 2014, John Maguire <john.maguire@gmail.com>
            2014, Krzysztof Sobiecki <sobkas@gmail.com>
            2018-2021, Jonas Kvinge <jonas@jkvinge.net>
@@ -248,25 +252,24 @@ Files: src/core/stylehelper.cpp
 Copyright: 2016 The Qt Company Ltd.
 License: GPL-3+
 
-Files: ext/gstmoodbar/gstfastspectrum.cpp
-       ext/gstmoodbar/gstfastspectrum.h
+Files: 3rdparty/gstfastspectrum/gstfastspectrum.cpp
+       3rdparty/gstfastspectrum/gstfastspectrum.h
 Copyright: 1999 Erik Walthinsen <omega@cse.ogi.edu>
            2006,2011 Stefan Kost <ensonic@users.sf.net>
            2007-2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+           2018-2024 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-2+
 
-Files: src/widgets/qsearchfield_nonmac.cpp
+Files: src/widgets/qsearchfield_qt.cpp
        src/widgets/qsearchfield_mac.mm
        src/widgets/qsearchfield.h
        src/widgets/qocoa_mac.h
+       src/widgets/searchfield_qt_private.cpp
+       src/widgets/searchfield_qt_private.h
 Copyright: 2011, Mike McQuaid <mike@mikemcquaid.com>
+           2018-2024, Jonas Kvinge <jonas@jkvinge.net>
 License: Expat
 
-Files: 3rdparty/SPMediaKeyTap/*
-Copyright: 2010, Spotify AB
-           2011, Joachim Bengtsson
-License: BSD-3-clause
-
 Files: 3rdparty/kdsingleapplication/*
 Copyright: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 License: MIT

dist/CMakeLists.txt

@@ -13,7 +13,8 @@ if(APPLE)
 endif(APPLE)
 
 if(WIN32)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/windres.rc.in ${CMAKE_BINARY_DIR}/windres.rc)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_BINARY_DIR}/strawberry.nsi @ONLY)
 endif(WIN32)
 
 if(UNIX AND NOT APPLE)
@@ -22,7 +23,7 @@ if(UNIX AND NOT APPLE)
   install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
   install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
   install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
-  install(FILES unix/strawberry.1 unix/strawberry-tagreader.1 DESTINATION share/man/man1)
+  install(FILES unix/strawberry.1 DESTINATION share/man/man1)
 endif(UNIX AND NOT APPLE)
 
 if(APPLE)

dist/macos/macgstcopy.sh

@@ -111,6 +111,7 @@ libgstrtsp
 libgstsoup
 libgstspectrum
 libgstspeex
+libgstspotify
 libgsttaglib
 libgsttcp
 libgsttwolame

dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml

@@ -6,17 +6,19 @@
   <project_license>GPL-3.0+</project_license>
   <provides>
     <binary>strawberry</binary>
-    <binary>strawberry-tagreader</binary>
   </provides>
   <name>Strawberry Music Player</name>
   <summary>A music player and collection organizer</summary>
   <url type="homepage">https://www.strawberrymusicplayer.org/</url>
   <url type="bugtracker">https://github.com/strawberrymusicplayer/strawberry/</url>
+  <developer id="net.jkvinge.jonas">
+    <name>Jonas Kvinge</name>
+  </developer>
   ​<translation type="qt">strawberry</translation>
   <content_rating type="oars-1.1" />
   <description>
     <p>
-      Strawberry is a music player and music collection organizer. It is aimed at music collectors and audiophiles. With Strawberry you can play and manage your digital music collection, or stream your favorite radios. It also has unofficial streaming support for Tidal and Qobuz. Strawberry is free software released under GPL. The source code is available on GitHub. It's written in C++ using the Qt toolkit and GStreamer. Strawberry is compatible with both Qt version 5 and 6.
+      Strawberry is a music player and music collection organizer. It is aimed at music collectors and audiophiles. Strawberry is free software released under GPL. It's written in C++ using the Qt framework and GStreamer.
     </p>
     <p>Features:</p>
     <ul>
@@ -30,12 +32,11 @@
       <li>Automatically retrieve tags from MusicBrainz</li>
       <li>Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify</li>
       <li>Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net</li>
-      <li>Support for multiple backends</li>
       <li>Audio analyzer and equalizer</li>
       <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
       <li>Scrobbler with support for Last.fm, Libre.fm and ListenBrainz</li>
       <li>Streaming support for Subsonic-compatible servers</li>
-      <li>Unofficial streaming support for Tidal and Qobuz</li>
+      <li>Unofficial streaming support for Tidal, Spotify and Qobuz</li>
     </ul>
   </description>
   <screenshots>
@@ -50,6 +51,13 @@
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
     <releases>
+        <release version="1.2.3" date="2024-12-08"/>
+        <release version="1.2.2" date="2024-11-23"/>
+        <release version="1.2.1" date="2024-11-21"/>
+        <release version="1.1.3" date="2024-09-21"/>
+        <release version="1.1.2" date="2024-09-12"/>
+        <release version="1.1.1" date="2024-07-22"/>
+        <release version="1.1.0" date="2024-07-14"/>
         <release version="1.0.23" date="2024-01-11"/>
         <release version="1.0.22" date="2023-12-09"/>
         <release version="1.0.21" date="2023-10-21"/>

dist/unix/strawberry-tagreader.1

@@ -1,10 +0,0 @@
-.TH STRAWBERRY-TAGREADER "1"
-.SH NAME
-strawberry-tagreader \- internal tag reader for strawberry
-.SH SYNOPSIS
-.B strawberry-tagreader
-.SH DESCRIPTION
-This program is used internally by Strawberry to parse tags in music files without exposing the whole application to crashes caused by malformed files.  It is not meant to be run on its own.
-.SH "AUTHORS"
-.PP
-Strawberry main developer is Jonas Kvinge <jonas@jkvinge.net>.

dist/unix/strawberry.spec.in

@@ -21,7 +21,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  make
 BuildRequires:  git
-BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
@@ -38,9 +37,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
-BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sqlite3) >= 3.9
 BuildRequires:  pkgconfig(taglib)
 BuildRequires:  pkgconfig(fftw3)
@@ -55,9 +52,6 @@ BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Gui)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Widgets)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Test)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@LinguistTools)
-%if "@QT_VERSION_MAJOR@" == "5"
-BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@X11Extras)
-%endif
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(gstreamer-audio-1.0)
@@ -69,18 +63,10 @@ BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libebur128)
 BuildRequires:  pkgconfig(libgpod-1.0)
 BuildRequires:  pkgconfig(libmtp)
-%if 0%{?suse_version} || 0%{?fedora_version}
-BuildRequires:  pkgconfig(libvlc)
-%endif
 
 %if 0%{?suse_version}
-  %if "@QT_VERSION_MAJOR@" == "6"
 Requires:  qt6-sql-sqlite
 Requires:  qt6-network-tls
-  %endif
-  %if "@QT_VERSION_MAJOR@" == "5"
-Requires:  libQt5Sql5-sqlite
-  %endif
 %endif
 
 %description
@@ -151,11 +137,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicpl
 %doc README.md Changelog
 %license COPYING
 %{_bindir}/strawberry
-%{_bindir}/strawberry-tagreader
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/strawberry.*
 %{_mandir}/man1/%{name}.1.*
-%{_mandir}/man1/%{name}-tagreader.1.*
 %if 0%{?suse_version}
 %{_datadir}/metainfo/*.appdata.xml
 %else

dist/windows/strawberry.nsi.in

@@ -236,7 +236,6 @@ Section "Strawberry" Strawberry
   ; Common executables
 
   File "strawberry.exe"
-  File "strawberry-tagreader.exe"
   File "strawberry.ico"
   File "sqlite3.exe"
   File "gst-launch-1.0.exe"
@@ -261,6 +260,7 @@ Section "Strawberry" Strawberry
   File "libFLAC-12.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
+  File "libbrotlienc.dll"
   File "libbs2b-0.dll"
   File "libbz2.dll"
   File "libchromaprint.dll"
@@ -272,6 +272,7 @@ Section "Strawberry" Strawberry
   File "libffi-8.dll"
   File "libfreetype-6.dll"
   File "libgcrypt-20.dll"
+  File "libgetopt.dll"
   File "libgio-2.0-0.dll"
   File "libglib-2.0-0.dll"
   File "libgme.dll"
@@ -336,48 +337,6 @@ Section "Strawberry" Strawberry
   File "libzstd.dll"
   File "zlib1.dll"
 
-  File "libabsl_base.dll"
-  File "libabsl_city.dll"
-  File "libabsl_cord.dll"
-  File "libabsl_cord_internal.dll"
-  File "libabsl_cordz_handle.dll"
-  File "libabsl_cordz_info.dll"
-  File "libabsl_crc32c.dll"
-  File "libabsl_crc_cord_state.dll"
-  File "libabsl_crc_internal.dll"
-  File "libabsl_die_if_null.dll"
-  File "libabsl_examine_stack.dll"
-  File "libabsl_hash.dll"
-  File "libabsl_int128.dll"
-  File "libabsl_kernel_timeout_internal.dll"
-  File "libabsl_log_globals.dll"
-  File "libabsl_log_internal_check_op.dll"
-  File "libabsl_log_internal_conditions.dll"
-  File "libabsl_log_internal_format.dll"
-  File "libabsl_log_internal_globals.dll"
-  File "libabsl_log_internal_log_sink_set.dll"
-  File "libabsl_log_internal_message.dll"
-  File "libabsl_log_internal_nullguard.dll"
-  File "libabsl_log_internal_proto.dll"
-  File "libabsl_log_sink.dll"
-  File "libabsl_low_level_hash.dll"
-  File "libabsl_malloc_internal.dll"
-  File "libabsl_raw_hash_set.dll"
-  File "libabsl_raw_logging_internal.dll"
-  File "libabsl_spinlock_wait.dll"
-  File "libabsl_stacktrace.dll"
-  File "libabsl_status.dll"
-  File "libabsl_statusor.dll"
-  File "libabsl_strerror.dll"
-  File "libabsl_str_format_internal.dll"
-  File "libabsl_strings.dll"
-  File "libabsl_strings_internal.dll"
-  File "libabsl_symbolize.dll"
-  File "libabsl_synchronization.dll"
-  File "libabsl_throw_delegate.dll"
-  File "libabsl_time.dll"
-  File "libabsl_time_zone.dll"
-
 !ifdef debug
   File "gdb.exe"
   File "libexpat-1.dll"
@@ -387,7 +346,6 @@ Section "Strawberry" Strawberry
   File "libpcre2-16d.dll"
   File "libreadline8.dll"
   File "libtermcap.dll"
-  File "libabsl_graphcycles_internal.dll"
 !else
   File "libpcre2-8.dll"
   File "libpcre2-16.dll"
@@ -416,10 +374,12 @@ Section "Strawberry" Strawberry
   File "faad-2.dll"
   File "fdk-aac.dll"
   File "ffi-7.dll"
+  File "getopt.dll"
   File "gio-2.0-0.dll"
   File "glib-2.0-0.dll"
   File "gme.dll"
   File "gmodule-2.0-0.dll"
+  File "gnutls.dll"
   File "gobject-2.0-0.dll"
   File "gstadaptivedemux-1.0-0.dll"
   File "gstapp-1.0-0.dll"
@@ -464,7 +424,6 @@ Section "Strawberry" Strawberry
   File "vorbis.dll"
   File "vorbisfile.dll"
   File "wavpackdll.dll"
-  File "abseil_dll.dll"
 
 !ifdef release
   File "freetype.dll"
@@ -497,16 +456,11 @@ Section "Strawberry" Strawberry
 
   ; Common files
 
-  File "icudt75.dll"
+  File "icudt76.dll"
   File "libfftw3-3.dll"
-!ifdef debug
-  File "libprotobufd.dll"
-!else
-  File "libprotobuf.dll"
-!endif
 !ifdef msvc && debug
-  File "icuin75d.dll"
-  File "icuuc75d.dll"
+  File "icuin76d.dll"
+  File "icuuc76d.dll"
   File "libxml2d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
@@ -515,8 +469,8 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
-  File "icuin75.dll"
-  File "icuuc75.dll"
+  File "icuin76.dll"
+  File "icuuc76.dll"
   File "libxml2.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
@@ -526,13 +480,13 @@ Section "Strawberry" Strawberry
   File "Qt6Widgets.dll"
 !endif
 
-  File "avcodec-60.dll"
-  File "avfilter-9.dll"
-  File "avformat-60.dll"
-  File "avutil-58.dll"
-  File "postproc-57.dll"
-  File "swresample-4.dll"
-  File "swscale-7.dll"
+  File "avcodec-61.dll"
+  File "avfilter-10.dll"
+  File "avformat-61.dll"
+  File "avutil-59.dll"
+  File "postproc-58.dll"
+  File "swresample-5.dll"
+  File "swscale-8.dll"
 
   ; Register Strawberry with Default Programs
   Var /GLOBAL AppIcon
@@ -805,7 +759,6 @@ Section "Uninstall"
   ; Delete all the files
 
   Delete "$INSTDIR\strawberry.exe"
-  Delete "$INSTDIR\strawberry-tagreader.exe"
   Delete "$INSTDIR\strawberry.ico"
   Delete "$INSTDIR\sqlite3.exe"
   Delete "$INSTDIR\gst-launch-1.0.exe"
@@ -831,6 +784,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libFLAC-12.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
+  Delete "$INSTDIR\libbrotlienc.dll"
   Delete "$INSTDIR\libbs2b-0.dll"
   Delete "$INSTDIR\libbz2.dll"
   Delete "$INSTDIR\libchromaprint.dll"
@@ -842,6 +796,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libffi-8.dll"
   Delete "$INSTDIR\libfreetype-6.dll"
   Delete "$INSTDIR\libgcrypt-20.dll"
+  Delete "$INSTDIR\libgetopt.dll"
   Delete "$INSTDIR\libgio-2.0-0.dll"
   Delete "$INSTDIR\libglib-2.0-0.dll"
   Delete "$INSTDIR\libgme.dll"
@@ -906,48 +861,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libzstd.dll"
   Delete "$INSTDIR\zlib1.dll"
 
-  Delete "$INSTDIR\libabsl_base.dll"
-  Delete "$INSTDIR\libabsl_city.dll"
-  Delete "$INSTDIR\libabsl_cord.dll"
-  Delete "$INSTDIR\libabsl_cord_internal.dll"
-  Delete "$INSTDIR\libabsl_cordz_handle.dll"
-  Delete "$INSTDIR\libabsl_cordz_info.dll"
-  Delete "$INSTDIR\libabsl_crc32c.dll"
-  Delete "$INSTDIR\libabsl_crc_cord_state.dll"
-  Delete "$INSTDIR\libabsl_crc_internal.dll"
-  Delete "$INSTDIR\libabsl_die_if_null.dll"
-  Delete "$INSTDIR\libabsl_examine_stack.dll"
-  Delete "$INSTDIR\libabsl_hash.dll"
-  Delete "$INSTDIR\libabsl_int128.dll"
-  Delete "$INSTDIR\libabsl_kernel_timeout_internal.dll"
-  Delete "$INSTDIR\libabsl_log_globals.dll"
-  Delete "$INSTDIR\libabsl_log_internal_check_op.dll"
-  Delete "$INSTDIR\libabsl_log_internal_conditions.dll"
-  Delete "$INSTDIR\libabsl_log_internal_format.dll"
-  Delete "$INSTDIR\libabsl_log_internal_globals.dll"
-  Delete "$INSTDIR\libabsl_log_internal_log_sink_set.dll"
-  Delete "$INSTDIR\libabsl_log_internal_message.dll"
-  Delete "$INSTDIR\libabsl_log_internal_nullguard.dll"
-  Delete "$INSTDIR\libabsl_log_internal_proto.dll"
-  Delete "$INSTDIR\libabsl_log_sink.dll"
-  Delete "$INSTDIR\libabsl_low_level_hash.dll"
-  Delete "$INSTDIR\libabsl_malloc_internal.dll"
-  Delete "$INSTDIR\libabsl_raw_hash_set.dll"
-  Delete "$INSTDIR\libabsl_raw_logging_internal.dll"
-  Delete "$INSTDIR\libabsl_spinlock_wait.dll"
-  Delete "$INSTDIR\libabsl_stacktrace.dll"
-  Delete "$INSTDIR\libabsl_status.dll"
-  Delete "$INSTDIR\libabsl_statusor.dll"
-  Delete "$INSTDIR\libabsl_strerror.dll"
-  Delete "$INSTDIR\libabsl_str_format_internal.dll"
-  Delete "$INSTDIR\libabsl_strings.dll"
-  Delete "$INSTDIR\libabsl_strings_internal.dll"
-  Delete "$INSTDIR\libabsl_symbolize.dll"
-  Delete "$INSTDIR\libabsl_synchronization.dll"
-  Delete "$INSTDIR\libabsl_throw_delegate.dll"
-  Delete "$INSTDIR\libabsl_time.dll"
-  Delete "$INSTDIR\libabsl_time_zone.dll"
-
 !ifdef debug
   Delete "$INSTDIR\gdb.exe"
   Delete "$INSTDIR\libexpat-1.dll"
@@ -957,7 +870,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libpcre2-16d.dll"
   Delete "$INSTDIR\libreadline8.dll"
   Delete "$INSTDIR\libtermcap.dll"
-  Delete "$INSTDIR\libabsl_graphcycles_internal.dll"
 !else
   Delete "$INSTDIR\libpcre2-8.dll"
   Delete "$INSTDIR\libpcre2-16.dll"
@@ -986,10 +898,12 @@ Section "Uninstall"
   Delete "$INSTDIR\faad-2.dll"
   Delete "$INSTDIR\fdk-aac.dll"
   Delete "$INSTDIR\ffi-7.dll"
+  Delete "$INSTDIR\getopt.dll"
   Delete "$INSTDIR\gio-2.0-0.dll"
   Delete "$INSTDIR\glib-2.0-0.dll"
   Delete "$INSTDIR\gme.dll"
   Delete "$INSTDIR\gmodule-2.0-0.dll"
+  Delete "$INSTDIR\gnutls.dll"
   Delete "$INSTDIR\gobject-2.0-0.dll"
   Delete "$INSTDIR\gstadaptivedemux-1.0-0.dll"
   Delete "$INSTDIR\gstapp-1.0-0.dll"
@@ -1034,7 +948,6 @@ Section "Uninstall"
   Delete "$INSTDIR\vorbis.dll"
   Delete "$INSTDIR\vorbisfile.dll"
   Delete "$INSTDIR\wavpackdll.dll"
-  Delete "$INSTDIR\abseil_dll.dll"
 
 !ifdef release
   Delete "$INSTDIR\freetype.dll"
@@ -1066,16 +979,11 @@ Section "Uninstall"
 
   ; Common files
 
-  Delete "$INSTDIR\icudt75.dll"
+  Delete "$INSTDIR\icudt76.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
-!ifdef debug
-  Delete "$INSTDIR\libprotobufd.dll"
-!else
-  Delete "$INSTDIR\libprotobuf.dll"
-!endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin75d.dll"
-  Delete "$INSTDIR\icuuc75d.dll"
+  Delete "$INSTDIR\icuin76d.dll"
+  Delete "$INSTDIR\icuuc76d.dll"
   Delete "$INSTDIR\libxml2d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
@@ -1084,8 +992,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin75.dll"
-  Delete "$INSTDIR\icuuc75.dll"
+  Delete "$INSTDIR\icuin76.dll"
+  Delete "$INSTDIR\icuuc76.dll"
   Delete "$INSTDIR\libxml2.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
@@ -1095,13 +1003,13 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Widgets.dll"
 !endif
 
-  Delete "$INSTDIR\avcodec-60.dll"
-  Delete "$INSTDIR\avfilter-9.dll"
-  Delete "$INSTDIR\avformat-60.dll"
-  Delete "$INSTDIR\avutil-58.dll"
-  Delete "$INSTDIR\postproc-57.dll"
-  Delete "$INSTDIR\swresample-4.dll"
-  Delete "$INSTDIR\swscale-7.dll"
+  Delete "$INSTDIR\avcodec-61.dll"
+  Delete "$INSTDIR\avfilter-10.dll"
+  Delete "$INSTDIR\avformat-61.dll"
+  Delete "$INSTDIR\avutil-59.dll"
+  Delete "$INSTDIR\postproc-58.dll"
+  Delete "$INSTDIR\swresample-5.dll"
+  Delete "$INSTDIR\swscale-8.dll"
 
 !ifdef mingw
   Delete "$INSTDIR\gio-modules\libgiognutls.dll"

dist/windows/windres.rc.in

@@ -1,4 +1,4 @@
-strawberry ICON "${CMAKE_CURRENT_SOURCE_DIR}/../dist/windows/strawberry.ico"
+strawberry ICON "${CMAKE_SOURCE_DIR}/dist/windows/strawberry.ico"
 1 VERSIONINFO
 FILEVERSION     ${STRAWBERRY_VERSION_MAJOR},${STRAWBERRY_VERSION_MINOR},${STRAWBERRY_VERSION_PATCH}
 PRODUCTVERSION  ${STRAWBERRY_VERSION_MAJOR},${STRAWBERRY_VERSION_MINOR},${STRAWBERRY_VERSION_PATCH}

ext/gstmoodbar/CMakeLists.txt

@@ -1,35 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-set(SOURCES gstfastspectrum.cpp gstmoodbarplugin.cpp)
-
-link_directories(
-  ${GLIB_LIBRARY_DIRS}
-  ${GOBJECT_LIBRARY_DIRS}
-  ${GSTREAMER_LIBRARY_DIRS}
-  ${GSTREAMER_BASE_LIBRARY_DIRS}
-  ${GSTREAMER_AUDIO_LIBRARY_DIRS}
-  ${FFTW3_LIBRARY_DIRS}
-)
-
-add_library(gstmoodbar STATIC ${SOURCES})
-
-target_include_directories(gstmoodbar SYSTEM PRIVATE
-  ${GLIB_INCLUDE_DIRS}
-  ${GOBJECT_INCLUDE_DIRS}
-  ${GSTREAMER_INCLUDE_DIRS}
-  ${GSTREAMER_BASE_INCLUDE_DIRS}
-  ${GSTREAMER_AUDIO_INCLUDE_DIRS}
-  ${FFTW3_INCLUDE_DIR}
-)
-
-target_include_directories(gstmoodbar PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(gstmoodbar PRIVATE
-  ${GLIB_LIBRARIES}
-  ${GOBJECT_LIBRARIES}
-  ${GSTREAMER_LIBRARIES}
-  ${GSTREAMER_BASE_LIBRARIES}
-  ${GSTREAMER_AUDIO_LIBRARIES}
-  ${FFTW3_FFTW_LIBRARY}
-  Qt${QT_VERSION_MAJOR}::Core
-)

ext/gstmoodbar/gstfastspectrum.cpp

@@ -1,520 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *               <2006,2011> Stefan Kost <ensonic@users.sf.net>
- *               <2007-2009> Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <QtGlobal>
-
-#include <cstring>
-#include <cmath>
-
-#include <glib.h>
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiofilter.h>
-
-#include <QMutex>
-
-#include "gstfastspectrum.h"
-
-GST_DEBUG_CATEGORY_STATIC(gst_fastspectrum_debug);
-
-namespace {
-
-// Spectrum properties
-constexpr auto DEFAULT_INTERVAL = (GST_SECOND / 10);
-constexpr auto DEFAULT_BANDS = 128;
-
-enum {
-  PROP_0,
-  PROP_INTERVAL,
-  PROP_BANDS
-};
-
-}  // namespace
-
-#define gst_fastspectrum_parent_class parent_class
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-G_DEFINE_TYPE(GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-static void gst_fastspectrum_finalize(GObject *object);
-static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void gst_fastspectrum_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static gboolean gst_fastspectrum_start(GstBaseTransform *trans);
-static gboolean gst_fastspectrum_stop(GstBaseTransform *trans);
-static GstFlowReturn gst_fastspectrum_transform_ip(GstBaseTransform *trans, GstBuffer *buffer);
-static gboolean gst_fastspectrum_setup(GstAudioFilter *base, const GstAudioInfo *info);
-
-static void gst_fastspectrum_class_init(GstFastSpectrumClass *klass) {
-
-  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
-  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS(klass);
-  GstAudioFilterClass *filter_class = GST_AUDIO_FILTER_CLASS(klass);
-  GstCaps *caps = nullptr;
-
-  gobject_class->set_property = gst_fastspectrum_set_property;
-  gobject_class->get_property = gst_fastspectrum_get_property;
-  gobject_class->finalize = gst_fastspectrum_finalize;
-
-  trans_class->start = GST_DEBUG_FUNCPTR(gst_fastspectrum_start);
-  trans_class->stop = GST_DEBUG_FUNCPTR(gst_fastspectrum_stop);
-  trans_class->transform_ip = GST_DEBUG_FUNCPTR(gst_fastspectrum_transform_ip);
-  trans_class->passthrough_on_same_caps = TRUE;
-
-  filter_class->setup = GST_DEBUG_FUNCPTR(gst_fastspectrum_setup);
-
-  g_object_class_install_property(gobject_class, PROP_INTERVAL, g_param_spec_uint64("interval", "Interval", "Interval of time between message posts (in nanoseconds)", 1, G_MAXUINT64, DEFAULT_INTERVAL, static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  g_object_class_install_property(gobject_class, PROP_BANDS, g_param_spec_uint("bands", "Bands", "Number of frequency bands", 0, G_MAXUINT, DEFAULT_BANDS, static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  GST_DEBUG_CATEGORY_INIT(gst_fastspectrum_debug, "spectrum", 0, "audio spectrum analyser element");
-
-  gst_element_class_set_static_metadata(element_class, "Spectrum analyzer",
-    "Filter/Analyzer/Audio",
-    "Run an FFT on the audio signal, output spectrum data",
-    "Erik Walthinsen <omega@cse.ogi.edu>, "
-    "Stefan Kost <ensonic@users.sf.net>, "
-    "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  caps = gst_caps_from_string(GST_AUDIO_CAPS_MAKE("{ S16LE, S24LE, S32LE, F32LE, F64LE }") ", layout = (string) interleaved, channels = 1");
-#else
-  caps = gst_caps_from_string(GST_AUDIO_CAPS_MAKE("{ S16BE, S24BE, S32BE, F32BE, F64BE }") ", layout = (string) interleaved, channels = 1");
-#endif
-
-  gst_audio_filter_class_add_pad_templates(filter_class, caps);
-  gst_caps_unref(caps);
-
-  klass->fftw_lock = new QMutex;
-}
-
-static void gst_fastspectrum_init(GstFastSpectrum *spectrum) {
-
-  spectrum->interval = DEFAULT_INTERVAL;
-  spectrum->bands = DEFAULT_BANDS;
-
-  spectrum->channel_data_initialized = false;
-
-  g_mutex_init(&spectrum->lock);
-
-}
-
-static void gst_fastspectrum_alloc_channel_data(GstFastSpectrum *spectrum) {
-
-  guint bands = spectrum->bands;
-  guint nfft = 2 * bands - 2;
-
-  spectrum->input_ring_buffer = new double[nfft];
-  spectrum->fft_input = reinterpret_cast<double*>(fftw_malloc(sizeof(double) * nfft));
-  spectrum->fft_output = reinterpret_cast<fftw_complex*>(fftw_malloc(sizeof(fftw_complex) * (nfft / 2 + 1)));
-
-  spectrum->spect_magnitude = new double[bands] {};
-
-  GstFastSpectrumClass *klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
-  {
-    QMutexLocker l(klass->fftw_lock);
-    spectrum->plan = fftw_plan_dft_r2c_1d(static_cast<int>(nfft), spectrum->fft_input, spectrum->fft_output, FFTW_ESTIMATE);
-  }
-  spectrum->channel_data_initialized = true;
-
-}
-
-static void gst_fastspectrum_free_channel_data(GstFastSpectrum *spectrum) {
-
-  GstFastSpectrumClass *klass = reinterpret_cast<GstFastSpectrumClass*>(G_OBJECT_GET_CLASS(spectrum));
-  if (spectrum->channel_data_initialized) {
-    {
-      QMutexLocker l(klass->fftw_lock);
-      fftw_destroy_plan(spectrum->plan);
-    }
-    fftw_free(spectrum->fft_input);
-    fftw_free(spectrum->fft_output);
-    delete[] spectrum->input_ring_buffer;
-    delete[] spectrum->spect_magnitude;
-
-    spectrum->channel_data_initialized = false;
-  }
-
-}
-
-static void gst_fastspectrum_flush(GstFastSpectrum *spectrum) {
-
-  spectrum->num_frames = 0;
-  spectrum->num_fft = 0;
-
-  spectrum->accumulated_error = 0;
-
-}
-
-static void gst_fastspectrum_reset_state(GstFastSpectrum *spectrum) {
-
-  GST_DEBUG_OBJECT(spectrum, "resetting state");
-
-  gst_fastspectrum_free_channel_data(spectrum);
-  gst_fastspectrum_flush(spectrum);
-
-}
-
-static void gst_fastspectrum_finalize(GObject *object) {
-
-  GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(object);
-
-  gst_fastspectrum_reset_state(spectrum);
-  g_mutex_clear(&spectrum->lock);
-
-  G_OBJECT_CLASS(parent_class)->finalize(object);
-
-}
-
-static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
-
-  GstFastSpectrum *filter = reinterpret_cast<GstFastSpectrum*>(object);
-
-  switch (prop_id) {
-    case PROP_INTERVAL: {
-      guint64 interval = g_value_get_uint64(value);
-      g_mutex_lock(&filter->lock);
-      if (filter->interval != interval) {
-        filter->interval = interval;
-        gst_fastspectrum_reset_state(filter);
-      }
-      g_mutex_unlock(&filter->lock);
-      break;
-    }
-    case PROP_BANDS: {
-      guint bands = g_value_get_uint(value);
-      g_mutex_lock(&filter->lock);
-      if (filter->bands != bands) {
-        filter->bands = bands;
-        gst_fastspectrum_reset_state(filter);
-      }
-      g_mutex_unlock(&filter->lock);
-      break;
-    }
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-      break;
-  }
-
-}
-
-static void gst_fastspectrum_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
-
-  GstFastSpectrum *filter = reinterpret_cast<GstFastSpectrum*>(object);
-
-  switch (prop_id) {
-    case PROP_INTERVAL:
-      g_value_set_uint64(value, filter->interval);
-      break;
-    case PROP_BANDS:
-      g_value_set_uint(value, filter->bands);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-      break;
-  }
-
-}
-
-static gboolean gst_fastspectrum_start(GstBaseTransform *trans) {
-
-  GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
-
-  gst_fastspectrum_reset_state(spectrum);
-
-  return TRUE;
-
-}
-
-static gboolean gst_fastspectrum_stop(GstBaseTransform *trans) {
-
-  GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
-
-  gst_fastspectrum_reset_state(spectrum);
-
-  return TRUE;
-
-}
-
-// Mixing data readers
-
-static void input_data_mixed_float(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
-
-  Q_UNUSED(max_value);
-
-  const gfloat *in = reinterpret_cast<const gfloat*>(_in);
-  guint ip = 0;
-
-  for (guint j = 0; j < len; j++) {
-    out[op] = in[ip++];
-    op = (op + 1) % nfft;
-  }
-
-}
-
-static void input_data_mixed_double(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
-
-  Q_UNUSED(max_value);
-
-  const gdouble *in = reinterpret_cast<const gdouble*>(_in);
-  guint ip = 0;
-
-  for (guint j = 0; j < len; j++) {
-    out[op] = in[ip++];
-    op = (op + 1) % nfft;
-  }
-
-}
-
-static void input_data_mixed_int32_max(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
-
-  const gint32 *in = reinterpret_cast<const gint32*>(_in);
-  guint ip = 0;
-
-  for (guint j = 0; j < len; j++) {
-    out[op] = in[ip++] / max_value;
-    op = (op + 1) % nfft;
-  }
-
-}
-
-static void input_data_mixed_int24_max(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
-
-  for (guint j = 0; j < len; j++) {
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-    guint32 value = GST_READ_UINT24_BE(_in);
-#else
-    guint32 value = GST_READ_UINT24_LE(_in);
-#endif
-    if (value & 0x00800000) {
-      value |= 0xff000000;
-    }
-
-    out[op] = value / max_value;
-    op = (op + 1) % nfft;
-    _in += 3;
-  }
-
-}
-
-static void input_data_mixed_int16_max(const guint8 *_in, double *out, guint len, double max_value, guint op, guint nfft) {
-
-  const gint16 *in = reinterpret_cast<const gint16*>(_in);
-  guint ip = 0;
-
-  for (guint j = 0; j < len; j++) {
-    out[op] = in[ip++] / max_value;
-    op = (op + 1) % nfft;
-  }
-
-}
-
-static gboolean gst_fastspectrum_setup(GstAudioFilter *base, const GstAudioInfo *info) {
-
-  GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(base);
-  GstFastSpectrumInputData input_data = nullptr;
-
-  g_mutex_lock(&spectrum->lock);
-  switch (GST_AUDIO_INFO_FORMAT(info)) {
-    case GST_AUDIO_FORMAT_S16:
-      input_data = input_data_mixed_int16_max;
-      break;
-    case GST_AUDIO_FORMAT_S24:
-      input_data = input_data_mixed_int24_max;
-      break;
-    case GST_AUDIO_FORMAT_S32:
-      input_data = input_data_mixed_int32_max;
-      break;
-    case GST_AUDIO_FORMAT_F32:
-      input_data = input_data_mixed_float;
-      break;
-    case GST_AUDIO_FORMAT_F64:
-      input_data = input_data_mixed_double;
-      break;
-    default:
-      g_assert_not_reached();
-      break;
-  }
-  spectrum->input_data = input_data;
-
-  gst_fastspectrum_reset_state(spectrum);
-  g_mutex_unlock(&spectrum->lock);
-
-  return TRUE;
-
-}
-
-static void gst_fastspectrum_run_fft(GstFastSpectrum *spectrum, guint input_pos) {
-
-  guint bands = spectrum->bands;
-  guint nfft = 2 * bands - 2;
-
-  for (guint i = 0; i < nfft; i++) {
-    spectrum->fft_input[i] = spectrum->input_ring_buffer[(input_pos + i) % nfft];
-  }
-
-  // Should be safe to execute the same plan multiple times in parallel.
-  fftw_execute(spectrum->plan);
-
-  // Calculate magnitude in db
-  for (guint i = 0; i < bands; i++) {
-    gdouble val = spectrum->fft_output[i][0] * spectrum->fft_output[i][0];
-    val += spectrum->fft_output[i][1] * spectrum->fft_output[i][1];
-    val /= nfft * nfft;
-    spectrum->spect_magnitude[i] += val;
-  }
-
-}
-
-static GstFlowReturn gst_fastspectrum_transform_ip(GstBaseTransform *trans, GstBuffer *buffer) {
-
-  GstFastSpectrum *spectrum = reinterpret_cast<GstFastSpectrum*>(trans);
-  guint rate = GST_AUDIO_FILTER_RATE(spectrum);
-  guint bps = GST_AUDIO_FILTER_BPS(spectrum);
-  guint bpf = GST_AUDIO_FILTER_BPF(spectrum);
-  double max_value = static_cast<double>((1UL << ((bps << 3) - 1)) - 1);
-  guint bands = spectrum->bands;
-  guint nfft = 2 * bands - 2;
-  guint input_pos = 0;
-  GstMapInfo map;
-  const guint8 *data = nullptr;
-  gsize size = 0;
-  GstFastSpectrumInputData input_data = nullptr;
-
-  g_mutex_lock(&spectrum->lock);
-  gst_buffer_map(buffer, &map, GST_MAP_READ);
-  data = map.data;
-  size = map.size;
-
-  GST_LOG_OBJECT(spectrum, "input size: %" G_GSIZE_FORMAT " bytes", size);
-
-  if (GST_BUFFER_IS_DISCONT(buffer)) {
-    GST_DEBUG_OBJECT(spectrum, "Discontinuity detected -- flushing");
-    gst_fastspectrum_flush(spectrum);
-  }
-
-  // If we don't have a FFT context yet (or it was reset due to parameter changes) get one and allocate memory for everything
-  if (!spectrum->channel_data_initialized) {
-    GST_DEBUG_OBJECT(spectrum, "allocating for bands %u", bands);
-
-    gst_fastspectrum_alloc_channel_data(spectrum);
-
-    // Number of sample frames we process before posting a message interval is in ns
-    spectrum->frames_per_interval = gst_util_uint64_scale(spectrum->interval, rate, GST_SECOND);
-    spectrum->frames_todo = spectrum->frames_per_interval;
-    // Rounding error for frames_per_interval in ns, aggregated it in accumulated_error
-    spectrum->error_per_interval = (spectrum->interval * rate) % GST_SECOND;
-    if (spectrum->frames_per_interval == 0) {
-      spectrum->frames_per_interval = 1;
-    }
-
-    GST_INFO_OBJECT(spectrum, "interval %" GST_TIME_FORMAT ", fpi %" G_GUINT64_FORMAT ", error %" GST_TIME_FORMAT, GST_TIME_ARGS(spectrum->interval), spectrum->frames_per_interval, GST_TIME_ARGS(spectrum->error_per_interval));
-
-    spectrum->input_pos = 0;
-
-    gst_fastspectrum_flush(spectrum);
-  }
-
-  if (spectrum->num_frames == 0) {
-    spectrum->message_ts = GST_BUFFER_TIMESTAMP(buffer);
-  }
-
-  input_pos = spectrum->input_pos;
-  input_data = spectrum->input_data;
-
-  while (size >= bpf) {
-    // Run input_data for a chunk of data
-    guint fft_todo = nfft - (spectrum->num_frames % nfft);
-    guint msg_todo = spectrum->frames_todo - spectrum->num_frames;
-    GST_LOG_OBJECT(spectrum, "message frames todo: %u, fft frames todo: %u, input frames %" G_GSIZE_FORMAT, msg_todo, fft_todo, (size / bpf));
-    guint block_size = msg_todo;
-    if (block_size > (size / bpf)) {
-      block_size = (size / bpf);
-    }
-    if (block_size > fft_todo) {
-      block_size = fft_todo;
-    }
-
-    // Move the current frames into our ringbuffers
-    input_data(data, spectrum->input_ring_buffer, block_size, max_value, input_pos, nfft);
-
-    data += block_size * bpf;
-    size -= block_size * bpf;
-    input_pos = (input_pos + block_size) % nfft;
-    spectrum->num_frames += block_size;
-
-    gboolean have_full_interval = (spectrum->num_frames == spectrum->frames_todo);
-
-    GST_LOG_OBJECT(spectrum, "size: %" G_GSIZE_FORMAT ", do-fft = %d, do-message = %d", size, (spectrum->num_frames % nfft == 0), have_full_interval);
-
-    // If we have enough frames for an FFT or we have all frames required for the interval and we haven't run a FFT, then run an FFT
-    if ((spectrum->num_frames % nfft == 0) || (have_full_interval && !spectrum->num_fft)) {
-      gst_fastspectrum_run_fft(spectrum, input_pos);
-      spectrum->num_fft++;
-    }
-
-    // Do we have the FFTs for one interval?
-    if (have_full_interval) {
-      GST_DEBUG_OBJECT(spectrum, "nfft: %u frames: %" G_GUINT64_FORMAT " fpi: %" G_GUINT64_FORMAT " error: %" GST_TIME_FORMAT, nfft, spectrum->num_frames, spectrum->frames_per_interval, GST_TIME_ARGS(spectrum->accumulated_error));
-
-      spectrum->frames_todo = spectrum->frames_per_interval;
-      if (spectrum->accumulated_error >= GST_SECOND) {
-        spectrum->accumulated_error -= GST_SECOND;
-        spectrum->frames_todo++;
-      }
-      spectrum->accumulated_error += spectrum->error_per_interval;
-
-      if (spectrum->output_callback) {
-        // Calculate average
-        for (guint i = 0; i < spectrum->bands; i++) {
-          spectrum->spect_magnitude[i] /= static_cast<double>(spectrum->num_fft);
-        }
-
-        spectrum->output_callback(spectrum->spect_magnitude, static_cast<int>(spectrum->bands));
-
-        // Reset spectrum accumulators
-        memset(spectrum->spect_magnitude, 0, spectrum->bands * sizeof(double));
-      }
-
-      if (GST_CLOCK_TIME_IS_VALID(spectrum->message_ts)) {
-        spectrum->message_ts += gst_util_uint64_scale(spectrum->num_frames, GST_SECOND, rate);
-      }
-
-      spectrum->num_frames = 0;
-      spectrum->num_fft = 0;
-    }
-  }
-
-  spectrum->input_pos = input_pos;
-
-  gst_buffer_unmap(buffer, &map);
-  g_mutex_unlock(&spectrum->lock);
-
-  g_assert(size == 0);
-
-  return GST_FLOW_OK;
-
-}

ext/gstmoodbar/gstmoodbarplugin.cpp

@@ -1,46 +0,0 @@
-/* This file was part of Clementine.
-   Copyright 2014, David Sansome <me@davidsansome.com>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfastspectrum.h"
-#include "gstmoodbarplugin.h"
-
-static gboolean gst_moodbar_plugin_init(GstPlugin *plugin) {
-
-  if (!gst_element_register(plugin, "fastspectrum", GST_RANK_NONE, GST_TYPE_FASTSPECTRUM)) {
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-int gstfastspectrum_register_static() {
-
-  return gst_plugin_register_static(
-    GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "fastspectrum",
-    "Fast spectrum analyzer for generating Moodbars",
-    gst_moodbar_plugin_init,
-    "0.1",
-    "GPL",
-    "FastSpectrum",
-    "FastSpectrum",
-    "https://www.strawberrymusicplayer.org");
-}

ext/gstmoodbar/gstmoodbarplugin.h

@@ -1,25 +0,0 @@
-/* This file was part of Clementine.
-   Copyright 2014, David Sansome <me@davidsansome.com>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef GST_MOODBAR_PLUGIN_H
-#define GST_MOODBAR_PLUGIN_H
-
-extern "C" {
-int gstfastspectrum_register_static();
-}
-
-#endif  // GST_MOODBAR_PLUGIN_H

ext/libstrawberry-common/CMakeLists.txt

@@ -1,43 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-set(SOURCES
-  core/logging.cpp
-  core/messagehandler.cpp
-  core/messagereply.cpp
-  core/workerpool.cpp
-)
-
-set(HEADERS
-  core/logging.h
-  core/messagehandler.h
-  core/messagereply.h
-  core/workerpool.h
-)
-
-qt_wrap_cpp(MOC ${HEADERS})
-
-link_directories(${GLIB_LIBRARY_DIRS})
-
-add_library(libstrawberry-common STATIC ${SOURCES} ${MOC})
-
-target_include_directories(libstrawberry-common SYSTEM PRIVATE ${GLIB_INCLUDE_DIRS})
-target_include_directories(libstrawberry-common PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/src
-)
-
-if(Backtrace_FOUND)
-  target_include_directories(libstrawberry-common SYSTEM PRIVATE ${Backtrace_INCLUDE_DIRS})
-endif()
-
-target_link_libraries(libstrawberry-common PRIVATE
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${GLIB_LIBRARIES}
-  Qt${QT_VERSION_MAJOR}::Core
-  Qt${QT_VERSION_MAJOR}::Network
-)
-
-if(Backtrace_FOUND)
-  target_link_libraries(libstrawberry-common PRIVATE ${Backtrace_LIBRARIES})
-endif()

ext/libstrawberry-common/core/messagehandler.cpp

@@ -1,117 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-#include "messagehandler.h"
-
-#include <QObject>
-#include <QAbstractSocket>
-#include <QDataStream>
-#include <QIODevice>
-#include <QLocalSocket>
-#include <QByteArray>
-
-#include "core/logging.h"
-
-_MessageHandlerBase::_MessageHandlerBase(QIODevice *device, QObject *parent)
-    : QObject(parent),
-      device_(nullptr),
-      flush_abstract_socket_(nullptr),
-      flush_local_socket_(nullptr),
-      reading_protobuf_(false),
-      expected_length_(0),
-      is_device_closed_(false) {
-  if (device) {
-    SetDevice(device);
-  }
-}
-
-void _MessageHandlerBase::SetDevice(QIODevice *device) {
-
-  device_ = device;
-
-  buffer_.open(QIODevice::ReadWrite);
-
-  QObject::connect(device, &QIODevice::readyRead, this, &_MessageHandlerBase::DeviceReadyRead);
-
-  // Yeah I know.
-  if (QAbstractSocket *abstractsocket = qobject_cast<QAbstractSocket*>(device)) {
-    flush_abstract_socket_ = &QAbstractSocket::flush;
-    QObject::connect(abstractsocket, &QAbstractSocket::disconnected, this, &_MessageHandlerBase::DeviceClosed);
-  }
-  else if (QLocalSocket *localsocket = qobject_cast<QLocalSocket*>(device)) {
-    flush_local_socket_ = &QLocalSocket::flush;
-    QObject::connect(localsocket, &QLocalSocket::disconnected, this, &_MessageHandlerBase::DeviceClosed);
-  }
-  else {
-    qFatal("Unsupported device type passed to _MessageHandlerBase");
-  }
-
-}
-
-void _MessageHandlerBase::DeviceReadyRead() {
-
-  while (device_->bytesAvailable() > 0) {
-    if (!reading_protobuf_) {
-      // Read the length of the next message
-      QDataStream s(device_);
-      s >> expected_length_;
-
-      reading_protobuf_ = true;
-    }
-
-    // Read some of the message
-    buffer_.write(device_->read(expected_length_ - buffer_.size()));
-
-    // Did we get everything?
-    if (buffer_.size() == expected_length_) {
-      // Parse the message
-      if (!RawMessageArrived(buffer_.data())) {
-        qLog(Error) << "Malformed protobuf message";
-        device_->close();
-        return;
-      }
-
-      // Clear the buffer
-      buffer_.close();
-      buffer_.setData(QByteArray());
-      buffer_.open(QIODevice::ReadWrite);
-      reading_protobuf_ = false;
-    }
-  }
-
-}
-
-void _MessageHandlerBase::WriteMessage(const QByteArray &data) {
-
-  QDataStream s(device_);
-  s << static_cast<quint32>(data.length());
-  s.writeRawData(data.data(), static_cast<int>(data.length()));
-
-  // Sorry.
-  if (flush_abstract_socket_) {
-    ((qobject_cast<QAbstractSocket*>(device_))->*(flush_abstract_socket_))();
-  }
-  else if (flush_local_socket_) {
-    ((qobject_cast<QLocalSocket*>(device_))->*(flush_local_socket_))();
-  }
-
-}
-
-void _MessageHandlerBase::DeviceClosed() {
-  is_device_closed_ = true;
-  AbortAll();
-}

ext/libstrawberry-common/core/messagehandler.h

@@ -1,176 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-
-#ifndef MESSAGEHANDLER_H
-#define MESSAGEHANDLER_H
-
-#include <string>
-
-#include <QtGlobal>
-#include <QObject>
-#include <QThread>
-#include <QBuffer>
-#include <QByteArray>
-#include <QMap>
-#include <QString>
-#include <QLocalSocket>
-#include <QAbstractSocket>
-
-#include "core/messagereply.h"
-
-class QIODevice;
-
-// Reads and writes uint32 length encoded protobufs to a socket.
-// This base QObject is separate from AbstractMessageHandler because moc can't handle templated classes.
-// Use AbstractMessageHandler instead.
-class _MessageHandlerBase : public QObject {
-  Q_OBJECT
-
- public:
-  // device can be nullptr, in which case you must call SetDevice before writing any messages.
-  _MessageHandlerBase(QIODevice *device, QObject *parent);
-
-  void SetDevice(QIODevice *device);
-
-  // After this is true, messages cannot be sent to the handler any more.
-  bool is_device_closed() const { return is_device_closed_; }
-
- protected slots:
-  void WriteMessage(const QByteArray &data);
-  void DeviceReadyRead();
-  virtual void DeviceClosed();
-
- protected:
-  virtual bool RawMessageArrived(const QByteArray &data) = 0;
-  virtual void AbortAll() = 0;
-
- protected:
-  typedef bool (QAbstractSocket::*FlushAbstractSocket)();
-  typedef bool (QLocalSocket::*FlushLocalSocket)();
-
-  QIODevice *device_;
-  FlushAbstractSocket flush_abstract_socket_;
-  FlushLocalSocket flush_local_socket_;
-
-  bool reading_protobuf_;
-  quint32 expected_length_;
-  QBuffer buffer_;
-
-  bool is_device_closed_;
-};
-
-// Reads and writes uint32 length encoded MessageType messages to a socket.
-// You should subclass this and implement the MessageArrived(MessageType) method.
-template<typename MT>
-class AbstractMessageHandler : public _MessageHandlerBase {
- public:
-  AbstractMessageHandler(QIODevice *device, QObject *parent);
-  ~AbstractMessageHandler() override { AbstractMessageHandler::AbortAll(); }
-
-  using MessageType = MT;
-  using ReplyType = MessageReply<MT>;
-
-  // Serialises the message and writes it to the socket.
-  // This version MUST be called from the thread in which the AbstractMessageHandler was created.
-  void SendMessage(const MessageType &message);
-
-  // Serialises the message and writes it to the socket.
-  // This version may be called from any thread.
-  void SendMessageAsync(const MessageType &message);
-
-  // Sends the request message inside and takes ownership of the MessageReply.
-  // The MessageReply's Finished() signal will be emitted when a reply arrives with the same ID.  Must be called from my thread.
-  void SendRequest(ReplyType *reply);
-
-  // Sets the "id" field of reply to the same as the request, and sends the reply on the socket.  Used on the worker side.
-  void SendReply(const MessageType &request, MessageType *reply);
-
- protected:
-  // Called when a message is received from the socket.
-  virtual void MessageArrived(const MessageType &message) { Q_UNUSED(message); }
-
-  // _MessageHandlerBase
-  bool RawMessageArrived(const QByteArray &data) override;
-  void AbortAll() override;
-
- private:
-  QMap<int, ReplyType*> pending_replies_;
-};
-
-template<typename MT>
-AbstractMessageHandler<MT>::AbstractMessageHandler(QIODevice *device, QObject *parent)
-    : _MessageHandlerBase(device, parent) {}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  const std::string data = message.SerializeAsString();
-  WriteMessage(QByteArray(data.data(), data.size()));
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendMessageAsync(const MessageType &message) {
-  const std::string data = message.SerializeAsString();
-  QMetaObject::invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendRequest(ReplyType *reply) {
-  pending_replies_[reply->id()] = reply;
-  SendMessage(reply->request_message());
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::SendReply(const MessageType &request, MessageType *reply) {
-  reply->set_id(request.id());
-  SendMessage(*reply);
-}
-
-template<typename MT>
-bool AbstractMessageHandler<MT>::RawMessageArrived(const QByteArray &data) {
-
-  MessageType message;
-  if (!message.ParseFromArray(data.constData(), data.size())) {
-    return false;
-  }
-
-  if (pending_replies_.contains(message.id())) {
-    // This is a reply to a message that we created earlier.
-    ReplyType *reply = pending_replies_.take(message.id());
-    reply->SetReply(message);
-  }
-  else {
-    MessageArrived(message);
-  }
-
-  return true;
-
-}
-
-template<typename MT>
-void AbstractMessageHandler<MT>::AbortAll() {
-
-  for (ReplyType *reply : pending_replies_) {
-    reply->Abort();
-  }
-  pending_replies_.clear();
-
-}
-
-#endif  // MESSAGEHANDLER_H

ext/libstrawberry-common/core/messagereply.cpp

@@ -1,48 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "messagereply.h"
-
-#include <QObject>
-#include <QtDebug>
-
-#include "core/logging.h"
-
-_MessageReplyBase::_MessageReplyBase(QObject *parent)
-    : QObject(parent), finished_(false), success_(false) {}
-
-bool _MessageReplyBase::WaitForFinished() {
-
-  qLog(Debug) << "Waiting on ID" << id();
-  semaphore_.acquire();
-  qLog(Debug) << "Acquired ID" << id();
-  return success_;
-
-}
-
-void _MessageReplyBase::Abort() {
-
-  Q_ASSERT(!finished_);
-  finished_ = true;
-  success_ = false;
-
-  emit Finished();
-  qLog(Debug) << "Releasing ID" << id() << "(aborted)";
-  semaphore_.release();
-
-}

ext/libstrawberry-common/core/messagereply.h

@@ -1,99 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef MESSAGEREPLY_H
-#define MESSAGEREPLY_H
-
-#include <QtGlobal>
-#include <QObject>
-#include <QSemaphore>
-#include <QString>
-#include <QTimer>
-
-#include "core/logging.h"
-
-// Base QObject for a reply future class that is returned immediately for requests that will occur in the background.
-// Similar to QNetworkReply. Use MessageReply instead.
-class _MessageReplyBase : public QObject {
-  Q_OBJECT
-
- public:
-  explicit _MessageReplyBase(QObject *parent = nullptr);
-
-  virtual int id() const = 0;
-  bool is_finished() const { return finished_; }
-  bool is_successful() const { return success_; }
-
-  // Waits for the reply to finish by waiting on a semaphore.  Never call this from the MessageHandler's thread or it will block forever.
-  // Returns true if the call was successful.
-  bool WaitForFinished();
-
-  void Abort();
-
- signals:
-  void Finished();
-
- protected:
-  bool finished_;
-  bool success_;
-
-  QSemaphore semaphore_;
-};
-
-// A reply future class that is returned immediately for requests that will occur in the background.  Similar to QNetworkReply.
-template<typename MessageType>
-class MessageReply : public _MessageReplyBase {
- public:
-  explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr);
-
-  int id() const override { return request_message_.id(); }
-  const MessageType &request_message() const { return request_message_; }
-  const MessageType &message() const { return reply_message_; }
-
-  void SetReply(const MessageType &message);
-
- private:
-  MessageType request_message_;
-  MessageType reply_message_;
-};
-
-
-template<typename MessageType>
-MessageReply<MessageType>::MessageReply(const MessageType &request_message, QObject *parent) : _MessageReplyBase(parent) {
-  request_message_.MergeFrom(request_message);
-}
-
-template<typename MessageType>
-void MessageReply<MessageType>::SetReply(const MessageType &message) {
-
-  Q_ASSERT(!finished_);
-
-  reply_message_.MergeFrom(message);
-  finished_ = true;
-  success_ = true;
-
-  qLog(Debug) << "Releasing ID" << id() << "(finished)";
-
-  // Delay the signal as workaround to fix the signal periodically not emitted.
-  QTimer::singleShot(1, this, &_MessageReplyBase::Finished);
-
-  semaphore_.release();
-
-}
-
-#endif  // MESSAGEREPLY_H

ext/libstrawberry-common/core/workerpool.cpp

@@ -1,23 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QObject>
-
-#include "workerpool.h"
-
-_WorkerPoolBase::_WorkerPoolBase(QObject *parent) : QObject(parent) {}

ext/libstrawberry-common/core/workerpool.h

@@ -1,466 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef WORKERPOOL_H
-#define WORKERPOOL_H
-
-#include "config.h"
-
-#include <cstdio>
-#include <cstddef>
-#include <utility>
-
-#include <QtGlobal>
-#include <QObject>
-#include <QCoreApplication>
-#include <QThread>
-#include <QMutex>
-#include <QLocalServer>
-#include <QProcess>
-#include <QDir>
-#include <QFile>
-#include <QList>
-#include <QQueue>
-#include <QString>
-#include <QStringList>
-#include <QAtomicInt>
-#include <QRandomGenerator>
-
-#include "core/logging.h"
-
-class QLocalSocket;
-
-// Base class containing signals and slots - required because moc doesn't do templated objects.
-class _WorkerPoolBase : public QObject {
-  Q_OBJECT
-
- public:
-  explicit _WorkerPoolBase(QObject *parent = nullptr);
-
- signals:
-  // Emitted when a worker failed to start.  This usually happens when the worker wasn't found, or couldn't be executed.
-  void WorkerFailedToStart();
-
- protected slots:
-  virtual void DoStart() {}
-  virtual void NewConnection() {}
-  virtual void ProcessReadyReadStandardOutput() {}
-  virtual void ProcessReadyReadStandardError() {}
-  virtual void ProcessError(QProcess::ProcessError) {}
-  virtual void SendQueuedMessages() {}
-};
-
-
-// Manages a pool of one or more external processes.
-// A local socket server is started for each process, and the address is passed to the process as argv[1].
-// The process is expected to connect back to the socket server, and when it does a HandlerType is created for it.
-// Instances of HandlerType are created in the WorkerPool's thread.
-template<typename HandlerType>
-class WorkerPool : public _WorkerPoolBase {
- public:
-  explicit WorkerPool(QObject *parent = nullptr);
-  ~WorkerPool() override;
-
-  using MessageType = typename HandlerType::MessageType;
-  using ReplyType = typename HandlerType::ReplyType;
-
-  // Sets the name of the worker executable.  This is looked for first in the current directory, and then in $PATH.
-  // You must call this before calling Start().
-  void SetExecutableName(const QString &executable_name);
-
-  // Sets the number of worker process to use.  Defaults to 1 <= (processors / 2) <= 2.
-  void SetWorkerCount(const int count);
-
-  // Sets the prefix to use for the local server (on unix this is a named pipe in /tmp).
-  // Defaults to QApplication::applicationName().
-  // A random number is appended to this name when creating each server.
-  void SetLocalServerName(const QString &local_server_name);
-
-  // Starts all workers.
-  void Start();
-
-  // Fills in the message's "id" field and creates a reply future.
-  // The message is queued and the WorkerPool's thread will send it to the next available worker.
-  // Can be called from any thread.
-  ReplyType *SendMessageWithReply(MessageType *message);
-
- protected:
-  // These are all reimplemented slots, they are called on the WorkerPool's thread.
-  void DoStart() override;
-  void NewConnection() override;
-  void ProcessReadyReadStandardOutput() override;
-  void ProcessReadyReadStandardError() override;
-  void ProcessError(QProcess::ProcessError error) override;
-  void SendQueuedMessages() override;
-
- private:
-  struct Worker {
-    Worker() : local_server_(nullptr), local_socket_(nullptr), process_(nullptr), handler_(nullptr) {}
-
-    QLocalServer *local_server_;
-    QLocalSocket *local_socket_;
-    QProcess *process_;
-    HandlerType *handler_;
-  };
-
-  // Must only ever be called on my thread.
-  void StartOneWorker(Worker *worker);
-
-  template<typename T>
-  Worker *FindWorker(T Worker::*member, T value) {
-    for (typename QList<Worker>::iterator it = workers_.begin(); it != workers_.end(); ++it) {
-      if ((*it).*member == value) {
-        return &(*it);
-      }
-    }
-    return nullptr;
-  }
-
-  template<typename T>
-  void DeleteQObjectPointerLater(T **p) {
-    if (*p) {
-      (*p)->deleteLater();
-      *p = nullptr;
-    }
-  }
-
-  // Creates a new reply future for the request with the next sequential ID,
-  // and sets the request's ID to the ID of the reply.  Can be called from any thread
-  ReplyType *NewReply(MessageType *message);
-
-  // Returns the next handler, or nullptr if there isn't one.  Must be called from my thread.
-  HandlerType *NextHandler() const;
-
- private:
-  QString local_server_name_;
-  QString executable_name_;
-  QString executable_path_;
-
-  int worker_count_;
-  mutable int next_worker_;
-  QList<Worker> workers_;
-
-  QAtomicInt next_id_;
-
-  QMutex message_queue_mutex_;
-  QQueue<ReplyType *> message_queue_;
-};
-
-
-template<typename HandlerType>
-WorkerPool<HandlerType>::WorkerPool(QObject *parent)
-    : _WorkerPoolBase(parent),
-      worker_count_(1),
-      next_worker_(0),
-      next_id_(0) {
-
-  local_server_name_ = qApp->applicationName().toLower();
-
-  if (local_server_name_.isEmpty()) {
-    local_server_name_ = QStringLiteral("workerpool");
-  }
-
-}
-
-template<typename HandlerType>
-WorkerPool<HandlerType>::~WorkerPool() {
-
-  for (const Worker &worker : workers_) {
-    if (worker.local_socket_ && worker.process_) {
-      QObject::disconnect(worker.process_, &QProcess::errorOccurred, this, &WorkerPool::ProcessError);
-      QObject::disconnect(worker.process_, &QProcess::readyReadStandardOutput, this, &WorkerPool::ProcessReadyReadStandardOutput);
-      QObject::disconnect(worker.process_, &QProcess::readyReadStandardError, this, &WorkerPool::ProcessReadyReadStandardError);
-
-      // The worker is connected.  Close his socket and wait for him to exit.
-      qLog(Debug) << "Closing worker socket";
-      worker.local_socket_->close();
-      worker.process_->waitForFinished(500);
-    }
-
-    if (worker.process_ && worker.process_->state() == QProcess::Running) {
-      // The worker is still running - kill it.
-      qLog(Debug) << "Killing worker process";
-      worker.process_->terminate();
-      if (!worker.process_->waitForFinished(500)) {
-        worker.process_->kill();
-      }
-    }
-  }
-
-  for (ReplyType *reply : message_queue_) {
-    reply->Abort();
-  }
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SetWorkerCount(const int count) {
-  Q_ASSERT(workers_.isEmpty());
-  worker_count_ = count;
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SetLocalServerName(const QString &local_server_name) {
-  Q_ASSERT(workers_.isEmpty());
-  local_server_name_ = local_server_name;
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SetExecutableName(const QString &executable_name) {
-  Q_ASSERT(workers_.isEmpty());
-  executable_name_ = executable_name;
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::Start() {
-  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::DoStart);
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::DoStart() {
-
-  Q_ASSERT(workers_.isEmpty());
-  Q_ASSERT(!executable_name_.isEmpty());
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  // Find the executable if we can, default to searching $PATH
-  executable_path_ = executable_name_;
-
-  QStringList search_path;
-  search_path << QCoreApplication::applicationDirPath();
-#if defined(Q_OS_UNIX)
-  search_path << QStringLiteral("/usr/libexec");
-  search_path << QStringLiteral("/usr/local/libexec");
-#endif
-#if defined(Q_OS_MACOS)
-  search_path << QDir::cleanPath(QCoreApplication::applicationDirPath() + QStringLiteral("/../PlugIns"));
-#endif
-
-  for (const QString &path_prefix : std::as_const(search_path)) {
-    const QString executable_path = path_prefix + QLatin1Char('/') + executable_name_;
-    if (QFile::exists(executable_path)) {
-      executable_path_ = executable_path;
-      qLog(Debug) << "Using worker" << executable_name_ << "from" << path_prefix;
-      break;
-    }
-  }
-
-  if (executable_path_ == executable_name_) {
-    qLog(Debug) << "Using worker" << executable_name_;
-  }
-
-  // Start all the workers
-  for (int i = 0; i < worker_count_; ++i) {
-    Worker worker;
-    StartOneWorker(&worker);
-
-    workers_ << worker;
-  }
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  DeleteQObjectPointerLater(&worker->local_server_);
-  DeleteQObjectPointerLater(&worker->local_socket_);
-  DeleteQObjectPointerLater(&worker->process_);
-  DeleteQObjectPointerLater(&worker->handler_);
-
-  worker->local_server_ = new QLocalServer(this);
-  worker->process_ = new QProcess(this);
-
-  QObject::connect(worker->local_server_, &QLocalServer::newConnection, this, &WorkerPool::NewConnection);
-  QObject::connect(worker->process_, &QProcess::errorOccurred, this, &WorkerPool::ProcessError);
-  QObject::connect(worker->process_, &QProcess::readyReadStandardOutput, this, &WorkerPool::ProcessReadyReadStandardOutput);
-  QObject::connect(worker->process_, &QProcess::readyReadStandardError, this, &WorkerPool::ProcessReadyReadStandardError);
-
-  // Create a server, find an unused name and start listening
-  forever {
-    const quint32 unique_number = QRandomGenerator::global()->bounded(static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
-    const QString name = QStringLiteral("%1_%2").arg(local_server_name_).arg(unique_number);
-
-    if (worker->local_server_->listen(name)) {
-      break;
-    }
-  }
-
-  qLog(Debug) << "Starting worker" << worker << executable_path_ << worker->local_server_->fullServerName();
-
-#ifdef Q_OS_WIN32
-  worker->process_->setProcessChannelMode(QProcess::SeparateChannels);
-#else
-  worker->process_->setProcessChannelMode(QProcess::ForwardedChannels);
-#endif
-
-  worker->process_->start(executable_path_, QStringList() << worker->local_server_->fullServerName());
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::NewConnection() {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QLocalServer *server = qobject_cast<QLocalServer*>(sender());
-
-  // Find the worker with this server.
-  Worker *worker = FindWorker(&Worker::local_server_, server);
-  if (!worker) return;
-
-  qLog(Debug) << "Worker" << worker << "connected to" << server->fullServerName();
-
-  // Accept the connection.
-  worker->local_socket_ = server->nextPendingConnection();
-
-  // We only ever accept one connection per worker, so destroy the server now.
-  worker->local_socket_->setParent(this);
-  worker->local_server_->deleteLater();
-  worker->local_server_ = nullptr;
-
-  // Create the handler.
-  worker->handler_ = new HandlerType(worker->local_socket_, this);
-
-  SendQueuedMessages();
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QProcess *process = qobject_cast<QProcess*>(sender());
-
-  // Find the worker with this process.
-  Worker *worker = FindWorker(&Worker::process_, process);
-  if (!worker) return;
-
-  switch (error) {
-    case QProcess::FailedToStart:
-      // Failed to start errors are bad - it usually means the worker isn't installed.
-      // Don't restart the process, but tell our owner, who will probably want to do something fatal.
-      qLog(Error) << "Worker failed to start";
-      emit WorkerFailedToStart();
-      break;
-
-    default:
-      // On any other error we just restart the process.
-      qLog(Debug) << "Worker" << worker << "failed with error" << error << "- restarting";
-      StartOneWorker(worker);
-      break;
-  }
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::ProcessReadyReadStandardOutput() {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QProcess *process = qobject_cast<QProcess*>(sender());
-  QByteArray data = process->readAllStandardOutput();
-
-  fprintf(stdout, "%s", data.data());
-  fflush(stdout);
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::ProcessReadyReadStandardError() {
-
-  Q_ASSERT(QThread::currentThread() == thread());
-
-  QProcess *process = qobject_cast<QProcess*>(sender());
-  QByteArray data = process->readAllStandardError();
-
-  fprintf(stderr, "%s", data.data());
-  fflush(stderr);
-
-}
-
-template <typename HandlerType>
-typename WorkerPool<HandlerType>::ReplyType*
-WorkerPool<HandlerType>::NewReply(MessageType *message) {
-
-  const int id = next_id_.fetchAndAddOrdered(1);
-  message->set_id(id);
-
-  return new ReplyType(*message);
-
-}
-
-template <typename HandlerType>
-typename WorkerPool<HandlerType>::ReplyType*
-WorkerPool<HandlerType>::SendMessageWithReply(MessageType *message) {
-
-  ReplyType *reply = NewReply(message);
-
-  // Add the pending reply to the queue
-  {
-    QMutexLocker l(&message_queue_mutex_);
-    message_queue_.enqueue(reply);
-  }
-
-  // Wake up the main thread
-  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::SendQueuedMessages, Qt::QueuedConnection);
-
-  return reply;
-
-}
-
-template<typename HandlerType>
-void WorkerPool<HandlerType>::SendQueuedMessages() {
-
-  QMutexLocker l(&message_queue_mutex_);
-
-  while (!message_queue_.isEmpty()) {
-    ReplyType *reply = message_queue_.dequeue();
-
-    // Find a worker for this message
-    HandlerType *handler = NextHandler();
-    if (!handler) {
-      // No available handlers - put the message on the front of the queue.
-      message_queue_.prepend(reply);
-      qLog(Debug) << "No available handlers to process request";
-      break;
-    }
-
-    handler->SendRequest(reply);
-  }
-
-}
-
-template<typename HandlerType>
-HandlerType *WorkerPool<HandlerType>::NextHandler() const {
-
-  for (int i = 0; i < workers_.count(); ++i) {
-    const int worker_index = (next_worker_ + i) % workers_.count();
-
-    if (workers_[worker_index].handler_ && !workers_[worker_index].handler_->is_device_closed()) {
-      next_worker_ = (worker_index + 1) % workers_.count();
-      return workers_[worker_index].handler_;
-    }
-  }
-
-  return nullptr;
-
-}
-
-#endif  // WORKERPOOL_H

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,69 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-# Workaround a bug in protobuf-generate.cmake (https://github.com/protocolbuffers/protobuf/issues/12450)
-if(NOT protobuf_PROTOC_EXE)
-  set(protobuf_PROTOC_EXE "protobuf::protoc")
-endif()
-
-if(NOT Protobuf_LIBRARIES)
-  set(Protobuf_LIBRARIES protobuf::libprotobuf)
-endif()
-
-set(SOURCES tagreaderbase.cpp tagreadermessages.proto)
-
-if(HAVE_TAGLIB)
-  list(APPEND SOURCES tagreadertaglib.cpp tagreadergme.cpp)
-endif()
-
-if(HAVE_TAGPARSER)
-  list(APPEND SOURCES tagreadertagparser.cpp)
-endif()
-
-link_directories(
-  ${GLIB_LIBRARY_DIRS}
-  ${PROTOBUF_LIBRARY_DIRS}
-)
-
-if(HAVE_TAGLIB)
-  link_directories(${TAGLIB_LIBRARY_DIRS})
-endif()
-
-if(HAVE_TAGPARSER)
-  link_directories(${TAGPARSER_LIBRARY_DIRS})
-endif()
-
-add_library(libstrawberry-tagreader STATIC ${PROTO_SOURCES} ${SOURCES})
-
-target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE
-  ${GLIB_INCLUDE_DIRS}
-  ${PROTOBUF_INCLUDE_DIRS}
-)
-
-target_include_directories(libstrawberry-tagreader PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_BINARY_DIR}/src
-)
-
-target_link_libraries(libstrawberry-tagreader PRIVATE
-  ${GLIB_LIBRARIES}
-  ${Protobuf_LIBRARIES}
-  Qt${QT_VERSION_MAJOR}::Core
-  Qt${QT_VERSION_MAJOR}::Network
-  Qt${QT_VERSION_MAJOR}::Gui
-  libstrawberry-common
-)
-
-if(HAVE_TAGLIB)
-  target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
-  target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
-endif()
-
-if(HAVE_TAGPARSER)
-  target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
-  target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
-endif()
-
-protobuf_generate(TARGET libstrawberry-tagreader)

ext/libstrawberry-tagreader/tagreaderbase.cpp

@@ -1,170 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include <string>
-
-#include <QObject>
-#include <QByteArray>
-#include <QString>
-#include <QIODevice>
-#include <QFile>
-#include <QBuffer>
-#include <QImage>
-#include <QMimeDatabase>
-
-#include "core/logging.h"
-#include "tagreaderbase.h"
-
-TagReaderBase::TagReaderBase() = default;
-
-QString TagReaderBase::ErrorString(const Result &result) {
-
-  switch (result.error_code) {
-    case Result::ErrorCode::Success:
-      return QObject::tr("Success");
-    case Result::ErrorCode::Unsupported:
-      return QObject::tr("File is unsupported");
-    case Result::ErrorCode::FilenameMissing:
-      return QObject::tr("Filename is missing");
-    case Result::ErrorCode::FileDoesNotExist:
-      return QObject::tr("File does not exist");
-    case Result::ErrorCode::FileOpenError:
-      return QObject::tr("File could not be opened");
-    case Result::ErrorCode::FileParseError:
-      return QObject::tr("Could not parse file");
-    case Result::ErrorCode::FileSaveError:
-      return QObject::tr("Could save file");
-    case Result::ErrorCode::CustomError:
-      return result.error;
-  }
-
-  return QObject::tr("Unknown error");
-
-}
-
-float TagReaderBase::ConvertPOPMRating(const int POPM_rating) {
-
-  if (POPM_rating < 0x01) return 0.0F;
-  if (POPM_rating < 0x40) return 0.20F;
-  if (POPM_rating < 0x80) return 0.40F;
-  if (POPM_rating < 0xC0) return 0.60F;
-  if (POPM_rating < 0xFC) return 0.80F;
-
-  return 1.0F;
-
-}
-
-int TagReaderBase::ConvertToPOPMRating(const float rating) {
-
-  if (rating < 0.20) return 0x00;
-  if (rating < 0.40) return 0x01;
-  if (rating < 0.60) return 0x40;
-  if (rating < 0.80) return 0x80;
-  if (rating < 1.0)  return 0xC0;
-
-  return 0xFF;
-
-}
-
-TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::WriteFileRequest &request) {
-
-  if (!request.has_save_cover() || !request.save_cover()) {
-    return Cover();
-  }
-
-  QString cover_filename;
-  if (request.has_cover_filename()) {
-    cover_filename = QString::fromStdString(request.cover_filename());
-  }
-  QByteArray cover_data;
-  if (request.has_cover_data()) {
-    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
-  }
-  QString cover_mime_type;
-  if (request.has_cover_mime_type()) {
-    cover_mime_type = QString::fromStdString(request.cover_mime_type());
-  }
-
-  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
-
-}
-
-TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::SaveEmbeddedArtRequest &request) {
-
-  QString cover_filename;
-  if (request.has_cover_filename()) {
-    cover_filename = QString::fromStdString(request.cover_filename());
-  }
-  QByteArray cover_data;
-  if (request.has_cover_data()) {
-    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
-  }
-  QString cover_mime_type;
-  if (request.has_cover_mime_type()) {
-    cover_mime_type = QString::fromStdString(request.cover_mime_type());
-  }
-
-  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
-
-}
-
-TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type) {
-
-  if (cover_data.isEmpty() && !cover_filename.isEmpty()) {
-    qLog(Debug) << "Loading cover from" << cover_filename << "for" << song_filename;
-    QFile file(cover_filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-      qLog(Error) << "Failed to open file" << cover_filename << "for reading:" << file.errorString();
-      return Cover();
-    }
-    cover_data = file.readAll();
-    file.close();
-  }
-
-  if (!cover_data.isEmpty()) {
-    if (cover_mime_type.isEmpty()) {
-      cover_mime_type = QMimeDatabase().mimeTypeForData(cover_data).name();
-    }
-    if (cover_mime_type == QLatin1String("image/jpeg")) {
-      qLog(Debug) << "Using cover from JPEG data for" << song_filename;
-      return Cover(cover_data, cover_mime_type);
-    }
-    if (cover_mime_type == QLatin1String("image/png")) {
-      qLog(Debug) << "Using cover from PNG data for" << song_filename;
-      return Cover(cover_data, cover_mime_type);
-    }
-    // Convert image to JPEG.
-    qLog(Debug) << "Converting cover to JPEG data for" << song_filename;
-    QImage cover_image;
-    if (!cover_image.loadFromData(cover_data)) {
-      qLog(Error) << "Failed to load image from cover data for" << song_filename;
-      return Cover();
-    }
-    cover_data.clear();
-    QBuffer buffer(&cover_data);
-    if (buffer.open(QIODevice::WriteOnly)) {
-      cover_image.save(&buffer, "JPEG");
-      buffer.close();
-    }
-    return Cover(cover_data, QStringLiteral("image/jpeg"));
-  }
-
-  return Cover();
-
-}

ext/libstrawberry-tagreader/tagreaderbase.h

@@ -1,91 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERBASE_H
-#define TAGREADERBASE_H
-
-#include "config.h"
-
-#include <string>
-
-#include <QByteArray>
-#include <QString>
-
-#include "tagreadermessages.pb.h"
-
-/*
- * This class holds all useful methods to read and write tags from/to files.
- * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
- */
-class TagReaderBase {
- public:
-  explicit TagReaderBase();
-  ~TagReaderBase() = default;
-
-  class Result {
-   public:
-    enum class ErrorCode {
-      Success,
-      Unsupported,
-      FilenameMissing,
-      FileDoesNotExist,
-      FileOpenError,
-      FileParseError,
-      FileSaveError,
-      CustomError,
-    };
-    Result(const ErrorCode _error_code, const QString &_error = QString()) : error_code(_error_code), error(_error) {}
-    ErrorCode error_code;
-    QString error;
-    bool success() const { return error_code == ErrorCode::Success; }
-  };
-
-  class Cover {
-   public:
-    explicit Cover(const QByteArray &_data = QByteArray(), const QString &_mime_type = QString()) : data(_data), mime_type(_mime_type) {}
-    QByteArray data;
-    QString mime_type;
-    QString error;
-  };
-
-  static QString ErrorString(const Result &result);
-
-  virtual bool IsMediaFile(const QString &filename) const = 0;
-
-  virtual Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const = 0;
-  virtual Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const = 0;
-
-  virtual Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const = 0;
-  virtual Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const = 0;
-
-  virtual Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const = 0;
-  virtual Result SaveSongRatingToFile(const QString &filename, const float rating) const = 0;
-
- protected:
-  static float ConvertPOPMRating(const int POPM_rating);
-  static int ConvertToPOPMRating(const float rating);
-
-  static Cover LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::WriteFileRequest &request);
-  static Cover LoadCoverFromRequest(const QString &song_filename, const spb::tagreader::SaveEmbeddedArtRequest &request);
-
- private:
-  static Cover LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type);
-
-  Q_DISABLE_COPY(TagReaderBase)
-};
-
-#endif  // TAGREADERBASE_H

ext/libstrawberry-tagreader/tagreadermessages.proto

@@ -1,195 +0,0 @@
-syntax = "proto2";
-
-package spb.tagreader;
-
-message SongMetadata {
-
-  enum FileType {
-    UNKNOWN = 0;
-    WAV = 1;
-    FLAC = 2;
-    WAVPACK = 3;
-    OGGFLAC = 4;
-    OGGVORBIS = 5;
-    OGGOPUS = 6;
-    OGGSPEEX = 7;
-    MPEG = 8;
-    MP4 = 9;
-    ASF = 10;
-    AIFF = 11;
-    MPC = 12;
-    TRUEAUDIO = 13;
-    DSF = 14;
-    DSDIFF = 15;
-    PCM = 16;
-    APE = 17;
-    MOD = 18;
-    S3M = 19;
-    XM = 20;
-    IT = 21;
-    SPC = 22;
-    VGM = 23;
-    CDDA = 90;
-    STREAM = 91;
-  }
-
-  optional bool valid = 1;
-
-  optional string title = 2;
-  optional string album = 3;
-  optional string artist = 4;
-  optional string albumartist = 5;
-  optional int32 track = 6;
-  optional int32 disc = 7;
-  optional int32 year = 8;
-  optional int32 originalyear = 9;
-  optional string genre = 10;
-  optional bool compilation = 11;
-  optional string composer = 12;
-  optional string performer = 13;
-  optional string grouping = 14;
-  optional string comment = 15;
-  optional string lyrics = 16;
-
-  optional uint64 length_nanosec = 17;
-
-  optional int32 bitrate = 18;
-  optional int32 samplerate = 19;
-  optional int32 bitdepth = 20;
-
-  optional string url = 21;
-  optional string basefilename = 22;
-  optional FileType filetype = 23;
-  optional int64 filesize = 24;
-  optional int64 mtime = 25;
-  optional int64 ctime = 26;
-
-  optional uint32 playcount = 27;
-  optional uint32 skipcount = 28;
-  optional int64 lastplayed = 29;
-  optional int64 lastseen = 30;
-
-  optional bool art_embedded = 31;
-
-  optional float rating = 32;
-
-  optional string acoustid_id = 33;
-  optional string acoustid_fingerprint = 34;
-
-  optional string musicbrainz_album_artist_id = 35;     // MusicBrainz Release Artist ID (MUSICBRAINZ_ALBUMARTISTID)
-  optional string musicbrainz_artist_id = 36;           // MusicBrainz Artist ID (MUSICBRAINZ_ARTISTID)
-  optional string musicbrainz_original_artist_id = 37;  // MusicBrainz Original Artist ID (MUSICBRAINZ_ORIGINALARTISTID)
-  optional string musicbrainz_album_id = 38;            // MusicBrainz Release ID (MUSICBRAINZ_ALBUMID)
-  optional string musicbrainz_original_album_id = 39;   // MusicBrainz Original Release ID (MUSICBRAINZ_ORIGINALALBUMID)
-  optional string musicbrainz_recording_id = 40;        // MusicBrainz Recording ID (MUSICBRAINZ_TRACKID)
-  optional string musicbrainz_track_id = 41;            // MusicBrainz Track ID (MUSICBRAINZ_RELEASETRACKID)
-  optional string musicbrainz_disc_id = 42;             // MusicBrainz Disc ID (MUSICBRAINZ_DISCID)
-  optional string musicbrainz_release_group_id = 43;    // MusicBrainz Release Group ID (MUSICBRAINZ_RELEASEGROUPID)
-  optional string musicbrainz_work_id = 44;             // MusicBrainz Work ID (MUSICBRAINZ_WORKID)
-
-  optional bool suspicious_tags = 50;
-
-}
-
-message IsMediaFileRequest {
-  optional string filename = 1;
-}
-
-message IsMediaFileResponse {
-  optional bool success = 1;
-}
-
-message ReadFileRequest {
-  optional string filename = 1;
-}
-
-message ReadFileResponse {
-  optional bool success = 1;
-  optional SongMetadata metadata = 2;
-  optional string error = 3;
-}
-
-message WriteFileRequest {
-  optional string filename = 1;
-  optional bool save_tags = 2;
-  optional bool save_playcount = 3;
-  optional bool save_rating = 4;
-  optional bool save_cover = 5;
-  optional SongMetadata metadata = 6;
-  optional string cover_filename = 7;
-  optional bytes cover_data = 8;
-  optional string cover_mime_type = 9;
-}
-
-message WriteFileResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message LoadEmbeddedArtRequest {
-  optional string filename = 1;
-}
-
-message LoadEmbeddedArtResponse {
-  optional bool success = 1;
-  optional bytes data = 2;
-  optional string error = 3;
-}
-
-message SaveEmbeddedArtRequest {
-  optional string filename = 1;
-  optional string cover_filename = 2;
-  optional bytes cover_data = 3;
-  optional string cover_mime_type = 4;
-}
-
-message SaveEmbeddedArtResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message SaveSongPlaycountToFileRequest {
-  optional string filename = 1;
-  optional uint32 playcount = 2;
-}
-
-message SaveSongPlaycountToFileResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message SaveSongRatingToFileRequest {
-  optional string filename = 1;
-  optional float rating = 2;
-}
-
-message SaveSongRatingToFileResponse {
-  optional bool success = 1;
-  optional string error = 2;
-}
-
-message Message {
-  optional int32 id = 1;
-
-  optional ReadFileRequest read_file_request = 2;
-  optional ReadFileResponse read_file_response = 3;
-
-  optional WriteFileRequest write_file_request = 4;
-  optional WriteFileResponse write_file_response = 5;
-
-  optional IsMediaFileRequest is_media_file_request = 6;
-  optional IsMediaFileResponse is_media_file_response = 7;
-
-  optional LoadEmbeddedArtRequest load_embedded_art_request = 8;
-  optional LoadEmbeddedArtResponse load_embedded_art_response = 9;
-
-  optional SaveEmbeddedArtRequest save_embedded_art_request = 10;
-  optional SaveEmbeddedArtResponse save_embedded_art_response = 11;
-
-  optional SaveSongPlaycountToFileRequest save_song_playcount_to_file_request = 12;
-  optional SaveSongPlaycountToFileResponse save_song_playcount_to_file_response = 13;
-
-  optional SaveSongRatingToFileRequest save_song_rating_to_file_request = 14;
-  optional SaveSongRatingToFileResponse save_song_rating_to_file_response = 15;
-
-}

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -1,145 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2013, David Sansome <me@davidsansome.com>
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERTAGLIB_H
-#define TAGREADERTAGLIB_H
-
-#include "config.h"
-
-#include <string>
-
-#include <QByteArray>
-#include <QString>
-
-#include <taglib/tstring.h>
-#include <taglib/fileref.h>
-#include <taglib/xiphcomment.h>
-#include <taglib/flacfile.h>
-#include <taglib/mpegfile.h>
-#include <taglib/mp4file.h>
-#include <taglib/apetag.h>
-#include <taglib/apefile.h>
-#include <taglib/asffile.h>
-#include <taglib/id3v2tag.h>
-#include <taglib/popularimeterframe.h>
-#include <taglib/mp4tag.h>
-#include <taglib/asftag.h>
-
-#include "tagreaderbase.h"
-#include "tagreadermessages.pb.h"
-
-#undef TStringToQString
-#undef QStringToTString
-
-class FileRefFactory;
-
-/*
- * This class holds all useful methods to read and write tags from/to files.
- * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
- */
-class TagReaderTagLib : public TagReaderBase {
- public:
-  explicit TagReaderTagLib();
-  ~TagReaderTagLib();
-
-  static inline TagLib::String StdStringToTagLibString(const std::string &s) {
-    return TagLib::String(s.c_str(), TagLib::String::UTF8);
-  }
-
-  static inline std::string TagLibStringToStdString(const TagLib::String &s) {
-    return std::string(s.toCString(true), s.length());
-  }
-
-  static inline TagLib::String QStringToTagLibString(const QString &s) {
-    return TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8);
-  }
-
-  static inline QString TagLibStringToQString(const TagLib::String &s) {
-    return QString::fromUtf8((s).toCString(true));
-  }
-
-  static inline void AssignTagLibStringToStdString(const TagLib::String &tstr, std::string *output) {
-
-    const QString qstr = TagLibStringToQString(tstr).trimmed();
-    const QByteArray data = qstr.toUtf8();
-    output->assign(data.constData(), data.size());
-
-  }
-
-  bool IsMediaFile(const QString &filename) const override;
-
-  Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
-  Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const override;
-
-  Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const;
-  Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const override;
-
-  Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const override;
-  Result SaveSongRatingToFile(const QString &filename, const float rating) const override;
-
- private:
-  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-
-  void ParseID3v2Tags(TagLib::ID3v2::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseVorbisComments(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseAPETags(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseMP4Tags(TagLib::MP4::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseASFTags(TagLib::ASF::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-  void ParseASFAttribute(const TagLib::ASF::AttributeListMap &attributes_map, const char *attribute, std::string *str) const;
-
-  void SetID3v2Tag(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const;
-  void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-  void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUserTextFrame(const QString &description, const QString &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUserTextFrame(const std::string &description, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const;
-
-  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comment, const spb::tagreader::SongMetadata &song) const;
-  void SetAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
-  void SetASFTag(TagLib::ASF::Tag *tag, const spb::tagreader::SongMetadata &song) const;
-  void SetAsfAttribute(TagLib::ASF::Tag *tag, const char *attribute, const std::string &value) const;
-  void SetAsfAttribute(TagLib::ASF::Tag *tag, const char *attribute, const int value) const;
-
-  QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-
-  static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag *tag);
-
-  void SetPlaycount(TagLib::Ogg::XiphComment *vorbis_comment, const uint playcount) const;
-  void SetPlaycount(TagLib::APE::Tag *tag, const uint playcount) const;
-  void SetPlaycount(TagLib::ID3v2::Tag *tag, const uint playcount) const;
-  void SetPlaycount(TagLib::MP4::Tag *tag, const uint playcount) const;
-  void SetPlaycount(TagLib::ASF::Tag *tag, const uint playcount) const;
-
-  void SetRating(TagLib::Ogg::XiphComment *vorbis_comment, const float rating) const;
-  void SetRating(TagLib::APE::Tag *tag, const float rating) const;
-  void SetRating(TagLib::ID3v2::Tag *tag, const float rating) const;
-  void SetRating(TagLib::MP4::Tag *tag, const float rating) const;
-  void SetRating(TagLib::ASF::Tag *tag, const float rating) const;
-
-  void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *vorbis_comment, const QByteArray &data, const QString &mime_type) const;
-  void SetEmbeddedArt(TagLib::Ogg::XiphComment *vorbis_comment, const QByteArray &data, const QString &mime_type) const;
-  void SetEmbeddedArt(TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const;
-  void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const;
-
- private:
-  FileRefFactory *factory_;
-
-  Q_DISABLE_COPY(TagReaderTagLib)
-};
-
-#endif  // TAGREADERTAGLIB_H

ext/libstrawberry-tagreader/tagreadertagparser.cpp

@@ -1,557 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2021-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include "tagreadertagparser.h"
-
-#include <string>
-#include <memory>
-#include <algorithm>
-#include <vector>
-#include <sys/stat.h>
-
-#include <tagparser/mediafileinfo.h>
-#include <tagparser/diagnostics.h>
-#include <tagparser/progressfeedback.h>
-#include <tagparser/tag.h>
-#include <tagparser/abstracttrack.h>
-
-#include <QtGlobal>
-#include <QFile>
-#include <QFileInfo>
-#include <QByteArray>
-#include <QString>
-#include <QUrl>
-#include <QDateTime>
-#include <QtDebug>
-
-#include "core/logging.h"
-#include "core/messagehandler.h"
-#include "utilities/timeconstants.h"
-
-TagReaderTagParser::TagReaderTagParser() = default;
-
-TagReaderTagParser::~TagReaderTagParser() = default;
-
-bool TagReaderTagParser::IsMediaFile(const QString &filename) const {
-
-  qLog(Debug) << "Checking for valid file" << filename;
-
-  QFileInfo fileinfo(filename);
-  if (!fileinfo.exists() || fileinfo.suffix().compare(QLatin1String("bak"), Qt::CaseInsensitive) == 0) return false;
-
-  try {
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-    taginfo.open(true);
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return false;
-    }
-
-    taginfo.parseTracks(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return false;
-    }
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    const auto tracks = taginfo.tracks();
-    for (TagParser::AbstractTrack *track : tracks) {
-      if (track->mediaType() == TagParser::MediaType::Audio) {
-        taginfo.close();
-        return true;
-      }
-    }
-    taginfo.close();
-  }
-  catch(...) {}
-
-  return false;
-
-}
-
-TagReaderBase::Result TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
-
-  qLog(Debug) << "Reading tags from" << filename;
-
-  const QFileInfo fileinfo(filename);
-
-  if (!fileinfo.exists() || fileinfo.suffix().compare(QLatin1String("bak"), Qt::CaseInsensitive) == 0) return Result::ErrorCode::FileParseError;
-
-  const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-  const QByteArray basefilename = fileinfo.fileName().toUtf8();
-
-  song->set_basefilename(basefilename.constData(), basefilename.size());
-  song->set_url(url.constData(), url.size());
-  song->set_filesize(fileinfo.size());
-
-  song->set_mtime(fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-  song->set_ctime(fileinfo.birthTime().isValid() ? std::max(fileinfo.birthTime().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-
-  if (song->ctime() <= 0) {
-    song->set_ctime(song->mtime());
-  }
-
-  song->set_lastseen(QDateTime::currentDateTime().toSecsSinceEpoch());
-
-  try {
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-
-    taginfo.open(true);
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTracks(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    std::vector<TagParser::AbstractTrack*> tracks = taginfo.tracks();
-    for (TagParser::AbstractTrack *track : tracks) {
-      switch (track->format().general) {
-        case TagParser::GeneralMediaFormat::Flac:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_FLAC);
-          break;
-        case TagParser::GeneralMediaFormat::WavPack:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_WAVPACK);
-          break;
-        case TagParser::GeneralMediaFormat::MonkeysAudio:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_APE);
-          break;
-        case TagParser::GeneralMediaFormat::WindowsMediaAudio:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_ASF);
-          break;
-        case TagParser::GeneralMediaFormat::Vorbis:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGVORBIS);
-          break;
-        case TagParser::GeneralMediaFormat::Opus:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGOPUS);
-          break;
-        case TagParser::GeneralMediaFormat::Speex:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGSPEEX);
-          break;
-        case TagParser::GeneralMediaFormat::Mpeg1Audio:
-          switch (track->format().sub) {
-            case TagParser::SubFormats::Mpeg1Layer3:
-              song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_MPEG);
-              break;
-            case TagParser::SubFormats::None:
-            default:
-              break;
-          }
-          break;
-        case TagParser::GeneralMediaFormat::Mpc:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_MPC);
-          break;
-        case TagParser::GeneralMediaFormat::Pcm:
-          song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_PCM);
-          break;
-        case TagParser::GeneralMediaFormat::Unknown:
-        default:
-          break;
-      }
-      song->set_length_nanosec(track->duration().totalMilliseconds() * kNsecPerMsec);
-      song->set_samplerate(track->samplingFrequency());
-      song->set_bitdepth(track->bitsPerSample());
-      song->set_bitrate(std::max(track->bitrate(), track->maxBitrate()));
-    }
-
-    if (song->filetype() == spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_UNKNOWN) {
-      taginfo.close();
-      return Result::ErrorCode::Unsupported;
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      song->set_albumartist(tag->value(TagParser::KnownField::AlbumArtist).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_artist(tag->value(TagParser::KnownField::Artist).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_album(tag->value(TagParser::KnownField::Album).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_title(tag->value(TagParser::KnownField::Title).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_genre(tag->value(TagParser::KnownField::Genre).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_composer(tag->value(TagParser::KnownField::Composer).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_performer(tag->value(TagParser::KnownField::Performers).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_grouping(tag->value(TagParser::KnownField::Grouping).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_comment(tag->value(TagParser::KnownField::Comment).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_lyrics(tag->value(TagParser::KnownField::Lyrics).toString(TagParser::TagTextEncoding::Utf8));
-      song->set_year(tag->value(TagParser::KnownField::RecordDate).toInteger());
-      song->set_originalyear(tag->value(TagParser::KnownField::ReleaseDate).toInteger());
-      song->set_track(tag->value(TagParser::KnownField::TrackPosition).toInteger());
-      song->set_disc(tag->value(TagParser::KnownField::DiskPosition).toInteger());
-      if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
-        song->set_art_embedded(true);
-      }
-      const float rating = ConvertPOPMRating(tag->value(TagParser::KnownField::Rating));
-      if (song->rating() <= 0 && rating > 0.0 && rating <= 1.0) {
-        song->set_rating(rating);
-      }
-    }
-
-    // Set integer fields to -1 if they're not valid
-    if (song->track() <= 0) { song->set_track(-1); }
-    if (song->disc() <= 0) { song->set_disc(-1); }
-    if (song->year() <= 0) { song->set_year(-1); }
-    if (song->originalyear() <= 0) { song->set_originalyear(-1); }
-    if (song->samplerate() <= 0) { song->set_samplerate(-1); }
-    if (song->bitdepth() <= 0) { song->set_bitdepth(-1); }
-    if (song->bitrate() <= 0) { song->set_bitrate(-1); }
-    if (song->lastplayed() <= 0) { song->set_lastplayed(-1); }
-
-    song->set_valid(true);
-
-    taginfo.close();
-
-    return Result::ErrorCode::Success;
-
-  }
-  catch(...) {
-    return Result::ErrorCode::FileParseError;
-  }
-
-}
-
-TagReaderBase::Result TagReaderTagParser::WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const {
-
-  if (request.filename().empty()) return Result::ErrorCode::FilenameMissing;
-
-  const spb::tagreader::SongMetadata &song = request.metadata();
-  const bool save_tags = request.has_save_tags() && request.save_tags();
-  const bool save_playcount = request.has_save_playcount() && request.save_playcount();
-  const bool save_rating = request.has_save_rating() && request.save_rating();
-  const bool save_cover = request.has_save_cover() && request.save_cover();
-
-  QStringList save_tags_options;
-  if (save_tags) {
-    save_tags_options << QStringLiteral("tags");
-  }
-  if (save_playcount) {
-    save_tags_options << QStringLiteral("playcount");
-  }
-  if (save_rating) {
-    save_tags_options << QStringLiteral("rating");
-  }
-  if (save_cover) {
-    save_tags_options << QStringLiteral("embedded cover");
-  }
-
-  qLog(Debug) << "Saving" << save_tags_options.join(QLatin1String(", ")) << "to" << filename;
-
-  const Cover cover = LoadCoverFromRequest(filename, request);
-
-  try {
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-    taginfo.open(false);
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTracks(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    if (taginfo.tags().size() <= 0) {
-      taginfo.createAppropriateTags();
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      if (save_tags) {
-        tag->setValue(TagParser::KnownField::AlbumArtist, TagParser::TagValue(song.albumartist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Artist, TagParser::TagValue(song.artist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Album, TagParser::TagValue(song.album(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Title, TagParser::TagValue(song.title(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Genre, TagParser::TagValue(song.genre(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Composer, TagParser::TagValue(song.composer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Performers, TagParser::TagValue(song.performer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Grouping, TagParser::TagValue(song.grouping(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Comment, TagParser::TagValue(song.comment(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::Lyrics, TagParser::TagValue(song.lyrics(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-        tag->setValue(TagParser::KnownField::TrackPosition, TagParser::TagValue(song.track()));
-        tag->setValue(TagParser::KnownField::DiskPosition, TagParser::TagValue(song.disc()));
-        tag->setValue(TagParser::KnownField::RecordDate, TagParser::TagValue(song.year()));
-        tag->setValue(TagParser::KnownField::ReleaseDate, TagParser::TagValue(song.originalyear()));
-      }
-      if (save_playcount) {
-        SaveSongPlaycountToFile(tag, song.playcount());
-      }
-      if (save_rating) {
-        SaveSongRatingToFile(tag, song.rating());
-      }
-      if (save_cover) {
-        SaveEmbeddedArt(tag, cover.data);
-      }
-    }
-
-    taginfo.applyChanges(diag, progress);
-    taginfo.close();
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    return Result::ErrorCode::Success;
-  }
-  catch(...) {}
-
-  return Result::ErrorCode::FileParseError;
-
-}
-
-TagReaderBase::Result TagReaderTagParser::LoadEmbeddedArt(const QString &filename, QByteArray &data) const {
-
-  if (filename.isEmpty()) return Result::ErrorCode::FilenameMissing;
-
-  qLog(Debug) << "Loading art from" << filename;
-
-  try {
-
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-
-    taginfo.open();
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
-        data = QByteArray(tag->value(TagParser::KnownField::Cover).dataPointer(), tag->value(TagParser::KnownField::Cover).dataSize());
-        taginfo.close();
-        return Result::ErrorCode::Success;
-      }
-    }
-
-    taginfo.close();
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-  }
-  catch(...) {}
-
-  return Result::ErrorCode::FileParseError;
-
-}
-
-void TagReaderTagParser::SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const {
-
-  tag->setValue(TagParser::KnownField::Cover, TagParser::TagValue(data.toStdString()));
-
-}
-
-TagReaderBase::Result TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const {
-
-  if (request.filename().empty()) return Result::ErrorCode::FilenameMissing;
-
-  qLog(Debug) << "Saving art to" << filename;
-
-  const Cover cover = LoadCoverFromRequest(filename, request);
-
-  try {
-
-    TagParser::MediaFileInfo taginfo;
-    TagParser::Diagnostics diag;
-    TagParser::AbortableProgressFeedback progress;
-
-#ifdef Q_OS_WIN32
-    taginfo.setPath(filename.toStdWString().toStdString());
-#else
-    taginfo.setPath(QFile::encodeName(filename).toStdString());
-#endif
-
-    taginfo.open();
-
-    taginfo.parseContainerFormat(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    taginfo.parseTags(diag, progress);
-    if (progress.isAborted()) {
-      taginfo.close();
-      return Result::ErrorCode::FileParseError;
-    }
-
-    if (taginfo.tags().size() <= 0) {
-      taginfo.createAppropriateTags();
-    }
-
-    for (TagParser::Tag *tag : taginfo.tags()) {
-      SaveEmbeddedArt(tag, cover.data);
-    }
-
-    taginfo.applyChanges(diag, progress);
-    taginfo.close();
-
-    for (const TagParser::DiagMessage &msg : diag) {
-      qLog(Debug) << QString::fromStdString(msg.message());
-    }
-
-    return Result::ErrorCode::Success;
-
-  }
-  catch(...) {}
-
-  return Result::ErrorCode::FileParseError;
-
-}
-
-void TagReaderTagParser::SaveSongPlaycountToFile(TagParser::Tag *tag, const uint playcount) const {
-
-  Q_UNUSED(tag);
-  Q_UNUSED(playcount);
-
-}
-
-TagReaderBase::Result TagReaderTagParser::SaveSongPlaycountToFile(const QString &filename, const uint playcount) const {
-
-  Q_UNUSED(filename);
-  Q_UNUSED(playcount);
-
-  return Result::ErrorCode::Unsupported;
-
-}
-
-void TagReaderTagParser::SaveSongRatingToFile(TagParser::Tag *tag, const float rating) const {
-
-  tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(ConvertToPOPMRating(rating)));
-
-}
-
-TagReaderBase::Result TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const float rating) const {
-
-    if (filename.isEmpty()) return Result::ErrorCode::FilenameMissing;
-
-    qLog(Debug) << "Saving song rating to" << filename;
-
-    try {
-      TagParser::MediaFileInfo taginfo;
-      TagParser::Diagnostics diag;
-      TagParser::AbortableProgressFeedback progress;
-  #ifdef Q_OS_WIN32
-      taginfo.setPath(filename.toStdWString().toStdString());
-  #else
-      taginfo.setPath(QFile::encodeName(filename).toStdString());
-  #endif
-      taginfo.open(false);
-
-      taginfo.parseContainerFormat(diag, progress);
-      if (progress.isAborted()) {
-        taginfo.close();
-        return Result::ErrorCode::FileParseError;
-      }
-
-      taginfo.parseTracks(diag, progress);
-      if (progress.isAborted()) {
-        taginfo.close();
-        return Result::ErrorCode::FileParseError;
-      }
-
-      taginfo.parseTags(diag, progress);
-      if (progress.isAborted()) {
-        taginfo.close();
-        return Result::ErrorCode::FileParseError;
-      }
-
-      if (taginfo.tags().size() <= 0) {
-        taginfo.createAppropriateTags();
-      }
-
-      for (TagParser::Tag *tag : taginfo.tags()) {
-        SaveSongRatingToFile(tag, rating);
-      }
-
-      taginfo.applyChanges(diag, progress);
-      taginfo.close();
-
-      for (const TagParser::DiagMessage &msg : diag) {
-        qLog(Debug) << QString::fromStdString(msg.message());
-      }
-
-      return Result::ErrorCode::Success;
-    }
-    catch(...) {}
-
-    return Result::ErrorCode::FileParseError;
-
-}

ext/libstrawberry-tagreader/tagreadertagparser.h

@@ -1,62 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2021-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERTAGPARSER_H
-#define TAGREADERTAGPARSER_H
-
-#include "config.h"
-
-#include <string>
-
-#include <tagparser/tag.h>
-
-#include <QByteArray>
-#include <QString>
-
-#include "tagreadermessages.pb.h"
-#include "tagreaderbase.h"
-
-/*
- * This class holds all useful methods to read and write tags from/to files.
- * You should not use it directly in the main process but rather use a TagReaderWorker process (using TagReaderClient)
- */
-class TagReaderTagParser : public TagReaderBase {
- public:
-  explicit TagReaderTagParser();
-  ~TagReaderTagParser();
-
-  bool IsMediaFile(const QString &filename) const override;
-
-  Result ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
-  Result WriteFile(const QString &filename, const spb::tagreader::WriteFileRequest &request) const override;
-
-  Result LoadEmbeddedArt(const QString &filename, QByteArray &data) const override;
-  Result SaveEmbeddedArt(const QString &filename, const spb::tagreader::SaveEmbeddedArtRequest &request) const override;
-
-  Result SaveSongPlaycountToFile(const QString &filename, const uint playcount) const override;
-  Result SaveSongRatingToFile(const QString &filename, const float rating) const override;
-
- private:
-  void SaveSongPlaycountToFile(TagParser::Tag *tag, const uint playcount) const;
-  void SaveSongRatingToFile(TagParser::Tag *tag, const float rating) const;
-  void SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const;
-
- public:
-  Q_DISABLE_COPY(TagReaderTagParser)
-};
-
-#endif  // TAGREADERTAGPARSER_H

ext/macdeploycheck/CMakeLists.txt

@@ -1,15 +0,0 @@
-qt_wrap_cpp(MACDEPLOYCHECK_MOC ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common/core/logging.h)
-link_directories(${GLIB_LIBRARY_DIRS})
-add_executable(macdeploycheck macdeploycheck.cpp ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common/core/logging.cpp ${MACDEPLOYCHECK_MOC})
-target_include_directories(macdeploycheck PUBLIC SYSTEM
-  ${GLIB_INCLUDE_DIRS}
-)
-target_include_directories(macdeploycheck PUBLIC
-  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
-  ${CMAKE_BINARY_DIR}/src
-)
-target_link_libraries(macdeploycheck PUBLIC
-  "-framework AppKit"
-  ${GLIB_LIBRARIES}
-  Qt${QT_VERSION_MAJOR}::Core
-)

ext/macdeploycheck/macdeploycheck.cpp

@@ -1,147 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QCoreApplication>
-#include <QString>
-#include <QStringList>
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
-#include <QDirIterator>
-#include <QProcess>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-
-#include "core/logging.h"
-
-int main(int argc, char **argv);
-int main(int argc, char **argv) {
-
-  QCoreApplication app(argc, argv);
-
-  logging::Init();
-
-  qLog(Info) << "Running macdeploycheck";
-
-  if (argc < 1) {
-    qLog(Error) << "Usage: macdeploycheck <bundledir>";
-    return 1;
-  }
-  QString bundle_path = QString::fromLocal8Bit(argv[1]);
-
-  bool success = true;
-
-  QDirIterator iter(bundle_path, QDir::Files | QDir::NoSymLinks, QDirIterator::Subdirectories);
-  while (iter.hasNext()) {
-
-    iter.next();
-
-    QString filepath = iter.fileInfo().filePath();
-
-    // Ignore these files.
-    if (filepath.endsWith(".plist") ||
-        filepath.endsWith(".icns") ||
-        filepath.endsWith(".prl") ||
-        filepath.endsWith(".conf") ||
-        filepath.endsWith(".h") ||
-        filepath.endsWith(".nib") ||
-        filepath.endsWith(".strings") ||
-        filepath.endsWith(".css") ||
-        filepath.endsWith("CodeResources") ||
-        filepath.endsWith("PkgInfo") ||
-        filepath.endsWith(".modulemap")) {
-      continue;
-    }
-
-    QProcess otool;
-    otool.start("otool", QStringList() << "-L" << filepath);
-    otool.waitForFinished();
-    if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
-      qLog(Error) << "otool failed for" << filepath << ":" << otool.readAllStandardError();
-      success = false;
-      continue;
-    }
-    QString output = otool.readAllStandardOutput();
-    QStringList output_lines = output.split("\n", Qt::SkipEmptyParts);
-    if (output_lines.size() < 2) {
-      qLog(Error) << "Could not parse otool output:" << output;
-      success = false;
-      continue;
-    }
-    QString first_line = output_lines.first();
-    if (first_line.endsWith(':')) first_line.chop(1);
-    if (first_line == filepath) {
-      output_lines.removeFirst();
-    }
-    else {
-      qLog(Error) << "First line" << first_line << "does not match" << filepath;
-      success = false;
-    }
-    QRegularExpression regexp(QStringLiteral("^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), current version (\\d+\\.\\d+\\.\\d+)(, weak|, reexport)?\\)$"));
-    for (const QString &output_line : output_lines) {
-
-      //qDebug() << "Final check on" << filepath << output_line;
-
-      QRegularExpressionMatch match = regexp.match(output_line);
-      if (match.hasMatch()) {
-        QString library = match.captured(1);
-        if (QFileInfo(library).fileName() == QFileInfo(filepath).fileName()) {  // It's this.
-          continue;
-        }
-        else if (library.startsWith("@executable_path")) {
-          QString real_path = library;
-          real_path = real_path.replace("@executable_path", bundle_path + "/Contents/MacOS");
-          if (!QFile::exists(real_path)) {
-            qLog(Error) << real_path << "does not exist for" << filepath;
-            success = false;
-          }
-        }
-        else if (library.startsWith("@rpath")) {
-          QString real_path = library;
-          real_path = real_path.replace("@rpath", bundle_path + "/Contents/Frameworks");
-          if (!QFile::exists(real_path) && !real_path.endsWith("QtSvg")) {  // FIXME: Ignore broken svg image plugin.
-            qLog(Error) << real_path << "does not exist for" << filepath;
-            success = false;
-          }
-        }
-        else if (library.startsWith("@loader_path")) {
-          QString loader_path = QFileInfo(filepath).path();
-          QString real_path = library;
-          real_path = real_path.replace("@loader_path", loader_path);
-          if (!QFile::exists(real_path)) {
-            qLog(Error) << real_path << "does not exist for" << filepath;
-            success = false;
-          }
-        }
-        else if (library.startsWith("/System/Library/") || library.startsWith("/usr/lib/")) {  // System library
-          continue;
-        }
-        else {
-          qLog(Error) << "File" << filepath << "points to" << library;
-          success = false;
-        }
-      }
-      else {
-        qLog(Error) << "Could not parse otool output line:" << output_line;
-        success = false;
-      }
-    }
-  }
-
-  return success ? 0 : 1;
-
-}

ext/strawberry-tagreader/CMakeLists.txt

@@ -1,64 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-
-set(SOURCES main.cpp tagreaderworker.cpp)
-set(HEADERS tagreaderworker.h)
-
-qt_wrap_cpp(MOC ${HEADERS})
-
-link_directories(${GLIB_LIBRARY_DIRS})
-
-if(HAVE_TAGLIB)
-  link_directories(${TAGLIB_LIBRARY_DIRS})
-endif()
-
-if(HAVE_TAGPARSER)
-  link_directories(${TAGPARSER_LIBRARY_DIRS})
-endif()
-
-add_executable(strawberry-tagreader ${SOURCES} ${MOC} ${QRC})
-
-target_include_directories(strawberry-tagreader SYSTEM PRIVATE
-  ${GLIB_INCLUDE_DIRS}
-  ${PROTOBUF_INCLUDE_DIRS}
-)
-
-target_include_directories(strawberry-tagreader PRIVATE
-  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
-  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
-  ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
-  ${CMAKE_BINARY_DIR}/src
-)
-
-target_link_libraries(strawberry-tagreader PRIVATE
-  ${GLIB_LIBRARIES}
-  Qt${QT_VERSION_MAJOR}::Core
-  Qt${QT_VERSION_MAJOR}::Network
-  libstrawberry-common
-  libstrawberry-tagreader
-)
-
-if(HAVE_TAGLIB)
-  target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
-  target_link_libraries(strawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})
-endif()
-
-if(HAVE_TAGPARSER)
-  target_include_directories(strawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
-  target_link_libraries(strawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
-endif()
-
-if(FREEBSD)
-  target_link_libraries(strawberry-tagreader PRIVATE execinfo)
-endif()
-
-if(APPLE)
-  target_link_libraries(strawberry-tagreader PRIVATE /System/Library/Frameworks/Foundation.framework)
-endif()
-
-if(APPLE)
-  install(TARGETS strawberry-tagreader DESTINATION ${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns)
-else()
-  install(TARGETS strawberry-tagreader RUNTIME DESTINATION bin)
-endif()

ext/strawberry-tagreader/main.cpp

@@ -1,61 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include <QtGlobal>
-
-#include <iostream>
-
-#include <QCoreApplication>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QLocalSocket>
-
-#include "core/logging.h"
-#include "tagreaderworker.h"
-
-int main(int argc, char **argv) {
-
-  QCoreApplication a(argc, argv);
-  QStringList args(a.arguments());
-
-  if (args.count() != 2) {
-    std::cerr << "This program is used internally by Strawberry to parse tags in music files\n"
-                 "without exposing the whole application to crashes caused by malformed\n"
-                 "files.  It is not meant to be run on its own.\n";
-    return 1;
-  }
-
-  logging::Init();
-  qLog(Info) << "TagReader worker connecting to" << args[1];
-
-  // Connect to the parent process.
-  QLocalSocket socket;
-  socket.connectToServer(args[1]);
-  if (!socket.waitForConnected(2000)) {
-    std::cerr << "Failed to connect to the parent process.\n";
-    return 1;
-  }
-
-  TagReaderWorker worker(&socket);
-
-  return a.exec();
-  
-}

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -1,193 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include <memory>
-#include <string>
-
-#include <QCoreApplication>
-#include <QObject>
-#include <QIODevice>
-#include <QByteArray>
-
-#include "tagreaderworker.h"
-
-#ifdef HAVE_TAGLIB
-#  include "tagreadertaglib.h"
-#  include "tagreadergme.h"
-#endif
-
-#ifdef HAVE_TAGPARSER
-#  include "tagreadertagparser.h"
-#endif
-
-using std::make_shared;
-using std::shared_ptr;
-
-TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
-    : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {
-
-#ifdef HAVE_TAGLIB
-  tagreaders_ << make_shared<TagReaderTagLib>();
-  tagreaders_ << make_shared<TagReaderGME>();
-#endif
-
-#ifdef HAVE_TAGPARSER
-  tagreaders_ << make_shared<TagReaderTagParser>();
-#endif
-
-}
-
-void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
-
-  spb::tagreader::Message reply;
-
-  HandleMessage(message, reply);
-  SendReply(message, &reply);
-
-}
-
-void TagReaderWorker::DeviceClosed() {
-
-  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
-
-  QCoreApplication::exit();
-
-}
-
-void TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply) {
-
-  for (shared_ptr<TagReaderBase> reader : tagreaders_) {
-
-    if (message.has_is_media_file_request()) {
-      const QString filename = QString::fromStdString(message.is_media_file_request().filename());
-      const bool success = reader->IsMediaFile(filename);
-      reply.mutable_is_media_file_response()->set_success(success);
-      if (success) {
-        return;
-      }
-    }
-    if (message.has_read_file_request()) {
-      const QString filename = QString::fromStdString(message.read_file_request().filename());
-      spb::tagreader::ReadFileResponse *response = reply.mutable_read_file_response();
-      const TagReaderBase::Result result = reader->ReadFile(filename, response->mutable_metadata());
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_write_file_request()) {
-      const QString filename = QString::fromStdString(message.write_file_request().filename());
-      const TagReaderBase::Result result = reader->WriteFile(filename, message.write_file_request());
-      spb::tagreader::WriteFileResponse *response = reply.mutable_write_file_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_load_embedded_art_request()) {
-      const QString filename = QString::fromStdString(message.load_embedded_art_request().filename());
-      QByteArray data;
-      const TagReaderBase::Result result = reader->LoadEmbeddedArt(filename, data);
-      spb::tagreader::LoadEmbeddedArtResponse *response = reply.mutable_load_embedded_art_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        response->set_data(data.toStdString());
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_save_embedded_art_request()) {
-      const QString filename = QString::fromStdString(message.save_embedded_art_request().filename());
-      const TagReaderBase::Result result = reader->SaveEmbeddedArt(filename, message.save_embedded_art_request());
-      spb::tagreader::SaveEmbeddedArtResponse *response = reply.mutable_save_embedded_art_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_save_song_playcount_to_file_request()) {
-      const QString filename = QString::fromStdString(message.save_song_playcount_to_file_request().filename());
-      const TagReaderBase::Result result = reader->SaveSongPlaycountToFile(filename, message.save_song_playcount_to_file_request().playcount());
-      spb::tagreader::SaveSongPlaycountToFileResponse *response = reply.mutable_save_song_playcount_to_file_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-    if (message.has_save_song_rating_to_file_request()) {
-      const QString filename = QString::fromStdString(message.save_song_rating_to_file_request().filename());
-      const TagReaderBase::Result result = reader->SaveSongRatingToFile(filename, message.save_song_rating_to_file_request().rating());
-      spb::tagreader::SaveSongRatingToFileResponse *response = reply.mutable_save_song_rating_to_file_response();
-      response->set_success(result.success());
-      if (result.success()) {
-        if (response->has_error()) {
-          response->clear_error();
-        }
-        return;
-      }
-      else {
-        if (!response->has_error()) {
-          response->set_error(TagReaderBase::ErrorString(result).toStdString());
-        }
-      }
-    }
-
-  }
-
-}

ext/strawberry-tagreader/tagreaderworker.h

@@ -1,54 +0,0 @@
-/* This file is part of Strawberry.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-   Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
-
-   Strawberry is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Strawberry is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TAGREADERWORKER_H
-#define TAGREADERWORKER_H
-
-#include "config.h"
-
-#include <memory>
-
-#include <QObject>
-#include <QList>
-
-#include "core/messagehandler.h"
-
-#include "tagreadermessages.pb.h"
-
-class QIODevice;
-class TagReaderBase;
-
-using std::shared_ptr;
-
-class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
-  Q_OBJECT
-
- public:
-  explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
-
- protected:
-  void MessageArrived(const spb::tagreader::Message &message) override;
-  void DeviceClosed() override;
-
- private:
-  void HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply);
-
-  QList<shared_ptr<TagReaderBase>> tagreaders_;
-};
-
-#endif  // TAGREADERWORKER_H

src/analyzer/analyzerbase.cpp

@@ -29,7 +29,7 @@
 #include <algorithm>
 
 #include <QWidget>
-#include <QVector>
+#include <QList>
 #include <QPainter>
 #include <QPalette>
 #include <QBasicTimer>
@@ -67,11 +67,13 @@ AnalyzerBase::~AnalyzerBase() {
   delete fht_;
 }
 
-void AnalyzerBase::showEvent(QShowEvent*) {
+void AnalyzerBase::showEvent(QShowEvent *e) {
+  Q_UNUSED(e)
   timer_.start(timeout(), this);
 }
 
-void AnalyzerBase::hideEvent(QHideEvent*) {
+void AnalyzerBase::hideEvent(QHideEvent *e) {
+  Q_UNUSED(e)
   timer_.stop();
 }
 
@@ -87,7 +89,7 @@ void AnalyzerBase::ChangeTimeout(const int timeout) {
 
 void AnalyzerBase::transform(Scope &scope) {
 
-  QVector<float> aux(fht_->size());
+  QList<float> aux(fht_->size());
   if (static_cast<quint64>(aux.size()) >= scope.size()) {
     std::copy(scope.begin(), scope.end(), aux.begin());
   }

src/analyzer/analyzerbase.h

@@ -31,14 +31,12 @@
 
 #include <vector>
 
-#include <QtGlobal>
-#include <QObject>
 #include <QWidget>
 #include <QBasicTimer>
 #include <QString>
 #include <QPainter>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "analyzer/fht.h"
 #include "engine/enginebase.h"
 
@@ -65,13 +63,13 @@ class AnalyzerBase : public QWidget {
   using Scope = std::vector<float>;
   explicit AnalyzerBase(QWidget*, const uint scopeSize = 7);
 
-  void hideEvent(QHideEvent*) override;
-  void showEvent(QShowEvent*) override;
+  void hideEvent(QHideEvent *e) override;
+  void showEvent(QShowEvent *e) override;
   void paintEvent(QPaintEvent *e) override;
   void timerEvent(QTimerEvent *e) override;
 
-  int resizeExponent(int);
-  int resizeForBands(const int);
+  int resizeExponent(int exp);
+  int resizeForBands(const int bands);
   virtual void init() {}
   virtual void transform(Scope&);
   virtual void analyze(QPainter &p, const Scope&, const bool new_frame) = 0;

src/analyzer/analyzercontainer.cpp

@@ -44,12 +44,13 @@
 #include "waverubberanalyzer.h"
 #include "rainbowanalyzer.h"
 
+#include "includes/shared_ptr.h"
 #include "core/logging.h"
-#include "core/shared_ptr.h"
 #include "core/settings.h"
 #include "engine/enginebase.h"
 
 using namespace std::chrono_literals;
+using namespace Qt::Literals::StringLiterals;
 
 const char *AnalyzerContainer::kSettingsGroup = "Analyzer";
 const char *AnalyzerContainer::kSettingsFramerate = "framerate";
@@ -111,16 +112,8 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
 void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
-  if (engine_->type() != EngineBase::Type::GStreamer) {
-    return;
-  }
-
   if (e->button() == Qt::RightButton) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     context_menu_->popup(e->globalPosition().toPoint());
-#else
-    context_menu_->popup(e->globalPos());
-#endif
   }
 
 }
@@ -130,7 +123,7 @@ void AnalyzerContainer::ShowPopupMenu() {
 }
 
 void AnalyzerContainer::wheelEvent(QWheelEvent *e) {
-  emit WheelEvent(e->angleDelta().y());
+  Q_EMIT WheelEvent(e->angleDelta().y());
 }
 
 void AnalyzerContainer::SetEngine(SharedPtr<EngineBase> engine) {
@@ -141,15 +134,17 @@ void AnalyzerContainer::SetEngine(SharedPtr<EngineBase> engine) {
 }
 
 void AnalyzerContainer::DisableAnalyzer() {
+
   delete current_analyzer_;
   current_analyzer_ = nullptr;
 
   Save();
+
 }
 
 void AnalyzerContainer::ChangeAnalyzer(const int id) {
 
-  QObject *instance = analyzer_types_[id]->newInstance(Q_ARG(QWidget*, this));
+  QObject *instance = analyzer_types_.at(id)->newInstance(Q_ARG(QWidget*, this));
 
   if (!instance) {
     qLog(Warning) << "Couldn't initialize a new" << analyzer_types_[id]->className();
@@ -187,7 +182,7 @@ void AnalyzerContainer::Load() {
 
   Settings s;
   s.beginGroup(kSettingsGroup);
-  QString type = s.value("type", QStringLiteral("BlockAnalyzer")).toString();
+  QString type = s.value("type", u"BlockAnalyzer"_s).toString();
   current_framerate_ = s.value(kSettingsFramerate, kMediumFramerate).toInt();
   s.endGroup();
 
@@ -200,18 +195,25 @@ void AnalyzerContainer::Load() {
     for (int i = 0; i < analyzer_types_.count(); ++i) {
       if (type == QString::fromLatin1(analyzer_types_[i]->className())) {
         ChangeAnalyzer(i);
-        actions_[i]->setChecked(true);
+        QAction *action = actions_.value(i);
+        action->setChecked(true);
         break;
       }
     }
+    if (!current_analyzer_) {
+      ChangeAnalyzer(0);
+      QAction *action = actions_.value(0);
+      action->setChecked(true);
+    }
   }
 
   // Framerate
-  QList<QAction*> actions = group_framerate_->actions();
+  const QList<QAction*> actions = group_framerate_->actions();
   for (int i = 0; i < framerate_list_.count(); ++i) {
-    if (current_framerate_ == framerate_list_[i]) {
+    if (current_framerate_ == framerate_list_.value(i)) {
       ChangeFramerate(current_framerate_);
-      actions[i]->setChecked(true);
+      QAction *action = actions[i];
+      action->setChecked(true);
       break;
     }
   }

src/analyzer/analyzercontainer.h

@@ -30,7 +30,7 @@
 #include <QAction>
 #include <QActionGroup>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "engine/enginebase.h"
 
 class QTimer;
@@ -50,14 +50,14 @@ class AnalyzerContainer : public QWidget {
   static const char *kSettingsGroup;
   static const char *kSettingsFramerate;
 
- signals:
+ Q_SIGNALS:
   void WheelEvent(const int delta);
 
  protected:
   void mouseReleaseEvent(QMouseEvent *e) override;
   void wheelEvent(QWheelEvent *e) override;
 
- private slots:
+ private Q_SLOTS:
   void ChangeAnalyzer(const int id);
   void ChangeFramerate(int new_framerate);
   void DisableAnalyzer();

src/analyzer/blockanalyzer.cpp

@@ -36,12 +36,14 @@
 #include "analyzerbase.h"
 #include "fht.h"
 
-const int BlockAnalyzer::kHeight = 2;
-const int BlockAnalyzer::kWidth = 4;
-const int BlockAnalyzer::kMinRows = 3;       // arbitrary
-const int BlockAnalyzer::kMinColumns = 32;   // arbitrary
-const int BlockAnalyzer::kMaxColumns = 256;  // must be 2**n
-const int BlockAnalyzer::kFadeSize = 90;
+namespace {
+constexpr int kHeight = 2;
+constexpr int kWidth = 4;
+constexpr int kMinRows = 3;       // arbitrary
+constexpr int kMinColumns = 32;   // arbitrary
+constexpr int kMaxColumns = 256;  // must be 2**n
+constexpr int kFadeSize = 90;
+}  // namespace
 
 const char *BlockAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Block analyzer");
 
@@ -165,11 +167,12 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
 
   for (int x = 0, y = 0; x < static_cast<int>(scope_.size()); ++x) {
     // determine y
-    for (y = 0; scope_[x] < yscale_[y]; ++y);
+    for (y = 0; scope_[x] < yscale_.at(y); ++y);
 
     // This is opposite to what you'd think, higher than y means the bar is lower than y (physically)
-    if (static_cast<double>(y) > store_[x]) {
-      y = static_cast<int>(store_[x] += step_);
+    if (static_cast<double>(y) > store_.at(x)) {
+      store_[x] += step_;
+      y = static_cast<int>(store_.value(x));
     }
     else {
       store_[x] = y;
@@ -177,18 +180,19 @@ void BlockAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_frame) {
 
     // If y is lower than fade_pos_, then the bar has exceeded the height of the fadeout
     // if the fadeout is quite faded now, then display the new one
-    if (y <= fade_pos_[x] /*|| fade_intensity_[x] < kFadeSize / 3*/) {
+    if (y <= fade_pos_.at(x) /*|| fade_intensity_[x] < kFadeSize / 3*/) {
       fade_pos_[x] = y;
       fade_intensity_[x] = kFadeSize;
     }
 
-    if (fade_intensity_[x] > 0) {
-      const int offset = --fade_intensity_[x];
-      const int y2 = y_ + (fade_pos_[x] * (kHeight + 1));
+    if (fade_intensity_.at(x) > 0) {
+      --fade_intensity_[x];
+      const int offset = fade_intensity_.value(x);
+      const int y2 = y_ + (fade_pos_.value(x) * (kHeight + 1));
       canvas_painter.drawPixmap(x * (kWidth + 1), y2, fade_bars_[offset], 0, 0, kWidth, height() - y2);
     }
 
-    if (fade_intensity_[x] == 0) fade_pos_[x] = rows_;
+    if (fade_intensity_.at(x) == 0) fade_pos_[x] = rows_;
 
     // REMEMBER: y is a number from 0 to rows_, 0 means all blocks are glowing, rows_ means none are
     canvas_painter.drawPixmap(x * (kWidth + 1), y * (kHeight + 1) + y_, *bar(), 0, y * (kHeight + 1), bar()->width(), bar()->height());
@@ -336,7 +340,9 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
 
 }
 
-void BlockAnalyzer::paletteChange(const QPalette&) {
+void BlockAnalyzer::paletteChange(const QPalette &_palette) {
+
+  Q_UNUSED(_palette)
 
   const QColor bg = palette().color(QPalette::Window);
   const QColor fg = ensureContrast(bg, palette().color(QPalette::Highlight));

src/analyzer/blockanalyzer.h

@@ -26,7 +26,7 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QVector>
+#include <QList>
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
@@ -43,20 +43,13 @@ class BlockAnalyzer : public AnalyzerBase {
  public:
   Q_INVOKABLE explicit BlockAnalyzer(QWidget*);
 
-  static const int kHeight;
-  static const int kWidth;
-  static const int kMinRows;
-  static const int kMinColumns;
-  static const int kMaxColumns;
-  static const int kFadeSize;
-
   static const char *kName;
 
  protected:
   void transform(Scope&) override;
   void analyze(QPainter &p, const Scope &s, const bool new_frame) override;
   void resizeEvent(QResizeEvent*) override;
-  virtual void paletteChange(const QPalette&);
+  virtual void paletteChange(const QPalette &_palette);
   void framerateChanged() override;
 
   void drawBackground();
@@ -72,12 +65,12 @@ class BlockAnalyzer : public AnalyzerBase {
   QPixmap background_;
   QPixmap canvas_;
   Scope scope_;  // so we don't create a vector every frame
-  QVector<double> store_;  // current bar heights
-  QVector<double> yscale_;
+  QList<double> store_;  // current bar heights
+  QList<double> yscale_;
 
-  QVector<QPixmap> fade_bars_;
-  QVector<int> fade_pos_;
-  QVector<int> fade_intensity_;
+  QList<QPixmap> fade_bars_;
+  QList<int> fade_pos_;
+  QList<int> fade_intensity_;
 
   double step_;  // rows to fall per frame
 };

src/analyzer/boomanalyzer.h

@@ -47,7 +47,7 @@ class BoomAnalyzer : public AnalyzerBase {
   void transform(Scope &s) override;
   void analyze(QPainter &p, const Scope &scope, const bool new_frame) override;
 
- public slots:
+ public Q_SLOTS:
   void changeK_barHeight(int);
   void changeF_peakSpeed(int);
 

src/analyzer/fht.cpp

@@ -25,7 +25,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include <QVector>
+#include <QList>
 #include <QtMath>
 
 FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast<int>(n)) {

src/analyzer/fht.h

@@ -23,7 +23,7 @@
 #ifndef FHT_H
 #define FHT_H
 
-#include <QVector>
+#include <QList>
 
 /**
  * Implementation of the Hartley Transform after Bracewell's discrete
@@ -37,9 +37,9 @@ class FHT {
   const int num_;
   const int exp2_;
 
-  QVector<float> buf_vector_;
-  QVector<float> tab_vector_;
-  QVector<int> log_vector_;
+  QList<float> buf_vector_;
+  QList<float> tab_vector_;
+  QList<int> log_vector_;
 
   float *buf_();
   float *tab_();

src/analyzer/rainbowanalyzer.cpp

@@ -41,6 +41,8 @@
 #include "fht.h"
 #include "analyzerbase.h"
 
+using namespace Qt::Literals::StringLiterals;
+
 const char *NyanCatAnalyzer::kName = "Nyanalyzer Cat";
 const char *RainbowDashAnalyzer::kName = "Rainbow Dash";
 
@@ -68,8 +70,8 @@ RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
       background_brush_(QColor(0x0f, 0x43, 0x73)) {
 
   rainbowtype = rbtype;
-  cat_dash_[0] = QPixmap(QStringLiteral(":/pictures/nyancat.png"));
-  cat_dash_[1] = QPixmap(QStringLiteral(":/pictures/rainbowdash.png"));
+  cat_dash_[0] = QPixmap(u":/pictures/nyancat.png"_s);
+  cat_dash_[1] = QPixmap(u":/pictures/rainbowdash.png"_s);
   memset(history_, 0, sizeof(history_));
 
   for (int i = 0; i < kRainbowBands; ++i) {

src/analyzer/waverubberanalyzer.cpp

@@ -82,9 +82,9 @@ void WaveRubberAnalyzer::analyze(QPainter &p, const Scope &s, const bool new_fra
 
 }
 
-void WaveRubberAnalyzer::transform(Scope &s) {
+void WaveRubberAnalyzer::transform(Scope &scope) {
   // No need transformation for waveform analyzer
-  Q_UNUSED(s);
+  Q_UNUSED(scope);
 }
 
 void WaveRubberAnalyzer::demo(QPainter &p) {

src/collection/collectionbackend.h

@@ -36,7 +36,7 @@
 #include <QUrl>
 #include <QSqlDatabase>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/song.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
@@ -45,7 +45,6 @@
 class QThread;
 class TaskManager;
 class Database;
-class SmartPlaylistSearch;
 
 class CollectionBackendInterface : public QObject {
   Q_OBJECT
@@ -227,8 +226,7 @@ class CollectionBackend : public CollectionBackendInterface {
 
   SongList GetSongsByFingerprint(const QString &fingerprint) override;
 
-  SongList SmartPlaylistsGetAllSongs();
-  SongList SmartPlaylistsFindSongs(const SmartPlaylistSearch &search);
+  SongList ExecuteQuery(const QString &sql);
 
   void AddOrUpdateSongsAsync(const SongList &songs);
   void UpdateSongsBySongIDAsync(const SongMap &new_songs);
@@ -236,7 +234,7 @@ class CollectionBackend : public CollectionBackendInterface {
   void UpdateSongRatingAsync(const int id, const float rating, const bool save_tags = false);
   void UpdateSongsRatingAsync(const QList<int> &ids, const float rating, const bool save_tags = false);
 
- public slots:
+ public Q_SLOTS:
   void Exit();
   void GetAllSongs(const int id);
   void LoadDirectories();
@@ -275,7 +273,7 @@ class CollectionBackend : public CollectionBackendInterface {
   void UpdateLastSeen(const int directory_id, const int expire_unavailable_songs_days);
   void ExpireSongs(const int directory_id, const int expire_unavailable_songs_days);
 
- signals:
+ Q_SIGNALS:
   void DirectoryAdded(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdir);
   void DirectoryDeleted(const CollectionDirectory &dir);
 

src/collection/collectiondirectorymodel.cpp

@@ -29,7 +29,7 @@
 #include <QVariant>
 #include <QString>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/filesystemmusicstorage.h"
 #include "core/iconloader.h"
 #include "core/musicstorage.h"
@@ -39,10 +39,11 @@
 #include "collectiondirectorymodel.h"
 
 using std::make_shared;
+using namespace Qt::Literals::StringLiterals;
 
 CollectionDirectoryModel::CollectionDirectoryModel(SharedPtr<CollectionBackend> backend, QObject *parent)
     : QStandardItemModel(parent),
-      dir_icon_(IconLoader::Load(QStringLiteral("document-open-folder"))),
+      dir_icon_(IconLoader::Load(u"document-open-folder"_s)),
       backend_(backend) {
 
   QObject::connect(&*backend_, &CollectionBackend::DirectoryAdded, this, &CollectionDirectoryModel::AddDirectory);

src/collection/collectiondirectorymodel.h

@@ -33,7 +33,7 @@
 #include <QStringList>
 #include <QIcon>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "collectiondirectory.h"
 
 class QModelIndex;
@@ -54,7 +54,7 @@ class CollectionDirectoryModel : public QStandardItemModel {
   QMap<int, CollectionDirectory> directories() const { return directories_; }
   QStringList paths() const { return paths_; }
 
- private slots:
+ private Q_SLOTS:
   void AddDirectory(const CollectionDirectory &directory);
   void RemoveDirectory(const CollectionDirectory &directory);
 

src/collection/collectionfilter.cpp

@@ -19,29 +19,30 @@
 
 #include "config.h"
 
-#include <QSortFilterProxyModel>
-#include <QVariant>
+#include <algorithm>
+#include <functional>
+
+#include <QSet>
+#include <QList>
 #include <QString>
-#include <QStringList>
-
-#include "core/logging.h"
-#include "utilities/timeconstants.h"
-#include "utilities/searchparserutils.h"
+#include <QUrl>
 
+#include "core/song.h"
+#include "core/songmimedata.h"
+#include "filterparser/filterparser.h"
+#include "filterparser/filtertree.h"
+#include "collectionbackend.h"
 #include "collectionfilter.h"
 #include "collectionmodel.h"
 #include "collectionitem.h"
 
-const QStringList CollectionFilter::Operators = QStringList() << QStringLiteral(":")
-                                                              << QStringLiteral("=")
-                                                              << QStringLiteral("==")
-                                                              << QStringLiteral("<>")
-                                                              << QStringLiteral("<")
-                                                              << QStringLiteral("<=")
-                                                              << QStringLiteral(">")
-                                                              << QStringLiteral(">=");
+CollectionFilter::CollectionFilter(QObject *parent) : QSortFilterProxyModel(parent), query_hash_(0) {
 
-CollectionFilter::CollectionFilter(QObject *parent) : QSortFilterProxyModel(parent) {}
+  setSortLocaleAware(true);
+  setDynamicSortFilter(true);
+  setRecursiveFilteringEnabled(true);
+
+}
 
 bool CollectionFilter::filterAcceptsRow(const int source_row, const QModelIndex &source_parent) const {
 
@@ -52,284 +53,79 @@ bool CollectionFilter::filterAcceptsRow(const int source_row, const QModelIndex
   CollectionItem *item = model->IndexToItem(idx);
   if (!item) return false;
 
-  if (item->type == CollectionItem::Type::LoadingIndicator) return true;
+  if (filter_string_.isEmpty()) return true;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  QString filter_text = filterRegularExpression().pattern().remove(QLatin1Char('\\'));
-#else
-  QString filter_text = filterRegExp().pattern();
-#endif
+  if (item->type != CollectionItem::Type::Song) {
+    return item->type == CollectionItem::Type::LoadingIndicator;
+  }
 
-  if (filter_text.isEmpty()) return true;
+  size_t hash = qHash(filter_string_);
+  if (hash != query_hash_) {
+    FilterParser p(filter_string_);
+    filter_tree_.reset(p.parse());
+    query_hash_ = hash;
+  }
 
-  filter_text = filter_text.replace(QRegularExpression(QStringLiteral("\\s*:\\s*")), QStringLiteral(":"))
-                           .replace(QRegularExpression(QStringLiteral("\\s*=\\s*")), QStringLiteral("="))
-                           .replace(QRegularExpression(QStringLiteral("\\s*==\\s*")), QStringLiteral("=="))
-                           .replace(QRegularExpression(QStringLiteral("\\s*<>\\s*")), QStringLiteral("<>"))
-                           .replace(QRegularExpression(QStringLiteral("\\s*<\\s*")), QStringLiteral("<"))
-                           .replace(QRegularExpression(QStringLiteral("\\s*>\\s*")), QStringLiteral(">"))
-                           .replace(QRegularExpression(QStringLiteral("\\s*<=\\s*")), QStringLiteral("<="))
-                           .replace(QRegularExpression(QStringLiteral("\\s*>=\\s*")), QStringLiteral(">="));
+  return item->metadata.is_valid() && filter_tree_->accept(item->metadata);
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-  const QStringList tokens = filter_text.split(QRegularExpression(QStringLiteral("\\s+")), Qt::SkipEmptyParts);
-#else
-  const QStringList tokens = filter_text.split(QRegularExpression(QStringLiteral("\\s+")), QString::SkipEmptyParts);
-#endif
+}
 
-  filter_text.clear();
+void CollectionFilter::SetFilterString(const QString &filter_string) {
 
-  FilterList filters;
-  static QRegularExpression operator_regex(QStringLiteral("(=|<[>=]?|>=?|!=)"));
-  for (int i = 0; i < tokens.count(); ++i) {
-    const QString &token = tokens[i];
-    if (token.contains(QLatin1Char(':'))) {
-      QString field = token.section(QLatin1Char(':'), 0, 0).remove(QLatin1Char(':')).trimmed();
-      QString value = token.section(QLatin1Char(':'), 1, -1).remove(QLatin1Char(':')).trimmed();
-      if (field.isEmpty() || value.isEmpty()) continue;
-      if (Song::kTextSearchColumns.contains(field, Qt::CaseInsensitive) && value.count(QLatin1Char('"')) <= 2) {
-        bool quotation_mark_start = false;
-        bool quotation_mark_end = false;
-        if (value.left(1) == QLatin1Char('"')) {
-          value.remove(0, 1);
-          quotation_mark_start = true;
-          if (value.length() >= 1 && value.count(QLatin1Char('"')) == 1) {
-            value = value.section(QLatin1Char(QLatin1Char('"')), 0, 0).remove(QLatin1Char('"')).trimmed();
-            quotation_mark_end = true;
-          }
-        }
-        for (int y = i + 1; y < tokens.count() && !quotation_mark_end; ++y) {
-          QString next_value = tokens[y];
-          if (!quotation_mark_start && ContainsOperators(next_value)) {
-            break;
-          }
-          if (quotation_mark_start && next_value.contains(QLatin1Char('"'))) {
-            next_value = next_value.section(QLatin1Char(QLatin1Char('"')), 0, 0).remove(QLatin1Char('"')).trimmed();
-            quotation_mark_end = true;
-          }
-          value.append(QLatin1Char(' ') + next_value);
-          i = y;
-        }
-        if (!field.isEmpty() && !value.isEmpty()) {
-          filters.insert(field, Filter(field, value));
-        }
-        continue;
+  filter_string_ = filter_string;
+  setFilterFixedString(filter_string);
+
+}
+
+QMimeData *CollectionFilter::mimeData(const QModelIndexList &indexes) const {
+
+  if (indexes.isEmpty()) return nullptr;
+
+  CollectionModel *collection_model = qobject_cast<CollectionModel*>(sourceModel());
+  SongMimeData *data = new SongMimeData;
+  data->backend = collection_model->backend();
+
+  QSet<int> song_ids;
+  QList<QUrl> urls;
+  for (const QModelIndex &idx : indexes) {
+    const QModelIndex source_index = mapToSource(idx);
+    CollectionItem *item = collection_model->IndexToItem(source_index);
+    GetChildSongs(item, song_ids, urls, data->songs);
+  }
+
+  data->setUrls(urls);
+  data->name_for_new_playlist_ = Song::GetNameForNewPlaylist(data->songs);
+
+  return data;
+
+}
+
+void CollectionFilter::GetChildSongs(CollectionItem *item, QSet<int> &song_ids, QList<QUrl> &urls, SongList &songs) const {
+
+  CollectionModel *collection_model = qobject_cast<CollectionModel*>(sourceModel());
+
+  switch (item->type) {
+    case CollectionItem::Type::Container:{
+      QList<CollectionItem*> children = item->children;
+      std::sort(children.begin(), children.end(), std::bind(&CollectionModel::CompareItems, collection_model, std::placeholders::_1, std::placeholders::_2));
+      for (CollectionItem *child : children) {
+        GetChildSongs(child, song_ids, urls, songs);
       }
+      break;
     }
-    else if (token.contains(operator_regex)) {
-      QRegularExpressionMatch re_match = operator_regex.match(token);
-      if (re_match.hasMatch()) {
-        const QString foperator = re_match.captured(0);
-        const QString field = token.section(foperator, 0, 0).remove(foperator).trimmed();
-        const QString value = token.section(foperator, 1, -1).remove(foperator).trimmed();
-        if (value.isEmpty()) continue;
-        if (Song::kNumericalSearchColumns.contains(field, Qt::CaseInsensitive)) {
-          if (Song::kIntSearchColumns.contains(field, Qt::CaseInsensitive)) {
-            bool ok = false;
-            const int value_int = value.toInt(&ok);
-            if (ok) {
-              filters.insert(field, Filter(field, value_int, foperator));
-              continue;
-            }
-          }
-          else if (Song::kUIntSearchColumns.contains(field, Qt::CaseInsensitive)) {
-            bool ok = false;
-            const uint value_uint = value.toUInt(&ok);
-            if (ok) {
-              filters.insert(field, Filter(field, value_uint, foperator));
-              continue;
-            }
-          }
-          else if (field.compare(QLatin1String("length"), Qt::CaseInsensitive) == 0) {
-            filters.insert(field, Filter(field, static_cast<qint64>(Utilities::ParseSearchTime(value)) * kNsecPerSec, foperator));
-            continue;
-          }
-          else if (field.compare(QLatin1String("rating"), Qt::CaseInsensitive) == 0) {
-            filters.insert(field, Filter(field, Utilities::ParseSearchRating(value), foperator));
-          }
+    case CollectionItem::Type::Song:{
+      const QModelIndex idx = collection_model->ItemToIndex(item);
+      if (filterAcceptsRow(idx.row(), idx.parent())) {
+        urls << item->metadata.url();
+        if (!song_ids.contains(item->metadata.id())) {
+          song_ids.insert(item->metadata.id());
+          songs << item->metadata;
         }
       }
+      break;
     }
-    if (!filter_text.isEmpty()) filter_text.append(QLatin1Char(' '));
-    filter_text += token;
+    default:
+      break;
   }
 
-  if (filter_text.isEmpty() && filters.isEmpty()) return true;
-
-  return ItemMatchesFilters(item, filters, filter_text);
-
-}
-
-bool CollectionFilter::ItemMatchesFilters(CollectionItem *item, const FilterList &filters, const QString &filter_text) {
-
- if (item->type == CollectionItem::Type::Song &&
-     item->metadata.is_valid() &&
-     ItemMetadataMatchesFilters(item->metadata, filters, filter_text)) {
-    return true;
- }
-
-  for (CollectionItem *child : std::as_const(item->children)) {
-    if (ItemMatchesFilters(child, filters, filter_text)) return true;
-  }
-
-  return false;
-
-}
-
-bool CollectionFilter::ItemMetadataMatchesFilters(const Song &metadata, const FilterList &filters, const QString &filter_text) {
-
-  for (FilterList::const_iterator it = filters.begin() ; it != filters.end() ; ++it) {
-    const QString &field = it.key();
-    const Filter &filter = it.value();
-    const QVariant &value = filter.value;
-    const QString &foperator = filter.foperator;
-    if (field.isEmpty() || !value.isValid()) {
-      continue;
-    }
-    const QVariant data = DataFromField(field, metadata);
-    if (
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        value.metaType() != data.metaType()
-#else
-        value.type() != data.type()
-#endif
-        || !FieldValueMatchesData(value, data, foperator)) {
-      return false;
-    }
-  }
-
-  return filter_text.isEmpty() || ItemMetadataMatchesFilterText(metadata, filter_text);
-
-}
-
-bool CollectionFilter::ItemMetadataMatchesFilterText(const Song &metadata, const QString &filter_text) {
-
-  return metadata.effective_albumartist().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.artist().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.album().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.title().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.composer().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.performer().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.grouping().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.genre().contains(filter_text, Qt::CaseInsensitive) ||
-         metadata.comment().contains(filter_text, Qt::CaseInsensitive);
-
-}
-
-QVariant CollectionFilter::DataFromField(const QString &field, const Song &metadata) {
-
-  if (field == QLatin1String("albumartist")) return metadata.effective_albumartist();
-  if (field == QLatin1String("artist"))      return metadata.artist();
-  if (field == QLatin1String("album"))       return metadata.album();
-  if (field == QLatin1String("title"))       return metadata.title();
-  if (field == QLatin1String("composer"))    return metadata.composer();
-  if (field == QLatin1String("performer"))   return metadata.performer();
-  if (field == QLatin1String("grouping"))    return metadata.grouping();
-  if (field == QLatin1String("genre"))       return metadata.genre();
-  if (field == QLatin1String("comment"))     return metadata.comment();
-  if (field == QLatin1String("track"))       return metadata.track();
-  if (field == QLatin1String("year"))        return metadata.year();
-  if (field == QLatin1String("length"))      return metadata.length_nanosec();
-  if (field == QLatin1String("samplerate"))  return metadata.samplerate();
-  if (field == QLatin1String("bitdepth"))    return metadata.bitdepth();
-  if (field == QLatin1String("bitrate"))     return metadata.bitrate();
-  if (field == QLatin1String("rating"))      return metadata.rating();
-  if (field == QLatin1String("playcount"))   return metadata.playcount();
-  if (field == QLatin1String("skipcount"))   return metadata.skipcount();
-
-  return QVariant();
-
-}
-
-bool CollectionFilter::FieldValueMatchesData(const QVariant &value, const QVariant &data, const QString &foperator) {
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  switch (value.metaType().id()) {
-#else
-  switch (value.userType()) {
-#endif
-    case QMetaType::QString:{
-      const QString str_value = value.toString();
-      const QString str_data = data.toString();
-      return str_data.contains(str_value, Qt::CaseInsensitive);
-    }
-    case QMetaType::Int:{
-      return FieldIntValueMatchesData(value.toInt(), foperator, data.toInt());
-    }
-    case QMetaType::UInt:{
-      return FieldUIntValueMatchesData(value.toUInt(), foperator, data.toUInt());
-    }
-    case QMetaType::LongLong:{
-      return FieldLongLongValueMatchesData(value.toLongLong(), foperator, data.toLongLong());
-    }
-    case QMetaType::Float:{
-      return FieldFloatValueMatchesData(value.toFloat(), foperator, data.toFloat());
-    }
-    default:{
-      return false;
-    }
-  }
-
-  return false;
-
-}
-
-template<typename T>
-bool CollectionFilter::FieldNumericalValueMatchesData(const T value, const QString &foperator, const T data) {
-
-  if (foperator == QLatin1Char('=') || foperator == QLatin1String("==")) {
-    return data == value;
-  }
-  if (foperator == QLatin1String("!=") || foperator == QLatin1String("<>")) {
-    return data != value;
-  }
-  if (foperator == QLatin1Char('<')) {
-    return data < value;
-  }
-  if (foperator == QLatin1Char('>')) {
-    return data > value;
-  }
-  if (foperator == QLatin1String(">=")) {
-    return data >= value;
-  }
-  if (foperator == QLatin1String("<=")) {
-    return data <= value;
-  }
-
-  return false;
-
-}
-
-bool CollectionFilter::FieldIntValueMatchesData(const int value, const QString &foperator, const int data) {
-
-  return FieldNumericalValueMatchesData(value, foperator, data);
-
-}
-
-bool CollectionFilter::FieldUIntValueMatchesData(const uint value, const QString &foperator, const uint data) {
-
-  return FieldNumericalValueMatchesData(value, foperator, data);
-
-}
-
-bool CollectionFilter::FieldLongLongValueMatchesData(const qint64 value, const QString &foperator, const qint64 data) {
-
-  return FieldNumericalValueMatchesData(value, foperator, data);
-
-}
-
-bool CollectionFilter::FieldFloatValueMatchesData(const float value, const QString &foperator, const float data) {
-
-  return FieldNumericalValueMatchesData(value, foperator, data);
-
-}
-
-bool CollectionFilter::ContainsOperators(const QString &token) {
-
-  for (const QString &foperator : Operators) {
-    if (token.contains(foperator, Qt::CaseInsensitive)) return true;
-  }
-
-  return false;
-
 }

src/collection/collectionfilter.h

@@ -22,14 +22,14 @@
 
 #include "config.h"
 
-#include <QtGlobal>
-#include <QObject>
 #include <QSortFilterProxyModel>
-#include <QVariant>
-#include <QString>
-#include <QStringList>
+#include <QScopedPointer>
+#include <QSet>
+#include <QList>
+#include <QUrl>
 
 #include "core/song.h"
+#include "filterparser/filtertree.h"
 
 class CollectionItem;
 
@@ -39,31 +39,20 @@ class CollectionFilter : public QSortFilterProxyModel {
  public:
   explicit CollectionFilter(QObject *parent = nullptr);
 
+  void SetFilterString(const QString &filter_string);
+  QString filter_string() const { return filter_string_; }
+
  protected:
   bool filterAcceptsRow(const int source_row, const QModelIndex &source_parent) const override;
+  QMimeData *mimeData(const QModelIndexList &indexes) const override;
 
  private:
-  static const QStringList Operators;
-  struct Filter {
-   public:
-    Filter(const QString &_field = QString(), const QVariant &_value = QVariant(), const QString &_foperator = QString()) : field(_field), value(_value), foperator(_foperator) {}
-    QString field;
-    QVariant value;
-    QString foperator;
-  };
-  using FilterList = QMap<QString, Filter>;
-  static bool ItemMatchesFilters(CollectionItem *item, const FilterList &filters, const QString &filter_text);
-  static bool ItemMetadataMatchesFilters(const Song &metadata, const FilterList &filters, const QString &filter_text);
-  static bool ItemMetadataMatchesFilterText(const Song &metadata, const QString &filter_text);
-  static QVariant DataFromField(const QString &field, const Song &metadata);
-  static bool FieldValueMatchesData(const QVariant &value, const QVariant &data, const QString &foperator);
-  template<typename T>
-  static bool FieldNumericalValueMatchesData(const T value, const QString &foperator, const T data);
-  static bool FieldIntValueMatchesData(const int value, const QString &foperator, const int data);
-  static bool FieldUIntValueMatchesData(const uint value, const QString &foperator, const uint data);
-  static bool FieldLongLongValueMatchesData(const qint64 value, const QString &foperator, const qint64 data);
-  static bool FieldFloatValueMatchesData(const float value, const QString &foperator, const float data);
-  static bool ContainsOperators(const QString &token);
+  void GetChildSongs(CollectionItem *item, QSet<int> &song_ids, QList<QUrl> &urls, SongList &songs) const;
+
+ private:
+  mutable QScopedPointer<FilterTree> filter_tree_;
+  mutable size_t query_hash_;
+  QString filter_string_;
 };
 
 #endif  // COLLECTIONFILTER_H

src/collection/collectionfilterwidget.cpp

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <utility>
-#include <memory>
 
 #include <QApplication>
 #include <QWidget>
@@ -42,23 +41,28 @@
 #include <QMenu>
 #include <QSettings>
 #include <QToolButton>
-#include <QtEvents>
+#include <QKeyEvent>
 
 #include "core/iconloader.h"
-#include "core/song.h"
 #include "core/logging.h"
 #include "core/settings.h"
 #include "collectionfilteroptions.h"
 #include "collectionmodel.h"
 #include "collectionfilter.h"
-#include "collectionquery.h"
+#include "filterparser/filterparser.h"
 #include "savedgroupingmanager.h"
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
 #include "ui_collectionfilterwidget.h"
-#include "widgets/qsearchfield.h"
-#include "settings/collectionsettingspage.h"
-#include "settings/appearancesettingspage.h"
+#include "widgets/searchfield.h"
+#include "constants/collectionsettings.h"
+#include "constants/appearancesettings.h"
+
+using namespace Qt::Literals::StringLiterals;
+
+namespace {
+constexpr int kFilterDelay = 500;  // msec
+}
 
 CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
     : QWidget(parent),
@@ -71,50 +75,22 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
       group_by_menu_(nullptr),
       collection_menu_(nullptr),
       group_by_group_(nullptr),
-      filter_delay_(new QTimer(this)),
+      timer_filter_delay_(new QTimer(this)),
       filter_applies_to_model_(true),
       delay_behaviour_(DelayBehaviour::DelayedOnLargeLibraries) {
 
   ui_->setupUi(this);
 
-  QString available_fields = Song::kTextSearchColumns.join(QLatin1String(", "));
-  available_fields += QLatin1String(", ") + Song::kNumericalSearchColumns.join(QLatin1String(", "));
+  ui_->search_field->setToolTip(FilterParser::ToolTip());
 
-  ui_->search_field->setToolTip(
-    QLatin1String("<html><head/><body><p>") +
-    tr("Prefix a word with a field name to limit the search to that field, e.g.:") +
-    QLatin1Char(' ') +
-    QLatin1String("<span style=\"font-weight:600;\">") +
-    tr("artist") +
-    QLatin1String(":</span><span style=\"font-style:italic;\">Strawbs</span> ") +
-    tr("searches the collection for all artists that contain the word %1. ").arg(QLatin1String("Strawbs")) +
-    QLatin1String("</p><p>") +
-    tr("Search terms for numerical fields can be prefixed with %1 or %2 to refine the search, e.g.: ")
-      .arg(QLatin1String(" =, !=, &lt;, &gt;, &lt;="), QLatin1String("&gt;=")) +
-    QLatin1String("<span style=\"font-weight:600;\">") +
-    tr("rating") +
-    QLatin1String("</span>") +
-    QLatin1String(":>=") +
-    QLatin1String("<span style=\"font-weight:italic;\">4</span>") +
+  QObject::connect(ui_->search_field, &SearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed);
+  QObject::connect(timer_filter_delay_, &QTimer::timeout, this, &CollectionFilterWidget::FilterDelayTimeout);
 
-    QLatin1String("</p><p><span style=\"font-weight:600;\">") +
-    tr("Available fields") +
-    QLatin1String(": ") +
-    QLatin1String("</span>") +
-    QLatin1String("<span style=\"font-style:italic;\">") +
-    available_fields +
-    QLatin1String("</span>.") +
-    QLatin1String("</p></body></html>")
-  );
-
-  QObject::connect(ui_->search_field, &QSearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed);
-  QObject::connect(filter_delay_, &QTimer::timeout, this, &CollectionFilterWidget::FilterDelayTimeout);
-
-  filter_delay_->setInterval(kFilterDelay);
-  filter_delay_->setSingleShot(true);
+  timer_filter_delay_->setInterval(kFilterDelay);
+  timer_filter_delay_->setSingleShot(true);
 
   // Icons
-  ui_->options->setIcon(IconLoader::Load(QStringLiteral("configure")));
+  ui_->options->setIcon(IconLoader::Load(u"configure"_s));
 
   // Filter by age
   QActionGroup *filter_age_group = new QActionGroup(this);
@@ -150,7 +126,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
   collection_menu_->addSeparator();
   ui_->options->setMenu(collection_menu_);
 
-  QObject::connect(ui_->search_field, &QSearchField::textChanged, this, &CollectionFilterWidget::FilterTextChanged);
+  QObject::connect(ui_->search_field, &SearchField::textChanged, this, &CollectionFilterWidget::FilterTextChanged);
   QObject::connect(ui_->options, &QToolButton::clicked, ui_->options, &QToolButton::showMenu);
 
   ReloadSettings();
@@ -181,7 +157,7 @@ void CollectionFilterWidget::Init(CollectionModel *model, CollectionFilter *filt
 
   const QList<QAction*> actions = filter_max_ages_.keys();
   for (QAction *action : actions) {
-    int filter_max_age = filter_max_ages_[action];
+    const int filter_max_age = filter_max_ages_.value(action);
     QObject::connect(action, &QAction::triggered, this, [this, filter_max_age]() { model_->SetFilterMaxAge(filter_max_age); } );
   }
 
@@ -228,8 +204,8 @@ void CollectionFilterWidget::setFilter(CollectionFilter *filter) {
 void CollectionFilterWidget::ReloadSettings() {
 
   Settings s;
-  s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
-  int iconsize = s.value(AppearanceSettingsPage::kIconSizeConfigureButtons, 20).toInt();
+  s.beginGroup(AppearanceSettings::kSettingsGroup);
+  int iconsize = s.value(AppearanceSettings::kIconSizeConfigureButtons, 20).toInt();
   s.endGroup();
   ui_->options->setIconSize(QSize(iconsize, iconsize));
   ui_->search_field->setIconSize(iconsize);
@@ -239,7 +215,7 @@ void CollectionFilterWidget::ReloadSettings() {
 QString CollectionFilterWidget::group_by_version() const {
 
   if (settings_prefix_.isEmpty()) {
-    return QStringLiteral("group_by_version");
+    return u"group_by_version"_s;
   }
 
   return QStringLiteral("%1_group_by_version").arg(settings_prefix_);
@@ -249,7 +225,7 @@ QString CollectionFilterWidget::group_by_version() const {
 QString CollectionFilterWidget::group_by_key() const {
 
   if (settings_prefix_.isEmpty()) {
-    return QStringLiteral("group_by");
+    return u"group_by"_s;
   }
 
   return QStringLiteral("%1_group_by").arg(settings_prefix_);
@@ -261,7 +237,7 @@ QString CollectionFilterWidget::group_by_key(const int number) const { return gr
 QString CollectionFilterWidget::separate_albums_by_grouping_key() const {
 
   if (settings_prefix_.isEmpty()) {
-    return QStringLiteral("separate_albums_by_grouping");
+    return u"separate_albums_by_grouping"_s;
   }
 
   return QStringLiteral("%1_separate_albums_by_grouping").arg(settings_prefix_);
@@ -319,7 +295,7 @@ QActionGroup *CollectionFilterWidget::CreateGroupByActions(const QString &saved_
   if (version == 1) {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      if (saved.at(i) == QLatin1String("version")) continue;
+      if (saved.at(i) == "version"_L1) continue;
       QByteArray bytes = s.value(saved.at(i)).toByteArray();
       QDataStream ds(&bytes, QIODevice::ReadOnly);
       CollectionModel::Grouping g;
@@ -330,7 +306,7 @@ QActionGroup *CollectionFilterWidget::CreateGroupByActions(const QString &saved_
   else {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      if (saved.at(i) == QLatin1String("version")) continue;
+      if (saved.at(i) == "version"_L1) continue;
       s.remove(saved.at(i));
     }
   }
@@ -369,7 +345,7 @@ void CollectionFilterWidget::SaveGroupBy() {
   qLog(Debug) << "Saving current grouping to" << name;
 
   Settings s;
-  if (settings_group_.isEmpty() || settings_group_ == QLatin1String(CollectionSettingsPage::kSettingsGroup)) {
+  if (settings_group_.isEmpty() || settings_group_ == QLatin1String(CollectionSettings::kSettingsGroup)) {
     s.beginGroup(SavedGroupingManager::kSavedGroupingsSettingsGroup);
   }
   else {
@@ -378,7 +354,7 @@ void CollectionFilterWidget::SaveGroupBy() {
   QByteArray buffer;
   QDataStream datastream(&buffer, QIODevice::WriteOnly);
   datastream << model_->GetGroupBy();
-  s.setValue("version", QStringLiteral("1"));
+  s.setValue("version", u"1"_s);
   s.setValue(name, buffer);
   s.endGroup();
 
@@ -502,12 +478,12 @@ void CollectionFilterWidget::keyReleaseEvent(QKeyEvent *e) {
 
   switch (e->key()) {
     case Qt::Key_Up:
-      emit UpPressed();
+      Q_EMIT UpPressed();
       e->accept();
       break;
 
     case Qt::Key_Down:
-      emit DownPressed();
+      Q_EMIT DownPressed();
       e->accept();
       break;
 
@@ -529,10 +505,10 @@ void CollectionFilterWidget::FilterTextChanged(const QString &text) {
   const bool delay = (delay_behaviour_ == DelayBehaviour::AlwaysDelayed) || (delay_behaviour_ == DelayBehaviour::DelayedOnLargeLibraries && !text.isEmpty() && text.length() < 3 && model_->total_song_count() >= 100000);
 
   if (delay) {
-    filter_delay_->start();
+    timer_filter_delay_->start();
   }
   else {
-    filter_delay_->stop();
+    timer_filter_delay_->stop();
     FilterDelayTimeout();
   }
 
@@ -541,7 +517,7 @@ void CollectionFilterWidget::FilterTextChanged(const QString &text) {
 void CollectionFilterWidget::FilterDelayTimeout() {
 
   if (filter_applies_to_model_) {
-    filter_->setFilterFixedString(ui_->search_field->text());
+    filter_->SetFilterString(ui_->search_field->text());
   }
 
 }

src/collection/collectionfilterwidget.h

@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#include <memory>
-
 #include <QWidget>
 #include <QObject>
 #include <QHash>
@@ -51,8 +49,6 @@ class CollectionFilterWidget : public QWidget {
   explicit CollectionFilterWidget(QWidget *parent = nullptr);
   ~CollectionFilterWidget() override;
 
-  static const int kFilterDelay = 500;  // msec
-
   enum class DelayBehaviour {
     AlwaysInstant,
     DelayedOnLargeLibraries,
@@ -88,12 +84,12 @@ class CollectionFilterWidget : public QWidget {
   bool SearchFieldHasFocus() const;
   void FocusSearchField();
 
- public slots:
+ public Q_SLOTS:
   void UpdateGroupByActions();
   void SetFilterMode(CollectionFilterOptions::FilterMode filter_mode);
   void FocusOnFilter(QKeyEvent *e);
 
- signals:
+ Q_SIGNALS:
   void UpPressed();
   void DownPressed();
   void ReturnPressed();
@@ -101,7 +97,7 @@ class CollectionFilterWidget : public QWidget {
  protected:
   void keyReleaseEvent(QKeyEvent *e) override;
 
- private slots:
+ private Q_SLOTS:
   void GroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping);
   void GroupByClicked(QAction *action);
   void SaveGroupBy();
@@ -128,7 +124,7 @@ class CollectionFilterWidget : public QWidget {
   QActionGroup *group_by_group_;
   QHash<QAction*, int> filter_max_ages_;
 
-  QTimer *filter_delay_;
+  QTimer *timer_filter_delay_;
 
   bool filter_applies_to_model_;
   DelayBehaviour delay_behaviour_;

src/collection/collectionfilterwidget.ui

@@ -30,7 +30,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QSearchField" name="search_field" native="true">
+    <widget class="SearchField" name="search_field" native="true">
      <property name="placeholderText" stdset="0">
       <string>Enter search terms here</string>
      </property>
@@ -123,9 +123,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QSearchField</class>
+   <class>SearchField</class>
    <extends>QWidget</extends>
-   <header>widgets/qsearchfield.h</header>
+   <header>widgets/searchfield.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/collection/collectionitem.cpp

@@ -0,0 +1,32 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "collectionitem.h"
+
+CollectionItem::CollectionItem(SimpleTreeModel<CollectionItem> *_model)
+    : SimpleTreeItem<CollectionItem>(_model),
+      type(Type::Root),
+      container_level(-1),
+      compilation_artist_node_(nullptr) {}
+
+CollectionItem::CollectionItem(const Type _type, CollectionItem *_parent)
+    : SimpleTreeItem<CollectionItem>(_parent),
+      type(_type),
+      container_level(-1),
+      compilation_artist_node_(nullptr) {}

src/collection/collectionitem.h

@@ -1,8 +1,6 @@
 /*
  * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +20,6 @@
 #ifndef COLLECTIONITEM_H
 #define COLLECTIONITEM_H
 
-#include "config.h"
-
 #include "core/simpletreeitem.h"
 #include "core/song.h"
 
@@ -37,17 +33,8 @@ class CollectionItem : public SimpleTreeItem<CollectionItem> {
     LoadingIndicator,
   };
 
-  explicit CollectionItem(SimpleTreeModel<CollectionItem> *_model)
-      : SimpleTreeItem<CollectionItem>(_model),
-        type(Type::Root),
-        container_level(-1),
-        compilation_artist_node_(nullptr) {}
-
-  explicit CollectionItem(const Type _type, CollectionItem *_parent = nullptr)
-      : SimpleTreeItem<CollectionItem>(_parent),
-        type(_type),
-        container_level(-1),
-        compilation_artist_node_(nullptr) {}
+  explicit CollectionItem(SimpleTreeModel<CollectionItem> *_model);
+  explicit CollectionItem(const Type _type, CollectionItem *_parent = nullptr);
 
   Type type;
   int container_level;

src/collection/collectionitemdelegate.h

@@ -40,7 +40,7 @@ class CollectionItemDelegate : public QStyledItemDelegate {
   explicit CollectionItemDelegate(QObject *parent);
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const override;
 
- public slots:
+ public Q_SLOTS:
   bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &idx) override;
 };
 

src/collection/collectionlibrary.cpp

@@ -30,31 +30,34 @@
 #include <QSettings>
 #include <QtConcurrentRun>
 
-#include "core/application.h"
 #include "core/taskmanager.h"
 #include "core/database.h"
-#include "core/tagreaderclient.h"
 #include "core/thread.h"
 #include "core/song.h"
 #include "core/logging.h"
 #include "core/settings.h"
+#include "tagreader/tagreaderclient.h"
 #include "utilities/threadutils.h"
-#include "collection.h"
+#include "collectionlibrary.h"
 #include "collectionwatcher.h"
 #include "collectionbackend.h"
 #include "collectionmodel.h"
-#include "scrobbler/lastfmimport.h"
-#include "settings/collectionsettingspage.h"
+#include "constants/collectionsettings.h"
 
 using std::make_shared;
 
-const char *SCollection::kSongsTable = "songs";
-const char *SCollection::kDirsTable = "directories";
-const char *SCollection::kSubdirsTable = "subdirectories";
+const char *CollectionLibrary::kSongsTable = "songs";
+const char *CollectionLibrary::kDirsTable = "directories";
+const char *CollectionLibrary::kSubdirsTable = "subdirectories";
 
-SCollection::SCollection(Application *app, QObject *parent)
+CollectionLibrary::CollectionLibrary(const SharedPtr<Database> database,
+                                     const SharedPtr<TaskManager> task_manager,
+                                     const SharedPtr<TagReaderClient> tagreader_client,
+                                     const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                                     QObject *parent)
     : QObject(parent),
-      app_(app),
+      task_manager_(task_manager),
+      tagreader_client_(tagreader_client),
       backend_(nullptr),
       model_(nullptr),
       watcher_(nullptr),
@@ -63,24 +66,26 @@ SCollection::SCollection(Application *app, QObject *parent)
       save_playcounts_to_files_(false),
       save_ratings_to_files_(false) {
 
+  setObjectName(QLatin1String(metaObject()->className()));
+
   original_thread_ = thread();
 
   backend_ = make_shared<CollectionBackend>();
-  backend()->moveToThread(app->database()->thread());
-  qLog(Debug) << &*backend_ << "moved to thread" << app->database()->thread();
+  backend()->moveToThread(database->thread());
+  qLog(Debug) << &*backend_ << "moved to thread" << database->thread();
 
-  backend_->Init(app->database(), app->task_manager(), Song::Source::Collection, QLatin1String(kSongsTable), QLatin1String(kDirsTable), QLatin1String(kSubdirsTable));
+  backend_->Init(database, task_manager, Song::Source::Collection, QLatin1String(kSongsTable), QLatin1String(kDirsTable), QLatin1String(kSubdirsTable));
 
-  model_ = new CollectionModel(backend_, app_, this);
+  model_ = new CollectionModel(backend_, albumcover_loader, this);
 
   ReloadSettings();
 
 }
 
-SCollection::~SCollection() {
+CollectionLibrary::~CollectionLibrary() {
 
   if (watcher_) {
-    watcher_->Stop();
+    watcher_->Abort();
     watcher_->deleteLater();
   }
   if (watcher_thread_) {
@@ -90,10 +95,11 @@ SCollection::~SCollection() {
 
 }
 
-void SCollection::Init() {
+void CollectionLibrary::Init() {
 
-  watcher_ = new CollectionWatcher(Song::Source::Collection);
+  watcher_ = new CollectionWatcher(Song::Source::Collection, task_manager_, tagreader_client_, backend_);
   watcher_thread_ = new Thread(this);
+  watcher_thread_->setObjectName(watcher_->objectName());
 
   watcher_thread_->SetIoPriority(Utilities::IoPriority::IOPRIO_CLASS_IDLE);
 
@@ -103,14 +109,11 @@ void SCollection::Init() {
 
   watcher_thread_->start(QThread::IdlePriority);
 
-  watcher_->set_backend(backend_);
-  watcher_->set_task_manager(app_->task_manager());
-
-  QObject::connect(&*backend_, &CollectionBackend::Error, this, &SCollection::Error);
+  QObject::connect(&*backend_, &CollectionBackend::Error, this, &CollectionLibrary::Error);
   QObject::connect(&*backend_, &CollectionBackend::DirectoryAdded, watcher_, &CollectionWatcher::AddDirectory);
   QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, watcher_, &CollectionWatcher::RemoveDirectory);
-  QObject::connect(&*backend_, &CollectionBackend::SongsRatingChanged, this, &SCollection::SongsRatingChanged);
-  QObject::connect(&*backend_, &CollectionBackend::SongsStatisticsChanged, this, &SCollection::SongsPlaycountChanged);
+  QObject::connect(&*backend_, &CollectionBackend::SongsRatingChanged, this, &CollectionLibrary::SongsRatingChanged);
+  QObject::connect(&*backend_, &CollectionBackend::SongsStatisticsChanged, this, &CollectionLibrary::SongsPlaycountChanged);
 
   QObject::connect(watcher_, &CollectionWatcher::NewOrUpdatedSongs, &*backend_, &CollectionBackend::AddOrUpdateSongs);
   QObject::connect(watcher_, &CollectionWatcher::SongsMTimeUpdated, &*backend_, &CollectionBackend::UpdateMTimesOnly);
@@ -122,46 +125,43 @@ void SCollection::Init() {
   QObject::connect(watcher_, &CollectionWatcher::CompilationsNeedUpdating, &*backend_, &CollectionBackend::CompilationsNeedUpdating);
   QObject::connect(watcher_, &CollectionWatcher::UpdateLastSeen, &*backend_, &CollectionBackend::UpdateLastSeen);
 
-  QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdateLastPlayed, &*backend_, &CollectionBackend::UpdateLastPlayed);
-  QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdatePlayCount, &*backend_, &CollectionBackend::UpdatePlayCount);
-
   // This will start the watcher checking for updates
   backend_->LoadDirectoriesAsync();
 
 }
 
-void SCollection::Exit() {
+void CollectionLibrary::Exit() {
 
   wait_for_exit_ << &*backend_ << watcher_;
 
   QObject::disconnect(&*backend_, nullptr, watcher_, nullptr);
   QObject::disconnect(watcher_, nullptr, &*backend_, nullptr);
 
-  QObject::connect(&*backend_, &CollectionBackend::ExitFinished, this, &SCollection::ExitReceived);
-  QObject::connect(watcher_, &CollectionWatcher::ExitFinished, this, &SCollection::ExitReceived);
+  QObject::connect(&*backend_, &CollectionBackend::ExitFinished, this, &CollectionLibrary::ExitReceived);
+  QObject::connect(watcher_, &CollectionWatcher::ExitFinished, this, &CollectionLibrary::ExitReceived);
   backend_->ExitAsync();
   watcher_->Abort();
   watcher_->ExitAsync();
 
 }
 
-void SCollection::ExitReceived() {
+void CollectionLibrary::ExitReceived() {
 
   QObject *obj = sender();
   QObject::disconnect(obj, nullptr, this, nullptr);
   qLog(Debug) << obj << "successfully exited.";
   wait_for_exit_.removeAll(obj);
-  if (wait_for_exit_.isEmpty()) emit ExitFinished();
+  if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished();
 
 }
 
-void SCollection::IncrementalScan() { watcher_->IncrementalScanAsync(); }
+void CollectionLibrary::IncrementalScan() { watcher_->IncrementalScanAsync(); }
 
-void SCollection::FullScan() { watcher_->FullScanAsync(); }
+void CollectionLibrary::FullScan() { watcher_->FullScanAsync(); }
 
-void SCollection::AbortScan() { watcher_->Stop(); }
+void CollectionLibrary::StopScan() { watcher_->Stop(); }
 
-void SCollection::Rescan(const SongList &songs) {
+void CollectionLibrary::Rescan(const SongList &songs) {
 
   qLog(Debug) << "Rescan" << songs.size() << "songs";
   if (!songs.isEmpty()) {
@@ -170,62 +170,58 @@ void SCollection::Rescan(const SongList &songs) {
 
 }
 
-void SCollection::PauseWatcher() { watcher_->SetRescanPausedAsync(true); }
+void CollectionLibrary::PauseWatcher() { watcher_->SetRescanPausedAsync(true); }
 
-void SCollection::ResumeWatcher() { watcher_->SetRescanPausedAsync(false); }
+void CollectionLibrary::ResumeWatcher() { watcher_->SetRescanPausedAsync(false); }
 
-void SCollection::ReloadSettings() {
+void CollectionLibrary::ReloadSettings() {
 
   watcher_->ReloadSettingsAsync();
   model_->ReloadSettings();
 
   Settings s;
-  s.beginGroup(CollectionSettingsPage::kSettingsGroup);
-  save_playcounts_to_files_ = s.value("save_playcounts", false).toBool();
-  save_ratings_to_files_ = s.value("save_ratings", false).toBool();
+  s.beginGroup(CollectionSettings::kSettingsGroup);
+  save_playcounts_to_files_ = s.value(CollectionSettings::kSavePlayCounts, false).toBool();
+  save_ratings_to_files_ = s.value(CollectionSettings::kSaveRatings, false).toBool();
   s.endGroup();
 
 }
 
-void SCollection::SyncPlaycountAndRatingToFilesAsync() {
+void CollectionLibrary::SyncPlaycountAndRatingToFilesAsync() {
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  (void)QtConcurrent::run(&SCollection::SyncPlaycountAndRatingToFiles, this);
-#else
-  (void)QtConcurrent::run(this, &SCollection::SyncPlaycountAndRatingToFiles);
-#endif
+  (void)QtConcurrent::run(&CollectionLibrary::SyncPlaycountAndRatingToFiles, this);
 
 }
 
-void SCollection::SyncPlaycountAndRatingToFiles() {
+void CollectionLibrary::SyncPlaycountAndRatingToFiles() {
 
-  const int task_id = app_->task_manager()->StartTask(tr("Saving playcounts and ratings"));
-  app_->task_manager()->SetTaskBlocksCollectionScans(task_id);
+  const int task_id = task_manager_->StartTask(tr("Saving playcounts and ratings"));
+  task_manager_->SetTaskBlocksCollectionScans(task_id);
 
   const SongList songs = backend_->GetAllSongs();
   const qint64 nb_songs = songs.size();
   int i = 0;
   for (const Song &song : songs) {
-    (void)TagReaderClient::Instance()->SaveSongPlaycountBlocking(song.url().toLocalFile(), song.playcount());
-    (void)TagReaderClient::Instance()->SaveSongRatingBlocking(song.url().toLocalFile(), song.rating());
-    app_->task_manager()->SetTaskProgress(task_id, ++i, nb_songs);
+    (void)tagreader_client_->SaveSongPlaycountBlocking(song.url().toLocalFile(), song.playcount());
+    (void)tagreader_client_->SaveSongRatingBlocking(song.url().toLocalFile(), song.rating());
+    task_manager_->SetTaskProgress(task_id, ++i, nb_songs);
   }
-  app_->task_manager()->SetTaskFinished(task_id);
+  task_manager_->SetTaskFinished(task_id);
 
 }
 
-void SCollection::SongsPlaycountChanged(const SongList &songs, const bool save_tags) {
+void CollectionLibrary::SongsPlaycountChanged(const SongList &songs, const bool save_tags) const {
 
   if (save_tags || save_playcounts_to_files_) {
-    app_->tag_reader_client()->SaveSongsPlaycount(songs);
+    tagreader_client_->SaveSongsPlaycountAsync(songs);
   }
 
 }
 
-void SCollection::SongsRatingChanged(const SongList &songs, const bool save_tags) {
+void CollectionLibrary::SongsRatingChanged(const SongList &songs, const bool save_tags) const {
 
   if (save_tags || save_ratings_to_files_) {
-    app_->tag_reader_client()->SaveSongsRating(songs);
+    tagreader_client_->SaveSongsRatingAsync(songs);
   }
 
 }

src/collection/collectionlibrary.h

@@ -29,22 +29,30 @@
 #include <QHash>
 #include <QString>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/song.h"
 
 class QThread;
-class Application;
 class Thread;
+class Database;
+class TaskManager;
+class TagReaderClient;
 class CollectionBackend;
 class CollectionModel;
 class CollectionWatcher;
+class AlbumCoverLoader;
 
-class SCollection : public QObject {
+class CollectionLibrary : public QObject {
   Q_OBJECT
 
  public:
-  explicit SCollection(Application *app, QObject *parent = nullptr);
-  ~SCollection() override;
+  explicit CollectionLibrary(const SharedPtr<Database> database,
+                             const SharedPtr<TaskManager> task_manager,
+                             const SharedPtr<TagReaderClient> tagreader_client,
+                             const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                             QObject *parent = nullptr);
+
+  ~CollectionLibrary() override;
 
   static const char *kSongsTable;
   static const char *kFtsTable;
@@ -64,29 +72,31 @@ class SCollection : public QObject {
  private:
   void SyncPlaycountAndRatingToFiles();
 
- public slots:
+ public Q_SLOTS:
   void ReloadSettings();
 
   void PauseWatcher();
   void ResumeWatcher();
 
   void FullScan();
-  void AbortScan();
+  void StopScan();
   void Rescan(const SongList &songs);
 
   void IncrementalScan();
 
- private slots:
+ private Q_SLOTS:
   void ExitReceived();
-  void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false);
-  void SongsRatingChanged(const SongList &songs, const bool save_tags = false);
+  void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false) const;
+  void SongsRatingChanged(const SongList &songs, const bool save_tags = false) const;
 
- signals:
+ Q_SIGNALS:
   void Error(const QString &error);
   void ExitFinished();
 
  private:
-  Application *app_;
+  const SharedPtr<TaskManager> task_manager_;
+  const SharedPtr<TagReaderClient> tagreader_client_;
+
   SharedPtr<CollectionBackend> backend_;
   CollectionModel *model_;
 

src/collection/collectionmodel.cpp

@@ -24,10 +24,11 @@
 #include <algorithm>
 #include <utility>
 #include <optional>
+#include <chrono>
 
 #include <QObject>
 #include <QtGlobal>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QThread>
 #include <QMutex>
 #include <QFuture>
@@ -52,14 +53,13 @@
 #include <QStandardPaths>
 #include <QTimer>
 
-#include "core/scoped_ptr.h"
-#include "core/shared_ptr.h"
-#include "core/application.h"
+#include "includes/scoped_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/database.h"
 #include "core/iconloader.h"
 #include "core/logging.h"
-#include "core/sqlrow.h"
 #include "core/settings.h"
+#include "core/songmimedata.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectionbackend.h"
@@ -68,12 +68,13 @@
 #include "collectionmodel.h"
 #include "collectionmodelupdate.h"
 #include "collectionfilter.h"
-#include "playlist/playlistmanager.h"
-#include "playlist/songmimedata.h"
 #include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
 #include "covermanager/albumcoverloader.h"
-#include "settings/collectionsettingspage.h"
+#include "constants/collectionsettings.h"
+
+using namespace std::chrono_literals;
+using namespace Qt::Literals::StringLiterals;
 
 const int CollectionModel::kPrettyCoverSize = 32;
 namespace {
@@ -81,44 +82,39 @@ constexpr char kPixmapDiskCacheDir[] = "pixmapcache";
 constexpr char kVariousArtists[] = QT_TR_NOOP("Various artists");
 }  // namespace
 
-QNetworkDiskCache *CollectionModel::sIconCache = nullptr;
-
-CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Application *app, QObject *parent)
+CollectionModel::CollectionModel(const SharedPtr<CollectionBackend> backend, const SharedPtr<AlbumCoverLoader> albumcover_loader, QObject *parent)
     : SimpleTreeModel<CollectionItem>(new CollectionItem(this), parent),
       backend_(backend),
-      app_(app),
+      albumcover_loader_(albumcover_loader),
       dir_model_(new CollectionDirectoryModel(backend, this)),
       filter_(new CollectionFilter(this)),
       timer_reload_(new QTimer(this)),
       timer_update_(new QTimer(this)),
-      icon_artist_(IconLoader::Load(QStringLiteral("folder-sound"))),
+      icon_artist_(IconLoader::Load(u"folder-sound"_s)),
       use_disk_cache_(false),
       total_song_count_(0),
       total_artist_count_(0),
       total_album_count_(0),
-      loading_(false) {
+      loading_(false),
+      icon_disk_cache_(new QNetworkDiskCache(this)) {
+
+  setObjectName(backend_->source() == Song::Source::Collection ? QLatin1String(metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(backend_->source()), QLatin1String(metaObject()->className())));
 
   filter_->setSourceModel(this);
   filter_->setSortRole(Role_SortText);
-  filter_->setDynamicSortFilter(true);
-  filter_->setSortLocaleAware(true);
   filter_->sort(0);
 
-  if (app_) {
-    QObject::connect(&*app_->album_cover_loader(), &AlbumCoverLoader::AlbumCoverLoaded, this, &CollectionModel::AlbumCoverLoaded);
+  if (albumcover_loader_) {
+    QObject::connect(&*albumcover_loader_, &AlbumCoverLoader::AlbumCoverLoaded, this, &CollectionModel::AlbumCoverLoaded);
   }
 
-  QIcon nocover = IconLoader::Load(QStringLiteral("cdcase"));
+  QIcon nocover = IconLoader::Load(u"cdcase"_s);
   if (!nocover.isNull()) {
     QList<QSize> nocover_sizes = nocover.availableSizes();
     pixmap_no_cover_ = nocover.pixmap(nocover_sizes.last()).scaled(kPrettyCoverSize, kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
   }
 
-  if (app_ && !sIconCache) {
-    sIconCache = new QNetworkDiskCache(this);
-    sIconCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/') + QLatin1String(kPixmapDiskCacheDir));
-    QObject::connect(app_, &Application::ClearPixmapDiskCache, this, &CollectionModel::ClearDiskCache);
-  }
+  icon_disk_cache_->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + u'/' + QLatin1String(kPixmapDiskCacheDir) + u'-' + Song::TextForSource(backend_->source()));
 
   QObject::connect(&*backend_, &CollectionBackend::SongsAdded, this, &CollectionModel::AddReAddOrUpdate);
   QObject::connect(&*backend_, &CollectionBackend::SongsChanged, this, &CollectionModel::AddReAddOrUpdate);
@@ -135,11 +131,11 @@ CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Applicati
   backend_->UpdateTotalAlbumCountAsync();
 
   timer_reload_->setSingleShot(true);
-  timer_reload_->setInterval(300);
+  timer_reload_->setInterval(300ms);
   QObject::connect(timer_reload_, &QTimer::timeout, this, &CollectionModel::Reload);
 
   timer_update_->setSingleShot(false);
-  timer_update_->setInterval(20);
+  timer_update_->setInterval(20ms);
   QObject::connect(timer_update_, &QTimer::timeout, this, &CollectionModel::ProcessUpdate);
 
   ReloadSettings();
@@ -148,7 +144,7 @@ CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Applicati
 
 CollectionModel::~CollectionModel() {
 
-  qLog(Debug) << "Collection model" << this << "for" << Song::TextForSource(backend_->source()) << "deleted";
+  qLog(Debug) << "Collection model" << this << "deleted";
 
   beginResetModel();
   Clear();
@@ -226,16 +222,16 @@ void CollectionModel::ScheduleReset() {
 void CollectionModel::ReloadSettings() {
 
   Settings settings;
-  settings.beginGroup(CollectionSettingsPage::kSettingsGroup);
-  const bool show_pretty_covers = settings.value("pretty_covers", true).toBool();
-  const bool show_dividers= settings.value("show_dividers", true).toBool();
-  const bool show_various_artists = settings.value("various_artists", true).toBool();
-  const bool sort_skips_articles = settings.value("sort_skips_articles", true).toBool();
+  settings.beginGroup(CollectionSettings::kSettingsGroup);
+  const bool show_pretty_covers = settings.value(CollectionSettings::kPrettyCovers, true).toBool();
+  const bool show_dividers= settings.value(CollectionSettings::kShowDividers, true).toBool();
+  const bool show_various_artists = settings.value(CollectionSettings::kVariousArtists, true).toBool();
+  const bool sort_skips_articles = settings.value(CollectionSettings::kSortSkipsArticles, true).toBool();
 
-  use_disk_cache_ = settings.value(CollectionSettingsPage::kSettingsDiskCacheEnable, false).toBool();
-  QPixmapCache::setCacheLimit(static_cast<int>(MaximumCacheSize(&settings, CollectionSettingsPage::kSettingsCacheSize, CollectionSettingsPage::kSettingsCacheSizeUnit, CollectionSettingsPage::kSettingsCacheSizeDefault) / 1024));
-  if (sIconCache) {
-    sIconCache->setMaximumCacheSize(MaximumCacheSize(&settings, CollectionSettingsPage::kSettingsDiskCacheSize, CollectionSettingsPage::kSettingsDiskCacheSizeUnit, CollectionSettingsPage::kSettingsDiskCacheSizeDefault));
+  use_disk_cache_ = settings.value(CollectionSettings::kSettingsDiskCacheEnable, false).toBool();
+  QPixmapCache::setCacheLimit(static_cast<int>(MaximumCacheSize(&settings, CollectionSettings::kSettingsCacheSize, CollectionSettings::kSettingsCacheSizeUnit, CollectionSettings::kSettingsCacheSizeDefault) / 1024));
+  if (icon_disk_cache_) {
+    icon_disk_cache_->setMaximumCacheSize(MaximumCacheSize(&settings, CollectionSettings::kSettingsDiskCacheSize, CollectionSettings::kSettingsDiskCacheSizeUnit, CollectionSettings::kSettingsDiskCacheSizeDefault));
   }
 
   settings.endGroup();
@@ -254,7 +250,7 @@ void CollectionModel::ReloadSettings() {
   }
 
   if (!use_disk_cache_) {
-    ClearDiskCache();
+    ClearIconDiskCache();
   }
 
 }
@@ -268,7 +264,7 @@ void CollectionModel::SetGroupBy(const Grouping g, const std::optional<bool> sep
 
   ScheduleReset();
 
-  emit GroupingChanged(g, options_current_.separate_albums_by_grouping);
+  Q_EMIT GroupingChanged(g, options_current_.separate_albums_by_grouping);
 
 }
 
@@ -391,12 +387,13 @@ QVariant CollectionModel::data(const CollectionItem *item, const int role) const
 Qt::ItemFlags CollectionModel::flags(const QModelIndex &idx) const {
 
   switch (IndexToItem(idx)->type) {
-    case CollectionItem::Type::Song:
-    case CollectionItem::Type::Container:
-      return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
-    case CollectionItem::Type::Divider:
-    case CollectionItem::Type::Root:
     case CollectionItem::Type::LoadingIndicator:
+    case CollectionItem::Type::Divider:
+      return Qt::ItemIsEnabled | Qt::ItemNeverHasChildren;
+    case CollectionItem::Type::Container:
+    case CollectionItem::Type::Song:
+      return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
+    case CollectionItem::Type::Root:
     default:
       return Qt::ItemIsEnabled;
   }
@@ -404,7 +401,7 @@ Qt::ItemFlags CollectionModel::flags(const QModelIndex &idx) const {
 }
 
 QStringList CollectionModel::mimeTypes() const {
-  return QStringList() << QStringLiteral("text/uri-list");
+  return QStringList() << u"text/uri-list"_s;
 }
 
 QMimeData *CollectionModel::mimeData(const QModelIndexList &indexes) const {
@@ -422,7 +419,7 @@ QMimeData *CollectionModel::mimeData(const QModelIndexList &indexes) const {
   }
 
   data->setUrls(urls);
-  data->name_for_new_playlist_ = PlaylistManager::GetNameForNewPlaylist(data->songs);
+  data->name_for_new_playlist_ = Song::GetNameForNewPlaylist(data->songs);
 
   return data;
 
@@ -515,7 +512,7 @@ void CollectionModel::AddReAddOrUpdateSongsInternal(const SongList &songs) {
       songs_added << new_song;
       continue;
     }
-    const Song &old_song = song_nodes_[new_song.id()]->metadata;
+    const Song old_song = song_nodes_.value(new_song.id())->metadata;
     bool container_key_changed = false;
     bool has_unique_album_identifier_1 = false;
     bool has_unique_album_identifier_2 = false;
@@ -581,7 +578,7 @@ void CollectionModel::AddSongsInternal(const SongList &songs) {
         container_key = container->container_key;
       }
       else {
-        if (!container_key.isEmpty()) container_key.append(QLatin1Char('-'));
+        if (!container_key.isEmpty()) container_key.append(u'-');
         container_key.append(ContainerKey(group_by, song, has_unique_album_identifier));
         if (container_nodes_[i].contains(container_key)) {
           container = container_nodes_[i][container_key];
@@ -607,7 +604,7 @@ void CollectionModel::UpdateSongsInternal(const SongList &songs) {
       qLog(Error) << "Song does not exist in model" << new_song.id() << new_song.PrettyTitleWithArtist();
       continue;
     }
-    CollectionItem *item = song_nodes_[new_song.id()];
+    CollectionItem *item = song_nodes_.value(new_song.id());
     const Song &old_song = item->metadata;
     const bool song_title_data_changed = IsSongTitleDataChanged(old_song, new_song);
     const bool art_changed = !old_song.IsArtEqual(new_song);
@@ -623,18 +620,18 @@ void CollectionModel::UpdateSongsInternal(const SongList &songs) {
       qLog(Debug) << "Song metadata and title for" << new_song.id() << new_song.PrettyTitleWithArtist() << "changed, informing model";
       const QModelIndex idx = ItemToIndex(item);
       if (!idx.isValid()) continue;
-      emit dataChanged(idx, idx);
+      Q_EMIT dataChanged(idx, idx);
     }
     else {
       qLog(Debug) << "Song metadata for" << new_song.id() << new_song.PrettyTitleWithArtist() << "changed";
     }
   }
 
-  for (CollectionItem *item : album_parents) {
+  for (CollectionItem *item : std::as_const(album_parents)) {
     ClearItemPixmapCache(item);
     const QModelIndex idx = ItemToIndex(item);
     if (idx.isValid()) {
-      emit dataChanged(idx, idx);
+      Q_EMIT dataChanged(idx, idx);
     }
   }
 
@@ -649,7 +646,7 @@ void CollectionModel::RemoveSongsInternal(const SongList &songs) {
   for (const Song &song : songs) {
 
     if (song_nodes_.contains(song.id())) {
-      CollectionItem *node = song_nodes_[song.id()];
+      CollectionItem *node = song_nodes_.value(song.id());
 
       if (node->parent != root_) parents << node->parent;
 
@@ -707,7 +704,7 @@ void CollectionModel::RemoveSongsInternal(const SongList &songs) {
     }
 
     // Remove the divider
-    int row = divider_nodes_[divider_key]->row;
+    const int row = divider_nodes_.value(divider_key)->row;
     beginRemoveRows(ItemToIndex(root_), row, row);
     root_->Delete(row);
     endRemoveRows();
@@ -720,7 +717,7 @@ CollectionItem *CollectionModel::CreateContainerItem(const GroupBy group_by, con
 
   QString divider_key;
   if (options_active_.show_dividers && container_level == 0) {
-    divider_key = DividerKey(group_by, song, SortText(group_by, container_level, song, options_active_.sort_skips_articles));
+    divider_key = DividerKey(group_by, song, SortText(group_by, song, options_active_.sort_skips_articles));
     if (!divider_key.isEmpty()) {
       if (!divider_nodes_.contains(divider_key)) {
         CreateDividerItem(divider_key, DividerDisplayText(group_by, divider_key), parent);
@@ -734,7 +731,7 @@ CollectionItem *CollectionModel::CreateContainerItem(const GroupBy group_by, con
   item->container_level = container_level;
   item->container_key = container_key;
   item->display_text = DisplayText(group_by, song);
-  item->sort_text = SortText(group_by, container_level, song, options_active_.sort_skips_articles);
+  item->sort_text = SortText(group_by, song, options_active_.sort_skips_articles);
   if (!divider_key.isEmpty()) {
     item->sort_text.prepend(divider_key + QLatin1Char(' '));
   }
@@ -754,7 +751,7 @@ void CollectionModel::CreateDividerItem(const QString &divider_key, const QStrin
   CollectionItem *divider = new CollectionItem(CollectionItem::Type::Divider, root_);
   divider->container_key = divider_key;
   divider->display_text = display_text;
-  divider->sort_text = divider_key + QLatin1String("  ");
+  divider->sort_text = divider_key + "  "_L1;
   divider_nodes_[divider_key] = divider;
 
   endInsertRows();
@@ -773,16 +770,10 @@ void CollectionModel::CreateSongItem(const Song &song, CollectionItem *parent) {
 
 }
 
-void CollectionModel::SetSongItemData(CollectionItem *item, const Song &song) {
+void CollectionModel::SetSongItemData(CollectionItem *item, const Song &song) const {
 
   item->display_text = song.TitleWithCompilationArtist();
-  if (item->container_level == 1 && !IsAlbumGroupBy(options_active_.group_by[0])) {
-    item->sort_text = SortText(song.title());
-  }
-  else {
-    item->sort_text = SortTextForSong(song);
-  }
-
+  item->sort_text = HasParentAlbumGroupBy(item->parent) ? SortTextForSong(song) : SortText(song.title());
   item->metadata = song;
 
 }
@@ -798,7 +789,7 @@ CollectionItem *CollectionModel::CreateCompilationArtistNode(CollectionItem *par
   if (parent != root_ && !parent->container_key.isEmpty()) parent->compilation_artist_node_->container_key.append(parent->container_key);
   parent->compilation_artist_node_->container_key.append(QLatin1String(kVariousArtists));
   parent->compilation_artist_node_->display_text = QLatin1String(kVariousArtists);
-  parent->compilation_artist_node_->sort_text = QLatin1String(" various");
+  parent->compilation_artist_node_->sort_text = " various"_L1;
   parent->compilation_artist_node_->container_level = parent->container_level + 1;
 
   endInsertRows();
@@ -809,11 +800,7 @@ CollectionItem *CollectionModel::CreateCompilationArtistNode(CollectionItem *par
 
 void CollectionModel::LoadSongsFromSqlAsync() {
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   QFuture<SongList> future = QtConcurrent::run(&CollectionModel::LoadSongsFromSql, this, options_active_.filter_options);
-#else
-  QFuture<SongList> future = QtConcurrent::run(this, &CollectionModel::LoadSongsFromSql, options_active_.filter_options);
-#endif
   QFutureWatcher<SongList> *watcher = new QFutureWatcher<SongList>();
   QObject::connect(watcher, &QFutureWatcher<void>::finished, this, &CollectionModel::LoadSongsFromSqlAsyncFinished);
   watcher->setFuture(future);
@@ -828,7 +815,7 @@ SongList CollectionModel::LoadSongsFromSql(const CollectionFilterOptions &filter
     QMutexLocker l(backend_->db()->Mutex());
     QSqlDatabase db(backend_->db()->Connect());
     CollectionQuery q(db, backend_->songs_table(), filter_options);
-    q.SetColumnSpec(QStringLiteral("%songs_table.ROWID, ") + Song::kColumnSpec);
+    q.SetColumnSpec(u"%songs_table.ROWID, "_s + Song::kColumnSpec);
     if (q.Exec()) {
       while (q.Next()) {
         Song song;
@@ -884,7 +871,7 @@ void CollectionModel::ClearItemPixmapCache(CollectionItem *item) {
   // Remove from pixmap cache
   const QString cache_key = AlbumIconPixmapCacheKey(ItemToIndex(item));
   QPixmapCache::remove(cache_key);
-  if (use_disk_cache_ && sIconCache) sIconCache->remove(AlbumIconPixmapDiskCacheKey(cache_key));
+  if (use_disk_cache_ && icon_disk_cache_) icon_disk_cache_->remove(AlbumIconPixmapDiskCacheKey(cache_key));
   if (pending_cache_keys_.contains(cache_key)) {
     pending_cache_keys_.remove(cache_key);
   }
@@ -915,8 +902,8 @@ QVariant CollectionModel::AlbumIcon(const QModelIndex &idx) {
   }
 
   // Try to load it from the disk cache
-  if (use_disk_cache_ && sIconCache) {
-    ScopedPtr<QIODevice> disk_cache_img(sIconCache->data(AlbumIconPixmapDiskCacheKey(cache_key)));
+  if (use_disk_cache_ && icon_disk_cache_) {
+    ScopedPtr<QIODevice> disk_cache_img(icon_disk_cache_->data(AlbumIconPixmapDiskCacheKey(cache_key)));
     if (disk_cache_img) {
       QImage cached_image;
       if (cached_image.load(&*disk_cache_img, "XPM")) {
@@ -937,7 +924,7 @@ QVariant CollectionModel::AlbumIcon(const QModelIndex &idx) {
     AlbumCoverLoaderOptions cover_loader_options(AlbumCoverLoaderOptions::Option::ScaledImage | AlbumCoverLoaderOptions::Option::PadScaledImage);
     cover_loader_options.desired_scaled_size = QSize(kPrettyCoverSize, kPrettyCoverSize);
     cover_loader_options.types = cover_types_;
-    const quint64 id = app_->album_cover_loader()->LoadImageAsync(cover_loader_options, songs.first());
+    const quint64 id = albumcover_loader_->LoadImageAsync(cover_loader_options, songs.first());
     pending_art_[id] = ItemAndCacheKey(item, cache_key);
     pending_cache_keys_.insert(cache_key);
   }
@@ -970,19 +957,19 @@ void CollectionModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderR
   }
 
   // If we have a valid cover not already in the disk cache
-  if (use_disk_cache_ && sIconCache && result.success && !result.image_scaled.isNull()) {
+  if (use_disk_cache_ && icon_disk_cache_ && result.success && !result.image_scaled.isNull()) {
     const QUrl disk_cache_key = AlbumIconPixmapDiskCacheKey(cache_key);
-    ScopedPtr<QIODevice> disk_cache_img(sIconCache->data(disk_cache_key));
+    ScopedPtr<QIODevice> disk_cache_img(icon_disk_cache_->data(disk_cache_key));
     if (!disk_cache_img) {
       QNetworkCacheMetaData disk_cache_metadata;
       disk_cache_metadata.setSaveToDisk(true);
       disk_cache_metadata.setUrl(disk_cache_key);
       // Qt 6 now ignores any entry without headers, so add a fake header.
       disk_cache_metadata.setRawHeaders(QNetworkCacheMetaData::RawHeaderList() << qMakePair(QByteArray("collection-thumbnail"), cache_key.toUtf8()));
-      QIODevice *device_iconcache = sIconCache->prepare(disk_cache_metadata);
+      QIODevice *device_iconcache = icon_disk_cache_->prepare(disk_cache_metadata);
       if (device_iconcache) {
         result.image_scaled.save(device_iconcache, "XPM");
-        sIconCache->insert(device_iconcache);
+        icon_disk_cache_->insert(device_iconcache);
       }
     }
   }
@@ -990,7 +977,7 @@ void CollectionModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderR
   const QModelIndex idx = ItemToIndex(item);
   if (!idx.isValid()) return;
 
-  emit dataChanged(idx, idx);
+  Q_EMIT dataChanged(idx, idx);
 
 }
 
@@ -1056,14 +1043,14 @@ QString CollectionModel::TextOrUnknown(const QString &text) {
 QString CollectionModel::PrettyYearAlbum(const int year, const QString &album) {
 
   if (year <= 0) return TextOrUnknown(album);
-  return QString::number(year) + QLatin1String(" - ") + TextOrUnknown(album);
+  return QString::number(year) + " - "_L1 + TextOrUnknown(album);
 
 }
 
 QString CollectionModel::PrettyAlbumDisc(const QString &album, const int disc) {
 
   if (disc <= 0 || Song::AlbumContainsDisc(album)) return TextOrUnknown(album);
-  return TextOrUnknown(album) + QLatin1String(" - (Disc ") + QString::number(disc) + QLatin1String(")");
+  return TextOrUnknown(album) + " - (Disc "_L1 + QString::number(disc) + ")"_L1;
 
 }
 
@@ -1072,9 +1059,9 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu
   QString str;
 
   if (year <= 0) str = TextOrUnknown(album);
-  else str = QString::number(year) + QLatin1String(" - ") + TextOrUnknown(album);
+  else str = QString::number(year) + " - "_L1 + TextOrUnknown(album);
 
-  if (!Song::AlbumContainsDisc(album) && disc > 0) str += QLatin1String(" - (Disc ") + QString::number(disc) + QLatin1String(")");
+  if (!Song::AlbumContainsDisc(album) && disc > 0) str += " - (Disc "_L1 + QString::number(disc) + ")"_L1;
 
   return str;
 
@@ -1082,7 +1069,7 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu
 
 QString CollectionModel::PrettyDisc(const int disc) {
 
-  return QLatin1String("Disc ") + QString::number(std::max(1, disc));
+  return "Disc "_L1 + QString::number(std::max(1, disc));
 
 }
 
@@ -1100,7 +1087,7 @@ QString CollectionModel::PrettyFormat(const Song &song) {
 
 }
 
-QString CollectionModel::SortText(const GroupBy group_by, const int container_level, const Song &song, const bool sort_skips_articles) {
+QString CollectionModel::SortText(const GroupBy group_by, const Song &song, const bool sort_skips_articles) {
 
   switch (group_by) {
     case GroupBy::AlbumArtist:
@@ -1144,12 +1131,8 @@ QString CollectionModel::SortText(const GroupBy group_by, const int container_le
     case GroupBy::Bitrate:
       return SortTextForNumber(std::max(0, song.bitrate())) + QLatin1Char(' ');
     case GroupBy::None:
-    case GroupBy::GroupByCount:{
-      if (container_level == 1 && !IsAlbumGroupBy(options_active_.group_by[0])) {
-        return SortText(song.title());
-      }
-      return SortTextForSong(song);
-    }
+    case GroupBy::GroupByCount:
+      break;
   }
 
   return QString();
@@ -1159,12 +1142,13 @@ QString CollectionModel::SortText(const GroupBy group_by, const int container_le
 QString CollectionModel::SortText(QString text) {
 
   if (text.isEmpty()) {
-    text = QLatin1String(" unknown");
+    text = " unknown"_L1;
   }
   else {
     text = text.toLower();
   }
-  text = text.remove(QRegularExpression(QStringLiteral("[^\\w ]"), QRegularExpression::UseUnicodePropertiesOption));
+  static const QRegularExpression regex_not_words(u"[^\\w ]"_s, QRegularExpression::UseUnicodePropertiesOption);
+  text = text.remove(regex_not_words);
 
   return text;
 
@@ -1178,7 +1162,7 @@ QString CollectionModel::SortTextForArtist(QString artist, const bool skip_artic
     for (const auto &i : Song::kArticles) {
       if (artist.startsWith(i)) {
         qint64 ilen = i.length();
-        artist = artist.right(artist.length() - ilen) + QLatin1String(", ") + i.left(ilen - 1);
+        artist = artist.right(artist.length() - ilen) + ", "_L1 + i.left(ilen - 1);
         break;
       }
     }
@@ -1189,7 +1173,6 @@ QString CollectionModel::SortTextForArtist(QString artist, const bool skip_artic
 }
 
 QString CollectionModel::SortTextForNumber(const int number) {
-
   return QStringLiteral("%1").arg(number, 4, 10, QLatin1Char('0'));
 }
 
@@ -1220,6 +1203,7 @@ bool CollectionModel::IsSongTitleDataChanged(const Song &song1, const Song &song
 
   return song1.url() != song2.url() ||
          song1.track() != song2.track() ||
+         song1.disc() != song2.disc() ||
          song1.title() != song2.title() ||
          song1.compilation() != song2.compilation() ||
          (song1.compilation() && song1.artist() != song2.artist());
@@ -1316,8 +1300,8 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
   }
 
   // Make sure we distinguish albums by different artists if the parent group by is not including artist.
-  if (IsAlbumGroupBy(group_by) && !has_unique_album_identifier && !song.effective_albumartist().isEmpty()) {
-    key.prepend(QLatin1Char('-'));
+  if (IsAlbumGroupBy(group_by) && !has_unique_album_identifier && !song.is_compilation() && !song.effective_albumartist().isEmpty()) {
+    key.prepend(u'-');
     key.prepend(TextOrUnknown(song.effective_albumartist()));
     has_unique_album_identifier = true;
   }
@@ -1346,8 +1330,8 @@ QString CollectionModel::DividerKey(const GroupBy group_by, const Song &song, co
     case GroupBy::Format:
     case GroupBy::FileType: {
       QChar c = sort_text[0];
-      if (c.isDigit()) return QStringLiteral("0");
-      if (c == QLatin1Char(' ')) return QString();
+      if (c.isDigit()) return u"0"_s;
+      if (c == u' ') return QString();
       if (c.decompositionTag() != QChar::NoDecomposition) {
         QString decomposition = c.decomposition();
         return QChar(decomposition[0]);
@@ -1396,25 +1380,25 @@ QString CollectionModel::DividerDisplayText(const GroupBy group_by, const QStrin
     case GroupBy::Genre:
     case GroupBy::FileType:
     case GroupBy::Format:
-      if (key == QLatin1String("0")) return QStringLiteral("0-9");
+      if (key == "0"_L1) return u"0-9"_s;
       return key.toUpper();
 
     case GroupBy::YearAlbum:
     case GroupBy::YearAlbumDisc:
     case GroupBy::OriginalYearAlbum:
     case GroupBy::OriginalYearAlbumDisc:
-      if (key == QLatin1String("0000")) return tr("Unknown");
+      if (key == "0000"_L1) return tr("Unknown");
       return key.toUpper();
 
     case GroupBy::Year:
     case GroupBy::OriginalYear:
-      if (key == QLatin1String("0000")) return tr("Unknown");
+      if (key == "0000"_L1) return tr("Unknown");
       return QString::number(key.toInt());  // To remove leading 0s
 
     case GroupBy::Samplerate:
     case GroupBy::Bitdepth:
     case GroupBy::Bitrate:
-      if (key == QLatin1String("000")) return tr("Unknown");
+      if (key == "000"_L1) return tr("Unknown");
       return QString::number(key.toInt());  // To remove leading 0s
 
     case GroupBy::None:
@@ -1430,24 +1414,35 @@ QString CollectionModel::DividerDisplayText(const GroupBy group_by, const QStrin
 
 bool CollectionModel::CompareItems(const CollectionItem *a, const CollectionItem *b) const {
 
-  QVariant left(data(a, CollectionModel::Role_SortText));
-  QVariant right(data(b, CollectionModel::Role_SortText));
+  QVariant left = data(a, CollectionModel::Role_SortText);
+  QVariant right = data(b, CollectionModel::Role_SortText);
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  if (left.metaType().id() == QMetaType::Int)
-#else
-  if (left.type() == QVariant::Int)
-#endif
+  if (left.metaType().id() == QMetaType::Int) {
     return left.toInt() < right.toInt();
-  else
+  }
+  else {
     return left.toString() < right.toString();
+  }
+
+}
+
+bool CollectionModel::HasParentAlbumGroupBy(CollectionItem *item) const {
+
+  while (item && item != root_) {
+    if (item->container_level >= 0 && item->container_level <= 2 && IsAlbumGroupBy(options_active_.group_by[item->container_level])) {
+      return true;
+    }
+    item = item->parent;
+  }
+
+  return false;
 
 }
 
 qint64 CollectionModel::MaximumCacheSize(Settings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default) {
 
   qint64 size = s->value(size_id, cache_size_default).toInt();
-  int unit = s->value(size_unit_id, static_cast<int>(CollectionSettingsPage::CacheSizeUnit::MB)).toInt() + 1;
+  int unit = s->value(size_unit_id, static_cast<int>(CollectionSettings::CacheSizeUnit::MB)).toInt() + 1;
 
   do {
     size *= 1024;
@@ -1532,37 +1527,28 @@ CollectionModel::GroupBy &CollectionModel::Grouping::operator[](const int i) {
 void CollectionModel::TotalSongCountUpdatedSlot(const int count) {
 
   total_song_count_ = count;
-  emit TotalSongCountUpdated(count);
+  Q_EMIT TotalSongCountUpdated(count);
 
 }
 
 void CollectionModel::TotalArtistCountUpdatedSlot(const int count) {
 
   total_artist_count_ = count;
-  emit TotalArtistCountUpdated(count);
+  Q_EMIT TotalArtistCountUpdated(count);
 
 }
 
 void CollectionModel::TotalAlbumCountUpdatedSlot(const int count) {
 
   total_album_count_ = count;
-  emit TotalAlbumCountUpdated(count);
+  Q_EMIT TotalAlbumCountUpdated(count);
 
 }
 
-void CollectionModel::ClearDiskCache() {
-  if (sIconCache) sIconCache->clear();
-}
+void CollectionModel::ClearIconDiskCache() {
 
-void CollectionModel::ExpandAll(CollectionItem *item) const {
-
-  if (!root_) return;
-
-  if (!item) item = root_;
-
-  for (CollectionItem *child : item->children) {
-    ExpandAll(child);
-  }
+  if (icon_disk_cache_) icon_disk_cache_->clear();
+  QPixmapCache::clear();
 
 }
 
@@ -1578,7 +1564,7 @@ void CollectionModel::RowsInserted(const QModelIndex &parent, const int first, c
   }
 
   if (!songs.isEmpty()) {
-    emit SongsAdded(songs);
+    Q_EMIT SongsAdded(songs);
   }
 
 }
@@ -1594,7 +1580,7 @@ void CollectionModel::RowsRemoved(const QModelIndex &parent, const int first, co
     songs << item->metadata;
   }
 
-  emit SongsRemoved(songs);
+  Q_EMIT SongsRemoved(songs);
 
 }
 

src/collection/collectionmodel.h

@@ -44,10 +44,9 @@
 #include <QNetworkDiskCache>
 #include <QQueue>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/simpletreemodel.h"
 #include "core/song.h"
-#include "core/sqlrow.h"
 #include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
 #include "collectionmodelupdate.h"
@@ -57,16 +56,16 @@
 class QTimer;
 class Settings;
 
-class Application;
 class CollectionBackend;
 class CollectionDirectoryModel;
 class CollectionFilter;
+class AlbumCoverLoader;
 
 class CollectionModel : public SimpleTreeModel<CollectionItem> {
   Q_OBJECT
 
  public:
-  explicit CollectionModel(SharedPtr<CollectionBackend> backend, Application *app, QObject *parent = nullptr);
+  explicit CollectionModel(const SharedPtr<CollectionBackend> backend, const SharedPtr<AlbumCoverLoader> albumcover_loader, QObject *parent = nullptr);
   ~CollectionModel() override;
 
   static const int kPrettyCoverSize;
@@ -142,6 +141,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
     CollectionFilterOptions filter_options;
   };
 
+  SharedPtr<CollectionBackend> backend() const { return backend_; }
   CollectionFilter *filter() const { return filter_; }
 
   void Init();
@@ -155,7 +155,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   int total_artist_count() const { return total_artist_count_; }
   int total_album_count() const { return total_album_count_; }
 
-  quint64 icon_cache_disk_size() { return sIconCache->cacheSize(); }
+  quint64 icon_disk_cache_size() { return icon_disk_cache_->cacheSize(); }
 
   const CollectionModel::Grouping GetGroupBy() const { return options_current_.group_by; }
   void SetGroupBy(const CollectionModel::Grouping g, const std::optional<bool> separate_albums_by_grouping = std::optional<bool>());
@@ -183,7 +183,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   static QString PrettyYearAlbumDisc(const int year, const QString &album, const int disc);
   static QString PrettyDisc(const int disc);
   static QString PrettyFormat(const Song &song);
-  QString SortText(const GroupBy group_by, const int container_level, const Song &song, const bool sort_skips_articles);
+  QString SortText(const GroupBy group_by, const Song &song, const bool sort_skips_articles);
   static QString SortText(QString text);
   static QString SortTextForNumber(const int number);
   static QString SortTextForArtist(QString artist, const bool skip_articles);
@@ -198,9 +198,11 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   SongList GetChildSongs(const QModelIndex &idx) const;
   SongList GetChildSongs(const QModelIndexList &indexes) const;
 
-  void ExpandAll(CollectionItem *item = nullptr) const;
+  bool CompareItems(const CollectionItem *a, const CollectionItem *b) const;
 
- signals:
+  bool HasParentAlbumGroupBy(CollectionItem *item) const;
+
+ Q_SIGNALS:
   void TotalSongCountUpdated(const int count);
   void TotalArtistCountUpdated(const int count);
   void TotalAlbumCountUpdated(const int count);
@@ -208,13 +210,15 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   void SongsAdded(const SongList &songs);
   void SongsRemoved(const SongList &songs);
 
- public slots:
+ public Q_SLOTS:
   void SetFilterMode(const CollectionFilterOptions::FilterMode filter_mode);
   void SetFilterMaxAge(const int filter_max_age);
 
   void AddReAddOrUpdate(const SongList &songs);
   void RemoveSongs(const SongList &songs);
 
+  void ClearIconDiskCache();
+
  private:
   void Clear();
   void BeginReset();
@@ -235,7 +239,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   void CreateDividerItem(const QString &divider_key, const QString &display_text, CollectionItem *parent);
   CollectionItem *CreateContainerItem(const GroupBy group_by, const int container_level, const QString &container_key, const Song &song, CollectionItem *parent);
   void CreateSongItem(const Song &song, CollectionItem *parent);
-  void SetSongItemData(CollectionItem *item, const Song &song);
+  void SetSongItemData(CollectionItem *item, const Song &song) const;
   CollectionItem *CreateCompilationArtistNode(CollectionItem *parent);
 
   void LoadSongsFromSqlAsync();
@@ -250,10 +254,9 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   static QUrl AlbumIconPixmapDiskCacheKey(const QString &cache_key);
   QVariant AlbumIcon(const QModelIndex &idx);
   void ClearItemPixmapCache(CollectionItem *item);
-  bool CompareItems(const CollectionItem *a, const CollectionItem *b) const;
   static qint64 MaximumCacheSize(Settings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default);
 
- private slots:
+ private Q_SLOTS:
   void Reload();
   void ScheduleReset();
   void ProcessUpdate();
@@ -265,15 +268,12 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   void TotalArtistCountUpdatedSlot(const int count);
   void TotalAlbumCountUpdatedSlot(const int count);
 
-  static void ClearDiskCache();
-
   void RowsInserted(const QModelIndex &parent, const int first, const int last);
   void RowsRemoved(const QModelIndex &parent, const int first, const int last);
 
  private:
-  static QNetworkDiskCache *sIconCache;
-  SharedPtr<CollectionBackend> backend_;
-  Application *app_;
+  const SharedPtr<CollectionBackend> backend_;
+  const SharedPtr<AlbumCoverLoader> albumcover_loader_;
   CollectionDirectoryModel *dir_model_;
   CollectionFilter *filter_;
   QTimer *timer_reload_;
@@ -308,6 +308,8 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   using ItemAndCacheKey = QPair<CollectionItem*, QString>;
   QMap<quint64, ItemAndCacheKey> pending_art_;
   QSet<QString> pending_cache_keys_;
+
+  QNetworkDiskCache *icon_disk_cache_;
 };
 
 Q_DECLARE_METATYPE(CollectionModel::Grouping)

src/collection/collectionmodelupdate.cpp

@@ -19,5 +19,5 @@
 
 #include "collectionmodelupdate.h"
 
-CollectionModelUpdate::CollectionModelUpdate(const Type &_type, const SongList &_songs)
+CollectionModelUpdate::CollectionModelUpdate(const Type _type, const SongList &_songs)
     : type(_type), songs(_songs) {}

src/collection/collectionmodelupdate.h

@@ -30,7 +30,7 @@ class CollectionModelUpdate {
     Update,
     Remove,
   };
-  explicit CollectionModelUpdate(const Type &_type, const SongList &_songs);
+  explicit CollectionModelUpdate(const Type _type, const SongList &_songs);
   Type type;
   SongList songs;
 };

src/collection/collectionplaylistitem.cpp

@@ -24,8 +24,9 @@
 #include <QVariant>
 #include <QUrl>
 
+#include "core/logging.h"
 #include "collectionplaylistitem.h"
-#include "core/tagreaderclient.h"
+#include "tagreader/tagreaderclient.h"
 
 class SqlRow;
 
@@ -41,9 +42,9 @@ QUrl CollectionPlaylistItem::Url() const { return song_.url(); }
 
 void CollectionPlaylistItem::Reload() {
 
-  const TagReaderClient::Result result = TagReaderClient::Instance()->ReadFileBlocking(song_.url().toLocalFile(), &song_);
+  const TagReaderResult result = TagReaderClient::Instance()->ReadFileBlocking(song_.url().toLocalFile(), &song_);
   if (!result.success()) {
-    qLog(Error) << "Could not reload file" << song_.url() << result.error;
+    qLog(Error) << "Could not reload file" << song_.url() << result.error_string();
     return;
   }
   UpdateTemporaryMetadata(song_);

src/collection/collectionquery.cpp

@@ -21,13 +21,14 @@
 
 #include "config.h"
 
+#include <utility>
+
 #include <QtGlobal>
 #include <QMetaType>
 #include <QDateTime>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QRegularExpression>
 #include <QSqlDatabase>
 
 #include "core/sqlquery.h"
@@ -35,7 +36,8 @@
 
 #include "collectionquery.h"
 #include "collectionfilteroptions.h"
-#include "utilities/searchparserutils.h"
+
+using namespace Qt::Literals::StringLiterals;
 
 CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const CollectionFilterOptions &filter_options)
     : SqlQuery(db),
@@ -45,16 +47,16 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
       limit_(-1) {
 
   if (filter_options.max_age() != -1) {
-    qint64 cutoff = QDateTime::currentDateTime().toSecsSinceEpoch() - filter_options.max_age();
+    qint64 cutoff = QDateTime::currentSecsSinceEpoch() - filter_options.max_age();
 
-    where_clauses_ << QStringLiteral("ctime > ?");
+    where_clauses_ << u"ctime > ?"_s;
     bound_values_ << cutoff;
   }
 
   duplicates_only_ = filter_options.filter_mode() == CollectionFilterOptions::FilterMode::Duplicates;
 
   if (filter_options.filter_mode() == CollectionFilterOptions::FilterMode::Untagged) {
-    where_clauses_ << QStringLiteral("(artist = '' OR album = '' OR title ='')");
+    where_clauses_ << u"(artist = '' OR album = '' OR title ='')"_s;
   }
 
 }
@@ -62,35 +64,25 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
 void CollectionQuery::AddWhere(const QString &column, const QVariant &value, const QString &op) {
 
   // Ignore 'literal' for IN
-  if (op.compare(QLatin1String("IN"), Qt::CaseInsensitive) == 0) {
-    QStringList values = value.toStringList();
+  if (op.compare("IN"_L1, Qt::CaseInsensitive) == 0) {
+    const QStringList values = value.toStringList();
     QStringList final_values;
     final_values.reserve(values.count());
     for (const QString &single_value : values) {
-      final_values.append(QStringLiteral("?"));
+      final_values.append(u"?"_s);
       bound_values_ << single_value;
     }
 
-    where_clauses_ << QStringLiteral("%1 IN (%2)").arg(column, final_values.join(QLatin1Char(',')));
+    where_clauses_ << QStringLiteral("%1 IN (%2)").arg(column, final_values.join(u','));
   }
   else {
     // Do integers inline - sqlite seems to get confused when you pass integers to bound parameters
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     if (value.metaType().id() == QMetaType::Int) {
-#else
-    if (value.type() == QVariant::Int) {
-#endif
       where_clauses_ << QStringLiteral("%1 %2 %3").arg(column, op, value.toString());
     }
-    else if (
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-      value.metaType().id() == QMetaType::QString
-#else
-      value.type() == QVariant::String
-#endif
-      && value.toString().isNull()) {
+    else if (value.metaType().id() == QMetaType::QString && value.toString().isNull()) {
       where_clauses_ << QStringLiteral("%1 %2 ?").arg(column, op);
-      bound_values_ << QLatin1String("");
+      bound_values_ << ""_L1;
     }
     else {
       where_clauses_ << QStringLiteral("%1 %2 ?").arg(column, op);
@@ -121,21 +113,21 @@ bool CollectionQuery::Exec() {
 
   QStringList where_clauses(where_clauses_);
   if (!include_unavailable_) {
-    where_clauses << QStringLiteral("unavailable = 0");
+    where_clauses << u"unavailable = 0"_s;
   }
 
-  if (!where_clauses.isEmpty()) sql += QLatin1String(" WHERE ") + where_clauses.join(QLatin1String(" AND "));
+  if (!where_clauses.isEmpty()) sql += " WHERE "_L1 + where_clauses.join(" AND "_L1);
 
-  if (!order_by_.isEmpty()) sql += QLatin1String(" ORDER BY ") + order_by_;
+  if (!order_by_.isEmpty()) sql += " ORDER BY "_L1 + order_by_;
 
-  if (limit_ != -1) sql += QLatin1String(" LIMIT ") + QString::number(limit_);
+  if (limit_ != -1) sql += " LIMIT "_L1 + QString::number(limit_);
 
-  sql.replace(QLatin1String("%songs_table"), songs_table_);
+  sql.replace("%songs_table"_L1, songs_table_);
 
   if (!QSqlQuery::prepare(sql)) return false;
 
   // Bind values
-  for (const QVariant &value : bound_values_) {
+  for (const QVariant &value : std::as_const(bound_values_)) {
     QSqlQuery::addBindValue(value);
   }
 

src/collection/collectionquery.h

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QMetaType>
 #include <QVariant>
 #include <QString>
 #include <QStringList>

src/collection/collectionqueryoptions.h

@@ -1,63 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2023, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef COLLECTIONQUERYOPTIONS_H
-#define COLLECTIONQUERYOPTIONS_H
-
-#include <QList>
-#include <QVariant>
-#include <QString>
-
-class CollectionQueryOptions {
- public:
-
-  explicit CollectionQueryOptions();
-
-  struct Where {
-    explicit Where(const QString &_column = QString(), const QVariant &_value = QString(), const QString &_op = QString()) : column(_column), value(_value), op(_op) {}
-    QString column;
-    QVariant value;
-    QString op;
-  };
-
-  enum class CompilationRequirement {
-    None,
-    On,
-    Off
-  };
-
-  QString column_spec() const { return column_spec_; }
-  CompilationRequirement compilation_requirement() const { return compilation_requirement_; }
-  bool query_have_compilations() const { return query_have_compilations_; }
-
-  void set_column_spec(const QString &column_spec) { column_spec_ = column_spec; }
-  void set_compilation_requirement(const CompilationRequirement compilation_requirement) { compilation_requirement_ = compilation_requirement; }
-  void set_query_have_compilations(const bool query_have_compilations) { query_have_compilations_ = query_have_compilations; }
-
-  QList<Where> where_clauses() const { return where_clauses_; }
-  void AddWhere(const QString &column, const QVariant &value, const QString &op = QStringLiteral("="));
-
- private:
-  QString column_spec_;
-  CompilationRequirement compilation_requirement_;
-  bool query_have_compilations_;
-  QList<Where> where_clauses_;
-};
-
-#endif  // COLLECTIONQUERYOPTIONS_H

src/collection/collectiontask.cpp

@@ -19,7 +19,7 @@
 
 #include <QString>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/taskmanager.h"
 #include "collectiontask.h"
 

src/collection/collectiontask.h

@@ -23,7 +23,7 @@
 #include <QtGlobal>
 #include <QString>
 
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 
 class TaskManager;
 

src/collection/collectionview.cpp

@@ -25,7 +25,6 @@
 #include <memory>
 
 #include <QtGlobal>
-#include <QWidget>
 #include <QAbstractItemView>
 #include <QTreeView>
 #include <QItemSelectionModel>
@@ -46,22 +45,25 @@
 #include <QAction>
 #include <QMessageBox>
 #include <QSettings>
-#include <QtEvents>
+#include <QPaintEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QContextMenuEvent>
 
-#include "core/application.h"
 #include "core/iconloader.h"
 #include "core/mimedata.h"
 #include "core/musicstorage.h"
 #include "core/deletefiles.h"
 #include "core/settings.h"
 #include "utilities/filemanagerutils.h"
-#include "collection.h"
+#include "collectionlibrary.h"
 #include "collectionbackend.h"
 #include "collectiondirectorymodel.h"
+#include "collectionmodel.h"
+#include "collectionfilter.h"
 #include "collectionfilterwidget.h"
 #include "collectionitem.h"
 #include "collectionitemdelegate.h"
-#include "collectionmodel.h"
 #include "collectionview.h"
 #ifndef Q_OS_WIN
 #  include "device/devicemanager.h"
@@ -71,18 +73,20 @@
 #include "dialogs/deleteconfirmationdialog.h"
 #include "organize/organizedialog.h"
 #include "organize/organizeerrordialog.h"
-#include "settings/collectionsettingspage.h"
+#include "constants/collectionsettings.h"
 
 using std::make_unique;
+using namespace Qt::Literals::StringLiterals;
 
 CollectionView::CollectionView(QWidget *parent)
     : AutoExpandingTreeView(parent),
-      app_(nullptr),
+      model_(nullptr),
       filter_(nullptr),
+      filter_widget_(nullptr),
       total_song_count_(-1),
       total_artist_count_(-1),
       total_album_count_(-1),
-      nomusic_(QStringLiteral(":/pictures/nomusic.png")),
+      nomusic_(u":/pictures/nomusic.png"_s),
       context_menu_(nullptr),
       action_load_(nullptr),
       action_add_to_playlist_(nullptr),
@@ -104,6 +108,8 @@ CollectionView::CollectionView(QWidget *parent)
       is_in_keyboard_search_(false),
       delete_files_(false) {
 
+  setObjectName(QLatin1String(metaObject()->className()));
+
   setItemDelegate(new CollectionItemDelegate(this));
   setAttribute(Qt::WA_MacShowFocusRect, false);
   setHeaderHidden(true);
@@ -112,12 +118,41 @@ CollectionView::CollectionView(QWidget *parent)
   setDragDropMode(QAbstractItemView::DragOnly);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-  setStyleSheet(QStringLiteral("QTreeView::item{padding-top:1px;}"));
+  setStyleSheet(u"QTreeView::item{padding-top:1px;}"_s);
 
 }
 
 CollectionView::~CollectionView() = default;
 
+void CollectionView::Init(const SharedPtr<TaskManager> task_manager,
+                          const SharedPtr<TagReaderClient> tagreader_client,
+                          const SharedPtr<NetworkAccessManager> network,
+                          const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                          const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader,
+                          const SharedPtr<CoverProviders> cover_providers,
+                          const SharedPtr<LyricsProviders> lyrics_providers,
+                          const SharedPtr<CollectionLibrary> collection,
+                          const SharedPtr<DeviceManager> device_manager,
+                          const SharedPtr<StreamingServices> streaming_services) {
+
+  task_manager_ = task_manager;
+  tagreader_client_ = tagreader_client;
+  network_ = network;
+  albumcover_loader_ = albumcover_loader;
+  current_albumcover_loader_ = current_albumcover_loader;
+  cover_providers_ = cover_providers;
+  lyrics_providers_ = lyrics_providers;
+  collection_ = collection;
+  device_manager_ = device_manager;
+  streaming_services_ = streaming_services;
+  backend_ = collection_->backend();
+  model_ = collection_->model();
+  filter_ = collection_->model()->filter();
+
+  ReloadSettings();
+
+}
+
 void CollectionView::SaveFocus() {
 
   const QModelIndex current = currentIndex();
@@ -137,8 +172,8 @@ void CollectionView::SaveFocus() {
 
   switch (item_type) {
     case CollectionItem::Type::Song:{
-      QModelIndex index = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(current);
-      SongList songs = app_->collection_model()->GetChildSongs(index);
+      QModelIndex index = filter_->mapToSource(current);
+      SongList songs = model_->GetChildSongs(index);
       if (!songs.isEmpty()) {
         last_selected_song_ = songs.last();
       }
@@ -205,8 +240,8 @@ bool CollectionView::RestoreLevelFocus(const QModelIndex &parent) {
         break;
       case CollectionItem::Type::Song:
         if (!last_selected_song_.url().isEmpty()) {
-          QModelIndex index = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(current);
-          const SongList songs = app_->collection_model()->GetChildSongs(index);
+          QModelIndex index = filter_->mapToSource(current);
+          const SongList songs = model_->GetChildSongs(index);
           if (std::any_of(songs.begin(), songs.end(), [this](const Song &song) { return song == last_selected_song_; })) {
             setCurrentIndex(current);
             return true;
@@ -236,6 +271,7 @@ bool CollectionView::RestoreLevelFocus(const QModelIndex &parent) {
       }
     }
   }
+
   return false;
 
 }
@@ -243,22 +279,14 @@ bool CollectionView::RestoreLevelFocus(const QModelIndex &parent) {
 void CollectionView::ReloadSettings() {
 
   Settings settings;
-  settings.beginGroup(CollectionSettingsPage::kSettingsGroup);
-  SetAutoOpen(settings.value("auto_open", false).toBool());
-  delete_files_ = settings.value("delete_files", false).toBool();
+  settings.beginGroup(CollectionSettings::kSettingsGroup);
+  SetAutoOpen(settings.value(CollectionSettings::kAutoOpen, false).toBool());
+  delete_files_ = settings.value(CollectionSettings::kDeleteFiles, false).toBool();
   settings.endGroup();
 
 }
 
-void CollectionView::SetApplication(Application *app) {
-
-  app_ = app;
-
-  ReloadSettings();
-
-}
-
-void CollectionView::SetFilter(CollectionFilterWidget *filter) { filter_ = filter; }
+void CollectionView::SetFilterWidget(CollectionFilterWidget *filter_widget) { filter_widget_ = filter_widget; }
 
 void CollectionView::TotalSongCountUpdated(const int count) {
 
@@ -273,7 +301,7 @@ void CollectionView::TotalSongCountUpdated(const int count) {
     unsetCursor();
   }
 
-  emit TotalSongCountUpdated_();
+  Q_EMIT TotalSongCountUpdated_();
 
 }
 
@@ -290,7 +318,7 @@ void CollectionView::TotalArtistCountUpdated(const int count) {
     unsetCursor();
   }
 
-  emit TotalArtistCountUpdated_();
+  Q_EMIT TotalArtistCountUpdated_();
 
 }
 
@@ -307,7 +335,7 @@ void CollectionView::TotalAlbumCountUpdated(const int count) {
     unsetCursor();
   }
 
-  emit TotalAlbumCountUpdated_();
+  Q_EMIT TotalAlbumCountUpdated_();
 
 }
 
@@ -348,7 +376,7 @@ void CollectionView::mouseReleaseEvent(QMouseEvent *e) {
   QTreeView::mouseReleaseEvent(e);
 
   if (total_song_count_ == 0) {
-    emit ShowConfigDialog();
+    Q_EMIT ShowSettingsDialog();
   }
 
 }
@@ -375,29 +403,29 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
   if (!context_menu_) {
     context_menu_ = new QMenu(this);
-    action_add_to_playlist_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Append to current playlist"), this, &CollectionView::AddToPlaylist);
-    action_load_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Replace current playlist"), this, &CollectionView::Load);
-    action_open_in_new_playlist_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("document-new")), tr("Open in new playlist"), this, &CollectionView::OpenInNewPlaylist);
+    action_add_to_playlist_ = context_menu_->addAction(IconLoader::Load(u"media-playback-start"_s), tr("Append to current playlist"), this, &CollectionView::AddToPlaylist);
+    action_load_ = context_menu_->addAction(IconLoader::Load(u"media-playback-start"_s), tr("Replace current playlist"), this, &CollectionView::Load);
+    action_open_in_new_playlist_ = context_menu_->addAction(IconLoader::Load(u"document-new"_s), tr("Open in new playlist"), this, &CollectionView::OpenInNewPlaylist);
 
     context_menu_->addSeparator();
-    action_add_to_playlist_enqueue_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Queue track"), this, &CollectionView::AddToPlaylistEnqueue);
-    action_add_to_playlist_enqueue_next_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Queue to play next"), this, &CollectionView::AddToPlaylistEnqueueNext);
+    action_add_to_playlist_enqueue_ = context_menu_->addAction(IconLoader::Load(u"go-next"_s), tr("Queue track"), this, &CollectionView::AddToPlaylistEnqueue);
+    action_add_to_playlist_enqueue_next_ = context_menu_->addAction(IconLoader::Load(u"go-next"_s), tr("Queue to play next"), this, &CollectionView::AddToPlaylistEnqueueNext);
 
     context_menu_->addSeparator();
 
-    action_search_for_this_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-find")), tr("Search for this"), this, &CollectionView::SearchForThis);
+    action_search_for_this_ = context_menu_->addAction(IconLoader::Load(u"edit-find"_s), tr("Search for this"), this, &CollectionView::SearchForThis);
 
     context_menu_->addSeparator();
-    action_organize_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Organize files..."), this, &CollectionView::Organize);
+    action_organize_ = context_menu_->addAction(IconLoader::Load(u"edit-copy"_s), tr("Organize files..."), this, &CollectionView::Organize);
 #ifndef Q_OS_WIN
-    action_copy_to_device_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("device")), tr("Copy to device..."), this, &CollectionView::CopyToDevice);
+    action_copy_to_device_ = context_menu_->addAction(IconLoader::Load(u"device"_s), tr("Copy to device..."), this, &CollectionView::CopyToDevice);
 #endif
-    action_delete_files_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-delete")), tr("Delete from disk..."), this, &CollectionView::Delete);
+    action_delete_files_ = context_menu_->addAction(IconLoader::Load(u"edit-delete"_s), tr("Delete from disk..."), this, &CollectionView::Delete);
 
     context_menu_->addSeparator();
-    action_edit_track_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Edit track information..."), this, &CollectionView::EditTracks);
-    action_edit_tracks_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Edit tracks information..."), this, &CollectionView::EditTracks);
-    action_show_in_browser_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("document-open-folder")), tr("Show in file browser..."), this, &CollectionView::ShowInBrowser);
+    action_edit_track_ = context_menu_->addAction(IconLoader::Load(u"edit-rename"_s), tr("Edit track information..."), this, &CollectionView::EditTracks);
+    action_edit_tracks_ = context_menu_->addAction(IconLoader::Load(u"edit-rename"_s), tr("Edit tracks information..."), this, &CollectionView::EditTracks);
+    action_show_in_browser_ = context_menu_->addAction(IconLoader::Load(u"document-open-folder"_s), tr("Show in file browser..."), this, &CollectionView::ShowInBrowser);
 
     context_menu_->addSeparator();
 
@@ -409,11 +437,11 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
     context_menu_->addSeparator();
 
-    context_menu_->addMenu(filter_->menu());
+    context_menu_->addMenu(filter_widget_->menu());
 
 #ifndef Q_OS_WIN
-    action_copy_to_device_->setDisabled(app_->device_manager()->connected_devices_model()->rowCount() == 0);
-    QObject::connect(app_->device_manager()->connected_devices_model(), &DeviceStateFilterModel::IsEmptyChanged, action_copy_to_device_, &QAction::setDisabled);
+    action_copy_to_device_->setDisabled(device_manager_->connected_devices_model()->rowCount() == 0);
+    QObject::connect(device_manager_->connected_devices_model(), &DeviceStateFilterModel::IsEmptyChanged, action_copy_to_device_, &QAction::setDisabled);
 #endif
 
   }
@@ -421,16 +449,16 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
   context_menu_index_ = indexAt(e->pos());
   if (!context_menu_index_.isValid()) return;
 
-  context_menu_index_ = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(context_menu_index_);
+  context_menu_index_ = filter_->mapToSource(context_menu_index_);
 
-  const QModelIndexList selected_indexes = qobject_cast<QSortFilterProxyModel*>(model())->mapSelectionToSource(selectionModel()->selection()).indexes();
+  const QModelIndexList selected_indexes = filter_->mapSelectionToSource(selectionModel()->selection()).indexes();
 
   int regular_elements = 0;
   int regular_editable = 0;
 
   for (const QModelIndex &idx : selected_indexes) {
     ++regular_elements;
-    if (app_->collection_model()->data(idx, CollectionModel::Role_Editable).toBool()) {
+    if (model_->data(idx, CollectionModel::Role_Editable).toBool()) {
       ++regular_editable;
     }
   }
@@ -457,11 +485,7 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
   action_copy_to_device_->setVisible(regular_elements == regular_editable);
 #endif
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
   action_delete_files_->setVisible(delete_files_);
-#else
-  action_delete_files_->setVisible(false);
-#endif
 
   action_show_in_various_->setVisible(songs_selected > 0);
   action_no_show_in_various_->setVisible(songs_selected > 0);
@@ -472,11 +496,7 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
   action_copy_to_device_->setEnabled(regular_elements == regular_editable);
 #endif
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
   action_delete_files_->setEnabled(delete_files_);
-#else
-  action_delete_files_->setEnabled(false);
-#endif
 
   context_menu_->popup(e->globalPos());
 
@@ -505,7 +525,7 @@ void CollectionView::SetShowInVarious(const bool on) {
   if (on && albums.keys().count() == 1) {
     const QStringList albums_list = albums.keys();
     const QString album = albums_list.first();
-    const SongList all_of_album = app_->collection_backend()->GetSongsByAlbum(album);
+    const SongList all_of_album = backend_->GetSongsByAlbum(album);
     QSet<QString> other_artists;
     for (const Song &s : all_of_album) {
       if (!albums.contains(album, s.artist()) && !other_artists.contains(s.artist())) {
@@ -521,13 +541,9 @@ void CollectionView::SetShowInVarious(const bool on) {
     }
   }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
   const QSet<QString> albums_set = QSet<QString>(albums.keyBegin(), albums.keyEnd());
-#else
-  const QSet<QString> albums_set = QSet<QString>::fromList(albums.keys());
-#endif
   for (const QString &album : albums_set) {
-    app_->collection_backend()->ForceCompilation(album, albums.values(album), on);
+    backend_->ForceCompilation(album, albums.values(album), on);
   }
 
 }
@@ -538,13 +554,13 @@ void CollectionView::Load() {
   if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
     mimedata->clear_first_ = true;
   }
-  emit AddToPlaylistSignal(q_mimedata);
+  Q_EMIT AddToPlaylistSignal(q_mimedata);
 
 }
 
 void CollectionView::AddToPlaylist() {
 
-  emit AddToPlaylistSignal(model()->mimeData(selectedIndexes()));
+  Q_EMIT AddToPlaylistSignal(model()->mimeData(selectedIndexes()));
 
 }
 
@@ -554,7 +570,7 @@ void CollectionView::AddToPlaylistEnqueue() {
   if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
     mimedata->enqueue_now_ = true;
   }
-  emit AddToPlaylistSignal(q_mimedata);
+  Q_EMIT AddToPlaylistSignal(q_mimedata);
 
 }
 
@@ -564,7 +580,7 @@ void CollectionView::AddToPlaylistEnqueueNext() {
   if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
     mimedata->enqueue_next_now_ = true;
   }
-  emit AddToPlaylistSignal(q_mimedata);
+  Q_EMIT AddToPlaylistSignal(q_mimedata);
 
 }
 
@@ -574,13 +590,13 @@ void CollectionView::OpenInNewPlaylist() {
   if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
     mimedata->open_in_new_playlist_ = true;
   }
-  emit AddToPlaylistSignal(q_mimedata);
+  Q_EMIT AddToPlaylistSignal(q_mimedata);
 
 }
 
 void CollectionView::SearchForThis() {
 
-  QModelIndex current = currentIndex();
+  const QModelIndex current = currentIndex();
   const QVariant role_type = model()->data(current, CollectionModel::Role_Type);
   if (!role_type.isValid()) {
     return;
@@ -591,15 +607,16 @@ void CollectionView::SearchForThis() {
     return;
   }
   QString search;
-  QModelIndex index = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(current);
+
+  QModelIndex index = filter_->mapToSource(current);
 
   switch (item_type) {
     case CollectionItem::Type::Song:{
-      SongList songs = app_->collection_model()->GetChildSongs(index);
+      SongList songs = model_->GetChildSongs(index);
       if (!songs.isEmpty()) {
         last_selected_song_ = songs.last();
       }
-      search = QStringLiteral("title:%1").arg(last_selected_song_.title());
+      search = QStringLiteral("title:\"%1\"").arg(last_selected_song_.title());
       break;
     }
 
@@ -608,29 +625,30 @@ void CollectionView::SearchForThis() {
     }
 
     case CollectionItem::Type::Container:{
-      CollectionItem *item = app_->collection_model()->IndexToItem(index);
+      CollectionItem *item = model_->IndexToItem(index);
+      const CollectionModel::GroupBy group_by = model_->GetGroupBy()[item->container_level];
+      while (!item->children.isEmpty()) {
+        item = item->children.constFirst();
+      }
 
-      int container_level = item->container_level;
-      CollectionModel::GroupBy container_group_by = app_->collection_model()->GetGroupBy()[container_level];
-
-      switch (container_group_by) {
+      switch (group_by) {
         case CollectionModel::GroupBy::AlbumArtist:
-          search = QStringLiteral("albumartist:%1").arg(item->metadata.effective_albumartist());
+          search = QStringLiteral("albumartist:\"%1\"").arg(item->metadata.effective_albumartist());
           break;
         case CollectionModel::GroupBy::Artist:
-          search = QStringLiteral("artist:%1").arg(item->metadata.artist());
+          search = QStringLiteral("artist:\"%1\"").arg(item->metadata.artist());
           break;
         case CollectionModel::GroupBy::Album:
         case CollectionModel::GroupBy::AlbumDisc:
-          search = QStringLiteral("album:%1").arg(item->metadata.album());
+          search = QStringLiteral("album:\"%1\"").arg(item->metadata.album());
           break;
         case CollectionModel::GroupBy::YearAlbum:
         case CollectionModel::GroupBy::YearAlbumDisc:
-          search = QStringLiteral("year:%1 album:%2").arg(item->metadata.year()).arg(item->metadata.album());
+          search = QStringLiteral("year:%1 album:\"%2\"").arg(item->metadata.year()).arg(item->metadata.album());
           break;
         case CollectionModel::GroupBy::OriginalYearAlbum:
         case CollectionModel::GroupBy::OriginalYearAlbumDisc:
-          search = QStringLiteral("year:%1 album:%2").arg(item->metadata.effective_originalyear()).arg(item->metadata.album());
+          search = QStringLiteral("year:%1 album:\"%2\"").arg(item->metadata.effective_originalyear()).arg(item->metadata.album());
           break;
         case CollectionModel::GroupBy::Year:
           search = QStringLiteral("year:%1").arg(item->metadata.year());
@@ -639,16 +657,16 @@ void CollectionView::SearchForThis() {
           search = QStringLiteral("year:%1").arg(item->metadata.effective_originalyear());
           break;
         case CollectionModel::GroupBy::Genre:
-          search = QStringLiteral("genre:%1").arg(item->metadata.genre());
+          search = QStringLiteral("genre:\"%1\"").arg(item->metadata.genre());
           break;
         case CollectionModel::GroupBy::Composer:
-          search = QStringLiteral("composer:%1").arg(item->metadata.composer());
+          search = QStringLiteral("composer:\"%1\"").arg(item->metadata.composer());
           break;
         case CollectionModel::GroupBy::Performer:
-          search = QStringLiteral("performer:%1").arg(item->metadata.performer());
+          search = QStringLiteral("performer:\"%1\"").arg(item->metadata.performer());
           break;
         case CollectionModel::GroupBy::Grouping:
-          search = QStringLiteral("grouping:%1").arg(item->metadata.grouping());
+          search = QStringLiteral("grouping:\"%1\"").arg(item->metadata.grouping());
           break;
         case CollectionModel::GroupBy::Samplerate:
           search = QStringLiteral("samplerate:%1").arg(item->metadata.samplerate());
@@ -669,7 +687,7 @@ void CollectionView::SearchForThis() {
       return;
   }
 
-  filter_->ShowInCollection(search);
+  filter_widget_->ShowInCollection(search);
 
 }
 
@@ -694,18 +712,18 @@ void CollectionView::scrollTo(const QModelIndex &idx, ScrollHint hint) {
 
 SongList CollectionView::GetSelectedSongs() const {
 
-  QModelIndexList selected_indexes = qobject_cast<QSortFilterProxyModel*>(model())->mapSelectionToSource(selectionModel()->selection()).indexes();
-  return app_->collection_model()->GetChildSongs(selected_indexes);
+  QModelIndexList selected_indexes = filter_->mapSelectionToSource(selectionModel()->selection()).indexes();
+  return model_->GetChildSongs(selected_indexes);
 
 }
 
 void CollectionView::Organize() {
 
   if (!organize_dialog_) {
-    organize_dialog_ = make_unique<OrganizeDialog>(app_->task_manager(), app_->collection_backend(), this);
+    organize_dialog_ = make_unique<OrganizeDialog>(task_manager_, tagreader_client_, backend_, this);
   }
 
-  organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model());
+  organize_dialog_->SetDestinationModel(model_->directory_model());
   organize_dialog_->SetCopy(false);
   const SongList songs = GetSelectedSongs();
   if (organize_dialog_->SetSongs(songs)) {
@@ -720,7 +738,7 @@ void CollectionView::Organize() {
 void CollectionView::EditTracks() {
 
   if (!edit_tag_dialog_) {
-    edit_tag_dialog_ = make_unique<EditTagDialog>(app_, this);
+    edit_tag_dialog_ = make_unique<EditTagDialog>(network_, tagreader_client_, backend_, albumcover_loader_, current_albumcover_loader_, cover_providers_, lyrics_providers_, streaming_services_, this);
     QObject::connect(&*edit_tag_dialog_, &EditTagDialog::Error, this, &CollectionView::EditTagError);
   }
   const SongList songs = GetSelectedSongs();
@@ -730,12 +748,12 @@ void CollectionView::EditTracks() {
 }
 
 void CollectionView::EditTagError(const QString &message) {
-  emit Error(message);
+  Q_EMIT Error(message);
 }
 
 void CollectionView::RescanSongs() {
 
-  app_->collection()->Rescan(GetSelectedSongs());
+  collection_->Rescan(GetSelectedSongs());
 
 }
 
@@ -743,10 +761,10 @@ void CollectionView::CopyToDevice() {
 
 #ifndef Q_OS_WIN
   if (!organize_dialog_) {
-    organize_dialog_ = make_unique<OrganizeDialog>(app_->task_manager(), nullptr, this);
+    organize_dialog_ = make_unique<OrganizeDialog>(task_manager_, tagreader_client_, nullptr, this);
   }
 
-  organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true);
+  organize_dialog_->SetDestinationModel(device_manager_->connected_devices_model(), true);
   organize_dialog_->SetCopy(true);
   organize_dialog_->SetSongs(GetSelectedSongs());
   organize_dialog_->show();
@@ -772,7 +790,7 @@ void CollectionView::FilterReturnPressed() {
 
   if (!currentIndex().isValid()) return;
 
-  emit doubleClicked(currentIndex());
+  Q_EMIT doubleClicked(currentIndex());
 }
 
 void CollectionView::ShowInBrowser() const {
@@ -818,9 +836,9 @@ void CollectionView::Delete() {
   if (DeleteConfirmationDialog::warning(files) != QDialogButtonBox::Yes) return;
 
   // We can cheat and always take the storage of the first directory, since they'll all be FilesystemMusicStorage in a collection and deleting doesn't check the actual directory.
-  SharedPtr<MusicStorage> storage = app_->collection_model()->directory_model()->index(0, 0).data(MusicStorage::Role_Storage).value<SharedPtr<MusicStorage>>();
+  SharedPtr<MusicStorage> storage = model_->directory_model()->index(0, 0).data(MusicStorage::Role_Storage).value<SharedPtr<MusicStorage>>();
 
-  DeleteFiles *delete_files = new DeleteFiles(app_->task_manager(), storage, true);
+  DeleteFiles *delete_files = new DeleteFiles(task_manager_, storage, true);
   QObject::connect(delete_files, &DeleteFiles::Finished, this, &CollectionView::DeleteFilesFinished);
   delete_files->Start(songs);
 

src/collection/collectionview.h

@@ -24,26 +24,39 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QString>
 #include <QPixmap>
 #include <QSet>
 
-#include "core/scoped_ptr.h"
+#include "includes/scoped_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/song.h"
 #include "widgets/autoexpandingtreeview.h"
 
-class QWidget;
+class QSortFilterProxyModel;
 class QMenu;
 class QAction;
 class QContextMenuEvent;
 class QMouseEvent;
 class QPaintEvent;
+class QKeyEvent;
 
-class Application;
+class TaskManager;
+class TagReaderClient;
+class NetworkAccessManager;
+class CollectionLibrary;
+class CollectionBackend;
+class CollectionModel;
+class CollectionFilter;
 class CollectionFilterWidget;
+class DeviceManager;
+class StreamingServices;
+class AlbumCoverLoader;
+class CurrentAlbumCoverLoader;
+class CoverProviders;
+class LyricsProviders;
 class EditTagDialog;
 class OrganizeDialog;
 
@@ -58,8 +71,18 @@ class CollectionView : public AutoExpandingTreeView {
   // Please note that the selection is recursive meaning that if for example an album is selected this will return all of it's songs.
   SongList GetSelectedSongs() const;
 
-  void SetApplication(Application *app);
-  void SetFilter(CollectionFilterWidget *filter);
+  void Init(const SharedPtr<TaskManager> task_manager,
+            const SharedPtr<TagReaderClient> tagreader_client,
+            const SharedPtr<NetworkAccessManager> network,
+            const SharedPtr<AlbumCoverLoader> albumcover_loader,
+            const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader,
+            const SharedPtr<CoverProviders> cover_providers,
+            const SharedPtr<LyricsProviders> lyrics_providers,
+            const SharedPtr<CollectionLibrary> collection,
+            const SharedPtr<DeviceManager> device_manager,
+            const SharedPtr<StreamingServices> streaming_services);
+
+  void SetFilterWidget(CollectionFilterWidget *filter_widget);
 
   // QTreeView
   void keyboardSearch(const QString &search) override;
@@ -69,7 +92,7 @@ class CollectionView : public AutoExpandingTreeView {
   int TotalArtists() const;
   int TotalAlbums() const;
 
- public slots:
+ public Q_SLOTS:
   void TotalSongCountUpdated(const int count);
   void TotalArtistCountUpdated(const int count);
   void TotalAlbumCountUpdated(const int count);
@@ -82,8 +105,8 @@ class CollectionView : public AutoExpandingTreeView {
 
   void EditTagError(const QString &message);
 
- signals:
-  void ShowConfigDialog();
+ Q_SIGNALS:
+  void ShowSettingsDialog();
 
   void TotalSongCountUpdated_();
   void TotalArtistCountUpdated_();
@@ -97,7 +120,7 @@ class CollectionView : public AutoExpandingTreeView {
   void mouseReleaseEvent(QMouseEvent *e) override;
   void contextMenuEvent(QContextMenuEvent *e) override;
 
- private slots:
+ private Q_SLOTS:
   void Load();
   void AddToPlaylist();
   void AddToPlaylistEnqueue();
@@ -121,8 +144,21 @@ class CollectionView : public AutoExpandingTreeView {
   void SaveContainerPath(const QModelIndex &child);
 
  private:
-  Application *app_;
-  CollectionFilterWidget *filter_;
+  SharedPtr<TaskManager> task_manager_;
+  SharedPtr<TagReaderClient> tagreader_client_;
+  SharedPtr<NetworkAccessManager> network_;
+  SharedPtr<DeviceManager> device_manager_;
+  SharedPtr<AlbumCoverLoader> albumcover_loader_;
+  SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader_;
+  SharedPtr<CollectionLibrary> collection_;
+  SharedPtr<CoverProviders> cover_providers_;
+  SharedPtr<LyricsProviders> lyrics_providers_;
+  SharedPtr<StreamingServices> streaming_services_;
+
+  SharedPtr<CollectionBackend> backend_;
+  CollectionModel *model_;
+  CollectionFilter *filter_;
+  CollectionFilterWidget *filter_widget_;
 
   int total_song_count_;
   int total_artist_count_;

src/collection/collectionviewcontainer.cpp

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <QWidget>
 #include <QKeyEvent>
 
 #include "collectionfilterwidget.h"
@@ -32,7 +31,7 @@
 CollectionViewContainer::CollectionViewContainer(QWidget *parent) : QWidget(parent), ui_(new Ui_CollectionViewContainer) {
 
   ui_->setupUi(this);
-  view()->SetFilter(filter_widget());
+  view()->SetFilterWidget(filter_widget());
 
   QObject::connect(filter_widget(), &CollectionFilterWidget::UpPressed, view(), &CollectionView::UpAndFocus);
   QObject::connect(filter_widget(), &CollectionFilterWidget::DownPressed, view(), &CollectionView::DownAndFocus);

src/collection/collectionviewcontainer.h

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QWidget>
 
 class CollectionFilterWidget;

src/collection/collectionwatcher.cpp

@@ -42,20 +42,21 @@
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
+#include <QMutexLocker>
 #include <QSettings>
 
 #include "core/filesystemwatcherinterface.h"
 #include "core/logging.h"
-#include "core/tagreaderclient.h"
 #include "core/taskmanager.h"
 #include "core/settings.h"
 #include "utilities/imageutils.h"
-#include "utilities/timeconstants.h"
+#include "constants/timeconstants.h"
+#include "tagreader/tagreaderclient.h"
 #include "collectiondirectory.h"
 #include "collectionbackend.h"
 #include "collectionwatcher.h"
 #include "playlistparsers/cueparser.h"
-#include "settings/collectionsettingspage.h"
+#include "constants/collectionsettings.h"
 #include "engine/ebur128measures.h"
 #ifdef HAVE_SONGFINGERPRINTING
 #  include "engine/chromaprinter.h"
@@ -70,15 +71,20 @@
 #endif
 
 using namespace std::chrono_literals;
+using namespace Qt::Literals::StringLiterals;
 
-QStringList CollectionWatcher::sValidImages = QStringList() << QStringLiteral("jpg") << QStringLiteral("png") << QStringLiteral("gif") << QStringLiteral("jpeg");
-QStringList CollectionWatcher::kIgnoredExtensions = QStringList() << QStringLiteral("tmp") << QStringLiteral("tar") << QStringLiteral("gz") << QStringLiteral("bz2") << QStringLiteral("xz") << QStringLiteral("tbz") << QStringLiteral("tgz") << QStringLiteral("z") << QStringLiteral("zip") << QStringLiteral("rar");
+QStringList CollectionWatcher::sValidImages = QStringList() << u"jpg"_s << u"png"_s << u"gif"_s << u"jpeg"_s;
 
-CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent)
+CollectionWatcher::CollectionWatcher(const Song::Source source,
+                                     const SharedPtr<TaskManager> task_manager,
+                                     const SharedPtr<TagReaderClient> tagreader_client,
+                                     const SharedPtr<CollectionBackend> backend,
+                                     QObject *parent)
     : QObject(parent),
       source_(source),
-      backend_(nullptr),
-      task_manager_(nullptr),
+      task_manager_(task_manager),
+      tagreader_client_(tagreader_client),
+      backend_(backend),
       fs_watcher_(FileSystemWatcherInterface::Create(this)),
       original_thread_(nullptr),
       scan_on_startup_(true),
@@ -95,9 +101,11 @@ CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent)
       periodic_scan_timer_(new QTimer(this)),
       rescan_paused_(false),
       total_watches_(0),
-      cue_parser_(new CueParser(backend_, this)),
+      cue_parser_(new CueParser(tagreader_client, backend, this)),
       last_scan_time_(0) {
 
+  setObjectName(source_ == Song::Source::Collection ? QLatin1String(metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(source_), QLatin1String(metaObject()->className())));
+
   original_thread_ = thread();
 
   rescan_timer_->setInterval(2s);
@@ -135,10 +143,51 @@ void CollectionWatcher::Exit() {
 
   Q_ASSERT(QThread::currentThread() == thread());
 
-  Stop();
+  Abort();
   if (backend_) backend_->Close();
   moveToThread(original_thread_);
-  emit ExitFinished();
+  Q_EMIT ExitFinished();
+
+}
+
+void CollectionWatcher::Stop() {
+
+  QMutexLocker l(&mutex_stop_);
+  stop_requested_ = true;
+
+}
+
+void CollectionWatcher::CancelStop() {
+
+  QMutexLocker l(&mutex_stop_);
+  stop_requested_ = false;
+
+}
+
+bool CollectionWatcher::stop_requested() const {
+
+  QMutexLocker l(&mutex_stop_);
+  return stop_requested_;
+
+}
+
+void CollectionWatcher::Abort() {
+
+  QMutexLocker l(&mutex_abort_);
+  abort_requested_ = true;
+
+}
+
+bool CollectionWatcher::abort_requested() const {
+
+  QMutexLocker l(&mutex_abort_);
+  return abort_requested_;
+
+}
+
+bool CollectionWatcher::stop_or_abort_requested() const {
+
+  return stop_requested() || abort_requested();
 
 }
 
@@ -152,23 +201,29 @@ void CollectionWatcher::ReloadSettings() {
 
   const bool was_monitoring_before = monitor_;
   Settings s;
-  s.beginGroup(CollectionSettingsPage::kSettingsGroup);
-  scan_on_startup_ = s.value("startup_scan", true).toBool();
-  monitor_ = s.value("monitor", true).toBool();
-  const QStringList filters = s.value("cover_art_patterns", QStringList() << QStringLiteral("front") << QStringLiteral("cover")).toStringList();
+  s.beginGroup(CollectionSettings::kSettingsGroup);
   if (source_ == Song::Source::Collection) {
-    song_tracking_ = s.value("song_tracking", false).toBool();
-    song_ebur128_loudness_analysis_ = s.value("song_ebur128_loudness_analysis", false).toBool();
-    mark_songs_unavailable_ = song_tracking_ ? true : s.value("mark_songs_unavailable", true).toBool();
+    scan_on_startup_ = s.value(CollectionSettings::kStartupScan, true).toBool();
+    monitor_ = s.value(CollectionSettings::kMonitor, true).toBool();
+  }
+  else {
+    scan_on_startup_ = true;
+    monitor_ = true;
+  }
+  const QStringList filters = s.value(CollectionSettings::kCoverArtPatterns, QStringList() << u"front"_s << u"cover"_s).toStringList();
+  if (source_ == Song::Source::Collection) {
+    song_tracking_ = s.value(CollectionSettings::kSongTracking, false).toBool();
+    song_ebur128_loudness_analysis_ = s.value(CollectionSettings::kSongENUR128LoudnessAnalysis, false).toBool();
+    mark_songs_unavailable_ = song_tracking_ ? true : s.value(CollectionSettings::kMarkSongsUnavailable, true).toBool();
   }
   else {
     song_tracking_ = false;
     song_ebur128_loudness_analysis_ = false;
     mark_songs_unavailable_ = false;
   }
-  expire_unavailable_songs_days_ = s.value("expire_unavailable_songs", 60).toInt();
-  overwrite_playcount_ = s.value("overwrite_playcount", false).toBool();
-  overwrite_rating_ = s.value("overwrite_rating", false).toBool();
+  expire_unavailable_songs_days_ = s.value(CollectionSettings::kExpireUnavailableSongs, 60).toInt();
+  overwrite_playcount_ = s.value(CollectionSettings::kOverwritePlaycount, false).toBool();
+  overwrite_rating_ = s.value(CollectionSettings::kOverwriteRating, false).toBool();
   s.endGroup();
 
   best_art_filters_.clear();
@@ -190,11 +245,13 @@ void CollectionWatcher::ReloadSettings() {
     }
   }
 
-  if (monitor_ && scan_on_startup_ && mark_songs_unavailable_ && !periodic_scan_timer_->isActive()) {
-    periodic_scan_timer_->start();
-  }
-  else if ((!monitor_ || !scan_on_startup_ || !mark_songs_unavailable_) && periodic_scan_timer_->isActive()) {
-    periodic_scan_timer_->stop();
+  if (source_ == Song::Source::Collection) {
+    if (monitor_ && scan_on_startup_ && mark_songs_unavailable_ && !periodic_scan_timer_->isActive()) {
+      periodic_scan_timer_->start();
+    }
+    else if ((!monitor_ || !scan_on_startup_ || !mark_songs_unavailable_) && periodic_scan_timer_->isActive()) {
+      periodic_scan_timer_->stop();
+    }
   }
 
 }
@@ -223,14 +280,14 @@ CollectionWatcher::ScanTransaction::ScanTransaction(CollectionWatcher *watcher,
   }
 
   task_id_ = watcher_->task_manager_->StartTask(description);
-  emit watcher_->ScanStarted(task_id_);
+  Q_EMIT watcher_->ScanStarted(task_id_);
 
 }
 
 CollectionWatcher::ScanTransaction::~ScanTransaction() {
 
   // If we're stopping then don't commit the transaction
-  if (!watcher_->stop_requested_ && !watcher_->abort_requested_) {
+  if (!watcher_->stop_or_abort_requested()) {
     CommitNewOrUpdatedSongs();
   }
 
@@ -256,35 +313,35 @@ void CollectionWatcher::ScanTransaction::CommitNewOrUpdatedSongs() {
 
   if (!deleted_songs.isEmpty()) {
     if (mark_songs_unavailable_ && watcher_->source() == Song::Source::Collection) {
-      emit watcher_->SongsUnavailable(deleted_songs);
+      Q_EMIT watcher_->SongsUnavailable(deleted_songs);
     }
     else {
-      emit watcher_->SongsDeleted(deleted_songs);
+      Q_EMIT watcher_->SongsDeleted(deleted_songs);
     }
     deleted_songs.clear();
   }
 
   if (!new_songs.isEmpty()) {
-    emit watcher_->NewOrUpdatedSongs(new_songs);
+    Q_EMIT watcher_->NewOrUpdatedSongs(new_songs);
     new_songs.clear();
   }
 
   if (!touched_songs.isEmpty()) {
-    emit watcher_->SongsMTimeUpdated(touched_songs);
+    Q_EMIT watcher_->SongsMTimeUpdated(touched_songs);
     touched_songs.clear();
   }
 
   if (!readded_songs.isEmpty()) {
-    emit watcher_->SongsReadded(readded_songs);
+    Q_EMIT watcher_->SongsReadded(readded_songs);
     readded_songs.clear();
   }
 
   if (!new_subdirs.isEmpty()) {
-    emit watcher_->SubdirsDiscovered(new_subdirs);
+    Q_EMIT watcher_->SubdirsDiscovered(new_subdirs);
   }
 
   if (!touched_subdirs.isEmpty()) {
-    emit watcher_->SubdirsMTimeUpdated(touched_subdirs);
+    Q_EMIT watcher_->SubdirsMTimeUpdated(touched_subdirs);
     touched_subdirs.clear();
   }
 
@@ -306,7 +363,7 @@ void CollectionWatcher::ScanTransaction::CommitNewOrUpdatedSongs() {
   new_subdirs.clear();
 
   if (incremental_ || ignores_mtime_) {
-    emit watcher_->UpdateLastSeen(dir_, expire_unavailable_songs_days_);
+    Q_EMIT watcher_->UpdateLastSeen(dir_, expire_unavailable_songs_days_);
   }
 
 }
@@ -317,7 +374,7 @@ SongList CollectionWatcher::ScanTransaction::FindSongsInSubdirectory(const QStri
   if (cached_songs_dirty_) {
     const SongList songs = watcher_->backend_->FindSongsInDirectory(dir_);
     for (const Song &song : songs) {
-      const QString p = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
+      const QString p = song.url().toLocalFile().section(u'/', 0, -2);
       cached_songs_.insert(p, song);
     }
     cached_songs_dirty_ = false;
@@ -336,7 +393,7 @@ bool CollectionWatcher::ScanTransaction::HasSongsWithMissingFingerprint(const QS
   if (cached_songs_missing_fingerprint_dirty_) {
     const SongList songs = watcher_->backend_->SongsWithMissingFingerprint(dir_);
     for (const Song &song : songs) {
-      const QString p = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
+      const QString p = song.url().toLocalFile().section(u'/', 0, -2);
       cached_songs_missing_fingerprint_.insert(p, song);
     }
     cached_songs_missing_fingerprint_dirty_ = false;
@@ -351,7 +408,7 @@ bool CollectionWatcher::ScanTransaction::HasSongsWithMissingLoudnessCharacterist
   if (cached_songs_missing_loudness_characteristics_dirty_) {
     const SongList songs = watcher_->backend_->SongsWithMissingLoudnessCharacteristics(dir_);
     for (const Song &song : songs) {
-      const QString p = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
+      const QString p = song.url().toLocalFile().section(u'/', 0, -2);
       cached_songs_missing_loudness_characteristics_.insert(p, song);
     }
     cached_songs_missing_loudness_characteristics_dirty_ = false;
@@ -407,7 +464,7 @@ CollectionSubdirectoryList CollectionWatcher::ScanTransaction::GetAllSubdirs() {
 
 void CollectionWatcher::AddDirectory(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdirs) {
 
-  stop_requested_ = false;
+  CancelStop();
 
   watched_dirs_[dir.id] = dir;
 
@@ -421,25 +478,29 @@ void CollectionWatcher::AddDirectory(const CollectionDirectory &dir, const Colle
     last_scan_time_ = QDateTime::currentSecsSinceEpoch();
   }
   else {
-    // We can do an incremental scan - looking at the mtimes of each subdirectory and only rescan if the directory has changed.
-    ScanTransaction transaction(this, dir.id, true, false, mark_songs_unavailable_);
-    QMap<QString, quint64> subdir_files_count;
-    const quint64 files_count = FilesCountForSubdirs(&transaction, subdirs, subdir_files_count);
-    transaction.SetKnownSubdirs(subdirs);
-    transaction.AddToProgressMax(files_count);
-    for (const CollectionSubdirectory &subdir : subdirs) {
-      if (stop_requested_ || abort_requested_) break;
-
-      if (scan_on_startup_) ScanSubdirectory(subdir.path, subdir, subdir_files_count[subdir.path], &transaction);
-
-      if (monitor_) AddWatch(dir, subdir.path);
+    if (monitor_) {
+      for (const CollectionSubdirectory &subdir : subdirs) {
+        AddWatch(dir, subdir.path);
+      }
+    }
+    if (scan_on_startup_) {
+      // We can do an incremental scan - looking at the mtimes of each subdirectory and only rescan if the directory has changed.
+      ScanTransaction transaction(this, dir.id, true, false, mark_songs_unavailable_);
+      QMap<QString, quint64> subdir_files_count;
+      const quint64 files_count = FilesCountForSubdirs(&transaction, subdirs, subdir_files_count);
+      transaction.SetKnownSubdirs(subdirs);
+      transaction.AddToProgressMax(files_count);
+      for (const CollectionSubdirectory &subdir : subdirs) {
+        if (stop_or_abort_requested()) break;
+        ScanSubdirectory(subdir.path, subdir, subdir_files_count[subdir.path], &transaction);
+      }
+      if (!stop_or_abort_requested()) {
+        last_scan_time_ = QDateTime::currentSecsSinceEpoch();
+      }
     }
-
-    last_scan_time_ = QDateTime::currentSecsSinceEpoch();
-
   }
 
-  emit CompilationsNeedUpdating();
+  Q_EMIT CompilationsNeedUpdating();
 
 }
 
@@ -493,7 +554,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
   QDirIterator it(path, QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
   while (it.hasNext()) {
 
-    if (stop_requested_ || abort_requested_) return;
+    if (stop_or_abort_requested()) return;
 
     QString child(it.next());
     QFileInfo child_info(child);
@@ -512,14 +573,14 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
     else {
       QString ext_part(ExtensionPart(child));
       QString dir_part(DirectoryPart(child));
-      if (kIgnoredExtensions.contains(child_info.suffix(), Qt::CaseInsensitive) || child_info.baseName() == QLatin1String("qt_temp")) {
+      if (Song::kRejectedExtensions.contains(child_info.suffix(), Qt::CaseInsensitive) || child_info.baseName() == "qt_temp"_L1) {
         t->AddToProgress(1);
       }
       else if (sValidImages.contains(ext_part)) {
         album_art[dir_part] << child;
         t->AddToProgress(1);
       }
-      else if (TagReaderClient::Instance()->IsMediaFileBlocking(child)) {
+      else if (tagreader_client_->IsMediaFileBlocking(child)) {
         files_on_disk << child;
       }
       else {
@@ -528,7 +589,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
     }
   }
 
-  if (stop_requested_ || abort_requested_) return;
+  if (stop_or_abort_requested()) return;
 
   // Ask the database for a list of files in this directory
   SongList songs_in_db = t->FindSongsInSubdirectory(path);
@@ -539,7 +600,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
   QStringList files_on_disk_copy = files_on_disk;
   for (const QString &file : files_on_disk_copy) {
 
-    if (stop_requested_ || abort_requested_) return;
+    if (stop_or_abort_requested()) return;
 
     // Associated CUE
     QString new_cue = CueParser::FindCueFilename(file);
@@ -614,7 +675,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
           Chromaprinter chromaprinter(file);
           fingerprint = chromaprinter.CreateFingerprint();
           if (fingerprint.isEmpty()) {
-            fingerprint = QLatin1String("NONE");
+            fingerprint = "NONE"_L1;
           }
         }
 #endif
@@ -641,11 +702,11 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
         Chromaprinter chromaprinter(file);
         fingerprint = chromaprinter.CreateFingerprint();
         if (fingerprint.isEmpty()) {
-          fingerprint = QLatin1String("NONE");
+          fingerprint = "NONE"_L1;
         }
       }
 #endif
-      if (song_tracking_ && !fingerprint.isEmpty() && fingerprint != QLatin1String("NONE") && FindSongsByFingerprint(file, fingerprint, &matching_songs)) {
+      if (song_tracking_ && !fingerprint.isEmpty() && fingerprint != "NONE"_L1 && FindSongsByFingerprint(file, fingerprint, &matching_songs)) {
 
         // The song is in the database and still on disk.
         // Check the mtime to see if it's been changed since it was added.
@@ -741,7 +802,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
 
   // Recurse into the new subdirs that we found
   for (const CollectionSubdirectory &my_new_subdir : std::as_const(my_new_subdirs)) {
-    if (stop_requested_ || abort_requested_) return;
+    if (stop_or_abort_requested()) return;
     ScanSubdirectory(my_new_subdir.path, my_new_subdir, 0, t, true);
   }
 
@@ -753,7 +814,7 @@ void CollectionWatcher::UpdateCueAssociatedSongs(const QString &file,
                                                  const QString &matching_cue,
                                                  const QUrl &art_automatic,
                                                  const SongList &old_cue_songs,
-                                                 ScanTransaction *t) {
+                                                 ScanTransaction *t) const {
 
   QHash<quint64, Song> sections_map;
   for (const Song &song : old_cue_songs) {
@@ -797,6 +858,7 @@ void CollectionWatcher::UpdateCueAssociatedSongs(const QString &file,
       t->deleted_songs << old_cue;
     }
   }
+
 }
 
 void CollectionWatcher::UpdateNonCueAssociatedSong(const QString &file,
@@ -817,7 +879,7 @@ void CollectionWatcher::UpdateNonCueAssociatedSong(const QString &file,
   }
 
   Song song_on_disk(source_);
-  const TagReaderClient::Result result = TagReaderClient::Instance()->ReadFileBlocking(file, &song_on_disk);
+  const TagReaderResult result = tagreader_client_->ReadFileBlocking(file, &song_on_disk);
   if (result.success() && song_on_disk.is_valid()) {
     song_on_disk.set_source(source_);
     song_on_disk.set_directory_id(t->dir());
@@ -831,7 +893,7 @@ void CollectionWatcher::UpdateNonCueAssociatedSong(const QString &file,
 
 }
 
-SongList CollectionWatcher::ScanNewFile(const QString &file, const QString &path, const QString &fingerprint, const QString &matching_cue, QSet<QString> *cues_processed) {
+SongList CollectionWatcher::ScanNewFile(const QString &file, const QString &path, const QString &fingerprint, const QString &matching_cue, QSet<QString> *cues_processed) const {
 
   SongList songs;
 
@@ -853,10 +915,10 @@ SongList CollectionWatcher::ScanNewFile(const QString &file, const QString &path
     // Also, watch out for incorrect media files.
     // Playlist parser for CUEs considers every entry in sheet valid, and we don't want invalid media getting into collection!
     QString file_nfd = file.normalized(QString::NormalizationForm_D);
-    SongList cue_congs = cue_parser_->Load(&cue_file, matching_cue, path, false);
+    SongList cue_songs = cue_parser_->Load(&cue_file, matching_cue, path, false);
     cue_file.close();
-    songs.reserve(cue_congs.count());
-    for (Song &cue_song : cue_congs) {
+    songs.reserve(cue_songs.count());
+    for (Song &cue_song : cue_songs) {
       cue_song.set_source(source_);
       PerformEBUR128Analysis(cue_song);
       cue_song.set_fingerprint(fingerprint);
@@ -870,7 +932,7 @@ SongList CollectionWatcher::ScanNewFile(const QString &file, const QString &path
   }
   else {  // It's a normal media file
     Song song(source_);
-    const TagReaderClient::Result result = TagReaderClient::Instance()->ReadFileBlocking(file, &song);
+    const TagReaderResult result = tagreader_client_->ReadFileBlocking(file, &song);
     if (result.success() && song.is_valid()) {
       song.set_source(source_);
       PerformEBUR128Analysis(song);
@@ -894,50 +956,50 @@ void CollectionWatcher::AddChangedSong(const QString &file, const Song &matching
   }
   else {
     if (matching_song.url() != new_song.url()) {
-      changes << QStringLiteral("file path");
+      changes << u"file path"_s;
       notify_new = true;
     }
     if (matching_song.fingerprint() != new_song.fingerprint()) {
-      changes << QStringLiteral("fingerprint");
+      changes << u"fingerprint"_s;
       notify_new = true;
     }
     if (!matching_song.IsMetadataEqual(new_song)) {
-      changes << QStringLiteral("metadata");
+      changes << u"metadata"_s;
       notify_new = true;
     }
     if (!matching_song.IsPlayStatisticsEqual(new_song)) {
-      changes << QStringLiteral("play statistics");
+      changes << u"play statistics"_s;
       notify_new = true;
     }
     if (!matching_song.IsRatingEqual(new_song)) {
-      changes << QStringLiteral("rating");
+      changes << u"rating"_s;
       notify_new = true;
     }
     if (!matching_song.IsArtEqual(new_song)) {
-      changes << QStringLiteral("album art");
+      changes << u"album art"_s;
       notify_new = true;
     }
     if (!matching_song.IsAcoustIdEqual(new_song)) {
-      changes << QStringLiteral("acoustid");
+      changes << u"acoustid"_s;
       notify_new = true;
     }
     if (!matching_song.IsMusicBrainzEqual(new_song)) {
-      changes << QStringLiteral("musicbrainz");
+      changes << u"musicbrainz"_s;
       notify_new = true;
     }
     if (!matching_song.IsEBUR128Equal(new_song)) {
-      changes << QStringLiteral("ebur128 loudness characteristics");
+      changes << u"ebur128 loudness characteristics"_s;
       notify_new = true;
     }
     if (matching_song.mtime() != new_song.mtime()) {
-      changes << QStringLiteral("mtime");
+      changes << u"mtime"_s;
     }
 
     if (changes.isEmpty()) {
       qLog(Debug) << "Song" << file << "unchanged.";
     }
     else {
-      qLog(Debug) << "Song" << file << changes.join(QLatin1String(", ")) << "changed.";
+      qLog(Debug) << "Song" << file << changes.join(", "_L1) << "changed.";
     }
 
   }
@@ -961,6 +1023,8 @@ void CollectionWatcher::PerformEBUR128Analysis(Song &song) const {
     song.set_ebur128_integrated_loudness_lufs(loudness_characteristics->loudness_lufs);
     song.set_ebur128_loudness_range_lu(loudness_characteristics->range_lu);
   }
+#else
+  Q_UNUSED(song)
 #endif
 
 }
@@ -979,6 +1043,7 @@ quint64 CollectionWatcher::GetMtimeForCue(const QString &cue_path) {
   const QDateTime cue_last_modified = fileinfo.lastModified();
 
   return cue_last_modified.isValid() ? cue_last_modified.toSecsSinceEpoch() : 0;
+
 }
 
 void CollectionWatcher::AddWatch(const CollectionDirectory &dir, const QString &path) {
@@ -1008,8 +1073,8 @@ void CollectionWatcher::RemoveDirectory(const CollectionDirectory &dir) {
   watched_dirs_.remove(dir.id);
 
   // Stop watching the directory's subdirectories
-  QStringList subdir_paths = subdir_mapping_.keys(dir);
-  for (const QString &subdir_path : std::as_const(subdir_paths)) {
+  const QStringList subdir_paths = subdir_mapping_.keys(dir);
+  for (const QString &subdir_path : subdir_paths) {
     fs_watcher_->RemovePath(subdir_path);
     subdir_mapping_.remove(subdir_path);
   }
@@ -1030,11 +1095,11 @@ bool CollectionWatcher::FindSongsByPath(const SongList &songs, const QString &pa
 
 bool CollectionWatcher::FindSongsByFingerprint(const QString &file, const QString &fingerprint, SongList *out) {
 
-  SongList songs = backend_->GetSongsByFingerprint(fingerprint);
-  for (const Song &song : std::as_const(songs)) {
+  const SongList songs = backend_->GetSongsByFingerprint(fingerprint);
+  for (const Song &song : songs) {
     QString filename = song.url().toLocalFile();
     QFileInfo info(filename);
-    // Allow mulitiple songs in different directories with the same fingerprint.
+    // Allow multiple songs in different directories with the same fingerprint.
     // Only use the matching song by fingerprint if it doesn't already exist in a different path.
     if (file == filename || !info.exists()) {
       *out << song;
@@ -1066,7 +1131,7 @@ void CollectionWatcher::DirectoryChanged(const QString &subdir) {
   if (it == subdir_mapping_.constEnd()) {
     return;
   }
-  CollectionDirectory dir = *it;
+  const CollectionDirectory dir = *it;
 
   qLog(Debug) << "Subdir" << subdir << "changed under directory" << dir.path << "id" << dir.id;
 
@@ -1081,10 +1146,10 @@ void CollectionWatcher::RescanPathsNow() {
 
   const QList<int> dirs = rescan_queue_.keys();
   for (const int dir : dirs) {
-    if (stop_requested_ || abort_requested_) break;
+    if (stop_or_abort_requested()) break;
     ScanTransaction transaction(this, dir, false, false, mark_songs_unavailable_);
 
-    const QStringList paths = rescan_queue_[dir];
+    const QStringList paths = rescan_queue_.value(dir);
 
     QMap<QString, quint64> subdir_files_count;
     for (const QString &path : paths) {
@@ -1094,7 +1159,7 @@ void CollectionWatcher::RescanPathsNow() {
     }
 
     for (const QString &path : paths) {
-      if (stop_requested_ || abort_requested_) break;
+      if (stop_or_abort_requested()) break;
       CollectionSubdirectory subdir;
       subdir.directory_id = dir;
       subdir.mtime = 0;
@@ -1105,7 +1170,7 @@ void CollectionWatcher::RescanPathsNow() {
 
   rescan_queue_.clear();
 
-  emit CompilationsNeedUpdating();
+  Q_EMIT CompilationsNeedUpdating();
 
 }
 
@@ -1139,7 +1204,7 @@ QString CollectionWatcher::PickBestArt(const QStringList &art_automatic_list) {
   QString biggest_path;
 
   for (const QString &path : std::as_const(filtered)) {
-    if (stop_requested_ || abort_requested_) break;
+    if (stop_or_abort_requested()) break;
 
     QImage image(path);
     if (image.isNull()) continue;
@@ -1215,14 +1280,14 @@ void CollectionWatcher::FullScanNow() { PerformScan(false, true); }
 
 void CollectionWatcher::PerformScan(const bool incremental, const bool ignore_mtimes) {
 
-  stop_requested_ = false;
+  CancelStop();
 
   for (const CollectionDirectory &dir : std::as_const(watched_dirs_)) {
 
-    if (stop_requested_ || abort_requested_) break;
+    if (stop_or_abort_requested()) break;
 
     ScanTransaction transaction(this, dir.id, incremental, ignore_mtimes, mark_songs_unavailable_);
-    CollectionSubdirectoryList subdirs(transaction.GetAllSubdirs());
+    CollectionSubdirectoryList subdirs = transaction.GetAllSubdirs();
 
     if (subdirs.isEmpty()) {
       qLog(Debug) << "Collection directory wasn't in subdir list.";
@@ -1237,7 +1302,7 @@ void CollectionWatcher::PerformScan(const bool incremental, const bool ignore_mt
     transaction.AddToProgressMax(files_count);
 
     for (const CollectionSubdirectory &subdir : std::as_const(subdirs)) {
-      if (stop_requested_ || abort_requested_) break;
+      if (stop_or_abort_requested()) break;
       ScanSubdirectory(subdir.path, subdir, subdir_files_count[subdir.path], &transaction);
     }
 
@@ -1245,7 +1310,7 @@ void CollectionWatcher::PerformScan(const bool incremental, const bool ignore_mt
 
   last_scan_time_ = QDateTime::currentSecsSinceEpoch();
 
-  emit CompilationsNeedUpdating();
+  Q_EMIT CompilationsNeedUpdating();
 
 }
 
@@ -1255,7 +1320,7 @@ quint64 CollectionWatcher::FilesCountForPath(ScanTransaction *t, const QString &
   QDirIterator it(path, QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
   while (it.hasNext()) {
 
-    if (stop_requested_ || abort_requested_) break;
+    if (stop_or_abort_requested()) break;
 
     QString child = it.next();
     QFileInfo path_info(child);
@@ -1289,7 +1354,7 @@ quint64 CollectionWatcher::FilesCountForSubdirs(ScanTransaction *t, const Collec
 
   quint64 i = 0;
   for (const CollectionSubdirectory &subdir : subdirs) {
-    if (stop_requested_ || abort_requested_) break;
+    if (stop_or_abort_requested()) break;
     const quint64 files_count = FilesCountForPath(t, subdir.path);
     subdir_files_count[subdir.path] = files_count;
     i += files_count;
@@ -1307,17 +1372,17 @@ void CollectionWatcher::RescanSongsAsync(const SongList &songs) {
 
 void CollectionWatcher::RescanSongs(const SongList &songs) {
 
-  stop_requested_ = false;
+  CancelStop();
 
   QStringList scanned_paths;
   for (const Song &song : songs) {
-    if (stop_requested_ || abort_requested_) break;
-    const QString song_path = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
+    if (stop_or_abort_requested()) break;
+    const QString song_path = song.url().toLocalFile().section(u'/', 0, -2);
     if (scanned_paths.contains(song_path)) continue;
     ScanTransaction transaction(this, song.directory_id(), false, true, mark_songs_unavailable_);
     const CollectionSubdirectoryList subdirs = transaction.GetAllSubdirs();
     for (const CollectionSubdirectory &subdir : subdirs) {
-      if (stop_requested_ || abort_requested_) break;
+      if (stop_or_abort_requested()) break;
       if (subdir.path != song_path) continue;
       qLog(Debug) << "Rescan for directory ID" << song.directory_id() << "directory" << subdir.path;
       quint64 files_count = FilesCountForPath(&transaction, subdir.path);
@@ -1326,6 +1391,6 @@ void CollectionWatcher::RescanSongs(const SongList &songs) {
     }
   }
 
-  emit CompilationsNeedUpdating();
+  Q_EMIT CompilationsNeedUpdating();
 
 }

src/collection/collectionwatcher.h

@@ -33,30 +33,35 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
+#include <QMutex>
 
 #include "collectiondirectory.h"
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/song.h"
 
 class QThread;
 class QTimer;
 
+class TaskManager;
+class TagReaderClient;
 class CollectionBackend;
 class FileSystemWatcherInterface;
-class TaskManager;
 class CueParser;
 
 class CollectionWatcher : public QObject {
   Q_OBJECT
 
  public:
-  explicit CollectionWatcher(Song::Source source, QObject *parent = nullptr);
+  explicit CollectionWatcher(const Song::Source source,
+                             const SharedPtr<TaskManager> task_manager,
+                             const SharedPtr<TagReaderClient> tagreader_client,
+                             const SharedPtr<CollectionBackend> backend,
+                             QObject *parent = nullptr);
+
   ~CollectionWatcher();
 
-  Song::Source source() { return source_; }
+  Song::Source source() const { return source_; }
 
-  void set_backend(SharedPtr<CollectionBackend> backend) { backend_ = backend; }
-  void set_task_manager(SharedPtr<TaskManager> task_manager) { task_manager_ = task_manager; }
   void set_device_name(const QString &device_name) { device_name_ = device_name; }
 
   void IncrementalScanAsync();
@@ -64,14 +69,15 @@ class CollectionWatcher : public QObject {
   void SetRescanPausedAsync(const bool pause);
   void ReloadSettingsAsync();
 
-  void Stop() { stop_requested_ = true; }
-  void Abort() { abort_requested_ = true; }
+  void Stop();
+  void CancelStop();
+  void Abort();
 
   void ExitAsync();
 
   void RescanSongsAsync(const SongList &songs);
 
- signals:
+ Q_SIGNALS:
   void NewOrUpdatedSongs(const SongList &songs);
   void SongsMTimeUpdated(const SongList &songs);
   void SongsDeleted(const SongList &songs);
@@ -85,7 +91,7 @@ class CollectionWatcher : public QObject {
 
   void ScanStarted(const int task_id);
 
- public slots:
+ public Q_SLOTS:
   void AddDirectory(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdirs);
   void RemoveDirectory(const CollectionDirectory &dir);
   void SetRescanPaused(bool pause);
@@ -131,7 +137,6 @@ class CollectionWatcher : public QObject {
     QStringList files_changed_path_;
 
    private:
-    ScanTransaction(const ScanTransaction&) {}
     ScanTransaction &operator=(const ScanTransaction&) { return *this; }
 
     int task_id_;
@@ -166,7 +171,7 @@ class CollectionWatcher : public QObject {
     bool known_subdirs_dirty_;
   };
 
- private slots:
+ private Q_SLOTS:
   void ReloadSettings();
   void Exit();
   void DirectoryChanged(const QString &subdir);
@@ -178,6 +183,9 @@ class CollectionWatcher : public QObject {
   void RescanSongs(const SongList &songs);
 
  private:
+  bool stop_requested() const;
+  bool abort_requested() const;
+  bool stop_or_abort_requested() const;
   static bool FindSongsByPath(const SongList &songs, const QString &path, SongList *out);
   bool FindSongsByFingerprint(const QString &file, const QString &fingerprint, SongList *out);
   static bool FindSongsByFingerprint(const QString &file, const SongList &songs, const QString &fingerprint, SongList *out);
@@ -192,12 +200,12 @@ class CollectionWatcher : public QObject {
   void PerformScan(const bool incremental, const bool ignore_mtimes);
 
   // Updates the sections of a cue associated and altered (according to mtime) media file during a scan.
-  void UpdateCueAssociatedSongs(const QString &file, const QString &path, const QString &fingerprint, const QString &matching_cue, const QUrl &art_automatic, const SongList &old_cue_songs, ScanTransaction *t);
+  void UpdateCueAssociatedSongs(const QString &file, const QString &path, const QString &fingerprint, const QString &matching_cue, const QUrl &art_automatic, const SongList &old_cue_songs, ScanTransaction *t) const;
   // Updates a single non-cue associated and altered (according to mtime) song during a scan.
   void UpdateNonCueAssociatedSong(const QString &file, const QString &fingerprint, const SongList &matching_songs, const QUrl &art_automatic, const bool cue_deleted, ScanTransaction *t);
   // Scans a single media file that's present on the disk but not yet in the collection.
   // It may result in a multiple files added to the collection when the media file has many sections (like a CUE related media file).
-  SongList ScanNewFile(const QString &file, const QString &path, const QString &fingerprint, const QString &matching_cue, QSet<QString> *cues_processed);
+  SongList ScanNewFile(const QString &file, const QString &path, const QString &fingerprint, const QString &matching_cue, QSet<QString> *cues_processed) const;
 
   static void AddChangedSong(const QString &file, const Song &matching_song, const Song &new_song, ScanTransaction *t);
 
@@ -209,9 +217,12 @@ class CollectionWatcher : public QObject {
   QString FindCueFilename(const QString &filename);
 
  private:
-  Song::Source source_;
-  SharedPtr<CollectionBackend> backend_;
-  SharedPtr<TaskManager> task_manager_;
+  const Song::Source source_;
+
+  const SharedPtr<TaskManager> task_manager_;
+  const SharedPtr<TagReaderClient> tagreader_client_;
+  const SharedPtr<CollectionBackend> backend_;
+
   QString device_name_;
 
   FileSystemWatcherInterface *fs_watcher_;
@@ -231,7 +242,10 @@ class CollectionWatcher : public QObject {
   bool overwrite_playcount_;
   bool overwrite_rating_;
 
+  mutable QMutex mutex_stop_;
   bool stop_requested_;
+
+  mutable QMutex mutex_abort_;
   bool abort_requested_;
 
   QMap<int, CollectionDirectory> watched_dirs_;
@@ -245,21 +259,20 @@ class CollectionWatcher : public QObject {
   CueParser *cue_parser_;
 
   static QStringList sValidImages;
-  static QStringList kIgnoredExtensions;
 
   qint64 last_scan_time_;
 
 };
 
 inline QString CollectionWatcher::NoExtensionPart(const QString &fileName) {
-  return fileName.contains(QLatin1Char('.')) ? fileName.section(QLatin1Char('.'), 0, -2) : QLatin1String("");
+  return fileName.contains(u'.') ? fileName.section(u'.', 0, -2) : QLatin1String("");
 }
 // Thanks Amarok
 inline QString CollectionWatcher::ExtensionPart(const QString &fileName) {
-  return fileName.contains(QLatin1Char('.')) ? fileName.mid(fileName.lastIndexOf(QLatin1Char('.')) + 1).toLower() : QLatin1String("");
+  return fileName.contains(u'.') ? fileName.mid(fileName.lastIndexOf(u'.') + 1).toLower() : QLatin1String("");
 }
 inline QString CollectionWatcher::DirectoryPart(const QString &fileName) {
-  return fileName.section(QLatin1Char('/'), 0, -2);
+  return fileName.section(u'/', 0, -2);
 }
 
 #endif  // COLLECTIONWATCHER_H

src/collection/groupbydialog.cpp

@@ -116,7 +116,7 @@ void GroupByDialog::Reset() {
 
 void GroupByDialog::accept() {
 
-  emit Accepted(CollectionModel::Grouping(
+  Q_EMIT Accepted(CollectionModel::Grouping(
       p_->mapping_.get<tag_index>().find(ui_->combobox_first->currentIndex())->group_by,
       p_->mapping_.get<tag_index>().find(ui_->combobox_second->currentIndex())->group_by,
       p_->mapping_.get<tag_index>().find(ui_->combobox_third->currentIndex())->group_by),