Release 1.0.8

Co-Authored-By: Jonas Kvinge <jonas@jkvinge.net>

.github/ISSUE_TEMPLATE.md

@@ -7,14 +7,12 @@ assignees: ''
 
 ---
 
+See the FAQ before opening an issue: https://wiki.strawberrymusicplayer.org/wiki/FAQ
+Check the Changelog to see if the issue is already fixed: https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog
+If it's already fixed, try the latest development build from: https://builds.strawberrymusicplayer.org/
 For technical issues, questions and discussion please use the forum on https://forum.strawberrymusicplayer.org/
 Any issues related to feature requests will be closed. See the README for more details.
 
-Check the Changelog to see if the issue is already fixed:
-https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog
-
-If it's fixed, try the latest development build from: https://builds.strawberrymusicplayer.org/
-
 **Describe the bug**
 A clear and concise description of what the bug is.
 

.gitignore

@@ -65,19 +65,6 @@ ui_*.h
 *.moc
 *.qm
 
-# QtCreator
-CMakeLists.txt.user*
-*.pro.user
-*.pro.user.*
-*creator.user*
-target_wrapper.*
-compile_commands.json
-
-*.kdev4
-*.vscode
-*.code-workspace
-*.sublime-workspace
-
 # Temporary files
 *~
 *.autosave
@@ -111,15 +98,23 @@ translations.pot
 zanata.xml
 .zanata-cache/
 
-# Snap
-parts/
-prime/
-stage/
-*.snap
-/snap/.snapcraft/
-/*_source.tar.bz2
+# QtCreator
+CMakeLists.txt.user*
+*.pro.user
+*.pro.user.*
+*creator.user*
+target_wrapper.*
+compile_commands.json
+
+*.kdev4
+*.vscode
+*.code-workspace
+*.sublime-workspace
 
 # MSVC
 CMakeSettings.json
-/.vs/
-/out/
+/.vs
+/out
+
+# CLion
+/.idea

3rdparty/macdeployqt/shared.cpp

@@ -1277,6 +1277,7 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
 
     // GStreamer plugins.
     QStringList gstreamer_plugins = QStringList()
+                                                  << "libgstaes.dylib"
                                                   << "libgstaiff.dylib"
                                                   << "libgstapetag.dylib"
                                                   << "libgstapp.dylib"
@@ -1295,13 +1296,16 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
                                                   << "libgstcoreelements.dylib"
                                                   << "libgstdash.dylib"
                                                   << "libgstequalizer.dylib"
-                                                  << "libgstflac.dylib"
                                                   << "libgstfaac.dylib"
                                                   << "libgstfaad.dylib"
                                                   << "libgstfdkaac.dylib"
+                                                  << "libgstflac.dylib"
                                                   << "libgstgio.dylib"
+                                                  << "libgstgme.dylib"
+                                                  << "libgsthls.dylib"
                                                   << "libgsticydemux.dylib"
                                                   << "libgstid3demux.dylib"
+                                                  << "libgstid3tag.dylib"
                                                   << "libgstisomp4.dylib"
                                                   << "libgstlame.dylib"
                                                   << "libgstlibav.dylib"
@@ -1322,10 +1326,12 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
                                                   << "libgstspeex.dylib"
                                                   << "libgsttaglib.dylib"
                                                   << "libgsttcp.dylib"
+                                                  << "libgsttwolame.dylib"
                                                   << "libgsttypefindfunctions.dylib"
                                                   << "libgstudp.dylib"
                                                   << "libgstvolume.dylib"
                                                   << "libgstvorbis.dylib"
+                                                  << "libgstwavenc.dylib"
                                                   << "libgstwavpack.dylib"
                                                   << "libgstwavparse.dylib"
                                                   << "libgstxingmux.dylib";

3rdparty/singleapplication/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 
 include(CheckIncludeFiles)
 include(CheckFunctionExists)

CMakeLists.txt

@@ -1,7 +1,10 @@
 project(strawberry)
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 cmake_policy(SET CMP0054 NEW)
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+  cmake_policy(SET CMP0074 NEW)
+endif()
 
 include(CheckCXXCompilerFlag)
 include(CheckCXXSourceRuns)
@@ -32,14 +35,22 @@ endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
+if(MSVC)
+  set(CMAKE_C_STANDARD 99)
+else()
+  set(CMAKE_C_STANDARD 11)
+endif()
+
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(MSVC)
-  list(APPEND COMPILE_OPTIONS /std:c++17 /MP)
+  list(APPEND COMPILE_OPTIONS /MP)
 else()
   list(APPEND COMPILE_OPTIONS
-    $<$<COMPILE_LANGUAGE:C>:-std=c99>
+    $<$<COMPILE_LANGUAGE:C>:-std=c11>
     $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
     -Wall
     -Wextra
@@ -86,6 +97,8 @@ if(CCACHE_EXECUTABLE)
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
 endif()
 
+option(USE_ICU "Use ICU" ON)
+
 find_package(PkgConfig REQUIRED)
 find_package(Boost REQUIRED)
 find_package(Threads)
@@ -93,7 +106,14 @@ find_package(Backtrace)
 if(Backtrace_FOUND)
   set(HAVE_BACKTRACE ON)
 endif()
-find_package(Iconv)
+if(USE_ICU)
+  find_package(ICU COMPONENTS uc i18n REQUIRED)
+  if(ICU_FOUND)
+    set(HAVE_ICU ON)
+  endif()
+else()
+  find_package(Iconv)
+endif()
 find_package(GnuTLS REQUIRED)
 find_package(Protobuf REQUIRED)
 if(NOT Protobuf_PROTOC_EXECUTABLE)

Changelog

@@ -2,9 +2,52 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 1.0.8 (2022.08.29):
+
+  Bugfixes:
+    * Fixed backslash being appended to filter text when switching playlist (#1005).
+    * Fixed OSD notifications service registering taking too long to timeout when not available.
+    * Fixed radio stream added twice when double-clicked (#1015).
+    * Fixed translating undo and redo buttons (#1017).
+
+  Enhancements:
+    * Use ICU instead of iconv to transliterate characters for filenames.
+    * Make separating albums by grouping tag optional in collection group by album.
+    * Added support for video game music formats VGM and SPC.
+    * Added setting for explicitly turning on HTTP/2 for streaming. Strawberry will set the
+      libsoup SOUP_FORCE_HTTP1 environment variable when the HTTP/2 is not checked (#1016).
+    * (Windows|MSVC) Install Visual C++ runtime redistributable automatically in installer.
+
+Version 1.0.7 (2022.07.25)
+
+  Bugfixes:
+    * Fixed checking file extension case-insensitive when loading and saving playlists.
+    * Fixed reading and saving rating with TagParser.
+    * (macOS/Windows) Fixed playlist column alignment. Applied patch for Qt bug QTBUG-103576 (#999).
+    * (Windows|MinGW) Fixed HLS streaming.
+    * (Windows|MSVC) Fixed MP3 encoding.
+
+  Enhancements
+    * Added option for selecting file extension when saving all playlists.
+
+Version 1.0.6 (2022.07.17)
+
+  Bugfixes:
+    * Fixed certain albums not added to playlist in correct track order from search for Tidal and QObuz.
+    * Fixed songs not added to playlist in numeric order when added from file view with right click (#977).
+    * Fixed "Stop after this track" graying out next track in dynamic mode (#912).
+    * Fixed a gstreamer caps leak when transcoding songs.
+    * Fixed errors in translation files (#994).
+
+  Enhancements
+    * Add songs to the collection even when they have invalid ctime or mtime.
+    * Made ListenBrainz scrobbler respect "Prefer album artist" option (#989).
+    * Send track duration, number, player name and version when scrobbling to ListenBrainz (#995).
+    * (macOS) Added missing HLS streaming plugin.
+
 Version 1.0.5 (2022.06.10)
 
-BugFixes:
+  Bugfixes:
     * Fixed smart playlist filetype search.
     * Fixed Radio Paradise URLs to use HTTPS instead of HTTP.
     * Fixed horizontal scrolling not affecting currently playing track (#952).

README.md

@@ -11,6 +11,7 @@ Strawberry is a music player and music collection organizer. It is a fork of Cle
 Resources:
 
   * Website: https://www.strawberrymusicplayer.org/
+  * Wiki: https://wiki.strawberrymusicplayer.org/
   * Forum: https://forum.strawberrymusicplayer.org/
   * Github: https://github.com/strawberrymusicplayer/strawberry
   * Buildbot: https://buildbot.strawberrymusicplayer.org/
@@ -22,6 +23,7 @@ Resources:
 
 ### :bangbang: Opening an issue:
 
+* Read the FAQ: https://wiki.strawberrymusicplayer.org/wiki/FAQ
 * Search for the issue to see if it is already solved, or if there is an open issue for it already. If there is an open issue already, you can comment on it if you have additional information that could be useful to us.
 * For technical problems, discussion, questions and feature suggestions use the forum (https://forum.strawberrymusicplayer.org/) instead. The forum is better suited for discussion.
 * We do not take feature requests from users on GitHub. Any issues related to feature requests will be closed. This does not necessarily mean that we won't add new features, but we don't have time to take feature requests or answer questions about new features from users. It is still possible to suggest or discuss new features on the forum (https://forum.strawberrymusicplayer.org/).
@@ -78,6 +80,7 @@ To build Strawberry from source you need the following installed on your system
 * [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org)
 * [GnuTLS](https://www.gnutls.org/)
 * [TagLib 1.11.1 or higher](https://www.taglib.org/) or [TagParser](https://github.com/Martchus/tagparser)
+* [ICU](https://unicode-org.github.io/icu/)
 
 Optional dependencies:
 
@@ -110,5 +113,5 @@ Strawberry is backwards compatible with Qt 5, to compile with Qt 5 use:
 
 ### :penguin:	Packaging status
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg)](https://repology.org/metapackage/strawberry/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)
 

cmake/Version.cmake

@@ -1,6 +1,6 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 5)
+set(STRAWBERRY_VERSION_PATCH 8)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)

data/data.qrc

@@ -1,15 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>schema/schema.sql</file>
-        <file>schema/schema-1.sql</file>
-        <file>schema/schema-2.sql</file>
-        <file>schema/schema-3.sql</file>
-        <file>schema/schema-4.sql</file>
-        <file>schema/schema-5.sql</file>
-        <file>schema/schema-6.sql</file>
-        <file>schema/schema-7.sql</file>
-        <file>schema/schema-8.sql</file>
-        <file>schema/schema-9.sql</file>
         <file>schema/schema-10.sql</file>
         <file>schema/schema-11.sql</file>
         <file>schema/schema-12.sql</file>

data/schema/device-schema.sql

@@ -1,35 +1,35 @@
 CREATE TABLE device_%deviceid_directories (
-  path TEXT NOT NULL DEFAULT '',
+  path TEXT NOT NULL,
   subdirs INTEGER NOT NULL
 );
 
 CREATE TABLE device_%deviceid_subdirectories (
   directory_id INTEGER NOT NULL,
-  path TEXT NOT NULL DEFAULT '',
+  path TEXT NOT NULL,
   mtime INTEGER NOT NULL
 );
 
 CREATE TABLE device_%deviceid_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -40,14 +40,14 @@ CREATE TABLE device_%deviceid_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -59,13 +59,13 @@ CREATE TABLE device_%deviceid_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 

data/schema/schema-1.sql

@@ -1,3 +0,0 @@
-ALTER TABLE playlist_items ADD COLUMN internet_service TEXT;
-
-UPDATE schema_version SET version=1;

data/schema/schema-14.sql

@@ -1,4 +1,4 @@
-ALTER TABLE %allsongstables ADD COLUMN fingerprint TEXT DEFAULT '';
+ALTER TABLE %allsongstables ADD COLUMN fingerprint TEXT;
 
 ALTER TABLE %allsongstables ADD COLUMN lastseen INTEGER NOT NULL DEFAULT -1;
 

data/schema/schema-15.sql

@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS radio_channels (
   source INTEGER NOT NULL DEFAULT 0,
-  name TEXT DEFAULT '',
-  url TEXT DEFAULT '',
-  thumbnail_url TEXT DEFAULT ''
+  name TEXT NOT NULL,
+  url TEXT NOT NULL,
+  thumbnail_url TEXT
 );
 
 UPDATE schema_version SET version=15;

data/schema/schema-2.sql

@@ -1,5 +0,0 @@
-ALTER TABLE songs ADD COLUMN lyrics TEXT;
-
-ALTER TABLE playlist_items ADD COLUMN lyrics TEXT;
-
-UPDATE schema_version SET version=2;

data/schema/schema-3.sql

@@ -1,65 +0,0 @@
-ALTER TABLE songs ADD COLUMN source INTEGER NOT NULL DEFAULT 0;
-
-UPDATE songs SET source = 2 WHERE source = 0;
-
-DROP TABLE playlist_items;
-
-CREATE TABLE IF NOT EXISTS playlist_items (
-
-  playlist INTEGER NOT NULL,
-  type INTEGER NOT NULL DEFAULT 0,
-  collection_id INTEGER,
-  url TEXT,
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER,
-  filename TEXT,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER,
-  mtime INTEGER,
-  ctime INTEGER,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-UPDATE schema_version SET version=3;

data/schema/schema-4.sql

@@ -1,205 +0,0 @@
-CREATE TABLE IF NOT EXISTS tidal_artists_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL,
-  filename TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT 0,
-  mtime INTEGER NOT NULL DEFAULT 0,
-  ctime INTEGER NOT NULL DEFAULT 0,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS tidal_albums_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL,
-  filename TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT 0,
-  mtime INTEGER NOT NULL DEFAULT 0,
-  ctime INTEGER NOT NULL DEFAULT 0,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS tidal_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL,
-  filename TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT 0,
-  mtime INTEGER NOT NULL DEFAULT 0,
-  ctime INTEGER NOT NULL DEFAULT 0,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_artists_songs_fts USING fts3(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize=unicode
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_albums_songs_fts USING fts3(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize=unicode
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS tidal_songs_fts USING fts3(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize=unicode
-
-);
-
-UPDATE schema_version SET version=4;

data/schema/schema-5.sql

@@ -1,31 +0,0 @@
-ALTER TABLE songs ADD COLUMN artist_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE songs ADD COLUMN album_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE songs ADD COLUMN song_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_artists_songs ADD COLUMN artist_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_artists_songs ADD COLUMN album_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_artists_songs ADD COLUMN song_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_albums_songs ADD COLUMN artist_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_albums_songs ADD COLUMN album_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_albums_songs ADD COLUMN song_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_songs ADD COLUMN artist_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_songs ADD COLUMN album_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE tidal_songs ADD COLUMN song_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE playlist_items ADD COLUMN artist_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE playlist_items ADD COLUMN album_id INTEGER NOT NULL DEFAULT -1;
-
-ALTER TABLE playlist_items ADD COLUMN song_id INTEGER NOT NULL DEFAULT -1;
-
-UPDATE schema_version SET version=5;

data/schema/schema-6.sql

@@ -1,73 +0,0 @@
-CREATE TABLE IF NOT EXISTS subsonic_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id INTEGER NOT NULL DEFAULT -1,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL,
-  filename TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT 0,
-  mtime INTEGER NOT NULL DEFAULT 0,
-  ctime INTEGER NOT NULL DEFAULT 0,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS subsonic_songs_fts USING fts3(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize=unicode
-
-);
-
-UPDATE schema_version SET version=6;

data/schema/schema-7.sql

@@ -1,217 +0,0 @@
-CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id INTEGER NOT NULL DEFAULT -1,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL,
-  filename TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT 0,
-  mtime INTEGER NOT NULL DEFAULT 0,
-  ctime INTEGER NOT NULL DEFAULT 0,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id INTEGER NOT NULL DEFAULT -1,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL,
-  filename TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT 0,
-  mtime INTEGER NOT NULL DEFAULT 0,
-  ctime INTEGER NOT NULL DEFAULT 0,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE IF NOT EXISTS qobuz_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id INTEGER NOT NULL DEFAULT -1,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT 0,
-  samplerate INTEGER NOT NULL DEFAULT 0,
-  bitdepth INTEGER NOT NULL DEFAULT 0,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL,
-  filename TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT 0,
-  mtime INTEGER NOT NULL DEFAULT 0,
-  ctime INTEGER NOT NULL DEFAULT 0,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT 0,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_artists_songs_fts USING fts3(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize=unicode
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_albums_songs_fts USING fts3(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize=unicode
-
-);
-
-CREATE VIRTUAL TABLE IF NOT EXISTS qobuz_songs_fts USING fts3(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize=unicode
-
-);
-
-UPDATE schema_version SET version=7;

data/schema/schema-8.sql

@@ -1,595 +0,0 @@
-ALTER TABLE songs RENAME TO songs_old;
-
-ALTER TABLE playlist_items RENAME TO playlist_items_old;
-
-ALTER TABLE tidal_artists_songs RENAME TO tidal_artists_songs_old;
-
-ALTER TABLE tidal_albums_songs RENAME TO tidal_albums_songs_old;
-
-ALTER TABLE tidal_songs RENAME TO tidal_songs_old;
-
-ALTER TABLE qobuz_artists_songs RENAME TO qobuz_artists_songs_old;
-
-ALTER TABLE qobuz_albums_songs RENAME TO qobuz_albums_songs_old;
-
-ALTER TABLE qobuz_songs RENAME TO qobuz_songs_old;
-
-ALTER TABLE subsonic_songs RENAME TO subsonic_songs_old;
-
-DROP INDEX idx_filename;
-
-CREATE TABLE songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE tidal_artists_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE tidal_albums_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE tidal_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE subsonic_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE qobuz_artists_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE qobuz_albums_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE qobuz_songs (
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER NOT NULL DEFAULT -1,
-  mtime INTEGER NOT NULL DEFAULT -1,
-  ctime INTEGER NOT NULL DEFAULT -1,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-CREATE TABLE playlist_items (
-
-  playlist INTEGER NOT NULL,
-  type INTEGER NOT NULL DEFAULT 0,
-  collection_id INTEGER,
-  playlist_url TEXT,
-
-  title TEXT NOT NULL,
-  album TEXT NOT NULL,
-  artist TEXT NOT NULL,
-  albumartist TEXT NOT NULL,
-  track INTEGER NOT NULL DEFAULT -1,
-  disc INTEGER NOT NULL DEFAULT -1,
-  year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT NOT NULL,
-  compilation INTEGER NOT NULL DEFAULT -1,
-  composer TEXT NOT NULL,
-  performer TEXT NOT NULL,
-  grouping TEXT NOT NULL,
-  comment TEXT NOT NULL,
-  lyrics TEXT NOT NULL,
-
-  artist_id INTEGER NOT NULL DEFAULT -1,
-  album_id TEXT NOT NULL,
-  song_id INTEGER NOT NULL DEFAULT -1,
-
-  beginning INTEGER NOT NULL DEFAULT 0,
-  length INTEGER NOT NULL DEFAULT 0,
-
-  bitrate INTEGER NOT NULL DEFAULT -1,
-  samplerate INTEGER NOT NULL DEFAULT -1,
-  bitdepth INTEGER NOT NULL DEFAULT -1,
-
-  source INTEGER NOT NULL DEFAULT 0,
-  directory_id INTEGER,
-  url TEXT,
-  filetype INTEGER NOT NULL DEFAULT 0,
-  filesize INTEGER,
-  mtime INTEGER,
-  ctime INTEGER,
-  unavailable INTEGER DEFAULT 0,
-
-  playcount INTEGER NOT NULL DEFAULT 0,
-  skipcount INTEGER NOT NULL DEFAULT 0,
-  lastplayed INTEGER NOT NULL DEFAULT -1,
-
-  compilation_detected INTEGER DEFAULT 0,
-  compilation_on INTEGER NOT NULL DEFAULT 0,
-  compilation_off INTEGER NOT NULL DEFAULT 0,
-  compilation_effective INTEGER NOT NULL DEFAULT 0,
-
-  art_automatic TEXT,
-  art_manual TEXT,
-
-  effective_albumartist TEXT,
-  effective_originalyear INTEGER NOT NULL DEFAULT 0,
-
-  cue_path TEXT
-
-);
-
-INSERT INTO songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM songs_old;
-
-DROP TABLE songs_old;
-
-INSERT INTO tidal_artists_songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM tidal_artists_songs_old;
-
-DROP TABLE tidal_artists_songs_old;
-
-INSERT INTO tidal_albums_songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM tidal_albums_songs_old;
-
-DROP TABLE tidal_albums_songs_old;
-
-INSERT INTO tidal_songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM tidal_songs_old;
-
-DROP TABLE tidal_songs_old;
-
-INSERT INTO qobuz_artists_songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM qobuz_artists_songs_old;
-
-DROP TABLE qobuz_artists_songs_old;
-
-INSERT INTO qobuz_albums_songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM qobuz_albums_songs_old;
-
-DROP TABLE qobuz_albums_songs_old;
-
-INSERT INTO qobuz_songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM qobuz_songs_old;
-
-DROP TABLE qobuz_songs_old;
-
-INSERT INTO subsonic_songs (title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM subsonic_songs_old;
-
-DROP TABLE subsonic_songs_old;
-
-INSERT INTO playlist_items (playlist, type, collection_id, playlist_url, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path)
-SELECT playlist, type, collection_id, url, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, artist_id, album_id, song_id, beginning, length, bitrate, samplerate, bitdepth, source, directory_id, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path
-FROM playlist_items_old;
-
-DROP TABLE playlist_items_old;
-
-CREATE INDEX idx_url ON songs (url);
-
-UPDATE schema_version SET version=8;

data/schema/schema-9.sql

@@ -1,41 +0,0 @@
-DROP TABLE %allsongstables_fts;
-
-DROP TABLE playlist_items_fts_;
-
-CREATE VIRTUAL TABLE %allsongstables_fts USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-CREATE VIRTUAL TABLE playlist_items_fts_ USING fts5(
-
-  ftstitle,
-  ftsalbum,
-  ftsartist,
-  ftsalbumartist,
-  ftscomposer,
-  ftsperformer,
-  ftsgrouping,
-  ftsgenre,
-  ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-
-);
-
-INSERT INTO %allsongstables_fts (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
-SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment FROM %allsongstables;
-
-INSERT INTO playlist_items_fts_ (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
-SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment FROM playlist_items;
-
-UPDATE schema_version SET version=9;

data/schema/schema.sql

@@ -7,37 +7,37 @@ DELETE FROM schema_version;
 INSERT INTO schema_version (version) VALUES (15);
 
 CREATE TABLE IF NOT EXISTS directories (
-  path TEXT NOT NULL DEFAULT '',
+  path TEXT NOT NULL,
   subdirs INTEGER NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS subdirectories (
   directory_id INTEGER NOT NULL,
-  path TEXT NOT NULL DEFAULT '',
+  path TEXT NOT NULL,
   mtime INTEGER NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -48,14 +48,14 @@ CREATE TABLE IF NOT EXISTS songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -67,13 +67,13 @@ CREATE TABLE IF NOT EXISTS songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -81,25 +81,25 @@ CREATE TABLE IF NOT EXISTS songs (
 
 CREATE TABLE IF NOT EXISTS subsonic_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -110,14 +110,14 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -129,13 +129,13 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -143,25 +143,25 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
 
 CREATE TABLE IF NOT EXISTS tidal_artists_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -172,14 +172,14 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -191,13 +191,13 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -205,25 +205,25 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
 
 CREATE TABLE IF NOT EXISTS tidal_albums_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -234,14 +234,14 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -253,13 +253,13 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -267,25 +267,25 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
 
 CREATE TABLE IF NOT EXISTS tidal_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -296,14 +296,14 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -315,13 +315,13 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -329,25 +329,25 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
 
 CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -358,14 +358,14 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -377,13 +377,13 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -391,25 +391,25 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
 
 CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -420,14 +420,14 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -439,13 +439,13 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -453,25 +453,25 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
 
 CREATE TABLE IF NOT EXISTS qobuz_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
   originalyear INTEGER NOT NULL DEFAULT -1,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -482,14 +482,14 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -501,13 +501,13 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
@@ -515,15 +515,15 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
 
 CREATE TABLE IF NOT EXISTS playlists (
 
-  name TEXT NOT NULL DEFAULT '',
+  name TEXT NOT NULL,
   last_played INTEGER NOT NULL DEFAULT -1,
   ui_order INTEGER NOT NULL DEFAULT 0,
-  special_type TEXT DEFAULT '',
-  ui_path TEXT DEFAULT '',
+  special_type TEXT,
+  ui_path TEXT,
   is_favorite INTEGER NOT NULL DEFAULT 0,
 
   dynamic_playlist_type INTEGER,
-  dynamic_playlist_backend TEXT DEFAULT '',
+  dynamic_playlist_backend TEXT,
   dynamic_playlist_data BLOB
 
 );
@@ -533,27 +533,27 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   playlist INTEGER NOT NULL,
   type INTEGER NOT NULL DEFAULT 0,
   collection_id INTEGER,
-  playlist_url TEXT DEFAULT '',
+  playlist_url TEXT,
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER,
   disc INTEGER,
   year INTEGER,
   originalyear INTEGER,
-  genre TEXT DEFAULT '',
+  genre TEXT,
   compilation INTEGER DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER,
   length INTEGER,
@@ -564,14 +564,14 @@ CREATE TABLE IF NOT EXISTS playlist_items (
 
   source INTEGER,
   directory_id INTEGER,
-  url TEXT DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER,
   filesize INTEGER,
   mtime INTEGER,
   ctime INTEGER,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER DEFAULT 0,
   skipcount INTEGER DEFAULT 0,
@@ -583,23 +583,23 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   compilation_off INTEGER DEFAULT 0,
   compilation_effective INTEGER DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_automatic TEXT,
+  art_manual TEXT,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
   rating INTEGER DEFAULT -1
 
 );
 
 CREATE TABLE IF NOT EXISTS devices (
-  unique_id TEXT NOT NULL DEFAULT '',
-  friendly_name TEXT DEFAULT '',
+  unique_id TEXT NOT NULL,
+  friendly_name TEXT,
   size INTEGER,
-  icon TEXT DEFAULT '',
+  icon TEXT,
   schema_version INTEGER NOT NULL DEFAULT 0,
   transcode_mode NOT NULL DEFAULT 3,
   transcode_format NOT NULL DEFAULT 5
@@ -607,9 +607,9 @@ CREATE TABLE IF NOT EXISTS devices (
 
 CREATE TABLE IF NOT EXISTS radio_channels (
   source INTEGER NOT NULL DEFAULT 0,
-  name TEXT DEFAULT '',
-  url TEXT DEFAULT '',
-  thumbnail_url TEXT DEFAULT ''
+  name TEXT,
+  url TEXT NOT NULL,
+  thumbnail_url TEXT
 );
 
 CREATE INDEX IF NOT EXISTS idx_url ON songs (url);

debian/control.in

@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 11),
                libasound2-dev,
                libpulse-dev,
                libtag1-dev,
+               libicu-devel,
                @DEBIAN_BUILD_DEPENDS_QT_PACKAGES@,
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,

debian/copyright

@@ -96,8 +96,8 @@ Files: src/core/main.h
        ext/libstrawberry-tagreader/tagreadertagparser.cpp
        ext/libstrawberry-tagreader/tagreadertagparser.h
        ext/macdeploycheck/*
-       widgets/resizabletextedit.cpp
-       widgets/resizabletextedit.h
+       src/widgets/resizabletextedit.cpp
+       src/widgets/resizabletextedit.h
 Copyright: 2012-2014, 2017-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
@@ -194,8 +194,7 @@ Copyright: 2015, Nick Lanham <nick@afternight.org>
            2019-2021 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files:
-       src/core/arraysize.h
+Files: src/core/arraysize.h
        src/core/scoped_cftyperef.h
        src/core/scoped_nsobject.h
        src/core/scoped_nsautorelease_pool.h
@@ -242,6 +241,7 @@ License: GPL-2+
 Files: src/scrobbler/subsonicscrobbler.*
 Copyright: 2018-2021 Jonas Kvinge <jonas@jkvinge.net>
            2020 Pascal Below <spezifisch@below.fr>
+License: GPL-3+
 
 Files: src/core/stylehelper.cpp
        src/core/stylehelper.h

dist/scripts/maketarball.sh.in

@@ -49,6 +49,7 @@ ${TAR} -cJf $name-$version.tar.xz \
     --exclude="*.nsi" \
     --exclude="*.kdev4" \
     --exclude=".vscode" \
+    --exclude=".idea" \
     --exclude="$root/.github" \
     --exclude="$root/.travis.yml" \
     --exclude="$root/.circleci" \
@@ -56,6 +57,7 @@ ${TAR} -cJf $name-$version.tar.xz \
     --exclude="$root/CMakeLists.txt.user" \
     --exclude="$root/.clang-format" \
     --exclude="$root/build" \
+    --exclude="$root/cmake-build-debug" \
     --exclude="$root/zanata.xml" \
     --exclude="$root/.zanata-cache" \
     --exclude="$root/debian/changelog" \

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -12,15 +12,11 @@ Categories=AudioVideo;Player;Qt;Audio;
 StartupNotify=false
 MimeType=x-content/audio-player;application/ogg;application/x-ogg;application/x-ogm-audio;audio/flac;audio/ogg;audio/vorbis;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/x-flac;audio/x-oggflac;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-speex;audio/x-wav;audio/x-wavpack;audio/x-ape;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-scpls;video/x-ms-asf;x-scheme-handler/tidal;
 StartupWMClass=strawberry
-Actions=Play;Pause;Stop;StopAfterCurrent;Previous;Next;
+Actions=Play-Pause;Stop;StopAfterCurrent;Previous;Next;
 
-[Desktop Action Play]
-Name=Play
-Exec=strawberry --play
-
-[Desktop Action Pause]
-Name=Pause
-Exec=strawberry --pause
+[Desktop Action Play-Pause]
+Name=Play/Pause
+Exec=strawberry --play-pause
 
 [Desktop Action Stop]
 Name=Stop

dist/unix/strawberry.spec.in

@@ -49,6 +49,8 @@ BuildRequires:  pkgconfig(sqlite3) >= 3.9
 BuildRequires:  pkgconfig(taglib)
 %endif
 BuildRequires:  pkgconfig(fftw3)
+BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(icu-i18n)
 %if "@QT_VERSION_MAJOR@" == "5" && ( 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} )
 BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Core)
 BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Gui)

dist/windows/strawberry.nsi.in

@@ -42,6 +42,10 @@
   !define release
 !endif
 
+!if "@CMAKE_BUILD_TYPE@" == "RelWithDebInfo"
+  !define release
+!endif
+
 !if "@CMAKE_BUILD_TYPE@" == "Debug"
   !define debug
   !undef build_type
@@ -128,6 +132,9 @@ SetCompressor /SOLID lzma
 !insertmacro MUI_PAGE_LICENSE COPYING
 Page Custom LockedListPageShow
 !insertmacro MUI_PAGE_DIRECTORY
+!ifdef msvc
+Page Custom InstallMSVCRuntime
+!endif
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
 
@@ -182,6 +189,20 @@ done:
 
 FunctionEnd
 
+!ifdef msvc
+!define vc_redist_file "vc_redist.${arch}.exe"
+Function InstallMSVCRuntime
+  ${registry::Read} "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\${arch}" "Version" $R0 $R1
+  ${If} $R0 == ""
+    SetDetailsView hide
+    inetc::get /caption "Downloading..." "https://aka.ms/vs/17/release/${vc_redist_file}" "$TEMP\${vc_redist_file}" /end
+    ExecWait '"$TEMP\${vc_redist_file}" /install /passive'
+    Delete "$TEMP\${vc_redist_file}"
+    SetDetailsView show
+  ${EndIf}
+FunctionEnd
+!endif
+
 Function .onInit
 
   !insertmacro MUI_LANGDLL_DISPLAY
@@ -224,26 +245,28 @@ Section "Strawberry" Strawberry
   File "avfilter-8.dll"
   File "avformat-59.dll"
   File "avutil-57.dll"
+  File "libFLAC-8.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
   File "libbrotlienc.dll"
   File "libbs2b-0.dll"
   File "libbz2.dll"
-  File "libcdio-19.dll"
   File "libchromaprint.dll"
   File "libdl.dll"
-  File "libfdk-aac-2.dll"
-  File "libffi-8.dll"
-  File "libFLAC-8.dll"
-  File "libfreetype-6.dll"
   File "libfaac-0.dll"
   File "libfaad-2.dll"
+  File "libfdk-aac-2.dll"
+  File "libffi-8.dll"
+  File "libfreetype-6.dll"
+  File "libgcrypt-20.dll"
   File "libgio-2.0-0.dll"
   File "libglib-2.0-0.dll"
+  File "libgme.dll"
   File "libgmodule-2.0-0.dll"
   File "libgmp-10.dll"
   File "libgnutls-30.dll"
   File "libgobject-2.0-0.dll"
+  File "libgpg-error-0.dll"
   File "libgstadaptivedemux-1.0-0.dll"
   File "libgstapp-1.0-0.dll"
   File "libgstaudio-1.0-0.dll"
@@ -277,18 +300,18 @@ Section "Strawberry" Strawberry
   File "libopenmpt-0.dll"
   File "libopus-0.dll"
   File "liborc-0.4-0.dll"
-  File "libpcre-1.dll"
   File "libpng16-16.dll"
   File "libprotobuf-32.dll"
   File "libpsl-5.dll"
   File "libqtsparkle-qt6.dll"
-  File "libsoup-2.4-1.dll"
+  File "libsoup-3.0-0.dll"
   File "libspeex-1.dll"
   File "libsqlite3-0.dll"
   File "libssp-0.dll"
   File "libstdc++-6.dll"
   File "libtag.dll"
   File "libtasn1-6.dll"
+  File "libtwolame-0.dll"
   File "libunistring-2.dll"
   File "libvorbis-0.dll"
   File "libvorbisenc-2.dll"
@@ -307,10 +330,12 @@ Section "Strawberry" Strawberry
   File "libexpat-1.dll"
   File "libmman.dll"
   File "libmpfr-6.dll"
+  File "libpcre2-8d.dll"
   File "libpcre2-16d.dll"
   File "libreadline8.dll"
   File "libtermcap.dll"
 !else
+  File "libpcre2-8.dll"
   File "libpcre2-16.dll"
 !endif
 
@@ -329,6 +354,7 @@ Section "Strawberry" Strawberry
   File "libssl-3-x64.dll"
 !endif
 
+  File "FLAC.dll"
   File "avcodec-58.dll"
   File "avfilter-7.dll"
   File "avformat-58.dll"
@@ -340,9 +366,9 @@ Section "Strawberry" Strawberry
   File "faad.dll"
   File "fdk-aac.dll"
   File "ffi-7.dll"
-  File "FLAC.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"
@@ -363,7 +389,7 @@ Section "Strawberry" Strawberry
   File "gsttag-1.0-0.dll"
   File "gsturidownloader-1.0-0.dll"
   File "gstvideo-1.0-0.dll"
-  File "gstwinrt-1.0-0.dll"
+  File "harfbuzz.dll"
   File "intl-8.dll"
   File "libbs2b.dll"
   File "libfaac_dll.dll"
@@ -374,13 +400,14 @@ Section "Strawberry" Strawberry
   File "libspeex.dll"
   File "mpcdec.dll"
   File "mpg123.dll"
+  File "nghttp2.dll"
   File "ogg.dll"
   File "opus.dll"
   File "orc-0.4-0.dll"
   File "postproc-55.dll"
   File "psl-5.dll"
   File "qtsparkle-qt6.dll"
-  File "soup-2.4-1.dll"
+  File "soup-3.0-0.dll"
   File "sqlite3.dll"
   File "swresample-3.dll"
   File "swscale-5.dll"
@@ -390,17 +417,23 @@ Section "Strawberry" Strawberry
   File "wavpackdll.dll"
 
 !ifdef release
+  File "freetype.dll"
   File "libpng16.dll"
   File "libprotobuf.dll"
   File "libxml2.dll"
+  File "pcre2-8.dll"
   File "pcre2-16.dll"
+  File "twolame.dll"
   File "zlib.dll"
 !endif
 !ifdef debug
+  File "freetyped.dll"
   File "libpng16d.dll"
   File "libprotobufd.dll"
   File "libxml2d.dll"
+  File "pcre2-8d.dll"
   File "pcre2-16d.dll"
+  File "twolamed.dll"
   File "zlibd.dll"
 !endif
 
@@ -408,8 +441,11 @@ Section "Strawberry" Strawberry
 
   ; Common files
 
+  File "icudt71.dll"
   File "libfftw3-3.dll"
 !ifdef msvc && debug
+  File "icuin71d.dll"
+  File "icuuc71d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
   File "Qt6Guid.dll"
@@ -417,6 +453,8 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
+  File "icuin71.dll"
+  File "icuuc71.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
   File "Qt6Gui.dll"
@@ -539,7 +577,6 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstaudiotestsrc.dll" "gstreamer-plugins\libgstaudiotestsrc.dll"
   File "/oname=libgstautodetect.dll" "gstreamer-plugins\libgstautodetect.dll"
   File "/oname=libgstbs2b.dll" "gstreamer-plugins\libgstbs2b.dll"
-  File "/oname=libgstcdio.dll" "gstreamer-plugins\libgstcdio.dll"
   File "/oname=libgstcoreelements.dll" "gstreamer-plugins\libgstcoreelements.dll"
   File "/oname=libgstdash.dll" "gstreamer-plugins\libgstdash.dll"
   File "/oname=libgstdirectsound.dll" "gstreamer-plugins\libgstdirectsound.dll"
@@ -549,9 +586,11 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstfdkaac.dll" "gstreamer-plugins\libgstfdkaac.dll"
   File "/oname=libgstflac.dll" "gstreamer-plugins\libgstflac.dll"
   File "/oname=libgstgio.dll" "gstreamer-plugins\libgstgio.dll"
+  File "/oname=libgstgme.dll" "gstreamer-plugins\libgstgme.dll"
   File "/oname=libgsthls.dll" "gstreamer-plugins\libgsthls.dll"
   File "/oname=libgsticydemux.dll" "gstreamer-plugins\libgsticydemux.dll"
   File "/oname=libgstid3demux.dll" "gstreamer-plugins\libgstid3demux.dll"
+  File "/oname=libgstid3tag.dll" "gstreamer-plugins\libgstid3tag.dll"
   File "/oname=libgstisomp4.dll" "gstreamer-plugins\libgstisomp4.dll"
   File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll"
   File "/oname=libgstlibav.dll" "gstreamer-plugins\libgstlibav.dll"
@@ -571,17 +610,20 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstspeex.dll" "gstreamer-plugins\libgstspeex.dll"
   File "/oname=libgsttaglib.dll" "gstreamer-plugins\libgsttaglib.dll"
   File "/oname=libgsttcp.dll" "gstreamer-plugins\libgsttcp.dll"
+  File "/oname=libgsttwolame.dll" "gstreamer-plugins\libgsttwolame.dll"
   File "/oname=libgsttypefindfunctions.dll" "gstreamer-plugins\libgsttypefindfunctions.dll"
   File "/oname=libgstudp.dll" "gstreamer-plugins\libgstudp.dll"
   File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll"
   File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll"
   File "/oname=libgstwasapi.dll" "gstreamer-plugins\libgstwasapi.dll"
+  File "/oname=libgstwavenc.dll" "gstreamer-plugins\libgstwavenc.dll"
   File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll"
   File "/oname=libgstwavparse.dll" "gstreamer-plugins\libgstwavparse.dll"
   File "/oname=libgstxingmux.dll" "gstreamer-plugins\libgstxingmux.dll"
 !endif ; MinGW
 
 !ifdef msvc
+  File "/oname=gstaes.dll" "gstreamer-plugins\gstaes.dll"
   File "/oname=gstaiff.dll" "gstreamer-plugins\gstaiff.dll"
   File "/oname=gstapetag.dll" "gstreamer-plugins\gstapetag.dll"
   File "/oname=gstapp.dll" "gstreamer-plugins\gstapp.dll"
@@ -605,9 +647,11 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstfdkaac.dll" "gstreamer-plugins\gstfdkaac.dll"
   File "/oname=gstflac.dll" "gstreamer-plugins\gstflac.dll"
   File "/oname=gstgio.dll" "gstreamer-plugins\gstgio.dll"
+  File "/oname=gstgme.dll" "gstreamer-plugins\gstgme.dll"
   File "/oname=gsthls.dll" "gstreamer-plugins\gsthls.dll"
   File "/oname=gsticydemux.dll" "gstreamer-plugins\gsticydemux.dll"
   File "/oname=gstid3demux.dll" "gstreamer-plugins\gstid3demux.dll"
+  File "/oname=gstid3tag.dll" "gstreamer-plugins\gstid3tag.dll"
   File "/oname=gstisomp4.dll" "gstreamer-plugins\gstisomp4.dll"
   File "/oname=gstlame.dll" "gstreamer-plugins\gstlame.dll"
   File "/oname=gstlibav.dll" "gstreamer-plugins\gstlibav.dll"
@@ -617,20 +661,23 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstopenmpt.dll" "gstreamer-plugins\gstopenmpt.dll"
   File "/oname=gstopus.dll" "gstreamer-plugins\gstopus.dll"
   File "/oname=gstopusparse.dll" "gstreamer-plugins\gstopusparse.dll"
+  File "/oname=gstpbtypes.dll" "gstreamer-plugins\gstpbtypes.dll"
   File "/oname=gstplayback.dll" "gstreamer-plugins\gstplayback.dll"
   File "/oname=gstreplaygain.dll" "gstreamer-plugins\gstreplaygain.dll"
   File "/oname=gstrtp.dll" "gstreamer-plugins\gstrtp.dll"
   File "/oname=gstrtsp.dll" "gstreamer-plugins\gstrtsp.dll"
-  File "/oname=gstspeex.dll" "gstreamer-plugins\gstspeex.dll"
   File "/oname=gstsoup.dll" "gstreamer-plugins\gstsoup.dll"
   File "/oname=gstspectrum.dll" "gstreamer-plugins\gstspectrum.dll"
+  File "/oname=gstspeex.dll" "gstreamer-plugins\gstspeex.dll"
+  File "/oname=gsttaglib.dll" "gstreamer-plugins\gsttaglib.dll"
   File "/oname=gsttcp.dll" "gstreamer-plugins\gsttcp.dll"
+  File "/oname=gsttwolame.dll" "gstreamer-plugins\gsttwolame.dll"
   File "/oname=gsttypefindfunctions.dll" "gstreamer-plugins\gsttypefindfunctions.dll"
   File "/oname=gstudp.dll" "gstreamer-plugins\gstudp.dll"
   File "/oname=gstvolume.dll" "gstreamer-plugins\gstvolume.dll"
   File "/oname=gstvorbis.dll" "gstreamer-plugins\gstvorbis.dll"
   File "/oname=gstwasapi.dll" "gstreamer-plugins\gstwasapi.dll"
-  ;File "/oname=gstwasapi2.dll" "gstreamer-plugins\gstwasapi2.dll"
+  File "/oname=gstwavenc.dll" "gstreamer-plugins\gstwavenc.dll"
   File "/oname=gstwavpack.dll" "gstreamer-plugins\gstwavpack.dll"
   File "/oname=gstwavparse.dll" "gstreamer-plugins\gstwavparse.dll"
   File "/oname=gstxingmux.dll" "gstreamer-plugins\gstxingmux.dll"
@@ -700,26 +747,28 @@ Section "Uninstall"
   Delete "$INSTDIR\avfilter-8.dll"
   Delete "$INSTDIR\avformat-59.dll"
   Delete "$INSTDIR\avutil-57.dll"
+  Delete "$INSTDIR\libFLAC-8.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
   Delete "$INSTDIR\libbrotlienc.dll"
   Delete "$INSTDIR\libbs2b-0.dll"
   Delete "$INSTDIR\libbz2.dll"
-  Delete "$INSTDIR\libcdio-19.dll"
   Delete "$INSTDIR\libchromaprint.dll"
   Delete "$INSTDIR\libdl.dll"
-  Delete "$INSTDIR\libfdk-aac-2.dll"
-  Delete "$INSTDIR\libffi-8.dll"
-  Delete "$INSTDIR\libFLAC-8.dll"
-  Delete "$INSTDIR\libfreetype-6.dll"
   Delete "$INSTDIR\libfaac-0.dll"
   Delete "$INSTDIR\libfaad-2.dll"
+  Delete "$INSTDIR\libfdk-aac-2.dll"
+  Delete "$INSTDIR\libffi-8.dll"
+  Delete "$INSTDIR\libfreetype-6.dll"
+  Delete "$INSTDIR\libgcrypt-20.dll"
   Delete "$INSTDIR\libgio-2.0-0.dll"
   Delete "$INSTDIR\libglib-2.0-0.dll"
+  Delete "$INSTDIR\libgme.dll"
   Delete "$INSTDIR\libgmodule-2.0-0.dll"
   Delete "$INSTDIR\libgmp-10.dll"
   Delete "$INSTDIR\libgnutls-30.dll"
   Delete "$INSTDIR\libgobject-2.0-0.dll"
+  Delete "$INSTDIR\libgpg-error-0.dll"
   Delete "$INSTDIR\libgstadaptivedemux-1.0-0.dll"
   Delete "$INSTDIR\libgstapp-1.0-0.dll"
   Delete "$INSTDIR\libgstaudio-1.0-0.dll"
@@ -753,18 +802,18 @@ Section "Uninstall"
   Delete "$INSTDIR\libopenmpt-0.dll"
   Delete "$INSTDIR\libopus-0.dll"
   Delete "$INSTDIR\liborc-0.4-0.dll"
-  Delete "$INSTDIR\libpcre-1.dll"
   Delete "$INSTDIR\libpng16-16.dll"
   Delete "$INSTDIR\libprotobuf-32.dll"
   Delete "$INSTDIR\libpsl-5.dll"
   Delete "$INSTDIR\libqtsparkle-qt6.dll"
-  Delete "$INSTDIR\libsoup-2.4-1.dll"
+  Delete "$INSTDIR\libsoup-3.0-0.dll"
   Delete "$INSTDIR\libspeex-1.dll"
   Delete "$INSTDIR\libsqlite3-0.dll"
   Delete "$INSTDIR\libssp-0.dll"
   Delete "$INSTDIR\libstdc++-6.dll"
   Delete "$INSTDIR\libtag.dll"
   Delete "$INSTDIR\libtasn1-6.dll"
+  Delete "$INSTDIR\libtwolame-0.dll"
   Delete "$INSTDIR\libunistring-2.dll"
   Delete "$INSTDIR\libvorbis-0.dll"
   Delete "$INSTDIR\libvorbisenc-2.dll"
@@ -783,10 +832,12 @@ Section "Uninstall"
   Delete "$INSTDIR\libexpat-1.dll"
   Delete "$INSTDIR\libmman.dll"
   Delete "$INSTDIR\libmpfr-6.dll"
+  Delete "$INSTDIR\libpcre2-8d.dll"
   Delete "$INSTDIR\libpcre2-16d.dll"
   Delete "$INSTDIR\libreadline8.dll"
   Delete "$INSTDIR\libtermcap.dll"
 !else
+  Delete "$INSTDIR\libpcre2-8.dll"
   Delete "$INSTDIR\libpcre2-16.dll"
 !endif
 
@@ -805,6 +856,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
 
+  Delete "$INSTDIR\FLAC.dll"
   Delete "$INSTDIR\avcodec-58.dll"
   Delete "$INSTDIR\avfilter-7.dll"
   Delete "$INSTDIR\avformat-58.dll"
@@ -816,9 +868,9 @@ Section "Uninstall"
   Delete "$INSTDIR\faad.dll"
   Delete "$INSTDIR\fdk-aac.dll"
   Delete "$INSTDIR\ffi-7.dll"
-  Delete "$INSTDIR\FLAC.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"
@@ -839,7 +891,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gsttag-1.0-0.dll"
   Delete "$INSTDIR\gsturidownloader-1.0-0.dll"
   Delete "$INSTDIR\gstvideo-1.0-0.dll"
-  Delete "$INSTDIR\gstwinrt-1.0-0.dll"
+  Delete "$INSTDIR\harfbuzz.dll"
   Delete "$INSTDIR\intl-8.dll"
   Delete "$INSTDIR\libbs2b.dll"
   Delete "$INSTDIR\libfaac_dll.dll"
@@ -850,13 +902,14 @@ Section "Uninstall"
   Delete "$INSTDIR\libspeex.dll"
   Delete "$INSTDIR\mpcdec.dll"
   Delete "$INSTDIR\mpg123.dll"
+  Delete "$INSTDIR\nghttp2.dll"
   Delete "$INSTDIR\ogg.dll"
   Delete "$INSTDIR\opus.dll"
   Delete "$INSTDIR\orc-0.4-0.dll"
   Delete "$INSTDIR\postproc-55.dll"
   Delete "$INSTDIR\psl-5.dll"
   Delete "$INSTDIR\qtsparkle-qt6.dll"
-  Delete "$INSTDIR\soup-2.4-1.dll"
+  Delete "$INSTDIR\soup-3.0-0.dll"
   Delete "$INSTDIR\sqlite3.dll"
   Delete "$INSTDIR\swresample-3.dll"
   Delete "$INSTDIR\swscale-5.dll"
@@ -866,17 +919,23 @@ Section "Uninstall"
   Delete "$INSTDIR\wavpackdll.dll"
 
 !ifdef release
+  Delete "$INSTDIR\freetype.dll"
   Delete "$INSTDIR\libpng16.dll"
   Delete "$INSTDIR\libprotobuf.dll"
   Delete "$INSTDIR\libxml2.dll"
+  Delete "$INSTDIR\pcre2-8.dll"
   Delete "$INSTDIR\pcre2-16.dll"
+  Delete "$INSTDIR\twolame.dll"
   Delete "$INSTDIR\zlib.dll"
 !endif
 !ifdef debug
+  Delete "$INSTDIR\freetyped.dll"
   Delete "$INSTDIR\libpng16d.dll"
   Delete "$INSTDIR\libprotobufd.dll"
   Delete "$INSTDIR\libxml2d.dll"
+  Delete "$INSTDIR\pcre2-8d.dll"
   Delete "$INSTDIR\pcre2-16d.dll"
+  Delete "$INSTDIR\twolamed.dll"
   Delete "$INSTDIR\zlibd.dll"
 !endif
 
@@ -884,8 +943,11 @@ Section "Uninstall"
 
   ; Common files
 
+  Delete "$INSTDIR\icudt71.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
 !ifdef msvc && debug
+  Delete "$INSTDIR\icuin71d.dll"
+  Delete "$INSTDIR\icuuc71d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
   Delete "$INSTDIR\Qt6Guid.dll"
@@ -893,6 +955,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
+  Delete "$INSTDIR\icuin71.dll"
+  Delete "$INSTDIR\icuuc71.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
   Delete "$INSTDIR\Qt6Gui.dll"
@@ -948,7 +1012,6 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudiotestsrc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstautodetect.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstbs2b.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstcdio.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstcoreelements.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstdash.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstdirectsound.dll"
@@ -958,9 +1021,11 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstfdkaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstflac.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstgio.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstgme.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgsthls.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgsticydemux.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstid3demux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstid3tag.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstisomp4.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstlame.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstlibav.dll"
@@ -980,11 +1045,13 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstspeex.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgsttaglib.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgsttcp.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgsttwolame.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgsttypefindfunctions.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstudp.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwasapi.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavparse.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstxingmux.dll"
@@ -993,6 +1060,7 @@ Section "Uninstall"
   ; MSVC GStreamer plugins
 
 !ifdef msvc
+  Delete "$INSTDIR\gstreamer-plugins\gstaes.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaiff.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstapetag.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstapp.dll"
@@ -1016,9 +1084,11 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstfdkaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstflac.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstgio.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstgme.dll"
   Delete "$INSTDIR\gstreamer-plugins\gsthls.dll"
   Delete "$INSTDIR\gstreamer-plugins\gsticydemux.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstid3demux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstid3tag.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstisomp4.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstlame.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstlibav.dll"
@@ -1028,20 +1098,23 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstopenmpt.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstopus.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstopusparse.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstpbtypes.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstplayback.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstreplaygain.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstrtp.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstrtsp.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstspeex.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstsoup.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstspectrum.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstspeex.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gsttaglib.dll"
   Delete "$INSTDIR\gstreamer-plugins\gsttcp.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gsttwolame.dll"
   Delete "$INSTDIR\gstreamer-plugins\gsttypefindfunctions.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstudp.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstvolume.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwasapi.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstwasapi2.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavparse.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstxingmux.dll"

ext/gstmoodbar/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 
 set(SOURCES gstfastspectrum.cpp gstmoodbarplugin.cpp)
 

ext/libstrawberry-common/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 
 set(SOURCES
   core/logging.cpp

ext/libstrawberry-common/core/messagehandler.cpp

@@ -98,7 +98,7 @@ void _MessageHandlerBase::DeviceReadyRead() {
 void _MessageHandlerBase::WriteMessage(const QByteArray &data) {
 
   QDataStream s(device_);
-  s << quint32(data.length());
+  s << static_cast<quint32>(data.length());
   s.writeRawData(data.data(), static_cast<int>(data.length()));
 
   // Sorry.

ext/libstrawberry-common/core/messagehandler.h

@@ -35,9 +35,6 @@
 
 class QIODevice;
 
-#define QStringFromStdString(x) QString::fromUtf8((x).data(), (x).size())
-#define DataCommaSizeFromQString(x) (x).toUtf8().constData(), (x).toUtf8().length()
-
 // 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.

ext/libstrawberry-common/core/workerpool.h

@@ -243,6 +243,10 @@ void WorkerPool<HandlerType>::DoStart() {
 
   QStringList search_path;
   search_path << QCoreApplication::applicationDirPath();
+#if defined(Q_OS_UNIX)
+  search_path << "/usr/libexec";
+  search_path << "/usr/local/libexec";
+#endif
 #if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
   search_path << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;
 #endif

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 
 set(MESSAGES tagreadermessages.proto)
 set(SOURCES tagreaderbase.cpp)
 
 if(USE_TAGLIB AND TAGLIB_FOUND)
-  list(APPEND SOURCES tagreadertaglib.cpp)
+  list(APPEND SOURCES tagreadertaglib.cpp tagreadergme.cpp)
 endif()
 
 if(USE_TAGPARSER AND TAGPARSER_FOUND)

ext/libstrawberry-tagreader/tagreaderbase.cpp

@@ -25,3 +25,33 @@ const std::string TagReaderBase::kEmbeddedCover = "(embedded)";
 
 TagReaderBase::TagReaderBase() = default;
 TagReaderBase::~TagReaderBase() = default;
+
+void TagReaderBase::Decode(const QString &tag, std::string *output) {
+
+  output->assign(DataCommaSizeFromQString(tag));
+
+}
+
+float TagReaderBase::ConvertPOPMRating(const int POPM_rating) {
+
+  if (POPM_rating < 0x01) return 0.0F;
+  else if (POPM_rating < 0x40) return 0.20F;
+  else if (POPM_rating < 0x80) return 0.40F;
+  else if (POPM_rating < 0xC0) return 0.60F;
+  else if (POPM_rating < 0xFC) return 0.80F;
+
+  return 1.0F;
+
+}
+
+int TagReaderBase::ConvertToPOPMRating(const float rating) {
+
+  if (rating < 0.20) return 0x00;
+  else if (rating < 0.40) return 0x01;
+  else if (rating < 0.60) return 0x40;
+  else if (rating < 0.80) return 0x80;
+  else if (rating < 1.0)  return 0xC0;
+
+  return 0xFF;
+
+}

ext/libstrawberry-tagreader/tagreaderbase.h

@@ -27,6 +27,9 @@
 
 #include "tagreadermessages.pb.h"
 
+#define QStringFromStdString(x) QString::fromUtf8((x).data(), (x).size())
+#define DataCommaSizeFromQString(x) (x).toUtf8().constData(), (x).toUtf8().length()
+
 /*
  * 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)
@@ -38,7 +41,7 @@ class TagReaderBase {
 
   virtual bool IsMediaFile(const QString &filename) const = 0;
 
-  virtual void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const = 0;
+  virtual bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const = 0;
   virtual bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 0;
 
   virtual QByteArray LoadEmbeddedArt(const QString &filename) const = 0;
@@ -47,6 +50,11 @@ class TagReaderBase {
   virtual bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 0;
   virtual bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const = 0;
 
+  static void Decode(const QString &tag, std::string *output);
+
+  static float ConvertPOPMRating(const int POPM_rating);
+  static int ConvertToPOPMRating(const float rating);
+
  protected:
   static const std::string kEmbeddedCover;
 

ext/libstrawberry-tagreader/tagreadergme.cpp

@@ -0,0 +1,299 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2022, Eoin O'Neill <eoinoneill1991@gmail.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 "tagreadergme.h"
+
+#include <tag.h>
+#include <apefile.h>
+
+#include <QByteArray>
+#include <QString>
+#include <QChar>
+#include <QFileInfo>
+#include <QFile>
+#include <QTextStream>
+
+#include "core/logging.h"
+#include "core/timeconstants.h"
+#include "core/messagehandler.h"
+#include "tagreaderbase.h"
+#include "tagreadertaglib.h"
+
+bool GME::IsSupportedFormat(const QFileInfo &file_info) {
+  return file_info.exists() && (file_info.completeSuffix().endsWith("spc", Qt::CaseInsensitive) || file_info.completeSuffix().endsWith("vgm"), Qt::CaseInsensitive);
+}
+
+bool GME::ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info) {
+
+  if (file_info.completeSuffix().endsWith("spc"), Qt::CaseInsensitive) {
+    SPC::Read(file_info, song_info);
+    return true;
+  }
+  if (file_info.completeSuffix().endsWith("vgm", Qt::CaseInsensitive)) {
+    VGM::Read(file_info, song_info);
+    return true;
+  }
+
+  return false;
+
+}
+
+quint32 GME::UnpackBytes32(const char *const bytes, size_t length) {
+
+  Q_ASSERT(length <= 4 && length > 0);
+
+  quint32 value = 0;
+  for (size_t i = 0; i < length; i++) {
+    value |= static_cast<unsigned char>(bytes[i]) << (8 * i);
+  }
+
+  return value;
+
+}
+
+void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info) {
+
+  QFile file(file_info.filePath());
+  if (!file.open(QIODevice::ReadOnly)) return;
+
+  qLog(Debug) << "Reading tags from SPC file" << file_info.fileName();
+
+  // Check for header -- more reliable than file name alone.
+  if (!file.read(33).startsWith(QString("SNES-SPC700").toLatin1())) return;
+
+  // First order of business -- get any tag values that exist within the core file information.
+  // These only allow for a certain number of bytes per field,
+  // so they will likely be overwritten either by the id666 standard or the APETAG format (as used by other players, such as foobar and winamp)
+  //
+  //  Make sure to check id6 documentation before changing the read values!
+
+  file.seek(HAS_ID6_OFFSET);
+  bool has_id6 = (file.read(1)[0] == static_cast<char>(xID6_STATUS::ON));
+
+  file.seek(SONG_TITLE_OFFSET);
+  song_info->set_title(QString::fromLatin1(file.read(32)).toStdString());
+
+  file.seek(GAME_TITLE_OFFSET);
+  song_info->set_album(QString::fromLatin1(file.read(32)).toStdString());
+
+  file.seek(ARTIST_OFFSET);
+  song_info->set_artist(QString::fromLatin1(file.read(32)).toStdString());
+
+  file.seek(INTRO_LENGTH_OFFSET);
+  QByteArray length_bytes = file.read(INTRO_LENGTH_SIZE);
+  quint64 length_in_sec = 0;
+  if (length_bytes.size() >= INTRO_LENGTH_SIZE) {
+    length_in_sec = ConvertSPCStringToNum(length_bytes);
+
+    if (!length_in_sec || length_in_sec >= 0x1FFF) {
+      // This means that parsing the length as a string failed, so get value LE.
+      length_in_sec = length_bytes[0] | (length_bytes[1] << 8) | (length_bytes[2] << 16);
+    }
+
+    if (length_in_sec < 0x1FFF) {
+      song_info->set_length_nanosec(length_in_sec * kNsecPerSec);
+    }
+  }
+
+  file.seek(FADE_LENGTH_OFFSET);
+  QByteArray fade_bytes = file.read(FADE_LENGTH_SIZE);
+  if (fade_bytes.size() >= FADE_LENGTH_SIZE) {
+    quint64 fade_length_in_ms = ConvertSPCStringToNum(fade_bytes);
+
+    if (fade_length_in_ms > 0x7FFF) {
+      fade_length_in_ms = fade_bytes[0] | (fade_bytes[1] << 8) | (fade_bytes[2] << 16) | (fade_bytes[3] << 24);
+    }
+  }
+
+  // Check for XID6 data -- this is infrequently used, but being able to fill in data from this is ideal before trying to rely on APETAG values.
+  // XID6 format follows EA's binary file format standard named "IFF"
+  file.seek(XID6_OFFSET);
+  if (has_id6 && file.read(4) == QString("xid6").toLatin1()) {
+    QByteArray xid6_head_data = file.read(4);
+    if (xid6_head_data.size() >= 4) {
+      qint64 xid6_size = xid6_head_data[0] | (xid6_head_data[1] << 8) | (xid6_head_data[2] << 16) | xid6_head_data[3];
+      // This should be the size remaining for entire ID6 block, but it seems that most files treat this as the size of the remaining header space...
+
+      qLog(Debug) << file_info.fileName() << "has ID6 tag.";
+
+      while ((file.pos()) + 4 < XID6_OFFSET + xid6_size) {
+        QByteArray arr = file.read(4);
+        if (arr.size() < 4) break;
+
+        qint8 id = arr[0];
+        qint8 type = arr[1];
+        Q_UNUSED(id);
+        Q_UNUSED(type);
+        qint16 length = arr[2] | (arr[3] << 8);
+
+        file.read(GetNextMemAddressAlign32bit(length));
+      }
+    }
+  }
+
+  // Music Players that support SPC tend to support additional tagging data as
+  // an APETAG entry at the bottom of the file instead of writing into the xid6 tagging space.
+  // This is where a lot of the extra data for a file is stored, such as genre or replaygain data.
+  // This data is currently supported by TagLib, so we will simply use that for the remaining values.
+  TagLib::APE::File ape(file_info.filePath().toStdString().data());
+  if (ape.hasAPETag()) {
+    TagLib::Tag *tag = ape.tag();
+    if (!tag) return;
+
+    TagReaderTagLib::Decode(tag->artist(), song_info->mutable_artist());
+    TagReaderTagLib::Decode(tag->album(), song_info->mutable_album());
+    TagReaderTagLib::Decode(tag->title(), song_info->mutable_title());
+    TagReaderTagLib::Decode(tag->genre(), song_info->mutable_genre());
+    song_info->set_track(tag->track());
+    song_info->set_year(tag->year());
+  }
+
+  song_info->set_valid(true);
+  song_info->set_filetype(spb::tagreader::SongMetadata_FileType_SPC);
+
+}
+
+qint16 GME::SPC::GetNextMemAddressAlign32bit(qint16 input) {
+  return ((input + 0x3) & ~0x3);
+  // Plus 0x3 for rounding up (not down), AND NOT to flatten out on a 32 bit level.
+}
+
+quint64 GME::SPC::ConvertSPCStringToNum(const QByteArray &arr) {
+
+  quint64 result = 0;
+  for (auto it = arr.begin(); it != arr.end(); it++) {
+    unsigned int num = *it - '0';
+    if (num > 9) break;
+    result = (result * 10) + num;  // Shift Left and add.
+  }
+
+  return result;
+
+}
+
+void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info) {
+
+  QFile file(file_info.filePath());
+  if (!file.open(QIODevice::ReadOnly)) return;
+
+  qLog(Debug) << "Reading tags from VGM file" << file_info.fileName();
+
+  if (!file.read(4).startsWith(QString("Vgm ").toLatin1())) return;
+
+  file.seek(GD3_TAG_PTR);
+  QByteArray gd3_head = file.read(4);
+  if (gd3_head.size() < 4) return;
+
+  quint64 pt = GME::UnpackBytes32(gd3_head, gd3_head.size());
+
+  file.seek(SAMPLE_COUNT);
+  QByteArray sample_count_bytes = file.read(4);
+  file.seek(LOOP_SAMPLE_COUNT);
+  QByteArray loop_count_bytes = file.read(4);
+  quint64 length = 0;
+
+  if (!GetPlaybackLength(sample_count_bytes, loop_count_bytes, length)) return;
+
+  file.seek(GD3_TAG_PTR + pt);
+  QByteArray gd3_version = file.read(4);
+
+  file.seek(file.pos() + 4);
+  QByteArray gd3_length_bytes = file.read(4);
+  quint32 gd3_length = GME::UnpackBytes32(gd3_length_bytes, gd3_length_bytes.size());
+
+  QByteArray gd3Data = file.read(gd3_length);
+  QTextStream fileTagStream(gd3Data, QIODevice::ReadOnly);
+  // Stored as 16 bit UTF string, two bytes per letter.
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  fileTagStream.setEncoding(QStringConverter::Utf16);
+#else
+  fileTagStream.setCodec("UTF-16");
+#endif
+  QStringList strings = fileTagStream.readLine(0).split(QChar('\0'));
+  if (strings.count() < 10) return;
+
+  // VGM standard dictates string tag data exist in specific order.
+  // Order alternates between English and Japanese version of data.
+  // Read GD3 tag standard for more details.
+  song_info->set_title(strings[0].toStdString());
+  song_info->set_album(strings[2].toStdString());
+  song_info->set_artist(strings[6].toStdString());
+  song_info->set_year(strings[8].left(4).toInt());
+  song_info->set_length_nanosec(length * kNsecPerMsec);
+  song_info->set_valid(true);
+  song_info->set_filetype(spb::tagreader::SongMetadata_FileType_VGM);
+
+}
+
+bool GME::VGM::GetPlaybackLength(const QByteArray &sample_count_bytes, const QByteArray &loop_count_bytes, quint64 &out_length) {
+
+  if (sample_count_bytes.size() != 4) return false;
+  if (loop_count_bytes.size() != 4) return false;
+
+  quint64 sample_count = GME::UnpackBytes32(sample_count_bytes, sample_count_bytes.size());
+
+  if (sample_count <= 0) return false;
+
+  quint64 loop_sample_count = GME::UnpackBytes32(loop_count_bytes, loop_count_bytes.size());
+
+  if (loop_sample_count <= 0) {
+    out_length = sample_count * 1000 / SAMPLE_TIMEBASE;
+    return true;
+  }
+
+  quint64 intro_length_ms = (sample_count - loop_sample_count) * 1000 / SAMPLE_TIMEBASE;
+  quint64 loop_length_ms = (loop_sample_count) * 1000 / SAMPLE_TIMEBASE;
+  out_length = intro_length_ms + (loop_length_ms * 2) + GST_GME_LOOP_TIME_MS;
+
+  return true;
+
+}
+
+TagReaderGME::TagReaderGME() = default;
+TagReaderGME::~TagReaderGME() = default;
+
+bool TagReaderGME::IsMediaFile(const QString &filename) const {
+  QFileInfo fileinfo(filename);
+  return GME::IsSupportedFormat(fileinfo);
+}
+
+bool TagReaderGME::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+  QFileInfo fileinfo(filename);
+  return GME::ReadFile(fileinfo, song);
+}
+
+bool TagReaderGME::SaveFile(const QString&, const spb::tagreader::SongMetadata&) const {
+  return false;
+}
+
+QByteArray TagReaderGME::LoadEmbeddedArt(const QString&) const {
+  return QByteArray();
+}
+
+bool TagReaderGME::SaveEmbeddedArt(const QString&, const QByteArray&) {
+  return false;
+}
+
+bool TagReaderGME::SaveSongPlaycountToFile(const QString&, const spb::tagreader::SongMetadata&) const {
+  return false;
+}
+
+bool TagReaderGME::SaveSongRatingToFile(const QString&, const spb::tagreader::SongMetadata&) const {
+  return false;
+}

ext/libstrawberry-tagreader/tagreadergme.h

@@ -0,0 +1,111 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2022, Eoin O'Neill <eoinoneill1991@gmail.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 TAGREADERGME_H
+#define TAGREADERGME_H
+
+#include <taglib/tstring.h>
+
+#include <QByteArray>
+#include <QString>
+#include <QFileInfo>
+
+#include "tagreaderbase.h"
+#include "tagreadermessages.pb.h"
+
+
+namespace GME {
+bool IsSupportedFormat(const QFileInfo &file_info);
+bool ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
+
+uint32_t UnpackBytes32(const char *const arr, size_t length);
+
+namespace SPC {
+// SPC SPEC: http://vspcplay.raphnet.net/spc_file_format.txt
+
+constexpr int HAS_ID6_OFFSET = 0x23;
+constexpr int SONG_TITLE_OFFSET = 0x2E;
+constexpr int GAME_TITLE_OFFSET = 0x4E;
+constexpr int DUMPER_OFFSET = 0x6E;
+constexpr int COMMENTS_OFFSET = 0x7E;
+// It seems that intro length and fade length are inconsistent from file to file.
+// It should be looked into within the GME source code to see how GStreamer gets its values for playback length.
+constexpr int INTRO_LENGTH_OFFSET = 0xA9;
+constexpr int INTRO_LENGTH_SIZE = 3;
+constexpr int FADE_LENGTH_OFFSET = 0xAC;
+constexpr int FADE_LENGTH_SIZE = 4;
+constexpr int ARTIST_OFFSET = 0xB1;
+constexpr int XID6_OFFSET = (0x101C0 + 64);
+
+constexpr int NANO_PER_MS = 1000000;
+
+enum xID6_STATUS {
+  ON = 0x26,
+  OFF = 0x27,
+};
+
+enum xID6_ID { SongName = 0x01, GameName = 0x02, ArtistName = 0x03 };
+
+enum xID6_TYPE { Length = 0x0, String = 0x1, Integer = 0x4 };
+
+void Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
+qint16 GetNextMemAddressAlign32bit(qint16 input);
+quint64 ConvertSPCStringToNum(const QByteArray &arr);
+}  // namespace SPC
+
+namespace VGM {
+// VGM SPEC:
+// http://www.smspower.org/uploads/Music/vgmspec170.txt?sid=17c810c54633b6dd4982f92f718361c1
+// GD3 TAG SPEC:
+// http://www.smspower.org/uploads/Music/gd3spec100.txt
+constexpr int GD3_TAG_PTR = 0x14;
+constexpr int SAMPLE_COUNT = 0x18;
+constexpr int LOOP_SAMPLE_COUNT = 0x20;
+constexpr int SAMPLE_TIMEBASE = 44100;
+constexpr int GST_GME_LOOP_TIME_MS = 8000;
+
+void Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
+// Takes in two QByteArrays, expected to be 4 bytes long. Desired length is returned via output parameter out_length. Returns false on error.
+bool GetPlaybackLength(const QByteArray &sample_count_bytes, const QByteArray &loop_count_bytes, quint64 &out_length);
+
+}  // namespace VGM
+
+}  // namespace GME
+
+// TagReaderGME
+// Fulfills Strawberry's Intended interface for tag reading.
+class TagReaderGME : public TagReaderBase {
+
+ public:
+  explicit TagReaderGME();
+  ~TagReaderGME();
+
+  bool IsMediaFile(const QString &filename) const override;
+
+  bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+
+  QByteArray LoadEmbeddedArt(const QString &filename) const override;
+  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+
+  bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+  bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
+};
+
+#endif

ext/libstrawberry-tagreader/tagreadermessages.proto

@@ -27,6 +27,8 @@ message SongMetadata {
     S3M = 19;
     XM = 20;
     IT = 21;
+    SPC = 22;
+    VGM = 23;
     CDDA = 90;
     STREAM = 91;
   }

ext/libstrawberry-tagreader/tagreadertaglib.cpp

@@ -22,6 +22,7 @@
 
 #include <string>
 #include <memory>
+#include <algorithm>
 #include <sys/stat.h>
 
 #include <taglib/taglib.h>
@@ -185,7 +186,7 @@ spb::tagreader::SongMetadata_FileType TagReaderTagLib::GuessFileType(TagLib::Fil
 
 }
 
-void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
 
   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
   const QFileInfo fileinfo(filename);
@@ -195,18 +196,23 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
   song->set_basefilename(DataCommaSizeFromQString(fileinfo.fileName()));
   song->set_url(url.constData(), url.size());
   song->set_filesize(fileinfo.size());
-  song->set_mtime(fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+  song->set_mtime(fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
-  song->set_ctime(fileinfo.birthTime().isValid() ? fileinfo.birthTime().toSecsSinceEpoch() : fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+  song->set_ctime(fileinfo.birthTime().isValid() ? std::max(fileinfo.birthTime().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
 #else
-  song->set_ctime(fileinfo.created().isValid() ? fileinfo.created().toSecsSinceEpoch() : fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+  song->set_ctime(fileinfo.created().isValid() ? std::max(fileinfo.created().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
 #endif
+
+  if (song->ctime() <= 0) {
+    song->set_ctime(song->mtime());
+  }
+
   song->set_lastseen(QDateTime::currentDateTime().toSecsSinceEpoch());
 
   std::unique_ptr<TagLib::FileRef> fileref(factory_->GetFileRef(filename));
   if (fileref->isNull()) {
     qLog(Info) << "TagLib hasn't been able to read" << filename << "file";
-    return;
+    return false;
   }
 
   song->set_filetype(GuessFileType(fileref.get()));
@@ -248,9 +254,7 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
   }
 
   if (TagLib::FLAC::File *file_flac = dynamic_cast<TagLib::FLAC::File *>(fileref->file())) {
-
     song->set_bitdepth(file_flac->audioProperties()->bitsPerSample());
-
     if (file_flac->xiphComment()) {
       ParseOggTag(file_flac->xiphComment()->fieldListMap(), &disc, &compilation, song);
       TagLib::List<TagLib::FLAC::Picture*> pictures = file_flac->pictureList();
@@ -511,6 +515,8 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
   if (song->bitrate() <= 0) { song->set_bitrate(-1); }
   if (song->lastplayed() <= 0) { song->set_lastplayed(-1); }
 
+  return song->filetype() != spb::tagreader::SongMetadata_FileType_UNKNOWN;
+
 }
 
 void TagReaderTagLib::Decode(const TagLib::String &tag, std::string *output) {
@@ -520,12 +526,6 @@ void TagReaderTagLib::Decode(const TagLib::String &tag, std::string *output) {
 
 }
 
-void TagReaderTagLib::Decode(const QString &tag, std::string *output) {
-
-  output->assign(DataCommaSizeFromQString(tag));
-
-}
-
 void TagReaderTagLib::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
 
   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
@@ -1041,30 +1041,6 @@ TagLib::ID3v2::PopularimeterFrame *TagReaderTagLib::GetPOPMFrameFromTag(TagLib::
 
 }
 
-float TagReaderTagLib::ConvertPOPMRating(const int POPM_rating) {
-
-  if (POPM_rating < 0x01) return 0.0F;
-  else if (POPM_rating < 0x40) return 0.20F;
-  else if (POPM_rating < 0x80) return 0.40F;
-  else if (POPM_rating < 0xC0) return 0.60F;
-  else if (POPM_rating < 0xFC) return 0.80F;
-
-  return 1.0F;
-
-}
-
-int TagReaderTagLib::ConvertToPOPMRating(const float rating) {
-
-  if (rating < 0.20) return 0x00;
-  else if (rating < 0.40) return 0x01;
-  else if (rating < 0.60) return 0x40;
-  else if (rating < 0.80) return 0x80;
-  else if (rating < 1.0)  return 0xC0;
-
-  return 0xFF;
-
-}
-
 bool TagReaderTagLib::SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
 
   if (filename.isEmpty()) return false;

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -50,7 +50,7 @@ class TagReaderTagLib : public TagReaderBase {
 
   bool IsMediaFile(const QString &filename) const override;
 
-  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
+  bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
   bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
 
   QByteArray LoadEmbeddedArt(const QString &filename) const override;
@@ -59,12 +59,11 @@ class TagReaderTagLib : public TagReaderBase {
   bool SaveSongPlaycountToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
   bool SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
 
+  static void Decode(const TagLib::String &tag, std::string *output);
+
  private:
   spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
 
-  static void Decode(const TagLib::String &tag, std::string *output);
-  static void Decode(const QString &tag, std::string *output);
-
   void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
   void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
 
@@ -79,8 +78,6 @@ class TagReaderTagLib : public TagReaderBase {
 
   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
 
-  static float ConvertPOPMRating(const int POPM_rating);
-  static int ConvertToPOPMRating(const float rating);
   static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag *tag);
 
  private:

ext/libstrawberry-tagreader/tagreadertagparser.cpp

@@ -93,25 +93,30 @@ bool TagReaderTagParser::IsMediaFile(const QString &filename) const {
 
 }
 
-void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+bool 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("bak", Qt::CaseInsensitive) == 0) return;
+  if (!fileinfo.exists() || fileinfo.suffix().compare("bak", Qt::CaseInsensitive) == 0) return false;
 
   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
 
   song->set_basefilename(DataCommaSizeFromQString(fileinfo.fileName()));
   song->set_url(url.constData(), url.size());
   song->set_filesize(fileinfo.size());
-  song->set_mtime(fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+  song->set_mtime(fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
-  song->set_ctime(fileinfo.birthTime().isValid() ? fileinfo.birthTime().toSecsSinceEpoch() : fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+  song->set_ctime(fileinfo.birthTime().isValid() ? std::max(fileinfo.birthTime().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
 #else
-  song->set_ctime(fileinfo.created().isValid() ? fileinfo.created().toSecsSinceEpoch() : fileinfo.lastModified().isValid() ? fileinfo.lastModified().toSecsSinceEpoch() : 0);
+  song->set_ctime(fileinfo.created().isValid() ? std::max(fileinfo.created().toSecsSinceEpoch(), 0LL) : fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
 #endif
+
+  if (song->ctime() <= 0) {
+    song->set_ctime(song->mtime());
+  }
+
   song->set_lastseen(QDateTime::currentDateTime().toSecsSinceEpoch());
 
   try {
@@ -130,19 +135,19 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
     taginfo.parseContainerFormat(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return;
+      return false;
     }
 
     taginfo.parseTracks(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return;
+      return false;
     }
 
     taginfo.parseTags(diag, progress);
     if (progress.isAborted()) {
       taginfo.close();
-      return;
+      return false;
     }
 
     for (const TagParser::DiagMessage &msg : diag) {
@@ -201,7 +206,7 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
 
     if (song->filetype() == spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_UNKNOWN) {
       taginfo.close();
-      return;
+      return false;
     }
 
     for (const auto tag : taginfo.tags()) {
@@ -222,6 +227,10 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
       if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
         song->set_art_automatic(kEmbeddedCover);
       }
+      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
@@ -238,8 +247,12 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
 
     taginfo.close();
 
+    return true;
+
+  }
+  catch(...) {
+    return false;
   }
-  catch(...) {}
 
 }
 
@@ -464,7 +477,7 @@ bool TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const spb
       }
 
       for (const auto tag : taginfo.tags()) {
-        tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(song.rating()));
+        tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(ConvertToPOPMRating(song.rating())));
       }
       taginfo.applyChanges(diag, progress);
       taginfo.close();

ext/libstrawberry-tagreader/tagreadertagparser.h

@@ -39,7 +39,7 @@ class TagReaderTagParser : public TagReaderBase {
 
   bool IsMediaFile(const QString &filename) const override;
 
-  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
+  bool ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const override;
   bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const override;
 
   QByteArray LoadEmbeddedArt(const QString &filename) const override;

ext/macdeploycheck/macdeploycheck.cpp

@@ -140,7 +140,7 @@ int main(int argc, char **argv) {
       }
       else {
         qLog(Error) << "Could not parse otool output line:" << output_line;
-        success = false;
+        continue;
       }
     }
   }

ext/strawberry-tagreader/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -34,28 +34,11 @@ void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
 
   spb::tagreader::Message reply;
 
-  if (message.has_is_media_file_request()) {
-    reply.mutable_is_media_file_response()->set_success(tag_reader_.IsMediaFile(QStringFromStdString(message.is_media_file_request().filename())));
-  }
-  else if (message.has_read_file_request()) {
-    tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-  }
-  else if (message.has_save_file_request()) {
-    reply.mutable_save_file_response()->set_success(tag_reader_.SaveFile(QStringFromStdString(message.save_file_request().filename()), message.save_file_request().metadata()));
-  }
-  else if (message.has_load_embedded_art_request()) {
-    QByteArray data = tag_reader_.LoadEmbeddedArt(QStringFromStdString(message.load_embedded_art_request().filename()));
-    reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
-  }
-  else if (message.has_save_embedded_art_request()) {
-    reply.mutable_save_embedded_art_response()->set_success(tag_reader_.SaveEmbeddedArt(QStringFromStdString(message.save_embedded_art_request().filename()), QByteArray(message.save_embedded_art_request().data().data(), static_cast<qint64>(message.save_embedded_art_request().data().size()))));
-  }
-
-  else if (message.has_save_song_playcount_to_file_request()) {
-    reply.mutable_save_song_playcount_to_file_response()->set_success(tag_reader_.SaveSongPlaycountToFile(QStringFromStdString(message.save_song_playcount_to_file_request().filename()), message.save_song_playcount_to_file_request().metadata()));
-  }
-  else if (message.has_save_song_rating_to_file_request()) {
-    reply.mutable_save_song_rating_to_file_response()->set_success(tag_reader_.SaveSongRatingToFile(QStringFromStdString(message.save_song_rating_to_file_request().filename()), message.save_song_rating_to_file_request().metadata()));
+  bool success = HandleMessage(message, reply, &tag_reader_);
+  if (!success) {
+#if defined(USE_TAGLIB)
+    HandleMessage(message, reply, &tag_reader_gme_);
+#endif
   }
 
   SendReply(message, &reply);
@@ -63,7 +46,50 @@ void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
 }
 
 void TagReaderWorker::DeviceClosed() {
+
   AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
 
   QCoreApplication::exit();
+
+}
+
+bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply, TagReaderBase *reader) {
+
+  if (message.has_is_media_file_request()) {
+    bool success = reader->IsMediaFile(QStringFromStdString(message.is_media_file_request().filename()));
+    reply.mutable_is_media_file_response()->set_success(success);
+    return success;
+  }
+  else if (message.has_read_file_request()) {
+    bool success = reader->ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
+    return success;
+  }
+  else if (message.has_save_file_request()) {
+    bool success = reader->SaveFile(QStringFromStdString(message.save_file_request().filename()), message.save_file_request().metadata());
+    reply.mutable_save_file_response()->set_success(success);
+    return success;
+  }
+  else if (message.has_load_embedded_art_request()) {
+    QByteArray data = reader->LoadEmbeddedArt(QStringFromStdString(message.load_embedded_art_request().filename()));
+    reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
+    return true;
+  }
+  else if (message.has_save_embedded_art_request()) {
+    bool success = reader->SaveEmbeddedArt(QStringFromStdString(message.save_embedded_art_request().filename()), QByteArray(message.save_embedded_art_request().data().data(), static_cast<qint64>(message.save_embedded_art_request().data().size())));
+    reply.mutable_save_embedded_art_response()->set_success(success);
+    return success;
+  }
+  else if (message.has_save_song_playcount_to_file_request()) {
+    bool success = reader->SaveSongPlaycountToFile(QStringFromStdString(message.save_song_playcount_to_file_request().filename()), message.save_song_playcount_to_file_request().metadata());
+    reply.mutable_save_song_playcount_to_file_response()->set_success(success);
+    return success;
+  }
+  else if (message.has_save_song_rating_to_file_request()) {
+    bool success = reader->SaveSongRatingToFile(QStringFromStdString(message.save_song_rating_to_file_request().filename()), message.save_song_rating_to_file_request().metadata());
+    reply.mutable_save_song_rating_to_file_response()->set_success(success);
+    return success;
+  }
+
+  return false;
+
 }

ext/strawberry-tagreader/tagreaderworker.h

@@ -26,9 +26,11 @@
 #include "core/messagehandler.h"
 #if defined(USE_TAGLIB)
 #  include "tagreadertaglib.h"
+#  include "tagreadergme.h"
 #elif defined(USE_TAGPARSER)
 #  include "tagreadertagparser.h"
 #endif
+
 #include "tagreadermessages.pb.h"
 
 class QIODevice;
@@ -44,8 +46,12 @@ class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
   void DeviceClosed() override;
 
  private:
+  // Handle message using specific TagReaderBase implementation. Returns true on successful message handle.
+  bool HandleMessage(const spb::tagreader::Message &message, spb::tagreader::Message &reply, TagReaderBase* reader);
+
 #if defined(USE_TAGLIB)
   TagReaderTagLib tag_reader_;
+  TagReaderGME tag_reader_gme_;
 #elif defined(USE_TAGPARSER)
   TagReaderTagParser tag_reader_;
 #endif

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 
 if(HAVE_TRANSLATIONS)
   include(../cmake/Translations.cmake)
@@ -186,6 +186,7 @@ set(SOURCES
   dialogs/deleteconfirmationdialog.cpp
   dialogs/lastfmimportdialog.cpp
   dialogs/snapdialog.cpp
+  dialogs/saveplaylistsdialog.cpp
 
   widgets/autoexpandingtreeview.cpp
   widgets/busyindicator.cpp
@@ -417,6 +418,7 @@ set(HEADERS
   dialogs/deleteconfirmationdialog.h
   dialogs/lastfmimportdialog.h
   dialogs/snapdialog.h
+  dialogs/saveplaylistsdialog.h
 
   widgets/autoexpandingtreeview.h
   widgets/busyindicator.h
@@ -542,6 +544,7 @@ set(UI
   dialogs/userpassdialog.ui
   dialogs/lastfmimportdialog.ui
   dialogs/snapdialog.ui
+  dialogs/saveplaylistsdialog.ui
 
   widgets/trackslider.ui
   widgets/fileview.ui
@@ -941,9 +944,14 @@ link_directories(
   ${SQLITE_LIBRARY_DIRS}
   ${SINGLEAPPLICATION_LIBRARY_DIRS}
   ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
-  ${Iconv_LIBRARY_DIRS}
 )
 
+if(HAVE_ICU)
+  link_directories(${ICU_LIBRARY_DIRS})
+else()
+  link_directories(${Iconv_LIBRARY_DIRS})
+endif()
+
 if(HAVE_ALSA)
   link_directories(${ALSA_LIBRARY_DIRS})
 endif()
@@ -1055,11 +1063,21 @@ target_link_libraries(strawberry_lib PUBLIC
   ${QT_LIBRARIES}
   ${SINGLEAPPLICATION_LIBRARIES}
   ${SINGLECOREAPPLICATION_LIBRARIES}
-  ${Iconv_LIBRARIES}
   libstrawberry-common
   libstrawberry-tagreader
 )
 
+if(HAVE_ICU)
+  target_include_directories(strawberry_lib SYSTEM PRIVATE ${ICU_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${ICU_LIBRARIES})
+else()
+  if(FREEBSD AND NOT Iconv_LIBRARIES)
+    set(Iconv_LIBRARIES iconv)
+  endif()
+  target_include_directories(strawberry_lib SYSTEM PRIVATE ${Iconv_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${Iconv_LIBRARIES})
+endif()
+
 if(HAVE_ALSA)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${ALSA_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${ALSA_LIBRARIES})
@@ -1138,10 +1156,6 @@ if(HAVE_LIBMTP)
   target_link_libraries(strawberry_lib PRIVATE ${LIBMTP_LIBRARIES})
 endif()
 
-if(FREEBSD)
-  target_link_libraries(strawberry_lib PRIVATE iconv)
-endif()
-
 if(APPLE)
   target_link_libraries(strawberry_lib PRIVATE
     "-framework AppKit"

src/analyzer/analyzerbase.cpp

@@ -57,7 +57,11 @@ Analyzer::Base::Base(QWidget *parent, const uint scopeSize)
       lastscope_(512),
       new_frame_(false),
       is_playing_(false),
-      timeout_(40) {}
+      timeout_(40) {
+
+  setAttribute(Qt::WA_OpaquePaintEvent, true);
+
+}
 
 Analyzer::Base::~Base() {
   delete fht_;

src/analyzer/analyzercontainer.cpp

@@ -33,7 +33,6 @@
 #include <QActionGroup>
 #include <QSettings>
 #include <QtEvents>
-#include <QtDebug>
 
 #include "analyzercontainer.h"
 

src/collection/collection.cpp

@@ -27,7 +27,6 @@
 #include <QList>
 #include <QSettings>
 #include <QtConcurrentRun>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/taskmanager.h"

src/collection/collectionbackend.cpp

@@ -1479,7 +1479,7 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
       info.art_manual = QUrl::fromLocalFile(art_manual);
     }
 
-    info.filetype = Song::FileType(query.Value(6).toInt());
+    info.filetype = static_cast<Song::FileType>(query.Value(6).toInt());
     QString filetype = Song::TextForFiletype(info.filetype);
     info.cue_path = query.Value(7).toString();
 

src/collection/collectionfilterwidget.cpp

@@ -2,6 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2019-2022, 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
@@ -58,7 +59,12 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
     : QWidget(parent),
       ui_(new Ui_CollectionFilterWidget),
       model_(nullptr),
-      group_by_dialog_(new GroupByDialog),
+      group_by_dialog_(new GroupByDialog(this)),
+      groupings_manager_(nullptr),
+      filter_age_menu_(nullptr),
+      group_by_menu_(nullptr),
+      collection_menu_(nullptr),
+      group_by_group_(nullptr),
       filter_delay_(new QTimer(this)),
       filter_applies_to_model_(true),
       delay_behaviour_(DelayedOnLargeLibraries) {
@@ -114,13 +120,8 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
   filter_ages_[ui_->filter_age_three_months] = 60 * 60 * 24 * 30 * 3;
   filter_ages_[ui_->filter_age_year] = 60 * 60 * 24 * 365;
 
-  // "Group by ..."
-  group_by_group_ = CreateGroupByActions(this);
-
   group_by_menu_ = new QMenu(tr("Group by"), this);
-  group_by_menu_->addActions(group_by_group_->actions());
 
-  QObject::connect(group_by_group_, &QActionGroup::triggered, this, &CollectionFilterWidget::GroupByClicked);
   QObject::connect(ui_->save_grouping, &QAction::triggered, this, &CollectionFilterWidget::SaveGroupBy);
   QObject::connect(ui_->manage_groupings, &QAction::triggered, this, &CollectionFilterWidget::ShowGroupingManager);
 
@@ -147,8 +148,8 @@ void CollectionFilterWidget::Init(CollectionModel *model) {
 
   if (model_) {
     QObject::disconnect(model_, nullptr, this, nullptr);
-    QObject::disconnect(model_, nullptr, group_by_dialog_.get(), nullptr);
-    QObject::disconnect(group_by_dialog_.get(), nullptr, model_, nullptr);
+    QObject::disconnect(model_, nullptr, group_by_dialog_, nullptr);
+    QObject::disconnect(group_by_dialog_, nullptr, model_, nullptr);
     QList<QAction*> filter_ages = filter_ages_.keys();
     for (QAction *action : filter_ages) {
       QObject::disconnect(action, &QAction::triggered, model_, nullptr);
@@ -158,9 +159,9 @@ void CollectionFilterWidget::Init(CollectionModel *model) {
   model_ = model;
 
   // Connect signals
-  QObject::connect(model_, &CollectionModel::GroupingChanged, group_by_dialog_.get(), &GroupByDialog::CollectionGroupingChanged);
+  QObject::connect(model_, &CollectionModel::GroupingChanged, group_by_dialog_, &GroupByDialog::CollectionGroupingChanged);
   QObject::connect(model_, &CollectionModel::GroupingChanged, this, &CollectionFilterWidget::GroupingChanged);
-  QObject::connect(group_by_dialog_.get(), &GroupByDialog::Accepted, model_, &CollectionModel::SetGroupBy);
+  QObject::connect(group_by_dialog_, &GroupByDialog::Accepted, model_, &CollectionModel::SetGroupBy);
 
   QList<QAction*> filter_ages = filter_ages_.keys();
   for (QAction *action : filter_ages) {
@@ -176,15 +177,31 @@ void CollectionFilterWidget::Init(CollectionModel *model) {
     if (s.contains(group_by_version())) version = s.value(group_by_version(), 0).toInt();
     if (version == 1) {
       model_->SetGroupBy(CollectionModel::Grouping(
-        CollectionModel::GroupBy(s.value(group_by(1), static_cast<int>(CollectionModel::GroupBy_AlbumArtist)).toInt()),
-        CollectionModel::GroupBy(s.value(group_by(2), static_cast<int>(CollectionModel::GroupBy_AlbumDisc)).toInt()),
-        CollectionModel::GroupBy(s.value(group_by(3), static_cast<int>(CollectionModel::GroupBy_None)).toInt())));
+        CollectionModel::GroupBy(s.value(group_by_key(1), static_cast<int>(CollectionModel::GroupBy_AlbumArtist)).toInt()),
+        CollectionModel::GroupBy(s.value(group_by_key(2), static_cast<int>(CollectionModel::GroupBy_AlbumDisc)).toInt()),
+        CollectionModel::GroupBy(s.value(group_by_key(3), static_cast<int>(CollectionModel::GroupBy_None)).toInt())), s.value(separate_albums_by_grouping_key(), false).toBool());
     }
     else {
-      model_->SetGroupBy(CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_AlbumDisc, CollectionModel::GroupBy_None));
+      model_->SetGroupBy(CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_AlbumDisc, CollectionModel::GroupBy_None), false);
     }
     s.endGroup();
   }
+
+}
+
+void CollectionFilterWidget::SetSettingsGroup(const QString &settings_group) {
+
+  settings_group_ = settings_group;
+  saved_groupings_settings_group_ = SavedGroupingManager::GetSavedGroupingsSettingsGroup(settings_group);
+
+  UpdateGroupByActions();
+
+}
+
+void CollectionFilterWidget::SetSettingsPrefix(const QString &prefix) {
+
+  settings_prefix_ = prefix;
+
 }
 
 void CollectionFilterWidget::ReloadSettings() {
@@ -198,21 +215,10 @@ void CollectionFilterWidget::ReloadSettings() {
 
 }
 
-QString CollectionFilterWidget::group_by() {
+QString CollectionFilterWidget::group_by_version() const {
 
   if (settings_prefix_.isEmpty()) {
-    return QString("group_by");
-  }
-  else {
-    return QString("%1_group_by").arg(settings_prefix_);
-  }
-
-}
-
-QString CollectionFilterWidget::group_by_version() {
-
-  if (settings_prefix_.isEmpty()) {
-    return QString("group_by_version");
+    return "group_by_version";
   }
   else {
     return QString("%1_group_by_version").arg(settings_prefix_);
@@ -220,7 +226,29 @@ QString CollectionFilterWidget::group_by_version() {
 
 }
 
-QString CollectionFilterWidget::group_by(const int number) { return group_by() + QString::number(number); }
+QString CollectionFilterWidget::group_by_key() const {
+
+  if (settings_prefix_.isEmpty()) {
+    return "group_by";
+  }
+  else {
+    return QString("%1_group_by").arg(settings_prefix_);
+  }
+
+}
+
+QString CollectionFilterWidget::group_by_key(const int number) const { return group_by_key() + QString::number(number); }
+
+QString CollectionFilterWidget::separate_albums_by_grouping_key() const {
+
+  if (settings_prefix_.isEmpty()) {
+    return "separate_albums_by_grouping";
+  }
+  else {
+    return QString("%1_separate_albums_by_grouping").arg(settings_prefix_);
+  }
+
+}
 
 void CollectionFilterWidget::UpdateGroupByActions() {
 
@@ -229,7 +257,7 @@ void CollectionFilterWidget::UpdateGroupByActions() {
     delete group_by_group_;
   }
 
-  group_by_group_ = CreateGroupByActions(this);
+  group_by_group_ = CreateGroupByActions(saved_groupings_settings_group_, this);
   group_by_menu_->clear();
   group_by_menu_->addActions(group_by_group_->actions());
   QObject::connect(group_by_group_, &QActionGroup::triggered, this, &CollectionFilterWidget::GroupByClicked);
@@ -239,8 +267,7 @@ void CollectionFilterWidget::UpdateGroupByActions() {
 
 }
 
-
-QActionGroup *CollectionFilterWidget::CreateGroupByActions(QObject *parent) {
+QActionGroup *CollectionFilterWidget::CreateGroupByActions(const QString &saved_groupings_settings_group, QObject *parent) {
 
   QActionGroup *ret = new QActionGroup(parent);
 
@@ -267,9 +294,9 @@ QActionGroup *CollectionFilterWidget::CreateGroupByActions(QObject *parent) {
   sep1->setSeparator(true);
   ret->addAction(sep1);
 
-  // read saved groupings
+  // Read saved groupings
   QSettings s;
-  s.beginGroup(CollectionModel::kSavedGroupingsSettingsGroup);
+  s.beginGroup(saved_groupings_settings_group);
   int version = s.value("version").toInt();
   if (version == 1) {
     QStringList saved = s.childKeys();
@@ -316,20 +343,38 @@ QAction *CollectionFilterWidget::CreateGroupByAction(const QString &text, QObjec
 
 void CollectionFilterWidget::SaveGroupBy() {
 
-  QString text = QInputDialog::getText(this, tr("Grouping Name"), tr("Grouping name:"));
-  if (!text.isEmpty() && model_) {
-    model_->SaveGrouping(text);
-    UpdateGroupByActions();
+  if (!model_) return;
+
+  QString name = QInputDialog::getText(this, tr("Grouping Name"), tr("Grouping name:"));
+  if (name.isEmpty()) return;
+
+  qLog(Debug) << "Saving current grouping to" << name;
+
+  QSettings s;
+  if (settings_group_.isEmpty() || settings_group_ == CollectionSettingsPage::kSettingsGroup) {
+    s.beginGroup(SavedGroupingManager::kSavedGroupingsSettingsGroup);
   }
+  else {
+    s.beginGroup(QString(SavedGroupingManager::kSavedGroupingsSettingsGroup) + "_" + settings_group_);
+  }
+  QByteArray buffer;
+  QDataStream datastream(&buffer, QIODevice::WriteOnly);
+  datastream << model_->GetGroupBy();
+  s.setValue("version", "1");
+  s.setValue(name, buffer);
+  s.endGroup();
+
+  UpdateGroupByActions();
 
 }
 
 void CollectionFilterWidget::ShowGroupingManager() {
 
   if (!groupings_manager_) {
-    groupings_manager_ = std::make_unique<SavedGroupingManager>();
+    groupings_manager_ = new SavedGroupingManager(saved_groupings_settings_group_, this);
+    QObject::connect(groupings_manager_, &SavedGroupingManager::UpdateGroupByActions, this, &CollectionFilterWidget::UpdateGroupByActions);
   }
-  groupings_manager_->SetFilter(this);
+
   groupings_manager_->UpdateModel();
   groupings_manager_->show();
 
@@ -366,16 +411,16 @@ void CollectionFilterWidget::GroupByClicked(QAction *action) {
 
 }
 
-void CollectionFilterWidget::GroupingChanged(const CollectionModel::Grouping g) {
+void CollectionFilterWidget::GroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping) {
 
   if (!settings_group_.isEmpty()) {
-    // Save the settings
     QSettings s;
     s.beginGroup(settings_group_);
     s.setValue(group_by_version(), 1);
-    s.setValue(group_by(1), static_cast<int>(g[0]));
-    s.setValue(group_by(2), static_cast<int>(g[1]));
-    s.setValue(group_by(3), static_cast<int>(g[2]));
+    s.setValue(group_by_key(1), static_cast<int>(g[0]));
+    s.setValue(group_by_key(2), static_cast<int>(g[1]));
+    s.setValue(group_by_key(3), static_cast<int>(g[2]));
+    s.setValue(separate_albums_by_grouping_key(), separate_albums_by_grouping);
     s.endGroup();
   }
 
@@ -386,6 +431,10 @@ void CollectionFilterWidget::GroupingChanged(const CollectionModel::Grouping g)
 
 void CollectionFilterWidget::CheckCurrentGrouping(const CollectionModel::Grouping g) {
 
+  if (!group_by_group_) {
+    UpdateGroupByActions();
+  }
+
   for (QAction *action : group_by_group_->actions()) {
     if (action->property("group_by").isNull()) continue;
 

src/collection/collectionfilterwidget.h

@@ -2,6 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2019-2022, 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
@@ -60,9 +61,8 @@ class CollectionFilterWidget : public QWidget {
 
   void Init(CollectionModel *model);
 
-  static QActionGroup *CreateGroupByActions(QObject *parent);
+  static QActionGroup *CreateGroupByActions(const QString &saved_groupings_settings_group, QObject *parent);
 
-  void UpdateGroupByActions();
   void SetFilterHint(const QString &hint);
   void SetApplyFilterToCollection(bool filter_applies_to_model) { filter_applies_to_model_ = filter_applies_to_model; }
   void SetDelayBehaviour(DelayBehaviour behaviour) { delay_behaviour_ = behaviour; }
@@ -73,12 +73,13 @@ class CollectionFilterWidget : public QWidget {
   QMenu *menu() const { return collection_menu_; }
   void AddMenuAction(QAction *action);
 
-  void SetSettingsGroup(const QString &group) { settings_group_ = group; }
-  void SetSettingsPrefix(const QString &prefix) { settings_prefix_ = prefix; }
+  void SetSettingsGroup(const QString &group);
+  void SetSettingsPrefix(const QString &prefix);
 
-  QString group_by();
-  QString group_by_version();
-  QString group_by(const int number);
+  QString group_by_version() const;
+  QString group_by_key() const;
+  QString group_by_key(const int number) const;
+  QString separate_albums_by_grouping_key() const;
 
   void ReloadSettings();
 
@@ -86,6 +87,7 @@ class CollectionFilterWidget : public QWidget {
   void FocusSearchField();
 
  public slots:
+  void UpdateGroupByActions();
   void SetQueryMode(QueryOptions::QueryMode query_mode);
   void FocusOnFilter(QKeyEvent *e);
 
@@ -99,7 +101,7 @@ class CollectionFilterWidget : public QWidget {
   void keyReleaseEvent(QKeyEvent *e) override;
 
  private slots:
-  void GroupingChanged(const CollectionModel::Grouping g);
+  void GroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping);
   void GroupByClicked(QAction *action);
   void SaveGroupBy();
   void ShowGroupingManager();
@@ -115,8 +117,8 @@ class CollectionFilterWidget : public QWidget {
   Ui_CollectionFilterWidget *ui_;
   CollectionModel *model_;
 
-  std::unique_ptr<GroupByDialog> group_by_dialog_;
-  std::unique_ptr<SavedGroupingManager> groupings_manager_;
+  GroupByDialog *group_by_dialog_;
+  SavedGroupingManager *groupings_manager_;
 
   QMenu *filter_age_menu_;
   QMenu *group_by_menu_;
@@ -130,6 +132,7 @@ class CollectionFilterWidget : public QWidget {
   DelayBehaviour delay_behaviour_;
 
   QString settings_group_;
+  QString saved_groupings_settings_group_;
   QString settings_prefix_;
 
 };

src/collection/collectionmodel.cpp

@@ -25,6 +25,7 @@
 #include <functional>
 #include <algorithm>
 #include <utility>
+#include <optional>
 
 #include <QObject>
 #include <QtGlobal>
@@ -52,7 +53,6 @@
 #include <QNetworkDiskCache>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/database.h"
@@ -71,7 +71,6 @@
 #include "covermanager/albumcoverloaderresult.h"
 #include "settings/collectionsettingspage.h"
 
-const char *CollectionModel::kSavedGroupingsSettingsGroup = "SavedGroupings";
 const int CollectionModel::kPrettyCoverSize = 32;
 const char *CollectionModel::kPixmapDiskCacheDir = "pixmapcache";
 
@@ -86,6 +85,7 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
       total_song_count_(0),
       total_artist_count_(0),
       total_album_count_(0),
+      separate_albums_by_grouping_(false),
       artist_icon_(IconLoader::Load("folder-sound")),
       album_icon_(IconLoader::Load("cdcase")),
       init_task_id_(-1),
@@ -160,22 +160,6 @@ void CollectionModel::set_show_dividers(const bool show_dividers) {
 
 }
 
-void CollectionModel::SaveGrouping(const QString &name) {
-
-  qLog(Debug) << "Model, save to: " << name;
-
-  QByteArray buffer;
-  QDataStream ds(&buffer, QIODevice::WriteOnly);
-  ds << group_by_;
-
-  QSettings s;
-  s.beginGroup(kSavedGroupingsSettingsGroup);
-  s.setValue("version", "1");
-  s.setValue(name, buffer);
-  s.endGroup();
-
-}
-
 void CollectionModel::ReloadSettings() {
 
   QSettings s;
@@ -239,13 +223,13 @@ void CollectionModel::SongsDiscovered(const SongList &songs) {
     CollectionItem *container = root_;
     QString key;
     for (int i = 0; i < 3; ++i) {
-      GroupBy type = group_by_[i];
-      if (type == GroupBy_None) break;
+      GroupBy group_by = group_by_[i];
+      if (group_by == GroupBy_None) break;
 
       if (!key.isEmpty()) key.append("-");
 
       // Special case: if the song is a compilation and the current GroupBy level is Artists, then we want the Various Artists node :(
-      if (IsArtistGroupBy(type) && song.is_compilation()) {
+      if (IsArtistGroupBy(group_by) && song.is_compilation()) {
         if (container->compilation_artist_node_ == nullptr) {
           CreateCompilationArtistNode(true, container);
         }
@@ -254,7 +238,7 @@ void CollectionModel::SongsDiscovered(const SongList &songs) {
       }
       else {
         // Otherwise find the proper container at this level based on the item's key
-        key.append(ContainerKey(type, song));
+        key.append(ContainerKey(group_by, separate_albums_by_grouping_, song));
 
         // Does it exist already?
         if (container_nodes_[i].contains(key)) {
@@ -262,7 +246,7 @@ void CollectionModel::SongsDiscovered(const SongList &songs) {
         }
         else {
           // Create the container
-          container = ItemFromSong(type, true, i == 0, container, song, i);
+          container = ItemFromSong(group_by, separate_albums_by_grouping_, true, i == 0, container, song, i);
           container_nodes_[i].insert(key, container);
         }
 
@@ -274,7 +258,7 @@ void CollectionModel::SongsDiscovered(const SongList &songs) {
     if (!container->lazy_loaded && use_lazy_loading_) continue;
 
     // We've gone all the way down to the deepest level and everything was already lazy loaded, so now we have to create the song in the container.
-    song_nodes_.insert(song.id(), ItemFromSong(GroupBy_None, true, false, container, song, -1));
+    song_nodes_.insert(song.id(), ItemFromSong(GroupBy_None, separate_albums_by_grouping_, true, false, container, song, -1));
   }
 
 }
@@ -311,11 +295,11 @@ CollectionItem *CollectionModel::CreateCompilationArtistNode(const bool signal,
 
 }
 
-QString CollectionModel::ContainerKey(const GroupBy type, const Song &song) {
+QString CollectionModel::ContainerKey(const GroupBy group_by, const bool separate_albums_by_grouping, const Song &song) {
 
   QString key;
 
-  switch (type) {
+  switch (group_by) {
     case GroupBy_AlbumArtist:
       key = TextOrUnknown(song.effective_albumartist());
       break;
@@ -325,32 +309,32 @@ QString CollectionModel::ContainerKey(const GroupBy type, const Song &song) {
     case GroupBy_Album:
       key = TextOrUnknown(song.album());
       if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (!song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
       break;
     case GroupBy_AlbumDisc:
       key = PrettyAlbumDisc(song.album(), song.disc());
       if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (!song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
       break;
     case GroupBy_YearAlbum:
       key = PrettyYearAlbum(song.year(), song.album());
       if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (!song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
       break;
     case GroupBy_YearAlbumDisc:
       key = PrettyYearAlbumDisc(song.year(), song.album(), song.disc());
       if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (!song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
       break;
     case GroupBy_OriginalYearAlbum:
       key = PrettyYearAlbum(song.effective_originalyear(), song.album());
       if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (!song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
       break;
     case GroupBy_OriginalYearAlbumDisc:
       key = PrettyYearAlbumDisc(song.effective_originalyear(), song.album(), song.disc());
       if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (!song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
       break;
     case GroupBy_Disc:
       key = PrettyDisc(song.disc());
@@ -408,13 +392,13 @@ QString CollectionModel::ContainerKey(const GroupBy type, const Song &song) {
 
 }
 
-QString CollectionModel::DividerKey(const GroupBy type, CollectionItem *item) {
+QString CollectionModel::DividerKey(const GroupBy group_by, CollectionItem *item) {
 
   // Items which are to be grouped under the same divider must produce the same divider key.  This will only get called for top-level items.
 
   if (item->sort_text.isEmpty()) return QString();
 
-  switch (type) {
+  switch (group_by) {
     case GroupBy_AlbumArtist:
     case GroupBy_Artist:
     case GroupBy_Album:
@@ -461,16 +445,16 @@ QString CollectionModel::DividerKey(const GroupBy type, CollectionItem *item) {
     case GroupByCount:
       return QString();
   }
-  qLog(Error) << "Unknown GroupBy type" << type << "for item" << item->display_text;
+  qLog(Error) << "Unknown GroupBy" << group_by << "for item" << item->display_text;
   return QString();
 
 }
 
-QString CollectionModel::DividerDisplayText(const GroupBy type, const QString &key) {
+QString CollectionModel::DividerDisplayText(const GroupBy group_by, const QString &key) {
 
   // Pretty display text for the dividers.
 
-  switch (type) {
+  switch (group_by) {
     case GroupBy_AlbumArtist:
     case GroupBy_Artist:
     case GroupBy_Album:
@@ -511,10 +495,9 @@ QString CollectionModel::DividerDisplayText(const GroupBy type, const QString &k
 
     case GroupBy_None:
     case GroupByCount:
-      // fallthrough
-      ;
+      break;
   }
-  qLog(Error) << "Unknown GroupBy type" << type << "for divider key" << key;
+  qLog(Error) << "Unknown GroupBy" << group_by << "for divider key" << key;
   return QString();
 
 }
@@ -727,8 +710,8 @@ QVariant CollectionModel::data(const QModelIndex &idx, const int role) const {
   if (use_pretty_covers_) {
     bool is_album_node = false;
     if (role == Qt::DecorationRole && item->type == CollectionItem::Type_Container) {
-      GroupBy container_type = group_by_[item->container_level];
-      is_album_node = IsAlbumGroupBy(container_type);
+      GroupBy container_group_by = group_by_[item->container_level];
+      is_album_node = IsAlbumGroupBy(container_group_by);
     }
     if (is_album_node) {
       // It has const behaviour some of the time - that's ok right?
@@ -742,7 +725,7 @@ QVariant CollectionModel::data(const QModelIndex &idx, const int role) const {
 
 QVariant CollectionModel::data(const CollectionItem *item, const int role) const {
 
-  GroupBy container_type = item->type == CollectionItem::Type_Container ? group_by_[item->container_level] : GroupBy_None;
+  GroupBy container_group_by = item->type == CollectionItem::Type_Container ? group_by_[item->container_level] : GroupBy_None;
 
   switch (role) {
     case Qt::DisplayRole:
@@ -752,7 +735,7 @@ QVariant CollectionModel::data(const CollectionItem *item, const int role) const
     case Qt::DecorationRole:
       switch (item->type) {
         case CollectionItem::Type_Container:
-          switch (container_type) {
+          switch (container_group_by) {
             case GroupBy_Album:
             case GroupBy_AlbumDisc:
             case GroupBy_YearAlbum:
@@ -779,7 +762,7 @@ QVariant CollectionModel::data(const CollectionItem *item, const int role) const
       return item->type == CollectionItem::Type_Divider;
 
     case Role_ContainerType:
-      return container_type;
+      return container_group_by;
 
     case Role_Key:
       return item->key;
@@ -850,26 +833,26 @@ CollectionModel::QueryResult CollectionModel::RunQuery(CollectionItem *parent) {
 
   // Information about what we want the children to be
   int child_level = parent == root_ ? 0 : parent->container_level + 1;
-  GroupBy child_type = child_level >= 3 ? GroupBy_None : group_by_[child_level];
+  GroupBy child_group_by = child_level >= 3 ? GroupBy_None : group_by_[child_level];
 
-  // Initialize the query.  child_type says what type of thing we want (artists, songs, etc.)
+  // Initialize the query.  child_group_by says what type of thing we want (artists, songs, etc.)
 
   {
     QMutexLocker l(backend_->db()->Mutex());
     QSqlDatabase db(backend_->db()->Connect());
 
     CollectionQuery q(db, backend_->songs_table(), backend_->fts_table(), query_options_);
-    InitQuery(child_type, &q);
+    InitQuery(child_group_by, separate_albums_by_grouping_, &q);
 
     // Walk up through the item's parents adding filters as necessary
     CollectionItem *p = parent;
     while (p && p->type == CollectionItem::Type_Container) {
-      FilterQuery(group_by_[p->container_level], p, &q);
+      FilterQuery(group_by_[p->container_level], separate_albums_by_grouping_, p, &q);
       p = p->parent;
     }
 
     // Artists GroupBy is special - we don't want compilation albums appearing
-    if (IsArtistGroupBy(child_type)) {
+    if (IsArtistGroupBy(child_group_by)) {
       // Add the special Various artists node
       if (show_various_artists_ && HasCompilations(db, q)) {
         result.create_va = true;
@@ -903,7 +886,7 @@ void CollectionModel::PostQuery(CollectionItem *parent, const CollectionModel::Q
 
   // Information about what we want the children to be
   int child_level = parent == root_ ? 0 : parent->container_level + 1;
-  GroupBy child_type = child_level >= 3 ? GroupBy_None : group_by_[child_level];
+  GroupBy child_group_by = child_level >= 3 ? GroupBy_None : group_by_[child_level];
 
   if (result.create_va && parent->compilation_artist_node_ == nullptr) {
     CreateCompilationArtistNode(signal, parent);
@@ -912,10 +895,10 @@ void CollectionModel::PostQuery(CollectionItem *parent, const CollectionModel::Q
   // Step through the results
   for (const SqlRow &row : result.rows) {
     // Create the item - it will get inserted into the model here
-    CollectionItem *item = ItemFromQuery(child_type, signal, child_level == 0, parent, row, child_level);
+    CollectionItem *item = ItemFromQuery(child_group_by, separate_albums_by_grouping_, signal, child_level == 0, parent, row, child_level);
 
     // Save a pointer to it for later
-    if (child_type == GroupBy_None) {
+    if (child_group_by == GroupBy_None) {
       song_nodes_.insert(item->metadata.id(), item);
     }
     else {
@@ -1003,34 +986,52 @@ void CollectionModel::Reset() {
 
 }
 
-void CollectionModel::InitQuery(const GroupBy type, CollectionQuery *q) {
+void CollectionModel::InitQuery(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionQuery *q) {
 
-  // Say what type of thing we want to get back from the database.
-  switch (type) {
+  // Say what group_by of thing we want to get back from the database.
+  switch (group_by) {
     case GroupBy_AlbumArtist:
       q->SetColumnSpec("DISTINCT effective_albumartist");
       break;
     case GroupBy_Artist:
       q->SetColumnSpec("DISTINCT artist");
       break;
-    case GroupBy_Album:
-      q->SetColumnSpec("DISTINCT album, album_id, grouping");
+    case GroupBy_Album:{
+      QString query("DISTINCT album, album_id");
+      if (separate_albums_by_grouping) query.append(", grouping");
+      q->SetColumnSpec(query);
       break;
-    case GroupBy_AlbumDisc:
-      q->SetColumnSpec("DISTINCT album, album_id, disc, grouping");
+    }
+    case GroupBy_AlbumDisc:{
+      QString query("DISTINCT album, album_id, disc");
+      if (separate_albums_by_grouping) query.append(", grouping");
+      q->SetColumnSpec(query);
       break;
-    case GroupBy_YearAlbum:
-      q->SetColumnSpec("DISTINCT year, album, album_id, grouping");
+    }
+    case GroupBy_YearAlbum:{
+      QString query("DISTINCT year, album, album_id");
+      if (separate_albums_by_grouping) query.append(", grouping");
+      q->SetColumnSpec(query);
       break;
-    case GroupBy_YearAlbumDisc:
-      q->SetColumnSpec("DISTINCT year, album, album_id, disc, grouping");
+    }
+    case GroupBy_YearAlbumDisc:{
+      QString query("DISTINCT year, album, album_id, disc");
+      if (separate_albums_by_grouping) query.append(", grouping");
+      q->SetColumnSpec(query);
       break;
-    case GroupBy_OriginalYearAlbum:
-      q->SetColumnSpec("DISTINCT year, originalyear, album, album_id, grouping");
+    }
+    case GroupBy_OriginalYearAlbum:{
+      QString query("DISTINCT year, originalyear, album, album_id");
+      if (separate_albums_by_grouping) query.append(", grouping");
+      q->SetColumnSpec(query);
       break;
-    case GroupBy_OriginalYearAlbumDisc:
-      q->SetColumnSpec("DISTINCT year, originalyear, album, album_id, disc, grouping");
+    }
+    case GroupBy_OriginalYearAlbumDisc:{
+      QString query("DISTINCT year, originalyear, album, album_id, disc");
+      if (separate_albums_by_grouping) query.append(", grouping");
+      q->SetColumnSpec(query);
       break;
+    }
     case GroupBy_Disc:
       q->SetColumnSpec("DISTINCT disc");
       break;
@@ -1075,11 +1076,11 @@ void CollectionModel::InitQuery(const GroupBy type, CollectionQuery *q) {
 
 }
 
-void CollectionModel::FilterQuery(const GroupBy type, CollectionItem *item, CollectionQuery *q) {
+void CollectionModel::FilterQuery(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionItem *item, CollectionQuery *q) {
 
   // Say how we want the query to be filtered.  This is done once for each parent going up the tree.
 
-  switch (type) {
+  switch (group_by) {
     case GroupBy_AlbumArtist:
       if (IsCompilationArtistNode(item)) {
         q->AddCompilationRequirement(true);
@@ -1103,33 +1104,33 @@ void CollectionModel::FilterQuery(const GroupBy type, CollectionItem *item, Coll
     case GroupBy_Album:
       q->AddWhere("album", item->metadata.album());
       q->AddWhere("album_id", item->metadata.album_id());
-      q->AddWhere("grouping", item->metadata.grouping());
+      if (separate_albums_by_grouping) q->AddWhere("grouping", item->metadata.grouping());
       break;
     case GroupBy_AlbumDisc:
       q->AddWhere("album", item->metadata.album());
       q->AddWhere("album_id", item->metadata.album_id());
       q->AddWhere("disc", item->metadata.disc());
-      q->AddWhere("grouping", item->metadata.grouping());
+      if (separate_albums_by_grouping) q->AddWhere("grouping", item->metadata.grouping());
       break;
     case GroupBy_YearAlbum:
       q->AddWhere("year", item->metadata.year());
       q->AddWhere("album", item->metadata.album());
       q->AddWhere("album_id", item->metadata.album_id());
-      q->AddWhere("grouping", item->metadata.grouping());
+      if (separate_albums_by_grouping) q->AddWhere("grouping", item->metadata.grouping());
       break;
     case GroupBy_YearAlbumDisc:
       q->AddWhere("year", item->metadata.year());
       q->AddWhere("album", item->metadata.album());
       q->AddWhere("album_id", item->metadata.album_id());
       q->AddWhere("disc", item->metadata.disc());
-      q->AddWhere("grouping", item->metadata.grouping());
+      if (separate_albums_by_grouping) q->AddWhere("grouping", item->metadata.grouping());
       break;
     case GroupBy_OriginalYearAlbum:
       q->AddWhere("year", item->metadata.year());
       q->AddWhere("originalyear", item->metadata.originalyear());
       q->AddWhere("album", item->metadata.album());
       q->AddWhere("album_id", item->metadata.album_id());
-      q->AddWhere("grouping", item->metadata.grouping());
+      if (separate_albums_by_grouping) q->AddWhere("grouping", item->metadata.grouping());
       break;
     case GroupBy_OriginalYearAlbumDisc:
       q->AddWhere("year", item->metadata.year());
@@ -1137,7 +1138,7 @@ void CollectionModel::FilterQuery(const GroupBy type, CollectionItem *item, Coll
       q->AddWhere("album", item->metadata.album());
       q->AddWhere("album_id", item->metadata.album_id());
       q->AddWhere("disc", item->metadata.disc());
-      q->AddWhere("grouping", item->metadata.grouping());
+      if (separate_albums_by_grouping) q->AddWhere("grouping", item->metadata.grouping());
       break;
     case GroupBy_Disc:
       q->AddWhere("disc", item->metadata.disc());
@@ -1179,15 +1180,15 @@ void CollectionModel::FilterQuery(const GroupBy type, CollectionItem *item, Coll
       break;
     case GroupBy_None:
     case GroupByCount:
-      qLog(Error) << "Unknown GroupBy type" << type << "used in filter";
+      qLog(Error) << "Unknown GroupBy" << group_by << "used in filter";
       break;
   }
 
 }
 
-CollectionItem *CollectionModel::InitItem(const GroupBy type, const bool signal, CollectionItem *parent, const int container_level) {
+CollectionItem *CollectionModel::InitItem(const GroupBy group_by, const bool signal, CollectionItem *parent, const int container_level) {
 
-  CollectionItem::Type item_type = type == GroupBy_None ? CollectionItem::Type_Song : CollectionItem::Type_Container;
+  CollectionItem::Type item_type = group_by == GroupBy_None ? CollectionItem::Type_Song : CollectionItem::Type_Container;
 
   if (signal) beginInsertRows(ItemToIndex(parent), static_cast<int>(parent->children.count()), static_cast<int>(parent->children.count()));
 
@@ -1200,25 +1201,25 @@ CollectionItem *CollectionModel::InitItem(const GroupBy type, const bool signal,
 
 }
 
-CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, const SqlRow &row, const int container_level) {
+CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const bool separate_albums_by_grouping, const bool signal, const bool create_divider, CollectionItem *parent, const SqlRow &row, const int container_level) {
 
-  CollectionItem *item = InitItem(type, signal, parent, container_level);
+  CollectionItem *item = InitItem(group_by, signal, parent, container_level);
 
   if (parent != root_ && !parent->key.isEmpty()) {
     item->key = parent->key + "-";
   }
 
-  switch (type) {
+  switch (group_by) {
     case GroupBy_AlbumArtist:{
       item->metadata.set_albumartist(row.value(0).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.albumartist());
       item->sort_text = SortTextForArtist(item->metadata.albumartist());
       break;
     }
     case GroupBy_Artist:{
       item->metadata.set_artist(row.value(0).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.artist());
       item->sort_text = SortTextForArtist(item->metadata.artist());
       break;
@@ -1227,7 +1228,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
       item->metadata.set_album(row.value(0).toString());
       item->metadata.set_album_id(row.value(1).toString());
       item->metadata.set_grouping(row.value(2).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.album());
       item->sort_text = SortTextForArtist(item->metadata.album());
       break;
@@ -1237,7 +1238,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
       item->metadata.set_album_id(row.value(1).toString());
       item->metadata.set_disc(row.value(2).toInt());
       item->metadata.set_grouping(row.value(3).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyAlbumDisc(item->metadata.album(), item->metadata.disc());
       item->sort_text = item->metadata.album() + SortTextForNumber(qMax(0, item->metadata.disc()));
       break;
@@ -1247,7 +1248,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
       item->metadata.set_album(row.value(1).toString());
       item->metadata.set_album_id(row.value(2).toString());
       item->metadata.set_grouping(row.value(3).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbum(item->metadata.year(), item->metadata.album());
       item->sort_text = SortTextForNumber(qMax(0, item->metadata.year())) + item->metadata.grouping() + item->metadata.album();
       break;
@@ -1258,7 +1259,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
       item->metadata.set_album_id(row.value(2).toString());
       item->metadata.set_disc(row.value(3).toInt());
       item->metadata.set_grouping(row.value(4).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbumDisc(item->metadata.year(), item->metadata.album(), item->metadata.disc());
       item->sort_text = SortTextForNumber(qMax(0, item->metadata.year())) + item->metadata.album() + SortTextForNumber(qMax(0, item->metadata.disc()));
       break;
@@ -1269,7 +1270,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
       item->metadata.set_album(row.value(2).toString());
       item->metadata.set_album_id(row.value(3).toString());
       item->metadata.set_grouping(row.value(4).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbum(item->metadata.effective_originalyear(), item->metadata.album());
       item->sort_text = SortTextForNumber(qMax(0, item->metadata.effective_originalyear())) + item->metadata.grouping() + item->metadata.album();
       break;
@@ -1281,14 +1282,14 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
       item->metadata.set_album_id(row.value(3).toString());
       item->metadata.set_disc(row.value(4).toInt());
       item->metadata.set_grouping(row.value(5).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbumDisc(item->metadata.effective_originalyear(), item->metadata.album(), item->metadata.disc());
       item->sort_text = SortTextForNumber(qMax(0, item->metadata.effective_originalyear())) + item->metadata.album() + SortTextForNumber(qMax(0, item->metadata.disc()));
       break;
     }
     case GroupBy_Disc:{
       item->metadata.set_disc(row.value(0).toInt());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int disc = qMax(0, row.value(0).toInt());
       item->display_text = PrettyDisc(disc);
       item->sort_text = SortTextForNumber(disc);
@@ -1296,7 +1297,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
     }
     case GroupBy_Year:{
       item->metadata.set_year(row.value(0).toInt());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int year = qMax(0, item->metadata.year());
       item->display_text = QString::number(year);
       item->sort_text = SortTextForNumber(year) + " ";
@@ -1304,7 +1305,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
     }
     case GroupBy_OriginalYear:{
       item->metadata.set_originalyear(row.value(0).toInt());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int year = qMax(0, item->metadata.originalyear());
       item->display_text = QString::number(year);
       item->sort_text = SortTextForNumber(year) + " ";
@@ -1312,44 +1313,44 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
     }
     case GroupBy_Genre:{
       item->metadata.set_genre(row.value(0).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.genre());
       item->sort_text = SortTextForArtist(item->metadata.genre());
       break;
     }
     case GroupBy_Composer:{
       item->metadata.set_composer(row.value(0).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.composer());
       item->sort_text = SortTextForArtist(item->metadata.composer());
       break;
     }
     case GroupBy_Performer:{
       item->metadata.set_performer(row.value(0).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.performer());
       item->sort_text = SortTextForArtist(item->metadata.performer());
       break;
     }
     case GroupBy_Grouping:{
       item->metadata.set_grouping(row.value(0).toString());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.grouping());
       item->sort_text = SortTextForArtist(item->metadata.grouping());
       break;
     }
     case GroupBy_FileType:{
-      item->metadata.set_filetype(Song::FileType(row.value(0).toInt()));
-      item->key.append(ContainerKey(type, item->metadata));
+      item->metadata.set_filetype(static_cast<Song::FileType>(row.value(0).toInt()));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = item->metadata.TextForFiletype();
       item->sort_text = item->metadata.TextForFiletype();
       break;
     }
     case GroupBy_Format:{
-      item->metadata.set_filetype(Song::FileType(row.value(0).toInt()));
+      item->metadata.set_filetype(static_cast<Song::FileType>(row.value(0).toInt()));
       item->metadata.set_samplerate(row.value(1).toInt());
       item->metadata.set_bitdepth(row.value(2).toInt());
-      QString key = ContainerKey(type, item->metadata);
+      QString key = ContainerKey(group_by, separate_albums_by_grouping, item->metadata);
       item->key.append(key);
       item->display_text = key;
       item->sort_text = key;
@@ -1357,7 +1358,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
     }
     case GroupBy_Samplerate:{
       item->metadata.set_samplerate(row.value(0).toInt());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int samplerate = qMax(0, item->metadata.samplerate());
       item->display_text = QString::number(samplerate);
       item->sort_text = SortTextForNumber(samplerate) + " ";
@@ -1365,7 +1366,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
     }
     case GroupBy_Bitdepth:{
       item->metadata.set_bitdepth(row.value(0).toInt());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int bitdepth = qMax(0, item->metadata.bitdepth());
       item->display_text = QString::number(bitdepth);
       item->sort_text = SortTextForNumber(bitdepth) + " ";
@@ -1373,7 +1374,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
     }
     case GroupBy_Bitrate:{
       item->metadata.set_bitrate(row.value(0).toInt());
-      item->key.append(ContainerKey(type, item->metadata));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int bitrate = qMax(0, item->metadata.bitrate());
       item->display_text = QString::number(bitrate);
       item->sort_text = SortTextForNumber(bitrate) + " ";
@@ -1393,31 +1394,31 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
       break;
   }
 
-  FinishItem(type, signal, create_divider, parent, item);
+  FinishItem(group_by, signal, create_divider, parent, item);
 
   return item;
 
 }
 
-CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, const Song &s, const int container_level) {
+CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool separate_albums_by_grouping, const bool signal, const bool create_divider, CollectionItem *parent, const Song &s, const int container_level) {
 
-  CollectionItem *item = InitItem(type, signal, parent, container_level);
+  CollectionItem *item = InitItem(group_by, signal, parent, container_level);
 
   if (parent != root_ && !parent->key.isEmpty()) {
     item->key = parent->key + "-";
   }
 
-  switch (type) {
+  switch (group_by) {
     case GroupBy_AlbumArtist:{
       item->metadata.set_albumartist(s.effective_albumartist());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.effective_albumartist());
       item->sort_text = SortTextForArtist(s.effective_albumartist());
       break;
     }
     case GroupBy_Artist:{
       item->metadata.set_artist(s.artist());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.artist());
       item->sort_text = SortTextForArtist(s.artist());
       break;
@@ -1426,7 +1427,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
       item->metadata.set_album(s.album());
       item->metadata.set_album_id(s.album_id());
       item->metadata.set_grouping(s.grouping());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.album());
       item->sort_text = SortTextForArtist(s.album());
       break;
@@ -1436,7 +1437,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
       item->metadata.set_album_id(s.album_id());
       item->metadata.set_disc(s.disc());
       item->metadata.set_grouping(s.grouping());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = PrettyAlbumDisc(s.album(), s.disc());
       item->sort_text = s.album() + SortTextForNumber(qMax(0, s.disc()));
       break;
@@ -1446,7 +1447,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
       item->metadata.set_album(s.album());
       item->metadata.set_album_id(s.album_id());
       item->metadata.set_grouping(s.grouping());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = PrettyYearAlbum(s.year(), s.album());
       item->sort_text = SortTextForNumber(qMax(0, s.year())) + s.grouping() + s.album();
       break;
@@ -1457,7 +1458,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
       item->metadata.set_album_id(s.album_id());
       item->metadata.set_disc(s.disc());
       item->metadata.set_grouping(s.grouping());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = PrettyYearAlbumDisc(s.year(), s.album(), s.disc());
       item->sort_text = SortTextForNumber(qMax(0, s.year())) + s.album() + SortTextForNumber(qMax(0, s.disc()));
       break;
@@ -1468,7 +1469,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
       item->metadata.set_album(s.album());
       item->metadata.set_album_id(s.album_id());
       item->metadata.set_grouping(s.grouping());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = PrettyYearAlbum(s.effective_originalyear(), s.album());
       item->sort_text = SortTextForNumber(qMax(0, s.effective_originalyear())) + s.grouping() + s.album();
       break;
@@ -1480,14 +1481,14 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
       item->metadata.set_album_id(s.album_id());
       item->metadata.set_disc(s.disc());
       item->metadata.set_grouping(s.grouping());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = PrettyYearAlbumDisc(s.effective_originalyear(), s.album(), s.disc());
       item->sort_text = SortTextForNumber(qMax(0, s.effective_originalyear())) + s.album() + SortTextForNumber(qMax(0, s.disc()));
       break;
     }
     case GroupBy_Disc:{
       item->metadata.set_disc(s.disc());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int disc = qMax(0, s.disc());
       item->display_text = PrettyDisc(disc);
       item->sort_text = SortTextForNumber(disc);
@@ -1495,7 +1496,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
     }
     case GroupBy_Year:{
       item->metadata.set_year(s.year());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int year = qMax(0, s.year());
       item->display_text = QString::number(year);
       item->sort_text = SortTextForNumber(year) + " ";
@@ -1503,7 +1504,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
     }
     case GroupBy_OriginalYear:{
       item->metadata.set_originalyear(s.effective_originalyear());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int year = qMax(0, s.effective_originalyear());
       item->display_text = QString::number(year);
       item->sort_text = SortTextForNumber(year) + " ";
@@ -1511,35 +1512,35 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
     }
     case GroupBy_Genre:{
       item->metadata.set_genre(s.genre());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.genre());
       item->sort_text = SortTextForArtist(s.genre());
       break;
     }
     case GroupBy_Composer:{
       item->metadata.set_composer(s.composer());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.composer());
       item->sort_text = SortTextForArtist(s.composer());
       break;
     }
     case GroupBy_Performer:{
       item->metadata.set_performer(s.performer());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.performer());
       item->sort_text = SortTextForArtist(s.performer());
       break;
     }
     case GroupBy_Grouping:{
       item->metadata.set_grouping(s.grouping());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.grouping());
       item->sort_text = SortTextForArtist(s.grouping());
       break;
     }
     case GroupBy_FileType:{
       item->metadata.set_filetype(s.filetype());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = s.TextForFiletype();
       item->sort_text = s.TextForFiletype();
       break;
@@ -1548,7 +1549,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
       item->metadata.set_filetype(s.filetype());
       item->metadata.set_samplerate(s.samplerate());
       item->metadata.set_bitdepth(s.bitdepth());
-      QString key = ContainerKey(type, s);
+      QString key = ContainerKey(group_by, separate_albums_by_grouping, s);
       item->key.append(key);
       item->display_text = key;
       item->sort_text = key;
@@ -1556,7 +1557,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
     }
     case GroupBy_Samplerate:{
       item->metadata.set_samplerate(s.samplerate());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int samplerate = qMax(0, s.samplerate());
       item->display_text = QString::number(samplerate);
       item->sort_text = SortTextForNumber(samplerate) + " ";
@@ -1564,7 +1565,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
     }
     case GroupBy_Bitdepth:{
       item->metadata.set_bitdepth(s.bitdepth());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int bitdepth = qMax(0, s.bitdepth());
       item->display_text = QString::number(bitdepth);
       item->sort_text = SortTextForNumber(bitdepth) + " ";
@@ -1572,7 +1573,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
     }
     case GroupBy_Bitrate:{
       item->metadata.set_bitrate(s.bitrate());
-      item->key.append(ContainerKey(type, s));
+      item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int bitrate = qMax(0, s.bitrate());
       item->display_text = QString::number(bitrate);
       item->sort_text = SortTextForNumber(bitrate) + " ";
@@ -1593,16 +1594,16 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy type, const bool sig
     }
   }
 
-  FinishItem(type, signal, create_divider, parent, item);
+  FinishItem(group_by, signal, create_divider, parent, item);
   if (s.url().scheme() == "cdda") item->lazy_loaded = true;
 
   return item;
 
 }
 
-void CollectionModel::FinishItem(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, CollectionItem *item) {
+void CollectionModel::FinishItem(const GroupBy group_by, const bool signal, const bool create_divider, CollectionItem *parent, CollectionItem *item) {
 
-  if (type == GroupBy_None) item->lazy_loaded = true;
+  if (group_by == GroupBy_None) item->lazy_loaded = true;
 
   if (signal) {
     endInsertRows();
@@ -1610,7 +1611,7 @@ void CollectionModel::FinishItem(const GroupBy type, const bool signal, const bo
 
   // Create the divider entry if we're supposed to
   if (create_divider && show_dividers_) {
-    QString divider_key = DividerKey(type, item);
+    QString divider_key = DividerKey(group_by, item);
     if (!divider_key.isEmpty()) {
       item->sort_text.prepend(divider_key + " ");
     }
@@ -1622,7 +1623,7 @@ void CollectionModel::FinishItem(const GroupBy type, const bool signal, const bo
 
       CollectionItem *divider = new CollectionItem(CollectionItem::Type_Divider, root_);
       divider->key = divider_key;
-      divider->display_text = DividerDisplayText(type, divider_key);
+      divider->display_text = DividerDisplayText(group_by, divider_key);
       divider->sort_text = divider_key + "  ";
       divider->lazy_loaded = true;
 
@@ -1876,12 +1877,15 @@ bool CollectionModel::canFetchMore(const QModelIndex &parent) const {
 
 }
 
-void CollectionModel::SetGroupBy(const Grouping g) {
+void CollectionModel::SetGroupBy(const Grouping g, const std::optional<bool> separate_albums_by_grouping) {
 
   group_by_ = g;
+  if (separate_albums_by_grouping) {
+    separate_albums_by_grouping_ = separate_albums_by_grouping.value();
+  }
 
   ResetAsync();
-  emit GroupingChanged(g);
+  emit GroupingChanged(g, separate_albums_by_grouping_);
 
 }
 
@@ -1949,7 +1953,7 @@ void CollectionModel::ExpandAll(CollectionItem *item) const {
 }
 
 QDataStream &operator<<(QDataStream &s, const CollectionModel::Grouping g) {
-  s << quint32(g.first) << quint32(g.second) << quint32(g.third);
+  s << static_cast<quint32>(g.first) << static_cast<quint32>(g.second) << static_cast<quint32>(g.third);
   return s;
 }
 
@@ -1957,11 +1961,11 @@ QDataStream &operator>>(QDataStream &s, CollectionModel::Grouping &g) {
 
   quint32 buf = 0;
   s >> buf;
-  g.first = CollectionModel::GroupBy(buf);
+  g.first = static_cast<CollectionModel::GroupBy>(buf);
   s >> buf;
-  g.second = CollectionModel::GroupBy(buf);
+  g.second = static_cast<CollectionModel::GroupBy>(buf);
   s >> buf;
-  g.third = CollectionModel::GroupBy(buf);
+  g.third = static_cast<CollectionModel::GroupBy>(buf);
   return s;
 
 }

src/collection/collectionmodel.h

@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include <optional>
+
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
@@ -64,8 +66,6 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   explicit CollectionModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr);
   ~CollectionModel() override;
 
-  static const char *kSavedGroupingsSettingsGroup;
-
   static const int kPrettyCoverSize;
   static const char *kPixmapDiskCacheDir;
 
@@ -160,9 +160,6 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   // Whether or not to show letters heading in the collection view
   void set_show_dividers(const bool show_dividers);
 
-  // Save the current grouping
-  void SaveGrouping(const QString &name);
-
   // Reload settings.
   void ReloadSettings();
 
@@ -195,15 +192,15 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   void ExpandAll(CollectionItem *item = nullptr) const;
 
   const CollectionModel::Grouping GetGroupBy() const { return group_by_; }
-  void SetGroupBy(const CollectionModel::Grouping g);
+  void SetGroupBy(const CollectionModel::Grouping g, const std::optional<bool> separate_albums_by_grouping = std::optional<bool>());
 
-  static QString ContainerKey(const GroupBy type, const Song &song);
+  static QString ContainerKey(const GroupBy group_by, const bool separate_albums_by_grouping, const Song &song);
 
  signals:
   void TotalSongCountUpdated(int count);
   void TotalArtistCountUpdated(int count);
   void TotalAlbumCountUpdated(int count);
-  void GroupingChanged(CollectionModel::Grouping g);
+  void GroupingChanged(CollectionModel::Grouping g, bool separate_albums_by_grouping);
 
  public slots:
   void SetFilterAge(const int age);
@@ -247,22 +244,22 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   // Functions for working with queries and creating items.
   // When the model is reset or when a node is lazy-loaded the Collection constructs a database query to populate the items.
   // Filters are added for each parent item, restricting the songs returned to a particular album or artist for example.
-  static void InitQuery(const GroupBy type, CollectionQuery *q);
-  static void FilterQuery(const GroupBy type, CollectionItem *item, CollectionQuery *q);
+  static void InitQuery(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionQuery *q);
+  static void FilterQuery(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionItem *item, CollectionQuery *q);
 
   // Items can be created either from a query that's been run to populate a node, or by a spontaneous SongsDiscovered emission from the backend.
-  CollectionItem *ItemFromQuery(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, const SqlRow &row, const int container_level);
-  CollectionItem *ItemFromSong(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, const Song &s, const int container_level);
+  CollectionItem *ItemFromQuery(const GroupBy group_by, const bool separate_albums_by_grouping, const bool signal, const bool create_divider, CollectionItem *parent, const SqlRow &row, const int container_level);
+  CollectionItem *ItemFromSong(const GroupBy group_by, const bool separate_albums_by_grouping, const bool signal, const bool create_divider, CollectionItem *parent, const Song &s, const int container_level);
 
   // The "Various Artists" node is an annoying special case.
   CollectionItem *CreateCompilationArtistNode(const bool signal, CollectionItem *parent);
 
   // Helpers for ItemFromQuery and ItemFromSong
-  CollectionItem *InitItem(const GroupBy type, const bool signal, CollectionItem *parent, const int container_level);
-  void FinishItem(const GroupBy type, const bool signal, const bool create_divider, CollectionItem *parent, CollectionItem *item);
+  CollectionItem *InitItem(const GroupBy group_by, const bool signal, CollectionItem *parent, const int container_level);
+  void FinishItem(const GroupBy group_by, const bool signal, const bool create_divider, CollectionItem *parent, CollectionItem *item);
 
-  static QString DividerKey(const GroupBy type, CollectionItem *item);
-  static QString DividerDisplayText(const GroupBy type, const QString &key);
+  static QString DividerKey(const GroupBy group_by, CollectionItem *item);
+  static QString DividerDisplayText(const GroupBy group_by, const QString &key);
 
   // Helpers
   static bool IsCompilationArtistNode(const CollectionItem *node) { return node == node->parent->compilation_artist_node_; }
@@ -284,6 +281,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
 
   QueryOptions query_options_;
   Grouping group_by_;
+  bool separate_albums_by_grouping_;
 
   // Keyed on database ID
   QMap<int, CollectionItem*> song_nodes_;

src/collection/collectionwatcher.cpp

@@ -38,13 +38,11 @@
 #include <QList>
 #include <QSet>
 #include <QTimer>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/filesystemwatcherinterface.h"
 #include "core/logging.h"
@@ -444,7 +442,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
   QStringList files_on_disk;
   SubdirectoryList my_new_subdirs;
 
-  // If a directory is moved then only its parent gets a changed notification, so we need to look and see if any of our children don't exist any more.
+  // If a directory is moved then only its parent gets a changed notification, so we need to look and see if any of our children don't exist anymore.
   // If one has been removed, "rescan" it to get the deleted songs
   SubdirectoryList previous_subdirs = t->GetImmediateSubdirs(path);
   for (const Subdirectory &prev_subdir : previous_subdirs) {
@@ -464,7 +462,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
 
     if (child_info.isDir()) {
       if (!t->HasSeenSubdir(child)) {
-        // We haven't seen this subdirectory before - add it to a list and later we'll tell the backend about it and scan it.
+        // We haven't seen this subdirectory before - add it to a list, and later we'll tell the backend about it and scan it.
         Subdirectory new_subdir;
         new_subdir.directory_id = -1;
         new_subdir.path = child;
@@ -761,7 +759,7 @@ void CollectionWatcher::UpdateNonCueAssociatedSong(const QString &file,
                                                    const bool cue_deleted,
                                                    ScanTransaction *t) {
 
-  // If a CUE got deleted, we turn it's first section into the new 'raw' (cueless) song and we just remove the rest of the sections from the collection
+  // If a CUE got deleted, we turn it's first section into the new 'raw' (cueless) song, and we just remove the rest of the sections from the collection
   const Song &matching_song = matching_songs.first();
   if (cue_deleted) {
     for (const Song &song : matching_songs) {
@@ -805,7 +803,7 @@ SongList CollectionWatcher::ScanNewFile(const QString &file, const QString &path
 
     // Ignore FILEs pointing to other media files.
     // 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!
+    // 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);
     cue_file.close();

src/collection/groupbydialog.cpp

@@ -108,22 +108,31 @@ GroupByDialog::GroupByDialog(QWidget *parent) : QDialog(parent), ui_(new Ui_Grou
 GroupByDialog::~GroupByDialog() = default;
 
 void GroupByDialog::Reset() {
+
   ui_->combobox_first->setCurrentIndex(2);   // Album Artist
-  ui_->combobox_second->setCurrentIndex(3);  // Album
+  ui_->combobox_second->setCurrentIndex(4);  // Album Disc
   ui_->combobox_third->setCurrentIndex(0);   // None
+  ui_->checkbox_separate_albums_by_grouping->setChecked(false);
+
 }
 
 void GroupByDialog::accept() {
+
   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)
+      p_->mapping_.get<tag_index>().find(ui_->combobox_third->currentIndex())->group_by),
+    ui_->checkbox_separate_albums_by_grouping->isChecked()
    );
   QDialog::accept();
+
 }
 
-void GroupByDialog::CollectionGroupingChanged(const CollectionModel::Grouping g) {
+void GroupByDialog::CollectionGroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping) {
+
   ui_->combobox_first->setCurrentIndex(p_->mapping_.get<tag_group_by>().find(g[0])->combo_box_index);
   ui_->combobox_second->setCurrentIndex(p_->mapping_.get<tag_group_by>().find(g[1])->combo_box_index);
   ui_->combobox_third->setCurrentIndex(p_->mapping_.get<tag_group_by>().find(g[2])->combo_box_index);
+  ui_->checkbox_separate_albums_by_grouping->setChecked(separate_albums_by_grouping);
+
 }

src/collection/groupbydialog.h

@@ -45,11 +45,11 @@ class GroupByDialog : public QDialog {
   ~GroupByDialog() override;
 
  public slots:
-  void CollectionGroupingChanged(const CollectionModel::Grouping g);
+  void CollectionGroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping);
   void accept() override;
 
  signals:
-  void Accepted(CollectionModel::Grouping g);
+  void Accepted(CollectionModel::Grouping g, bool separate_albums_by_grouping);
 
  private slots:
   void Reset();

src/collection/groupbydialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>354</width>
-    <height>246</height>
+    <width>394</width>
+    <height>273</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -370,6 +370,13 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="checkbox_separate_albums_by_grouping">
+     <property name="text">
+      <string>Separate albums by grouping tag</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="spacer_bottom">
      <property name="orientation">

src/collection/savedgroupingmanager.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2015, Nick Lanham <nick@afternight.org>
- * Copyright 2019-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2019-2022, 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,35 +22,31 @@
 #include "config.h"
 
 #include <QDialog>
-#include <QWidget>
 #include <QStandardItemModel>
 #include <QItemSelectionModel>
-#include <QAbstractItemModel>
-#include <QIODevice>
-#include <QDataStream>
-#include <QByteArray>
 #include <QList>
-#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
+#include <QIODevice>
+#include <QDataStream>
 #include <QKeySequence>
 #include <QPushButton>
-#include <QTreeView>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/iconloader.h"
-#include "collectionfilterwidget.h"
 #include "collectionmodel.h"
 #include "savedgroupingmanager.h"
 #include "ui_savedgroupingmanager.h"
 
-SavedGroupingManager::SavedGroupingManager(QWidget *parent)
+const char *SavedGroupingManager::kSavedGroupingsSettingsGroup = "SavedGroupings";
+
+SavedGroupingManager::SavedGroupingManager(const QString &saved_groupings_settings_group, QWidget *parent)
     : QDialog(parent),
       ui_(new Ui_SavedGroupingManager),
       model_(new QStandardItemModel(0, 4, this)),
-      filter_(nullptr) {
+      saved_groupings_settings_group_(saved_groupings_settings_group) {
 
   ui_->setupUi(this);
 
@@ -71,7 +67,17 @@ SavedGroupingManager::SavedGroupingManager(QWidget *parent)
 
 SavedGroupingManager::~SavedGroupingManager() {
   delete ui_;
-  delete model_;
+}
+
+QString SavedGroupingManager::GetSavedGroupingsSettingsGroup(const QString &settings_group) {
+
+  if (settings_group.isEmpty() || settings_group == CollectionSettingsPage::kSettingsGroup) {
+    return kSavedGroupingsSettingsGroup;
+  }
+  else {
+    return QString(kSavedGroupingsSettingsGroup) + "_" + settings_group;
+  }
+
 }
 
 QString SavedGroupingManager::GroupByToString(const CollectionModel::GroupBy g) {
@@ -151,7 +157,7 @@ void SavedGroupingManager::UpdateModel() {
 
   model_->setRowCount(0);  // don't use clear, it deletes headers
   QSettings s;
-  s.beginGroup(CollectionModel::kSavedGroupingsSettingsGroup);
+  s.beginGroup(saved_groupings_settings_group_);
   int version = s.value("version").toInt();
   if (version == 1) {
     QStringList saved = s.childKeys();
@@ -186,7 +192,7 @@ void SavedGroupingManager::Remove() {
 
   if (ui_->list->selectionModel()->hasSelection()) {
     QSettings s;
-    s.beginGroup(CollectionModel::kSavedGroupingsSettingsGroup);
+    s.beginGroup(saved_groupings_settings_group_);
     for (const QModelIndex &idx : ui_->list->selectionModel()->selectedRows()) {
       if (idx.isValid()) {
         qLog(Debug) << "Remove saved grouping: " << model_->item(idx.row(), 0)->text();
@@ -196,7 +202,8 @@ void SavedGroupingManager::Remove() {
     s.endGroup();
   }
   UpdateModel();
-  filter_->UpdateGroupByActions();
+
+  emit UpdateGroupByActions();
 
 }
 

src/collection/savedgroupingmanager.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2015, Nick Lanham <nick@afternight.org>
- * Copyright 2019-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2019-2022, 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
@@ -40,14 +40,20 @@ class SavedGroupingManager : public QDialog {
   Q_OBJECT
 
  public:
-  explicit SavedGroupingManager(QWidget *parent = nullptr);
+  explicit SavedGroupingManager(const QString &saved_groupings_settings_group, QWidget *parent = nullptr);
   ~SavedGroupingManager() override;
 
+  static const char *kSavedGroupingsSettingsGroup;
+
+  static QString GetSavedGroupingsSettingsGroup(const QString &settings_group);
+
   void UpdateModel();
-  void SetFilter(CollectionFilterWidget *filter) { filter_ = filter; }
 
   static QString GroupByToString(const CollectionModel::GroupBy g);
 
+  signals:
+   void UpdateGroupByActions();
+
  private slots:
   void UpdateButtonState();
   void Remove();
@@ -55,7 +61,7 @@ class SavedGroupingManager : public QDialog {
  private:
   Ui_SavedGroupingManager *ui_;
   QStandardItemModel *model_;
-  CollectionFilterWidget *filter_;
+  QString saved_groupings_settings_group_;
 };
 
 #endif  // SAVEDGROUPINGMANAGER_H

src/config.h.in

@@ -21,6 +21,8 @@
 #cmakedefine HAVE_MUSICBRAINZ
 #cmakedefine HAVE_GLOBALSHORTCUTS
 #cmakedefine HAVE_X11_GLOBALSHORTCUTS
+#cmakedefine HAVE_ICU
+
 #cmakedefine USE_INSTALL_PREFIX
 
 #cmakedefine HAVE_GSTREAMER

src/context/contextalbum.cpp

@@ -179,7 +179,7 @@ void ContextAlbum::SetImage(QImage image) {
 
 void ContextAlbum::DrawImage(QPainter *p, const QPixmap &pixmap, const qreal opacity) {
 
-  if (qFuzzyCompare(opacity, qreal(0.0))) return;
+  if (qFuzzyCompare(opacity, static_cast<qreal>(0.0))) return;
 
   p->setOpacity(opacity);
   p->drawPixmap(0, 0, pixmap.width(), pixmap.height(), pixmap);

src/core/appearance.cpp

@@ -22,7 +22,6 @@
 
 #include <QApplication>
 #include <QObject>
-#include <QVariant>
 #include <QPalette>
 #include <QColor>
 #include <QSettings>

src/core/application.cpp

@@ -29,12 +29,10 @@
 
 #include <QObject>
 #include <QThread>
-#include <QVariant>
 #include <QString>
 
 #include "core/lazy.h"
 #include "core/tagreaderclient.h"
-#include "core/song.h"
 #include "core/logging.h"
 
 #include "database.h"
@@ -99,33 +97,33 @@ using namespace std::chrono_literals;
 class ApplicationImpl {
  public:
   explicit ApplicationImpl(Application *app) :
-       tag_reader_client_([=]() {
+       tag_reader_client_([app]() {
           TagReaderClient *client = new TagReaderClient(app);
           app->MoveToNewThread(client);
           client->Start();
           return client;
         }),
-        database_([=]() {
+        database_([app]() {
           Database *db = new Database(app, app);
           app->MoveToNewThread(db);
           QTimer::singleShot(30s, db, &Database::DoBackup);
           return db;
         }),
-        appearance_([=]() { return new Appearance(app); }),
-        task_manager_([=]() { return new TaskManager(app); }),
-        player_([=]() { return new Player(app, app); }),
-        device_finders_([=]() { return new DeviceFinders(app); }),
+        appearance_([app]() { return new Appearance(app); }),
+        task_manager_([app]() { return new TaskManager(app); }),
+        player_([app]() { return new Player(app, app); }),
+        device_finders_([app]() { return new DeviceFinders(app); }),
 #ifndef Q_OS_WIN
-        device_manager_([=]() { return new DeviceManager(app, app); }),
+        device_manager_([app]() { return new DeviceManager(app, app); }),
 #endif
-        collection_([=]() { return new SCollection(app, app); }),
-        playlist_backend_([=]() {
+        collection_([app]() { return new SCollection(app, app); }),
+        playlist_backend_([this, app]() {
           PlaylistBackend *backend = new PlaylistBackend(app, app);
           app->MoveToThread(backend, database_->thread());
           return backend;
         }),
-        playlist_manager_([=]() { return new PlaylistManager(app); }),
-        cover_providers_([=]() {
+        playlist_manager_([app]() { return new PlaylistManager(app); }),
+        cover_providers_([app]() {
           CoverProviders *cover_providers = new CoverProviders(app);
           // Initialize the repository of cover providers.
           cover_providers->AddProvider(new LastFmCoverProvider(app, cover_providers->network(), app));
@@ -143,13 +141,13 @@ class ApplicationImpl {
           cover_providers->ReloadSettings();
           return cover_providers;
         }),
-        album_cover_loader_([=]() {
+        album_cover_loader_([app]() {
           AlbumCoverLoader *loader = new AlbumCoverLoader(app);
           app->MoveToNewThread(loader);
           return loader;
         }),
-        current_albumcover_loader_([=]() { return new CurrentAlbumCoverLoader(app, app); }),
-        lyrics_providers_([=]() {
+        current_albumcover_loader_([app]() { return new CurrentAlbumCoverLoader(app, app); }),
+        lyrics_providers_([app]() {
           LyricsProviders *lyrics_providers = new LyricsProviders(app);
           // Initialize the repository of lyrics providers.
           lyrics_providers->AddProvider(new AuddLyricsProvider(lyrics_providers->network(), app));
@@ -161,7 +159,7 @@ class ApplicationImpl {
           lyrics_providers->ReloadSettings();
           return lyrics_providers;
         }),
-        internet_services_([=]() {
+        internet_services_([app]() {
           InternetServices *internet_services = new InternetServices(app);
 #ifdef HAVE_SUBSONIC
           internet_services->AddService(new SubsonicService(app, internet_services));
@@ -174,13 +172,13 @@ class ApplicationImpl {
 #endif
           return internet_services;
         }),
-        radio_services_([=]() { return new RadioServices(app, app); }),
-        scrobbler_([=]() { return new AudioScrobbler(app, app); }),
+        radio_services_([app]() { return new RadioServices(app, app); }),
+        scrobbler_([app]() { return new AudioScrobbler(app, app); }),
 #ifdef HAVE_MOODBAR
-        moodbar_loader_([=]() { return new MoodbarLoader(app, app); }),
-        moodbar_controller_([=]() { return new MoodbarController(app, app); }),
+        moodbar_loader_([app]() { return new MoodbarLoader(app, app); }),
+        moodbar_controller_([app]() { return new MoodbarController(app, app); }),
 #endif
-        lastfm_import_([=]() { return new LastFMImport(app); })
+        lastfm_import_([app]() { return new LastFMImport(app); })
   {}
 
   Lazy<TagReaderClient> tag_reader_client_;

src/core/commandlineoptions.cpp

@@ -24,7 +24,6 @@
 #include <cstdlib>
 #include <getopt.h>
 #include <iostream>
-#include <type_traits>
 
 #include <QtGlobal>
 #include <QObject>
@@ -369,8 +368,8 @@ QString CommandlineOptions::tr(const char *source_text) {
 
 QDataStream &operator<<(QDataStream &s, const CommandlineOptions &a) {
 
-  s << qint32(a.player_action_)
-    << qint32(a.url_list_action_)
+  s << static_cast<quint32>(a.player_action_)
+    << static_cast<quint32>(a.url_list_action_)
     << a.set_volume_
     << a.volume_modifier_
     << a.seek_to_
@@ -406,8 +405,8 @@ QDataStream &operator>>(QDataStream &s, CommandlineOptions &a) {
     >> a.playlist_name_
     >> a.window_size_;
 
-  a.player_action_ = CommandlineOptions::PlayerAction(player_action);
-  a.url_list_action_ = CommandlineOptions::UrlListAction(url_list_action);
+  a.player_action_ = static_cast<CommandlineOptions::PlayerAction>(player_action);
+  a.url_list_action_ = static_cast<CommandlineOptions::UrlListAction>(url_list_action);
 
   return s;
 

src/core/database.cpp

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <cstddef>
 #include <sqlite3.h>
 #include <boost/scope_exit.hpp>
 
@@ -31,20 +30,15 @@
 #include <QIODevice>
 #include <QDir>
 #include <QFile>
-#include <QList>
 #include <QByteArray>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QUrl>
 #include <QSqlDriver>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 #include <QSqlError>
 #include <QStandardPaths>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "taskmanager.h"
@@ -55,6 +49,7 @@
 
 const char *Database::kDatabaseFilename = "strawberry.db";
 const int Database::kSchemaVersion = 15;
+const int Database::kMinSupportedSchemaVersion = 10;
 const char *Database::kMagicAllSongsTables = "%allsongstables";
 
 int Database::sNextConnectionId = 1;
@@ -153,35 +148,8 @@ QSqlDatabase Database::Connect() {
     UpdateDatabaseSchema(0, db);
   }
 
-  if (SchemaVersion(&db) < 10) {
-    //  Register unicode from unicode61 tokenizer to drop old FTS3 tables.
-    //  We need it also to drop old devices later when loading devices.
-    //  And that's done in a different thread after schemas are upgraded, so register it anyway.
-#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-    QVariant v = db.driver()->handle();
-    if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-      sqlite3 *handle = *static_cast<sqlite3**>(v.data());
-      if (handle) {
-        (void)sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, nullptr);
-      }
-      else qLog(Fatal) << "Unable to enable FTS3 tokenizer";
-    }
-#endif
-    SqlQuery get_fts_tokenizer(db);
-    get_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name)");
-    get_fts_tokenizer.BindValue(":name", "unicode61");
-    if (get_fts_tokenizer.exec() && get_fts_tokenizer.next()) {
-      SqlQuery set_fts_tokenizer(db);
-      set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)");
-      set_fts_tokenizer.BindValue(":name", "unicode");
-      set_fts_tokenizer.BindValue(":pointer", get_fts_tokenizer.value(0));
-      if (!set_fts_tokenizer.exec()) {
-        qLog(Warning) << "Couldn't register FTS3 tokenizer : " << set_fts_tokenizer.lastError();
-      }
-    }
-    else {
-      qLog(Warning) << "Couldn't get FTS3 tokenizer : " << get_fts_tokenizer.lastError();
-    }
+  if (SchemaVersion(&db) < kMinSupportedSchemaVersion) {
+    qFatal("Database schema too old.");
   }
 
   // Attach external databases
@@ -399,7 +367,6 @@ void Database::ExecSchemaCommandsFromFile(QSqlDatabase &db, const QString &filen
   QFile schema_file(filename);
   if (!schema_file.open(QIODevice::ReadOnly)) {
     qFatal("Couldn't open schema file %s for reading: %s", filename.toUtf8().constData(), schema_file.errorString().toUtf8().constData());
-    return;
   }
   QByteArray data = schema_file.readAll();
   QString schema = QString::fromUtf8(data);
@@ -417,9 +384,9 @@ void Database::ExecSchemaCommands(QSqlDatabase &db, const QString &schema, int s
   QStringList commands;
   commands = schema.split(QRegularExpression("; *\n\n"));
 
-  // We don't want this list to reflect possible DB schema changes so we initialize it before executing any statements.
-  // If no outer transaction is provided the song tables need to be queried before beginning an inner transaction! Otherwise
-  // DROP TABLE commands on song tables may fail due to database locks.
+  // We don't want this list to reflect possible DB schema changes, so we initialize it before executing any statements.
+  // If no outer transaction is provided the song tables need to be queried before beginning an inner transaction!
+  // Otherwise DROP TABLE commands on song tables may fail due to database locks.
   const QStringList song_tables(SongsTables(db, schema_version));
 
   if (!in_transaction) {

src/core/database.h

@@ -61,6 +61,7 @@ class Database : public QObject {
   };
 
   static const int kSchemaVersion;
+  static const int kMinSupportedSchemaVersion;
   static const char *kDatabaseFilename;
   static const char *kMagicAllSongsTables;
 

src/core/filesystemmusicstorage.cpp

@@ -27,12 +27,9 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QString>
-#include <QUrl>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "utilities.h"
-#include "song.h"
 #include "musicstorage.h"
 
 #include "filesystemmusicstorage.h"
@@ -61,7 +58,7 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job) {
     return false;
   }
 
-  // Remove the destination file if it exists and we want to overwrite
+  // Remove the destination file if it exists, and we want to overwrite
   if (job.overwrite_) {
     if (dest.exists()) QFile::remove(dest.absoluteFilePath());
     if (!cover_dest.filePath().isEmpty() && cover_dest.exists()) QFile::remove(cover_dest.absoluteFilePath());

src/core/filesystemwatcherinterface.h

@@ -40,7 +40,7 @@ class FileSystemWatcherInterface : public QObject {
   static FileSystemWatcherInterface *Create(QObject *parent = nullptr);
 
  signals:
-  void PathChanged(const QString &path);
+  void PathChanged(QString path);
 };
 
 #endif

src/core/imageutils.cpp

@@ -21,7 +21,6 @@
 
 #include <QList>
 #include <QBuffer>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
@@ -31,7 +30,6 @@
 #include <QPixmap>
 #include <QPainter>
 #include <QSize>
-#include <QSettings>
 
 #include "imageutils.h"
 #include "core/utilities.h"

src/core/macsystemtrayicon.mm

@@ -82,7 +82,7 @@ class MacSystemTrayIconPrivate {
 
     // Don't look now.
     // This must be called after our custom NSApplicationDelegate has been set.
-    [(AppDelegate*)([NSApp delegate]) setDockMenu:dock_menu_];
+    [reinterpret_cast<AppDelegate*>([NSApp delegate]) setDockMenu:dock_menu_];
 
     ClearNowPlaying();
   }

src/core/mainwindow.cpp

@@ -135,6 +135,7 @@
 #include "playlist/playlistmanager.h"
 #include "playlist/playlistsequence.h"
 #include "playlist/playlistview.h"
+#include "playlist/playlistfilter.h"
 #include "queue/queue.h"
 #include "queue/queueview.h"
 #include "playlistparsers/playlistparser.h"
@@ -222,7 +223,11 @@ const int kTrackPositionUpdateTimeMs = 1000;
 
 #ifdef HAVE_QTSPARKLE
 #  ifdef _MSC_VER
+#    ifdef _M_X64
 constexpr char QTSPARKLE_URL[] = "https://www.strawberrymusicplayer.org/sparkle-windows-msvc-x64";
+#    else
+constexpr char QTSPARKLE_URL[] = "https://www.strawberrymusicplayer.org/sparkle-windows-msvc-x86";
+#    endif
 #  else
 #    ifdef __x86_64__
 constexpr char QTSPARKLE_URL[] = "https://www.strawberrymusicplayer.org/sparkle-windows-mingw-x64";
@@ -241,7 +246,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
       app_(app),
       tray_icon_(tray_icon),
       osd_(osd),
-      console_([=]() {
+      console_([app]() {
         Console *console = new Console(app);
         return console;
       }),
@@ -259,7 +264,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
       playlist_list_(new PlaylistListContainer(this)),
       queue_view_(new QueueView(this)),
       settings_dialog_(std::bind(&MainWindow::CreateSettingsDialog, this)),
-      cover_manager_([=]() {
+      cover_manager_([this, app]() {
         AlbumCoverManager *cover_manager = new AlbumCoverManager(app, app->collection_backend(), this);
         cover_manager->Init();
 
@@ -269,18 +274,18 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
         return cover_manager;
       }),
       equalizer_(new Equalizer),
-      organize_dialog_([=]() {
+      organize_dialog_([this, app]() {
         OrganizeDialog *dialog = new OrganizeDialog(app->task_manager(), app->collection_backend(), this);
         dialog->SetDestinationModel(app->collection()->model()->directory_model());
         return dialog;
       }),
 #ifdef HAVE_GSTREAMER
-      transcode_dialog_([=]() {
+      transcode_dialog_([this]() {
         TranscodeDialog *dialog = new TranscodeDialog(this);
         return dialog;
       }),
 #endif
-      add_stream_dialog_([=]() {
+      add_stream_dialog_([this]() {
         AddStreamDialog *add_stream_dialog = new AddStreamDialog;
         QObject::connect(add_stream_dialog, &AddStreamDialog::accepted, this, &MainWindow::AddStreamAccepted);
         return add_stream_dialog;
@@ -921,7 +926,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
   ui_->tabs->setCurrentIndex(settings_.value("current_tab", 1).toInt());
   FancyTabWidget::Mode default_mode = FancyTabWidget::Mode_LargeSidebar;
   int tab_mode_int = settings_.value("tab_mode", default_mode).toInt();
-  FancyTabWidget::Mode tab_mode = FancyTabWidget::Mode(tab_mode_int);
+  FancyTabWidget::Mode tab_mode = static_cast<FancyTabWidget::Mode>(tab_mode_int);
   if (tab_mode == FancyTabWidget::Mode_None) tab_mode = default_mode;
   ui_->tabs->SetMode(tab_mode);
 
@@ -963,7 +968,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
       if (tray_icon_->IsSystemTrayAvailable() && tray_icon_->isVisible()) {
         break;
       }
-      // fallthrough
+      [[fallthrough]];
     case BehaviourSettingsPage::Startup_Remember:
     default: {
 
@@ -1509,9 +1514,9 @@ void MainWindow::PlayIndex(const QModelIndex &idx, Playlist::AutoScroll autoscro
   if (!idx.isValid()) return;
 
   int row = idx.row();
-  if (idx.model() == app_->playlist_manager()->current()->proxy()) {
+  if (idx.model() == app_->playlist_manager()->current()->filter()) {
     // The index was in the proxy model (might've been filtered), so we need to get the actual row in the source model.
-    row = app_->playlist_manager()->current()->proxy()->mapToSource(idx).row();
+    row = app_->playlist_manager()->current()->filter()->mapToSource(idx).row();
   }
 
   app_->playlist_manager()->SetActiveToCurrent();
@@ -1524,9 +1529,9 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex &idx) {
   if (!idx.isValid()) return;
 
   QModelIndex source_idx = idx;
-  if (idx.model() == app_->playlist_manager()->current()->proxy()) {
+  if (idx.model() == app_->playlist_manager()->current()->filter()) {
     // The index was in the proxy model (might've been filtered), so we need to get the actual row in the source model.
-    source_idx = app_->playlist_manager()->current()->proxy()->mapToSource(idx);
+    source_idx = app_->playlist_manager()->current()->filter()->mapToSource(idx);
   }
 
   switch (doubleclick_playlist_addmode_) {
@@ -1765,7 +1770,7 @@ void MainWindow::AddToPlaylistFromAction(QAction *action) {
 
   // Get the selected playlist items
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (!item) continue;
@@ -1804,8 +1809,8 @@ void MainWindow::PlaylistMenuHidden() {
 void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &index) {
 
   QModelIndex source_index = index;
-  if (index.model() == app_->playlist_manager()->current()->proxy()) {
-    source_index = app_->playlist_manager()->current()->proxy()->mapToSource(index);
+  if (index.model() == app_->playlist_manager()->current()->filter()) {
+    source_index = app_->playlist_manager()->current()->filter()->mapToSource(index);
   }
 
   playlist_menu_index_ = source_index;
@@ -1844,7 +1849,7 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
 
   for (const QModelIndex &idx : selection) {
 
-    const QModelIndex src_idx = app_->playlist_manager()->current()->proxy()->mapToSource(idx);
+    const QModelIndex src_idx = app_->playlist_manager()->current()->filter()->mapToSource(idx);
     if (!src_idx.isValid()) continue;
 
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(src_idx.row());
@@ -2048,7 +2053,7 @@ void MainWindow::RescanSongs() {
   SongList songs;
 
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item(app_->playlist_manager()->current()->item_at(source_index.row()));
     if (!item) continue;
@@ -2073,7 +2078,7 @@ void MainWindow::EditTracks() {
   PlaylistItemList items;
 
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item(app_->playlist_manager()->current()->item_at(source_index.row()));
     if (!item) continue;
@@ -2120,7 +2125,7 @@ void MainWindow::RenumberTracks() {
   }
 
   for (const QModelIndex &proxy_index : indexes) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (!item) continue;
@@ -2151,7 +2156,7 @@ void MainWindow::SelectionSetValue() {
   QVariant column_value = app_->playlist_manager()->current()->data(playlist_menu_index_);
 
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (!item) continue;
@@ -2179,7 +2184,7 @@ void MainWindow::EditValue() {
   if (column == -1) {
     for (int i = 0; i < ui_->playlist->view()->model()->columnCount(); ++i) {
       if (ui_->playlist->view()->isColumnHidden(i)) continue;
-      if (!Playlist::column_is_editable(Playlist::Column(i))) continue;
+      if (!Playlist::column_is_editable(static_cast<Playlist::Column>(i))) continue;
       column = i;
       break;
     }
@@ -2265,7 +2270,7 @@ void MainWindow::ShowInCollection() {
 
   SongList songs;
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (item && item->IsLocalCollectionItem()) {
@@ -2518,7 +2523,7 @@ void MainWindow::AddFilesToTranscoder() {
   QStringList filenames;
 
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item(app_->playlist_manager()->current()->item_at(source_index.row()));
     if (!item) continue;
@@ -2630,7 +2635,7 @@ void MainWindow::PlaylistOrganizeSelected(const bool copy) {
 
   SongList songs;
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (!item) continue;
@@ -2652,7 +2657,7 @@ void MainWindow::PlaylistOpenInBrowser() {
 
   QList<QUrl> urls;
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     urls << QUrl(source_index.sibling(source_index.row(), Playlist::Column_Filename).data().toString());
   }
@@ -2665,7 +2670,7 @@ void MainWindow::PlaylistCopyUrl() {
 
   QList<QUrl> urls;
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (!item) continue;
@@ -2686,7 +2691,7 @@ void MainWindow::PlaylistQueue() {
   QModelIndexList indexes;
   indexes.reserve(selected_rows.count());
   for (const QModelIndex &proxy_index : selected_rows) {
-    indexes << app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    indexes << app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
   }
 
   app_->playlist_manager()->current()->queue()->ToggleTracks(indexes);
@@ -2699,7 +2704,7 @@ void MainWindow::PlaylistQueuePlayNext() {
   QModelIndexList indexes;
   indexes.reserve(selected_rows.count());
   for (const QModelIndex &proxy_index : selected_rows) {
-    indexes << app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    indexes << app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
   }
 
   app_->playlist_manager()->current()->queue()->InsertFirst(indexes);
@@ -2712,7 +2717,7 @@ void MainWindow::PlaylistSkip() {
   QModelIndexList indexes;
   indexes.reserve(selected_rows.count());
   for (const QModelIndex &proxy_index : selected_rows) {
-    indexes << app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    indexes << app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
   }
 
   app_->playlist_manager()->current()->SkipTracks(indexes);
@@ -2726,7 +2731,7 @@ void MainWindow::PlaylistCopyToDevice() {
   SongList songs;
 
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (!item) continue;
@@ -2875,7 +2880,7 @@ void MainWindow::PlaylistViewSelectionModelChanged() {
 
 void MainWindow::PlaylistCurrentChanged(const QModelIndex &proxy_current) {
 
-  const QModelIndex source_current = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_current);
+  const QModelIndex source_current = app_->playlist_manager()->current()->filter()->mapToSource(proxy_current);
 
   // If the user moves the current index using the keyboard and then presses
   // F2, we don't want that editing the last column that was right clicked on.
@@ -2927,7 +2932,7 @@ void MainWindow::AutoCompleteTags() {
   // Get the selected songs and start fetching tags for them
   SongList songs;
   for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    const QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_index);
+    const QModelIndex source_index = app_->playlist_manager()->current()->filter()->mapToSource(proxy_index);
     if (!source_index.isValid()) continue;
     PlaylistItemPtr item(app_->playlist_manager()->current()->item_at(source_index.row()));
     if (!item) continue;
@@ -3144,7 +3149,7 @@ void MainWindow::PlaylistDelete() {
   QStringList files;
   bool is_current_item = false;
   for (const QModelIndex &proxy_idx : ui_->playlist->view()->selectionModel()->selectedRows()) {
-    QModelIndex source_idx = app_->playlist_manager()->current()->proxy()->mapToSource(proxy_idx);
+    QModelIndex source_idx = app_->playlist_manager()->current()->filter()->mapToSource(proxy_idx);
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_idx.row());
     if (!item || !item->Metadata().url().isLocalFile()) continue;
     QString filename = item->Metadata().url().toLocalFile();

src/core/mainwindow.ui

@@ -448,7 +448,7 @@
      <x>0</x>
      <y>0</y>
      <width>1131</width>
-     <height>26</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_music">
@@ -750,7 +750,7 @@
   </action>
   <action name="action_save_all_playlists">
    <property name="text">
-    <string>&amp;Save all playlists</string>
+    <string>&amp;Save all playlists...</string>
    </property>
   </action>
   <action name="action_next_playlist">
@@ -903,7 +903,6 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../data/data.qrc"/>
   <include location="../../data/icons.qrc"/>
  </resources>
  <connections/>

src/core/mpris2.cpp

@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <cstdlib>
-#include <memory>
 #include <algorithm>
 
 #include <QApplication>
@@ -41,7 +39,6 @@
 #include <QDBusMessage>
 #include <QDBusArgument>
 #include <QDBusObjectPath>
-#include <QtDebug>
 
 #include "core/logging.h"
 

src/core/networkproxyfactory.cpp

@@ -22,12 +22,10 @@
 
 #include <QtGlobal>
 #include <QMutex>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QNetworkProxy>
-#include <QtDebug>
 #include <QSettings>
 
 #include "core/logging.h"

src/core/networktimeouts.cpp

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 #include <QNetworkReply>
 #include <QTimerEvent>

src/core/player.cpp

@@ -28,15 +28,12 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QSortFilterProxyModel>
-#include <QList>
 #include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
 #include <QDateTime>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 
@@ -58,6 +55,7 @@
 
 #include "collection/collectionbackend.h"
 #include "playlist/playlist.h"
+#include "playlist/playlistfilter.h"
 #include "playlist/playlistitem.h"
 #include "playlist/playlistmanager.h"
 #include "playlist/playlistsequence.h"
@@ -385,7 +383,7 @@ void Player::NextItem(const Engine::TrackChangeFlags change, const Playlist::Aut
   if (change == Engine::Auto) {
     const PlaylistSequence::RepeatMode repeat_mode = active_playlist->sequence()->repeat_mode();
     if (repeat_mode != PlaylistSequence::Repeat_Off) {
-      if ((repeat_mode == PlaylistSequence::Repeat_Track && nb_errors_received_ >= 3) || (nb_errors_received_ >= app_->playlist_manager()->active()->proxy()->rowCount())) {
+      if ((repeat_mode == PlaylistSequence::Repeat_Track && nb_errors_received_ >= 3) || (nb_errors_received_ >= app_->playlist_manager()->active()->filter()->rowCount())) {
         // We received too many "Error" state changes: probably looping over a playlist which contains only unavailable elements: stop now.
         nb_errors_received_ = 0;
         Stop();
@@ -448,7 +446,7 @@ void Player::PlayPlaylistInternal(const Engine::TrackChangeFlags change, const P
 bool Player::HandleStopAfter(const Playlist::AutoScroll autoscroll) {
 
   if (app_->playlist_manager()->active()->stop_after_current()) {
-    // Find what the next track would've been, and mark that one as current so it plays next time the user presses Play.
+    // Find what the next track would've been, and mark that one as current, so it plays next time the user presses Play.
     const int next_row = app_->playlist_manager()->active()->next_row();
     if (next_row != -1) {
       app_->playlist_manager()->active()->set_current_row(next_row, autoscroll, true);
@@ -624,7 +622,7 @@ void Player::EngineStateChanged(const Engine::State state) {
       break;
     case Engine::Error:
       emit Error();
-      // fallthrough
+      [[fallthrough]];
     case Engine::Empty:
     case Engine::Idle:
       pause_time_ = QDateTime();
@@ -843,7 +841,7 @@ void Player::TrackAboutToEnd() {
   if (engine_->is_autocrossfade_enabled()) {
     // Crossfade is on, so just start playing the next track.  The current one will fade out, and the new one will fade in
 
-    // But, if there's no next track and we don't want to fade out, then do nothing and just let the track finish to completion.
+    // But, if there's no next track, and we don't want to fade out, then do nothing and just let the track finish to completion.
     if (!engine_->is_fadeout_enabled() && !has_next_row) return;
 
     // If the next track is on the same album (or same cue file),
@@ -854,7 +852,7 @@ void Player::TrackAboutToEnd() {
     }
   }
 
-  // Crossfade is off, so start preloading the next track so we don't get a gap between songs.
+  // Crossfade is off, so start preloading the next track, so we don't get a gap between songs.
   if (!has_next_row || !next_item) return;
 
   QUrl url = next_item->StreamUrl();

src/core/qtsystemtrayicon.cpp

@@ -29,12 +29,10 @@
 #include <QIcon>
 #include <QString>
 #include <QUrl>
-#include <QSettings>
 
 #include "song.h"
 #include "iconloader.h"
 #include "qtsystemtrayicon.h"
-#include "settings/behavioursettingspage.h"
 
 SystemTrayIcon::SystemTrayIcon(QObject *parent)
     : QSystemTrayIcon(parent),

src/core/scopedgobject.h

@@ -25,8 +25,6 @@
 
 #include <glib-object.h>
 
-#include <QtDebug>
-
 template<typename T>
 class ScopedGObject {
  public:

src/core/signalchecker.cpp

@@ -35,7 +35,6 @@ gulong CheckedGConnect(gpointer source, const char *signal, GCallback callback,
 
   if (!g_signal_parse_name(signal, G_OBJECT_TYPE(source), &signal_id, &detail, false)) {
     qFatal("Connecting to invalid signal: %s", signal);
-    return 0;
   }
 
   GSignalQuery query;
@@ -44,7 +43,6 @@ gulong CheckedGConnect(gpointer source, const char *signal, GCallback callback,
   int signal_params = static_cast<int>(query.n_params) + 2;
   if (signal_params != callback_param_count) {
     qFatal("Connecting callback to signal with different parameters counts");
-    return 0;
   }
 
   return g_signal_connect(source, signal, G_CALLBACK(callback), data);

src/core/song.cpp

@@ -38,21 +38,16 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QSharedData>
-#include <QHash>
 #include <QByteArray>
-#include <QVariant>
+#include <QVariantMap>
 #include <QString>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QUrl>
 #include <QImage>
 #include <QIcon>
-#include <QSqlQuery>
 #include <QStandardPaths>
-#include <QtDebug>
 
-#include "core/logging.h"
-#include "core/messagehandler.h"
 #include "core/iconloader.h"
 
 #include "engine/enginebase.h"
@@ -65,6 +60,9 @@
 #include "sqlrow.h"
 #include "tagreadermessages.pb.h"
 
+#define QStringFromStdString(x) QString::fromUtf8((x).data(), (x).size())
+#define DataCommaSizeFromQString(x) (x).toUtf8().constData(), (x).toUtf8().length()
+
 const QStringList Song::kColumns = QStringList() << "title"
                                                  << "album"
                                                  << "artist"
@@ -156,7 +154,7 @@ const QStringList Song::kArticles = QStringList() << "the " << "a " << "an ";
 const QStringList Song::kAcceptedExtensions = QStringList() << "wav" << "flac" << "wv" << "ogg" << "oga" << "opus" << "spx" << "ape" << "mpc"
                                                             << "mp2" << "mp3" <<  "m4a" << "mp4" << "aac" << "asf" << "asx" << "wma"
                                                             << "aif << aiff" << "mka" << "tta" << "dsf" << "dsd"
-                                                            << "ac3" << "dts";
+                                                            << "ac3" << "dts" << "spc" << "vgm";
 
 struct Song::Private : public QSharedData {
 
@@ -604,6 +602,8 @@ QString Song::TextForFiletype(FileType filetype) {
     case Song::FileType_XM:          return "Module Music Format";
     case Song::FileType_IT:          return "Module Music Format";
     case Song::FileType_CDDA:        return "CDDA";
+    case Song::FileType_SPC:         return "SNES SPC700";
+    case Song::FileType_VGM:         return "VGM";
     case Song::FileType_Stream:      return "Stream";
     case Song::FileType_Unknown:
     default:                         return QObject::tr("Unknown");
@@ -634,6 +634,8 @@ QString Song::ExtensionForFiletype(FileType filetype) {
     case Song::FileType_S3M:         return "s3m";
     case Song::FileType_XM:          return "xm";
     case Song::FileType_IT:          return "it";
+    case Song::FileType_SPC:         return "spc";
+    case Song::FileType_VGM:         return "vgm";
     case Song::FileType_Unknown:
     default:                         return "dat";
   }
@@ -710,6 +712,8 @@ Song::FileType Song::FiletypeByMimetype(const QString &mimetype) {
   else if (mimetype.compare("audio/x-ape", Qt::CaseInsensitive) == 0 || mimetype.compare("application/x-ape", Qt::CaseInsensitive) == 0 || mimetype.compare("audio/x-ffmpeg-parsed-ape", Qt::CaseInsensitive) == 0) return Song::FileType_APE;
   else if (mimetype.compare("audio/x-mod", Qt::CaseInsensitive) == 0) return Song::FileType_MOD;
   else if (mimetype.compare("audio/x-s3m", Qt::CaseInsensitive) == 0) return Song::FileType_S3M;
+  else if (mimetype.compare("audio/x-spc", Qt::CaseInsensitive) == 0) return Song::FileType_SPC;
+  else if (mimetype.compare("audio/x-vgm", Qt::CaseInsensitive) == 0) return Song::FileType_VGM;
 
   else return Song::FileType_Unknown;
 
@@ -733,6 +737,8 @@ Song::FileType Song::FiletypeByDescription(const QString &text) {
   else if (text.compare("audio/x-ffmpeg-parsed-ape", Qt::CaseInsensitive) == 0) return Song::FileType_APE;
   else if (text.compare("Module Music Format (MOD)", Qt::CaseInsensitive) == 0) return Song::FileType_MOD;
   else if (text.compare("Module Music Format (MOD)", Qt::CaseInsensitive) == 0) return Song::FileType_S3M;
+  else if (text.compare("SNES SPC700", Qt::CaseInsensitive) == 0) return Song::FileType_SPC;
+  else if (text.compare("VGM", Qt::CaseInsensitive) == 0) return Song::FileType_VGM;
   else return Song::FileType_Unknown;
 
 }
@@ -760,6 +766,8 @@ Song::FileType Song::FiletypeByExtension(const QString &ext) {
   else if (ext.compare("s3m", Qt::CaseInsensitive) == 0) return Song::FileType_S3M;
   else if (ext.compare("xm", Qt::CaseInsensitive) == 0) return Song::FileType_XM;
   else if (ext.compare("it", Qt::CaseInsensitive) == 0) return Song::FileType_IT;
+  else if (ext.compare("spc", Qt::CaseInsensitive) == 0) return Song::FileType_SPC;
+  else if (ext.compare("vgm", Qt::CaseInsensitive) == 0) return Song::FileType_VGM;
 
   else return Song::FileType_Unknown;
 
@@ -1310,9 +1318,9 @@ void Song::BindToQuery(SqlQuery *query) const {
   query->BindNotNullIntValue(":directory_id", d->directory_id_);
   query->BindUrlValue(":url", d->url_);
   query->BindValue(":filetype", d->filetype_);
-  query->BindNotNullLongLongValue(":filesize", d->filesize_);
-  query->BindNotNullLongLongValue(":mtime", d->mtime_);
-  query->BindNotNullLongLongValue(":ctime", d->ctime_);
+  query->BindLongLongValueOrZero(":filesize", d->filesize_);
+  query->BindLongLongValueOrZero(":mtime", d->mtime_);
+  query->BindLongLongValueOrZero(":ctime", d->ctime_);
   query->BindBoolValue(":unavailable", d->unavailable_);
 
   query->BindStringValue(":fingerprint", d->fingerprint_);

src/core/song.h

@@ -106,6 +106,8 @@ class Song {
     FileType_S3M = 19,
     FileType_XM = 20,
     FileType_IT = 21,
+    FileType_SPC = 22,
+    FileType_VGM = 23, 
     FileType_CDDA = 90,
     FileType_Stream = 91,
   };

src/core/songloader.cpp

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <cstdlib>
 #include <memory>
 #include <algorithm>
 
@@ -37,13 +36,11 @@
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
-#include <QList>
 #include <QSet>
 #include <QTimer>
 #include <QString>
 #include <QUrl>
 #include <QEventLoop>
-#include <QtDebug>
 
 #include "core/logging.h"
 
@@ -646,7 +643,7 @@ void SongLoader::EndOfStreamReached() {
       if (state_ == Finished) break;
     // It looks like a playlist, so parse it
 
-    // fallthrough
+    [[fallthrough]];
     case WaitingForData:
       // It's a playlist and we've got all the data - finish and parse it
       StopTypefindAsync(true);

src/core/sqlquery.cpp

@@ -19,10 +19,8 @@
 
 #include "config.h"
 
-#include <QSqlQuery>
 #include <QMap>
 #include <QVariant>
-#include <QVariantList>
 #include <QString>
 #include <QUrl>
 
@@ -62,6 +60,12 @@ void SqlQuery::BindLongLongValue(const QString &placeholder, const qint64 value)
 
 }
 
+void SqlQuery::BindLongLongValueOrZero(const QString &placeholder, const qint64 value) {
+
+  BindValue(placeholder, value <= 0 ? 0 : value);
+
+}
+
 void SqlQuery::BindFloatValue(const QString &placeholder, const float value) {
 
   BindValue(placeholder, value <= 0 ? -1 : value);
@@ -80,12 +84,6 @@ void SqlQuery::BindNotNullIntValue(const QString &placeholder, const int value)
 
 }
 
-void SqlQuery::BindNotNullLongLongValue(const QString &placeholder, const qint64 value) {
-
-  BindValue(placeholder, value == -1 ? QVariant() : value);
-
-}
-
 bool SqlQuery::Exec() {
 
   bool success = exec();

src/core/sqlquery.h

@@ -38,10 +38,10 @@ class SqlQuery : public QSqlQuery {
   void BindUrlValue(const QString &placeholder, const QUrl &value);
   void BindIntValue(const QString &placeholder, const int value);
   void BindLongLongValue(const QString &placeholder, const qint64 value);
+  void BindLongLongValueOrZero(const QString &placeholder, const qint64 value);
   void BindFloatValue(const QString &placeholder, const float value);
   void BindBoolValue(const QString &placeholder, const bool value);
   void BindNotNullIntValue(const QString &placeholder, const int value);
-  void BindNotNullLongLongValue(const QString &placeholder, const qint64 value);
 
   bool Exec();
   QString LastQuery() const;

src/core/standarditemiconloader.cpp

@@ -26,7 +26,6 @@
 #include <QStandardItem>
 #include <QMap>
 #include <QSet>
-#include <QImage>
 #include <QPixmap>
 #include <QIcon>
 

src/core/stylesheetloader.cpp

@@ -26,7 +26,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
-#include <QHash>
 #include <QTimer>
 #include <QIODevice>
 #include <QTextStream>
@@ -35,7 +34,6 @@
 #include <QColor>
 #include <QPalette>
 #include <QEvent>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "stylesheetloader.h"

src/core/tagreaderclient.cpp

@@ -30,7 +30,6 @@
 #include <QString>
 #include <QImage>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/workerpool.h"
@@ -39,6 +38,8 @@
 #include "tagreaderclient.h"
 #include "settings/collectionsettingspage.h"
 
+#define DataCommaSizeFromQString(x) (x).toUtf8().constData(), (x).toUtf8().length()
+
 const char *TagReaderClient::kWorkerExecutableName = "strawberry-tagreader";
 TagReaderClient *TagReaderClient::sInstance = nullptr;
 

src/core/threadsafenetworkdiskcache.cpp

@@ -32,7 +32,6 @@
 #include <QAbstractNetworkCache>
 #include <QUrl>
 
-#include "core/logging.h"
 #include "threadsafenetworkdiskcache.h"
 
 QMutex ThreadSafeNetworkDiskCache::sMutex;

src/core/utilities.cpp

@@ -23,14 +23,17 @@
 
 #include <memory>
 #include <cstdlib>
-#include <iconv.h>
+
+#ifdef HAVE_ICU
+#  include <unicode/translit.h>
+#else
+#  include <iconv.h>
+#endif
 
 #include <QtGlobal>
 #include <QApplication>
 #include <QCoreApplication>
 #include <QWindow>
-#include <QWidget>
-#include <QObject>
 #include <QIODevice>
 #include <QByteArray>
 #include <QMetaObject>
@@ -56,11 +59,9 @@
 #include <QMetaEnum>
 #include <QXmlStreamReader>
 #include <QSettings>
-#include <QtEvents>
 #include <QMessageBox>
 #include <QNetworkInterface>
 #include <QMimeDatabase>
-#include <QtDebug>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #  include <QRandomGenerator>
 #endif
@@ -209,7 +210,7 @@ quint64 FileSystemCapacity(const QString &path) {
 #if defined(Q_OS_UNIX)
   struct statvfs fs_info {};
   if (statvfs(path.toLocal8Bit().constData(), &fs_info) == 0)
-    return quint64(fs_info.f_blocks) * quint64(fs_info.f_bsize);
+    return static_cast<quint64>(fs_info.f_blocks) * static_cast<quint64>(fs_info.f_bsize);
 #elif defined(Q_OS_WIN32)
   _ULARGE_INTEGER ret;
   ScopedWCharArray wchar(QDir::toNativeSeparators(path));
@@ -226,7 +227,7 @@ quint64 FileSystemFreeSpace(const QString &path) {
 #if defined(Q_OS_UNIX)
   struct statvfs fs_info {};
   if (statvfs(path.toLocal8Bit().constData(), &fs_info) == 0)
-    return quint64(fs_info.f_bavail) * quint64(fs_info.f_bsize);
+    return static_cast<quint64>(fs_info.f_bavail) * static_cast<quint64>(fs_info.f_bsize);
 #elif defined(Q_OS_WIN32)
   _ULARGE_INTEGER ret;
   ScopedWCharArray wchar(QDir::toNativeSeparators(path));
@@ -517,8 +518,8 @@ QByteArray HmacSha1(const QByteArray &key, const QByteArray &data) {
 QByteArray Sha1CoverHash(const QString &artist, const QString &album) {
 
   QCryptographicHash hash(QCryptographicHash::Sha1);
-  hash.addData(artist.toLower().toUtf8().constData());
-  hash.addData(album.toLower().toUtf8().constData());
+  hash.addData(artist.toLower().toUtf8());
+  hash.addData(album.toLower().toUtf8());
 
   return hash.result();
 
@@ -786,16 +787,39 @@ QString DesktopEnvironment() {
 
 }
 
-QString UnicodeToAscii(const QString &unicode) {
+#ifdef HAVE_ICU
+
+QString Transliterate(const QString &accented_str) {
+
+  UErrorCode errorcode = U_ZERO_ERROR;
+  std::unique_ptr<icu::Transliterator> transliterator;
+  transliterator.reset(icu::Transliterator::createInstance("Any-Latin; Latin-ASCII;", UTRANS_FORWARD, errorcode));
+
+  if (!transliterator) return accented_str;
+
+  QByteArray accented_data = accented_str.toUtf8();
+  icu::UnicodeString ustring = icu::UnicodeString(accented_data.constData());
+  transliterator->transliterate(ustring);
+
+  std::string unaccented_str;
+  ustring.toUTF8String(unaccented_str);
+
+  return QString::fromStdString(unaccented_str);
+
+}
+
+#else
+
+QString Transliterate(const QString &accented_str) {
 
 #ifdef LC_ALL
   setlocale(LC_ALL, "");
 #endif
 
   iconv_t conv = iconv_open("ASCII//TRANSLIT", "UTF-8");
-  if (conv == reinterpret_cast<iconv_t>(-1)) return unicode;
+  if (conv == reinterpret_cast<iconv_t>(-1)) return accented_str;
 
-  QByteArray utf8 = unicode.toUtf8();
+  QByteArray utf8 = accented_str.toUtf8();
 
   size_t input_len = utf8.length() + 1;
   char *input_ptr = new char[input_len];
@@ -817,8 +841,11 @@ QString UnicodeToAscii(const QString &unicode) {
   delete[] output_ptr;
 
   return ret;
+
 }
 
+#endif
+
 QString MacAddress() {
 
   QString ret;

src/core/utilities.h

@@ -132,7 +132,7 @@ QString GetRandomString(const int len, const QString &UseCharacters);
 
 QString DesktopEnvironment();
 
-QString UnicodeToAscii(const QString &unicode);
+QString Transliterate(const QString &accented_str);
 
 QString MacAddress();
 

src/core/windows7thumbbar.cpp

@@ -27,11 +27,6 @@
 #include <QPixmap>
 #include <QAction>
 #include <QTimer>
-#include <QtDebug>
-
-#ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0600
-#endif
 
 #include <windows.h>
 #include <commctrl.h>
@@ -49,7 +44,8 @@ Windows7ThumbBar::Windows7ThumbBar(QWidget *widget)
     : QObject(widget),
       widget_(widget),
       timer_(new QTimer(this)),
-      button_created_message_id_(0) {
+      button_created_message_id_(0),
+      taskbar_list_(nullptr) {
 
   timer_->setSingleShot(true);
   timer_->setInterval(300);
@@ -130,8 +126,12 @@ void Windows7ThumbBar::HandleWinEvent(MSG *msg) {
 
   if (msg->message == button_created_message_id_) {
 
-    ITaskbarList3 *taskbar_list = CreateTaskbarList();
-    if (!taskbar_list) return;
+    if (taskbar_list_) {
+      taskbar_list_->Release();
+    }
+
+    taskbar_list_ = CreateTaskbarList();
+    if (!taskbar_list_) return;
 
     // Add the buttons
     THUMBBUTTON buttons[kMaxButtonCount];
@@ -143,7 +143,7 @@ void Windows7ThumbBar::HandleWinEvent(MSG *msg) {
     }
 
     qLog(Debug) << "Adding" << actions_.count() << "buttons";
-    HRESULT hr = taskbar_list->ThumbBarAddButtons(reinterpret_cast<HWND>(widget_->winId()), actions_.count(), buttons);
+    HRESULT hr = taskbar_list_->ThumbBarAddButtons(reinterpret_cast<HWND>(widget_->winId()), actions_.count(), buttons);
     if (hr != S_OK) {
       qLog(Debug) << "Failed to add buttons" << Qt::hex << DWORD(hr);
     }
@@ -154,8 +154,6 @@ void Windows7ThumbBar::HandleWinEvent(MSG *msg) {
       }
     }
 
-    taskbar_list->Release();
-
   }
   else if (msg->message == WM_COMMAND) {
     const int button_id = LOWORD(msg->wParam);
@@ -176,8 +174,7 @@ void Windows7ThumbBar::ActionChangedTriggered() {
 
 void Windows7ThumbBar::ActionChanged() {
 
-  ITaskbarList3 *taskbar_list = CreateTaskbarList();
-  if (!taskbar_list) return;
+  if (!taskbar_list_) return;
 
   qLog(Debug) << "Updating" << actions_.count() << "buttons";
 
@@ -190,7 +187,7 @@ void Windows7ThumbBar::ActionChanged() {
     SetupButton(action, button);
   }
 
-  HRESULT hr = taskbar_list->ThumbBarUpdateButtons(reinterpret_cast<HWND>(widget_->winId()), actions_.count(), buttons);
+  HRESULT hr = taskbar_list_->ThumbBarUpdateButtons(reinterpret_cast<HWND>(widget_->winId()), actions_.count(), buttons);
   if (hr != S_OK) {
     qLog(Debug) << "Failed to update buttons" << Qt::hex << DWORD(hr);
   }
@@ -201,6 +198,4 @@ void Windows7ThumbBar::ActionChanged() {
     }
   }
 
-  taskbar_list->Release();
-
 }

src/core/windows7thumbbar.h

@@ -62,6 +62,8 @@ class Windows7ThumbBar : public QObject {
   QList<QAction*> actions_;
 
   unsigned int button_created_message_id_;
+
+  ITaskbarList3 *taskbar_list_;
 };
 
 #endif  // WINDOWS7THUMBBAR_H

src/covermanager/albumcoverchoicecontroller.cpp

@@ -217,7 +217,7 @@ QUrl AlbumCoverChoiceController::LoadCoverFromFile(Song *song) {
         SaveCoverEmbeddedAutomatic(*song, cover_file);
         return QUrl::fromLocalFile(Song::kEmbeddedCover);
       }
-      // fallthrough
+      [[fallthrough]];
     case CollectionSettingsPage::SaveCoverType_Cache:
     case CollectionSettingsPage::SaveCoverType_Album:{
       QUrl cover_url = QUrl::fromLocalFile(cover_file);
@@ -658,7 +658,7 @@ void AlbumCoverChoiceController::SaveCoverEmbeddedAutomatic(const Song &song, co
     QFuture<SongList> future = QtConcurrent::run(app_->collection_backend(), &CollectionBackend::GetAlbumSongs, song.effective_albumartist(), song.effective_album(), QueryOptions());
 #endif
     QFutureWatcher<SongList> *watcher = new QFutureWatcher<SongList>();
-    QObject::connect(watcher, &QFutureWatcher<SongList>::finished, this, [=]() {
+    QObject::connect(watcher, &QFutureWatcher<SongList>::finished, this, [this, watcher, song, result]() {
       SongList songs = watcher->result();
       watcher->deleteLater();
       QList<QUrl> urls;
@@ -703,7 +703,7 @@ void AlbumCoverChoiceController::SaveCoverEmbeddedAutomatic(const Song &song, co
     QFuture<SongList> future = QtConcurrent::run(app_->collection_backend(), &CollectionBackend::GetAlbumSongs, song.effective_albumartist(), song.effective_album(), QueryOptions());
 #endif
     QFutureWatcher<SongList> *watcher = new QFutureWatcher<SongList>();
-    QObject::connect(watcher, &QFutureWatcher<SongList>::finished, this, [=]() {
+    QObject::connect(watcher, &QFutureWatcher<SongList>::finished, this, [this, watcher, song, cover_filename]() {
       SongList songs = watcher->result();
       watcher->deleteLater();
       QList<QUrl> urls;
@@ -789,7 +789,7 @@ QUrl AlbumCoverChoiceController::SaveCoverAutomatic(Song *song, const AlbumCover
         break;
       }
     }
-    // fallthrough
+    [[fallthrough]];
     case CollectionSettingsPage::SaveCoverType_Cache:
     case CollectionSettingsPage::SaveCoverType_Album:{
       cover_url = SaveCoverToFileAutomatic(song, result);

src/covermanager/albumcoverfetcher.cpp

@@ -27,7 +27,6 @@
 #include <QObject>
 #include <QTimer>
 #include <QString>
-#include <QImage>
 
 #include "core/networkaccessmanager.h"
 #include "core/song.h"

src/covermanager/albumcoverfetchersearch.cpp

@@ -28,16 +28,12 @@
 #include <QCoreApplication>
 #include <QTimer>
 #include <QList>
-#include <QMap>
-#include <QMultiMap>
-#include <QHash>
 #include <QString>
 #include <QUrl>
 #include <QImage>
 #include <QImageReader>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/utilities.h"

src/covermanager/albumcoverloader.cpp

@@ -38,9 +38,7 @@
 #include <QUrl>
 #include <QFile>
 #include <QImage>
-#include <QPixmap>
 #include <QPainter>
-#include <QSize>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QSettings>
@@ -110,7 +108,7 @@ QString AlbumCoverLoader::AlbumCoverFilename(QString artist, QString album, cons
   album.remove('/').remove('\\');
 
   QString filename = artist + "-" + album;
-  filename = Utilities::UnicodeToAscii(filename.toLower());
+  filename = Utilities::Transliterate(filename.toLower());
   filename = filename.replace(' ', '-')
                      .replace("--", "-")
                      .remove(OrganizeFormat::kInvalidFatCharacters)
@@ -186,14 +184,14 @@ QString AlbumCoverLoader::CoverFilenameFromSource(const Song::Source source, con
         filename = album_id + "-" + cover_url.fileName();
         break;
       }
-      // fallthrough
+      [[fallthrough]];
     case Song::Source_Subsonic:
     case Song::Source_Qobuz:
       if (!album_id.isEmpty()) {
         filename = album_id;
         break;
       }
-      // fallthrough
+      [[fallthrough]];
     case Song::Source_Collection:
     case Song::Source_LocalFile:
     case Song::Source_CDDA: