Release 1.0.9

The test doesn't seem to acually need gui_required = true, so set it to
false.

.github/ISSUE_TEMPLATE.md

@@ -7,12 +7,9 @@ assignees: ''
 
 ---
 
-For technical issues, questions and feature suggestions/requests please use the forum on https://forum.strawberrymusicplayer.org/
-
-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/
+- [ ] I have checked the [FAQ](https://wiki.strawberrymusicplayer.org/wiki/FAQ) for answers.
+- [ ] I have checked the [Changelog](https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog) that the issue is not already fixed. 
+- [ ] I believe this issue is a bug, and not a general technical issue, question or feature requests that can be discussed on the [forum](https://forum.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
@@ -105,17 +92,29 @@ Thumbs.db
 # Stuff in dist
 maketarball.sh
 changelog
-PKGBUILD
 
 # Translations
 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
+
+# CLion
+/.idea

3rdparty/README.md

@@ -23,3 +23,8 @@ macdeployqt
 A modified version of Qt's official macdeployqt utility that fixes some issues,
 this version also deploys gstreamer plugins.
 Can safely be deleted on other platforms.
+
+
+getopt
+------
+getopt included only when compiling with MSVC on Windows.

3rdparty/getopt/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(getopt STATIC getopt.c)
+target_include_directories(getopt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

3rdparty/getopt/getopt.c

@@ -0,0 +1,562 @@
+/*	$OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
+
+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <windows.h>
+
+#define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
+
+#ifdef REPLACE_GETOPT
+int	opterr = 1;		/* if error message should be printed */
+int	optind = 1;		/* index into parent argv vector */
+int	optopt = '?';		/* character checked for validity */
+#undef	optreset		/* see getopt.h */
+#define	optreset		__mingw_optreset
+int	optreset;		/* reset getopt */
+char    *optarg;		/* argument associated with option */
+#endif
+
+#define PRINT_ERROR	((opterr) && (*options != ':'))
+
+#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
+#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
+
+/* return values */
+#define	BADCH		(int)'?'
+#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
+#define	INORDER 	(int)1
+
+#ifndef __CYGWIN__
+#define __progname __argv[0]
+#else
+extern char __declspec(dllimport) *__progname;
+#endif
+
+#ifdef __CYGWIN__
+static char EMSG[] = "";
+#else
+#define	EMSG		""
+#endif
+
+static int getopt_internal(int, char * const *, const char *,
+			   const struct option *, int *, int);
+static int parse_long_options(char * const *, const char *,
+			      const struct option *, int *, int);
+static int gcd(int, int);
+static void permute_args(int, int, int, char * const *);
+
+static char *place = EMSG; /* option letter processing */
+
+/* XXX: set optreset to 1 rather than these two */
+static int nonopt_start = -1; /* first non option argument (for permute) */
+static int nonopt_end = -1;   /* first option after non options (for permute) */
+
+/* Error messages */
+static const char recargchar[] = "option requires an argument -- %c";
+static const char recargstring[] = "option requires an argument -- %s";
+static const char ambig[] = "ambiguous option -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char illoptchar[] = "unknown option -- %c";
+static const char illoptstring[] = "unknown option -- %s";
+
+static void
+_vwarnx(const char *fmt,va_list ap)
+{
+  (void)fprintf(stderr,"%s: ",__progname);
+  if (fmt != NULL)
+    (void)vfprintf(stderr,fmt,ap);
+  (void)fprintf(stderr,"\n");
+}
+
+static void
+warnx(const char *fmt,...)
+{
+  va_list ap;
+  va_start(ap,fmt);
+  _vwarnx(fmt,ap);
+  va_end(ap);
+}
+
+/*
+ * Compute the greatest common divisor of a and b.
+ */
+static int
+gcd(int a, int b)
+{
+	int c;
+
+	c = a % b;
+	while (c != 0) {
+		a = b;
+		b = c;
+		c = a % b;
+	}
+
+	return (b);
+}
+
+/*
+ * Exchange the block from nonopt_start to nonopt_end with the block
+ * from nonopt_end to opt_end (keeping the same order of arguments
+ * in each block).
+ */
+static void
+permute_args(int panonopt_start, int panonopt_end, int opt_end,
+	char * const *nargv)
+{
+	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+	char *swap;
+
+	/*
+	 * compute lengths of blocks and number and size of cycles
+	 */
+	nnonopts = panonopt_end - panonopt_start;
+	nopts = opt_end - panonopt_end;
+	ncycle = gcd(nnonopts, nopts);
+	cyclelen = (opt_end - panonopt_start) / ncycle;
+
+	for (i = 0; i < ncycle; i++) {
+		cstart = panonopt_end+i;
+		pos = cstart;
+		for (j = 0; j < cyclelen; j++) {
+			if (pos >= panonopt_end)
+				pos -= nnonopts;
+			else
+				pos += nopts;
+			swap = nargv[pos];
+			/* LINTED const cast */
+			((char **) nargv)[pos] = nargv[cstart];
+			/* LINTED const cast */
+			((char **)nargv)[cstart] = swap;
+		}
+	}
+}
+
+/*
+ * parse_long_options --
+ *	Parse long options in argc/argv argument vector.
+ * Returns -1 if short_too is set and the option does not match long_options.
+ */
+static int
+parse_long_options(char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int short_too)
+{
+	char *current_argv, *has_equal;
+	size_t current_argv_len;
+	int i, ambiguous, match;
+
+#define IDENTICAL_INTERPRETATION(_x, _y)                                \
+	(long_options[(_x)].has_arg == long_options[(_y)].has_arg &&    \
+	 long_options[(_x)].flag == long_options[(_y)].flag &&          \
+	 long_options[(_x)].val == long_options[(_y)].val)
+
+	current_argv = place;
+	match = -1;
+	ambiguous = 0;
+
+	optind++;
+
+	if ((has_equal = strchr(current_argv, '=')) != NULL) {
+		/* argument found (--option=arg) */
+		current_argv_len = has_equal - current_argv;
+		has_equal++;
+	} else
+		current_argv_len = strlen(current_argv);
+
+	for (i = 0; long_options[i].name; i++) {
+		/* find matching long option */
+		if (strncmp(current_argv, long_options[i].name,
+		    current_argv_len))
+			continue;
+
+		if (strlen(long_options[i].name) == current_argv_len) {
+			/* exact match */
+			match = i;
+			ambiguous = 0;
+			break;
+		}
+		/*
+		 * If this is a known short option, don't allow
+		 * a partial match of a single character.
+		 */
+		if (short_too && current_argv_len == 1)
+			continue;
+
+		if (match == -1)	/* partial match */
+			match = i;
+		else if (!IDENTICAL_INTERPRETATION(i, match))
+			ambiguous = 1;
+	}
+	if (ambiguous) {
+		/* ambiguous abbreviation */
+		if (PRINT_ERROR)
+			warnx(ambig, (int)current_argv_len,
+			     current_argv);
+		optopt = 0;
+		return (BADCH);
+	}
+	if (match != -1) {		/* option found */
+		if (long_options[match].has_arg == no_argument
+		    && has_equal) {
+			if (PRINT_ERROR)
+				warnx(noarg, (int)current_argv_len,
+				     current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			return (BADARG);
+		}
+		if (long_options[match].has_arg == required_argument ||
+		    long_options[match].has_arg == optional_argument) {
+			if (has_equal)
+				optarg = has_equal;
+			else if (long_options[match].has_arg ==
+			    required_argument) {
+				/*
+				 * optional argument doesn't use next nargv
+				 */
+				optarg = nargv[optind++];
+			}
+		}
+		if ((long_options[match].has_arg == required_argument)
+		    && (optarg == NULL)) {
+			/*
+			 * Missing argument; leading ':' indicates no error
+			 * should be generated.
+			 */
+			if (PRINT_ERROR)
+				warnx(recargstring,
+				    current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			--optind;
+			return (BADARG);
+		}
+	} else {			/* unknown option */
+		if (short_too) {
+			--optind;
+			return (-1);
+		}
+		if (PRINT_ERROR)
+			warnx(illoptstring, current_argv);
+		optopt = 0;
+		return (BADCH);
+	}
+	if (idx)
+		*idx = match;
+	if (long_options[match].flag) {
+		*long_options[match].flag = long_options[match].val;
+		return (0);
+	} else
+		return (long_options[match].val);
+#undef IDENTICAL_INTERPRETATION
+}
+
+/*
+ * getopt_internal --
+ *	Parse argc/argv argument vector.  Called by user level routines.
+ */
+static int
+getopt_internal(int nargc, char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int flags)
+{
+	char *oli;				/* option letter list index */
+	int optchar, short_too;
+	static int posixly_correct = -1;
+
+	if (options == NULL)
+		return (-1);
+
+	/*
+	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
+	 * XXX using optreset.  Work around this braindamage.
+	 */
+	if (optind == 0)
+		optind = optreset = 1;
+
+	/*
+	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
+	 * string begins with a '+'.
+	 *
+	 * CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or
+	 *                 optreset != 0 for GNU compatibility.
+	 */
+	if (posixly_correct == -1 || optreset != 0)
+		posixly_correct = (GetEnvironmentVariableW(L"POSIXLY_CORRECT", NULL, 0) != 0);
+	if (*options == '-')
+		flags |= FLAG_ALLARGS;
+	else if (posixly_correct || *options == '+')
+		flags &= ~FLAG_PERMUTE;
+	if (*options == '+' || *options == '-')
+		options++;
+
+	optarg = NULL;
+	if (optreset)
+		nonopt_start = nonopt_end = -1;
+start:
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc) {          /* end of argument vector */
+			place = EMSG;
+			if (nonopt_end != -1) {
+				/* do permutation, if we have to */
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			else if (nonopt_start != -1) {
+				/*
+				 * If we skipped non-options, set optind
+				 * to the first of them.
+				 */
+				optind = nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+		if (*(place = nargv[optind]) != '-' ||
+		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
+			place = EMSG;		/* found non-option */
+			if (flags & FLAG_ALLARGS) {
+				/*
+				 * GNU extension:
+				 * return non-option as argument to option 1
+				 */
+				optarg = nargv[optind++];
+				return (INORDER);
+			}
+			if (!(flags & FLAG_PERMUTE)) {
+				/*
+				 * If no permutation wanted, stop parsing
+				 * at first non-option.
+				 */
+				return (-1);
+			}
+			/* do permutation */
+			if (nonopt_start == -1)
+				nonopt_start = optind;
+			else if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				nonopt_start = optind -
+				    (nonopt_end - nonopt_start);
+				nonopt_end = -1;
+			}
+			optind++;
+			/* process next argument */
+			goto start;
+		}
+		if (nonopt_start != -1 && nonopt_end == -1)
+			nonopt_end = optind;
+
+		/*
+		 * If we have "-" do nothing, if "--" we are done.
+		 */
+		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+			optind++;
+			place = EMSG;
+			/*
+			 * We found an option (--), so if we skipped
+			 * non-options, we have to permute.
+			 */
+			if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+	}
+
+	/*
+	 * Check long options if:
+	 *  1) we were passed some
+	 *  2) the arg is not just "-"
+	 *  3) either the arg starts with -- we are getopt_long_only()
+	 */
+	if (long_options != NULL && place != nargv[optind] &&
+	    (*place == '-' || (flags & FLAG_LONGONLY))) {
+		short_too = 0;
+		if (*place == '-')
+			place++;		/* --foo long option */
+		else if (*place != ':' && strchr(options, *place) != NULL)
+			short_too = 1;		/* could be short option too */
+
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, short_too);
+		if (optchar != -1) {
+			place = EMSG;
+			return (optchar);
+		}
+	}
+
+	if ((optchar = (int)*place++) == (int)':' ||
+	    (optchar == (int)'-' && *place != '\0') ||
+	    (oli = strchr(options, optchar)) == NULL) {
+		/*
+		 * If the user specified "-" and  '-' isn't listed in
+		 * options, return -1 (non-option) as per POSIX.
+		 * Otherwise, it is an unknown option character (or ':').
+		 */
+		if (optchar == (int)'-' && *place == '\0')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (PRINT_ERROR)
+			warnx(illoptchar, optchar);
+		optopt = optchar;
+		return (BADCH);
+	}
+	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+		/* -W long-option */
+		if (*place)			/* no space */
+			/* NOTHING */;
+		else if (++optind >= nargc) {	/* no arg */
+			place = EMSG;
+			if (PRINT_ERROR)
+				warnx(recargchar, optchar);
+			optopt = optchar;
+			return (BADARG);
+		} else				/* white space */
+			place = nargv[optind];
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, 0);
+		place = EMSG;
+		return (optchar);
+	}
+	if (*++oli != ':') {			/* doesn't take argument */
+		if (!*place)
+			++optind;
+	} else {				/* takes (optional) argument */
+		optarg = NULL;
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (oli[1] != ':') {	/* arg not optional */
+			if (++optind >= nargc) {	/* no arg */
+				place = EMSG;
+				if (PRINT_ERROR)
+					warnx(recargchar, optchar);
+				optopt = optchar;
+				return (BADARG);
+			} else
+				optarg = nargv[optind];
+		}
+		place = EMSG;
+		++optind;
+	}
+	/* dump back option letter */
+	return (optchar);
+}
+
+#ifdef REPLACE_GETOPT
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ *
+ * [eventually this will replace the BSD getopt]
+ */
+int
+getopt(int nargc, char * const *nargv, const char *options)
+{
+
+	/*
+	 * We don't pass FLAG_PERMUTE to getopt_internal() since
+	 * the BSD getopt(3) (unlike GNU) has never done this.
+	 *
+	 * Furthermore, since many privileged programs call getopt()
+	 * before dropping privileges it makes sense to keep things
+	 * as simple (and bug-free) as possible.
+	 */
+	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+}
+#endif /* REPLACE_GETOPT */
+
+/*
+ * getopt_long --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE));
+}
+
+/*
+ * getopt_long_only --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long_only(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE|FLAG_LONGONLY));
+}

3rdparty/getopt/getopt.h

@@ -0,0 +1,95 @@
+#ifndef __GETOPT_H__
+/**
+ * DISCLAIMER
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the mingw-w64 runtime package.
+ *
+ * The mingw-w64 runtime package and its code is distributed in the hope that it 
+ * will be useful but WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESSED OR 
+ * IMPLIED ARE HEREBY DISCLAIMED.  This includes but is not limited to 
+ * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#define __GETOPT_H__
+
+/* All the headers include this file. */
+#include <crtdefs.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int optind;		/* index of first non-option in argv      */
+extern int optopt;		/* single option character, as parsed     */
+extern int opterr;		/* flag to enable built-in diagnostics... */
+				/* (user may set to zero, to suppress)    */
+
+extern char *optarg;		/* pointer to argument of current option  */
+
+extern int getopt(int nargc, char * const *nargv, const char *options);
+
+#ifdef _BSD_SOURCE
+/*
+ * BSD adds the non-standard `optreset' feature, for reinitialisation
+ * of `getopt' parsing.  We support this feature, for applications which
+ * proclaim their BSD heritage, before including this header; however,
+ * to maintain portability, developers are advised to avoid it.
+ */
+# define optreset  __mingw_optreset
+extern int optreset;
+#endif
+#ifdef __cplusplus
+}
+#endif
+/*
+ * POSIX requires the `getopt' API to be specified in `unistd.h';
+ * thus, `unistd.h' includes this header.  However, we do not want
+ * to expose the `getopt_long' or `getopt_long_only' APIs, when
+ * included in this manner.  Thus, close the standard __GETOPT_H__
+ * declarations block, and open an additional __GETOPT_LONG_H__
+ * specific block, only when *not* __UNISTD_H_SOURCED__, in which
+ * to declare the extended API.
+ */
+#endif /* !defined(__GETOPT_H__) */
+
+#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__)
+#define __GETOPT_LONG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct option		/* specification for a long form option...	*/
+{
+  const char *name;		/* option name, without leading hyphens */
+  int         has_arg;		/* does it take an argument?		*/
+  int        *flag;		/* where to save its status, or NULL	*/
+  int         val;		/* its associated status value		*/
+};
+
+enum    		/* permitted values for its `has_arg' field...	*/
+{
+  no_argument = 0,      	/* option never takes an argument	*/
+  required_argument,		/* option always requires an argument	*/
+  optional_argument		/* option may take an argument		*/
+};
+
+extern int getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx);
+extern int getopt_long_only(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx);
+/*
+ * Previous MinGW implementation had...
+ */
+#ifndef HAVE_DECL_GETOPT
+/*
+ * ...for the long form API only; keep this for compatibility.
+ */
+# define HAVE_DECL_GETOPT	1
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) */

3rdparty/macdeployqt/shared.cpp

@@ -40,6 +40,8 @@
 #include <QDir>
 #include <QSet>
 #include <QList>
+#include <QVariant>
+#include <QVariantMap>
 #include <QStack>
 #include <QDirIterator>
 #include <QLibraryInfo>
@@ -187,9 +189,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
         return info;
     }
 
-    static const QRegularExpression regexp(QStringLiteral(
-        "^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), "
-        "current version (\\d+\\.\\d+\\.\\d+)(, weak)?\\)$"));
+    static const QRegularExpression regexp(QStringLiteral("^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), current version (\\d+\\.\\d+\\.\\d+)(, weak|, reexport)?\\)$"));
 
     QString output = otool.readAllStandardOutput();
     QStringList outputLines = output.split("\n", Qt::SkipEmptyParts);
@@ -220,6 +220,8 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
     for (const QString &outputLine : outputLines) {
         const auto match = regexp.match(outputLine);
         if (match.hasMatch()) {
+            if (match.captured(1) == info.installName)
+                continue; // Another arch reference to the same binary
             DylibInfo dylib;
             dylib.binaryPath = match.captured(1);
             dylib.compatibilityVersion = QVersionNumber::fromString(match.captured(2));
@@ -300,11 +302,11 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundl
         if (state == QtPath) {
             // Check for library name part
             if (part < parts.count() && parts.at(part).contains(".dylib")) {
-                info.frameworkDirectory += "/" + (qtPath + currentPart + "/").simplified();
+                info.frameworkDirectory += "/" + QString(qtPath + currentPart + "/").simplified();
                 state = DylibName;
                 continue;
             } else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
-                info.frameworkDirectory += "/" + (qtPath + "lib/").simplified();
+                info.frameworkDirectory += "/" + QString(qtPath + "lib/").simplified();
                 state = FrameworkName;
                 continue;
             } else if (trimmed.startsWith("/") == false) {      // If the line does not contain a full path, the app is using a binary Qt package.
@@ -865,6 +867,18 @@ void changeInstallName(const QString &bundlePath, const FrameworkInfo &framework
         if (!framework.installName.isEmpty() && framework.installName != framework.sourceFilePath) {
             changeInstallName(framework.installName, deployedInstallName, binary);
         }
+        // Workaround for the case when the library ID name is a symlink, while the dependencies
+        // specified using the canonical path to the library (QTBUG-56814)
+        QFileInfo fileInfo= QFileInfo(framework.installName);
+        QString canonicalInstallName = fileInfo.canonicalFilePath();
+        if (!canonicalInstallName.isEmpty() && canonicalInstallName != framework.installName) {
+            changeInstallName(canonicalInstallName, deployedInstallName, binary);
+            // some libraries' inner dependencies (such as ffmpeg, nettle) use symbol link (QTBUG-100093)
+            QString innerDependency = fileInfo.canonicalPath() + "/" + fileInfo.fileName();
+            if (innerDependency != canonicalInstallName && innerDependency != framework.installName) {
+                changeInstallName(innerDependency, deployedInstallName, binary);
+            }
+        }
     }
 }
 
@@ -1078,7 +1092,7 @@ QString getLibInfix(const QStringList &deployedFrameworks)
 {
     QString libInfix;
     for (const QString &framework : deployedFrameworks) {
-        if (framework.startsWith(QStringLiteral("QtCore")) && framework.endsWith(QStringLiteral(".framework"))) {
+        if (framework.startsWith(QStringLiteral("QtCore")) && framework.endsWith(QStringLiteral(".framework")) && !framework.contains(QStringLiteral("5Compat"))) {
             Q_ASSERT(framework.length() >= 16);
             // 16 == "QtCore" + ".framework"
             const int lengthOfLibInfix = framework.length() - 16;
@@ -1214,28 +1228,42 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
 
     // GIO modules
     {
-      QString sourcePath = qgetenv("GIO_EXTRA_MODULES");
-      if (sourcePath.isEmpty()) {
-        if (QFileInfo::exists("/usr/local/lib/gio/modules/libgiognutls.so")) {
-          sourcePath = "/usr/local/lib/gio/modules/libgiognutls.so";
+      QString giomodule_path = qgetenv("GIO_EXTRA_MODULES");
+      if (giomodule_path.isEmpty()) {
+        if (QDir().exists("/usr/local/lib/gio/modules")) {
+          giomodule_path = "/usr/local/lib/gio/modules";
         }
-        else if (QFileInfo::exists("/opt/local/lib/gio/modules/libgiognutls.so")) {
-          sourcePath = "/opt/local/lib/gio/modules/libgiognutls.so";
+        else if (QDir().exists("/opt/local/lib/gio/modules")) {
+          giomodule_path = "/opt/local/lib/gio/modules";
         }
         else {
           qFatal("Missing GIO_EXTRA_MODULES");
         }
       }
-      else {
-        sourcePath = sourcePath + "/libgiognutls.so";
+
+      const QStringList giomodules = QStringList() << "libgiognutls.so" << "libgioopenssl.so";
+      bool have_giomodule = false;
+      for (const QString &giomodule : giomodules) {
+        const QString sourcePath = giomodule_path + "/" + giomodule;
+        QFileInfo fileinfo(sourcePath);
+        if (!fileinfo.exists()) {
+          LogError() << "Missing GIO module" << fileinfo.baseName();
+          continue;
+        }
+        have_giomodule = true;
+        const QString destinationPath = appBundleInfo.path + "/Contents/PlugIns/gio-modules/" + giomodule;
+        QDir dir;
+        if (dir.mkpath(QFileInfo(destinationPath).path()) && copyFilePrintStatus(sourcePath, destinationPath)) {
+          runStrip(destinationPath);
+          QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
+          deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
+        }
       }
-      const QString destinationPath = appBundleInfo.path + "/Contents/PlugIns/gio-modules/libgiognutls.so";
-      QDir dir;
-      if (dir.mkpath(QFileInfo(destinationPath).path()) && copyFilePrintStatus(sourcePath, destinationPath)) {
-        runStrip(destinationPath);
-        QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
-        deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
+
+      if (!have_giomodule) {
+        qFatal("Missing GIO modules.");
       }
+
     }
 
     // gst-plugin-scanner
@@ -1262,8 +1290,13 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
     }
 
     // GStreamer plugins.
-    QStringList gstreamer_plugins = QStringList() << "libgstapetag.dylib"
+    QStringList gstreamer_plugins = QStringList()
+                                                  << "libgstaes.dylib"
+                                                  << "libgstaiff.dylib"
+                                                  << "libgstapetag.dylib"
                                                   << "libgstapp.dylib"
+                                                  << "libgstasf.dylib"
+                                                  << "libgstasfmux.dylib"
                                                   << "libgstaudioconvert.dylib"
                                                   << "libgstaudiofx.dylib"
                                                   << "libgstaudiomixer.dylib"
@@ -1271,48 +1304,51 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
                                                   << "libgstaudiorate.dylib"
                                                   << "libgstaudioresample.dylib"
                                                   << "libgstaudiotestsrc.dylib"
-                                                  << "libgstaudiovisualizers.dylib"
-                                                  << "libgstauparse.dylib"
-                                                  << "libgstautoconvert.dylib"
                                                   << "libgstautodetect.dylib"
+                                                  << "libgstbs2b.dylib"
+                                                  << "libgstcdio.dylib"
                                                   << "libgstcoreelements.dylib"
+                                                  << "libgstdash.dylib"
                                                   << "libgstequalizer.dylib"
+                                                  << "libgstfaac.dylib"
+                                                  << "libgstfaad.dylib"
+                                                  << "libgstfdkaac.dylib"
+                                                  << "libgstflac.dylib"
                                                   << "libgstgio.dylib"
+                                                  << "libgstgme.dylib"
+                                                  << "libgsthls.dylib"
                                                   << "libgsticydemux.dylib"
                                                   << "libgstid3demux.dylib"
-                                                  << "libgstlevel.dylib"
+                                                  << "libgstid3tag.dylib"
+                                                  << "libgstisomp4.dylib"
+                                                  << "libgstlame.dylib"
+                                                  << "libgstlibav.dylib"
+                                                  << "libgstmpg123.dylib"
+                                                  << "libgstmusepack.dylib"
+                                                  << "libgstogg.dylib"
+                                                  << "libgstopenmpt.dylib"
+                                                  << "libgstopus.dylib"
+                                                  << "libgstopusparse.dylib"
                                                   << "libgstosxaudio.dylib"
-                                                  << "libgstplayback.dylib"
-                                                  << "libgstrawparse.dylib"
-                                                  << "libgstreplaygain.dylib"
-                                                  << "libgstsoup.dylib"
-                                                  << "libgstspectrum.dylib"
-                                                  << "libgsttypefindfunctions.dylib"
-                                                  << "libgstvolume.dylib"
-                                                  << "libgstxingmux.dylib"
-                                                  << "libgsttcp.dylib"
-                                                  << "libgstudp.dylib"
                                                   << "libgstpbtypes.dylib"
+                                                  << "libgstplayback.dylib"
+                                                  << "libgstreplaygain.dylib"
                                                   << "libgstrtp.dylib"
                                                   << "libgstrtsp.dylib"
-                                                  << "libgstflac.dylib"
-                                                  << "libgstwavparse.dylib"
-                                                  << "libgstfaad.dylib"
-                                                  << "libgstogg.dylib"
-                                                  << "libgstopus.dylib"
-                                                  << "libgstasf.dylib"
+                                                  << "libgstsoup.dylib"
+                                                  << "libgstspectrum.dylib"
                                                   << "libgstspeex.dylib"
                                                   << "libgsttaglib.dylib"
+                                                  << "libgsttcp.dylib"
+                                                  << "libgsttwolame.dylib"
+                                                  << "libgsttypefindfunctions.dylib"
+                                                  << "libgstudp.dylib"
+                                                  << "libgstvolume.dylib"
                                                   << "libgstvorbis.dylib"
-                                                  << "libgstisomp4.dylib"
-                                                  << "libgstlibav.dylib"
-                                                  << "libgstaiff.dylib"
-                                                  << "libgstlame.dylib";
-
-    // macports does not have these.
-    QStringList gstreamer_plugins_optional = QStringList() << "libgstopusparse.dylib"
-                                                           << "libgstfaac.dylib"
-                                                           << "libgstmusepack.dylib";
+                                                  << "libgstwavenc.dylib"
+                                                  << "libgstwavpack.dylib"
+                                                  << "libgstwavparse.dylib"
+                                                  << "libgstxingmux.dylib";
 
     QString gstreamer_plugins_dir = qgetenv("GST_PLUGIN_PATH");
     if (gstreamer_plugins_dir.isEmpty()) {
@@ -1327,13 +1363,16 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
       }
     }
 
+    QStringList missing_gst_plugins;
+
     for (const QString &plugin : gstreamer_plugins) {
         QFileInfo info(gstreamer_plugins_dir + "/" + plugin);
         if (!info.exists()) {
             info.setFile(gstreamer_plugins_dir + "/" + info.baseName() + QString(".so"));
             if (!info.exists()) {
                 LogError() << "Missing gstreamer plugin" << info.baseName();
-                qFatal("Missing %s", info.baseName().toUtf8().constData());
+                missing_gst_plugins << info.baseName();
+                continue;
             }
         }
         const QString &sourcePath = info.filePath();
@@ -1345,22 +1384,8 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
         }
     }
 
-    for (const QString &plugin : gstreamer_plugins_optional) {
-        QFileInfo info(gstreamer_plugins_dir + "/" + plugin);
-        if (!info.exists()) {
-            info.setFile(gstreamer_plugins_dir + "/" + info.baseName() + QString(".so"));
-            if (!info.exists()) {
-                LogWarning() << "Skip missing gstreamer plugin" << info.baseName();
-                continue;
-            }
-        }
-        const QString &sourcePath = info.filePath();
-        const QString destinationPath = appBundleInfo.path + "/Contents/PlugIns/gstreamer/" + info.fileName();
-        if (QDir().mkpath(QFileInfo(destinationPath).path()) && copyFilePrintStatus(sourcePath, destinationPath)) {
-            runStrip(destinationPath);
-            QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
-            deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
-        }
+    if (!missing_gst_plugins.isEmpty()) {
+      LogError() << "Missing gstreamer plugins" << missing_gst_plugins;
     }
 
 }
@@ -1463,9 +1488,9 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
     for (const QString &importPath : qmlImportPaths)
         argumentList << "-importPath" << importPath;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath);
+    QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
 #else
-    QString qmlImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+    QString qmlImportsPath = QLibraryInfo::location(QLibraryInfo::QmlImportsPath);
 #endif
     argumentList.append( "-importPath");
     argumentList.append(qmlImportsPath);
@@ -1477,7 +1502,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
         LogError() << "Could not start qmlimpoortscanner. Process error is" << qmlImportScanner.errorString();
         return false;
     }
-    qmlImportScanner.waitForFinished();
+    qmlImportScanner.waitForFinished(-1);
 
     // log qmlimportscanner errors
     qmlImportScanner.setReadChannel(QProcess::StandardError);

3rdparty/singleapplication/CMakeLists.txt

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

3rdparty/singleapplication/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Itay Grudev 2015 - 2016
+Copyright (c) Itay Grudev 2015 - 2020
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

3rdparty/singleapplication/README.md

@@ -1,7 +1,8 @@
 SingleApplication
 =================
+[![CI](https://github.com/itay-grudev/SingleApplication/workflows/CI:%20Build%20Test/badge.svg)](https://github.com/itay-grudev/SingleApplication/actions)
 
-This is a replacement of the QtSingleApplication for `Qt5`.
+This is a replacement of the QtSingleApplication for `Qt5` and `Qt6`.
 
 Keeps the Primary Instance of your Application and kills each subsequent
 instances. It can (if enabled) spawn secondary (non-related to the primary)
@@ -15,18 +16,6 @@ class you specify via the `QAPPLICATION_CLASS` macro (`QCoreApplication` is the
 default). Further usage is similar to the use of the `Q[Core|Gui]Application`
 classes.
 
-The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
-instance of your Application is your Primary Instance. It would check if the
-shared memory block exists and if not it will start a `QLocalServer` and listen
-for connections. Each subsequent instance of your application would check if the
-shared memory block exists and if it does, it will connect to the QLocalServer
-to notify the primary instance that a new instance had been started, after which
-it would terminate with status code `0`. In the Primary Instance
-`SingleApplication` would emit the `instanceStarted()` signal upon detecting
-that a new instance had been started.
-
-The library uses `stdlib` to terminate the program with the `exit()` function.
-
 You can use the library as if you use any other `QCoreApplication` derived
 class:
 
@@ -43,24 +32,49 @@ int main( int argc, char* argv[] )
 ```
 
 To include the library files I would recommend that you add it as a git
-submodule to your project and include it's contents with a `.pri` file. Here is
-how:
+submodule to your project. Here is how:
 
 ```bash
-git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
+git submodule add https://github.com/itay-grudev/SingleApplication.git singleapplication
 ```
 
-Then include the `singleapplication.pri` file in your `.pro` project file. Also
-don't forget to specify which `QCoreApplication` class your app is using if it
-is not `QCoreApplication`.
+**Qmake:**
+
+Then include the `singleapplication.pri` file in your `.pro` project file.
 
 ```qmake
 include(singleapplication/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
 ```
 
+**CMake:**
+
+Then include the subdirectory in your `CMakeLists.txt` project file.
+
+```cmake
+set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
+add_subdirectory(src/third-party/singleapplication)
+target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication)
+```
+
+
+The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
+instance of your Application is your Primary Instance. It would check if the
+shared memory block exists and if not it will start a `QLocalServer` and listen
+for connections. Each subsequent instance of your application would check if the
+shared memory block exists and if it does, it will connect to the QLocalServer
+to notify the primary instance that a new instance had been started, after which
+it would terminate with status code `0`. In the Primary Instance
+`SingleApplication` would emit the `instanceStarted()` signal upon detecting
+that a new instance had been started.
+
+The library uses `stdlib` to terminate the program with the `exit()` function.
+
+Also don't forget to specify which `QCoreApplication` class your app is using if it
+is not `QCoreApplication` as in examples above.
+
 The `Instance Started` signal
-------------------------
+-----------------------------
 
 The SingleApplication class implements a `instanceStarted()` signal. You can
 bind to that signal to raise your application's window when a new instance had
@@ -125,13 +139,22 @@ app.isSecondary();
 *__Note:__ If your Primary Instance is terminated a newly launched instance
 will replace the Primary one even if the Secondary flag has been set.*
 
+Examples
+--------
+
+There are three examples provided in this repository:
+
+* Basic example that prevents a secondary instance from starting [`examples/basic`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/basic)
+* An example of a graphical application raising it's parent window [`examples/calculator`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/calculator)
+* A console application sending the primary instance it's command line parameters [`examples/sending_arguments`](https://github.com/itay-grudev/SingleApplication/tree/master/examples/sending_arguments)
+
 API
 ---
 
 ### Members
 
 ```cpp
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100 )
+SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100, QString userData = QString() )
 ```
 
 Depending on whether `allowSecondary` is set, this constructor may terminate
@@ -140,7 +163,7 @@ can be specified to set whether the SingleApplication block should work
 user-wide or system-wide. Additionally the `Mode::SecondaryNotification` may be
 used to notify the primary instance whenever a secondary instance had been
 started (disabled by default). `timeout` specifies the maximum time in
-milliseconds to wait for blocking operations.
+milliseconds to wait for blocking operations. Setting `userData` provides additional data that will isolate this instance from other instances that do not have the same (or any) user data set.
 
 *__Note:__ `argc` and `argv` may be changed as Qt removes arguments that it
 recognizes.*
@@ -159,7 +182,8 @@ bool SingleApplication::sendMessage( QByteArray message, int timeout = 100 )
 ```
 
 Sends `message` to the Primary Instance. Uses `timeout` as a the maximum timeout
-in milliseconds for blocking functions
+in milliseconds for blocking functions. Returns `true` if the message has been sent
+successfully. If the message can't be sent or the function timeouts - returns `false`.
 
 ---
 
@@ -192,6 +216,22 @@ qint64 SingleApplication::primaryPid()
 
 Returns the process ID (PID) of the primary instance.
 
+---
+
+```cpp
+QString SingleApplication::primaryUser()
+```
+
+Returns the username the primary instance is running as.
+
+---
+
+```cpp
+QString SingleApplication::currentUser()
+```
+
+Returns the username the current instance is running as.
+
 ### Signals
 
 ```cpp

3rdparty/singleapplication/singleapplication.cpp

@@ -54,7 +54,7 @@
  * @param options Optional flags to toggle specific behaviour
  * @param timeout Maximum time blocking functions are allowed during app load
  */
-SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
+SingleApplication::SingleApplication(int &argc, char *argv[], const bool allowSecondary, const Options options, const int timeout)
     : app_t(argc, argv),
       d_ptr(new SingleApplicationPrivate(this)) {
 
@@ -67,7 +67,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
   d->genBlockServerName();
 
   // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
-  d->randomSleep();
+  SingleApplicationPrivate::randomSleep();
 
 #ifdef Q_OS_UNIX
   // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
@@ -106,14 +106,14 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
     }
   }
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(d->memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(d->memory_->data());
   QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
   forever {
     // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == inst->checksum) break;
+    if (d->blockChecksum() == instance->checksum) break;
 
     // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
     if (time.elapsed() > 5000) {
@@ -127,14 +127,14 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
       qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
       qDebug() << d->memory_->errorString();
     }
-    d->randomSleep();
+    SingleApplicationPrivate::randomSleep();
     if (!d->memory_->lock()) {
       qCritical() << "SingleApplication: Unable to lock memory after random wait.";
       abortSafely();
     }
   }
 
-  if (!inst->primary) {
+  if (!instance->primary) {
     d->startPrimary();
     if (!d->memory_->unlock()) {
       qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
@@ -178,8 +178,8 @@ SingleApplication::~SingleApplication() {
  * Checks if the current application instance is primary.
  * @return Returns true if the instance is primary, false otherwise.
  */
-bool SingleApplication::isPrimary() {
-  Q_D(SingleApplication);
+bool SingleApplication::isPrimary() const {
+  Q_D(const SingleApplication);
   return d->server_ != nullptr;
 }
 
@@ -187,8 +187,8 @@ bool SingleApplication::isPrimary() {
  * Checks if the current application instance is secondary.
  * @return Returns true if the instance is secondary, false otherwise.
  */
-bool SingleApplication::isSecondary() {
-  Q_D(SingleApplication);
+bool SingleApplication::isSecondary() const {
+  Q_D(const SingleApplication);
   return d->server_ == nullptr;
 }
 
@@ -197,8 +197,8 @@ bool SingleApplication::isSecondary() {
  * It is reset when the first (primary) instance of your app starts and only incremented afterwards.
  * @return Returns a unique instance id.
  */
-quint32 SingleApplication::instanceId() {
-  Q_D(SingleApplication);
+quint32 SingleApplication::instanceId() const {
+  Q_D(const SingleApplication);
   return d->instanceNumber_;
 }
 
@@ -207,8 +207,8 @@ quint32 SingleApplication::instanceId() {
  * Especially useful when SingleApplication is coupled with OS. specific APIs.
  * @return Returns the primary instance PID.
  */
-qint64 SingleApplication::primaryPid() {
-  Q_D(SingleApplication);
+qint64 SingleApplication::primaryPid() const {
+  Q_D(const SingleApplication);
   return d->primaryPid();
 }
 
@@ -216,8 +216,8 @@ qint64 SingleApplication::primaryPid() {
  * Returns the username the primary instance is running as.
  * @return Returns the username the primary instance is running as.
  */
-QString SingleApplication::primaryUser() {
-  Q_D(SingleApplication);
+QString SingleApplication::primaryUser() const {
+  Q_D(const SingleApplication);
   return d->primaryUser();
 }
 
@@ -225,9 +225,8 @@ QString SingleApplication::primaryUser() {
  * Returns the username the current instance is running as.
  * @return Returns the username the current instance is running as.
  */
-QString SingleApplication::currentUser() {
-  Q_D(SingleApplication);
-  return d->getUsername();
+QString SingleApplication::currentUser() const {
+  return SingleApplicationPrivate::getUsername();
 }
 
 /**
@@ -248,11 +247,7 @@ bool SingleApplication::sendMessage(const QByteArray &message, const int timeout
     return false;
   }
 
-  d->socket_->write(message);
-  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
-  d->socket_->flush();
-  return dataWritten;
-
+  return d->writeConfirmedMessage(timeout, message);
 }
 
 /**
@@ -265,6 +260,7 @@ void SingleApplication::abortSafely() {
 
   qCritical() << "SingleApplication: " << d->memory_->error() << d->memory_->errorString();
   delete d;
+
   ::exit(EXIT_FAILURE);
 
 }

3rdparty/singleapplication/singleapplication.h

@@ -48,7 +48,7 @@ class SingleApplicationPrivate;
 class SingleApplication : public QApplication {  // clazy:exclude=ctor-missing-parent-argument
   Q_OBJECT
 
-  typedef QApplication app_t;
+  using app_t = QApplication;
 
  public:
   /**
@@ -88,46 +88,45 @@ class SingleApplication : public QApplication {  // clazy:exclude=ctor-missing-p
    * operations. It does not guarantee that the SingleApplication
    * initialisation will be completed in given time, though is a good hint.
    * Usually 4*timeout would be the worst case (fail) scenario.
-   * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
-  explicit SingleApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
+  explicit SingleApplication(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
   ~SingleApplication() override;
 
   /**
    * @brief Returns if the instance is the primary instance
    * @returns {bool}
    */
-  bool isPrimary();
+  bool isPrimary() const;
 
   /**
    * @brief Returns if the instance is a secondary instance
    * @returns {bool}
    */
-  bool isSecondary();
+  bool isSecondary() const;
 
   /**
    * @brief Returns a unique identifier for the current instance
    * @returns {qint32}
    */
-  quint32 instanceId();
+  quint32 instanceId() const;
 
   /**
    * @brief Returns the process ID (PID) of the primary instance
    * @returns {qint64}
    */
-  qint64 primaryPid();
+  qint64 primaryPid() const;
 
   /**
    * @brief Returns the username of the user running the primary instance
    * @returns {QString}
    */
-  QString primaryUser();
+  QString primaryUser() const;
 
   /**
    * @brief Returns the username of the current user
    * @returns {QString}
    */
-  QString currentUser();
+  QString currentUser() const;
 
   /**
    * @brief Sends a message to the primary instance. Returns true on success.

3rdparty/singleapplication/singleapplication_p.cpp

@@ -44,6 +44,14 @@
 #  include <pwd.h>
 #endif
 
+#ifdef Q_OS_WIN
+#  ifndef NOMINMAX
+#    define NOMINMAX 1
+#  endif
+#  include <windows.h>
+#  include <lmcons.h>
+#endif
+
 #include <QObject>
 #include <QThread>
 #include <QIODevice>
@@ -53,7 +61,6 @@
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
-#include <QDir>
 #include <QElapsedTimer>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #  include <QRandomGenerator>
@@ -64,11 +71,6 @@
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
-#ifdef Q_OS_WIN
-#  include <windows.h>
-#  include <lmcons.h>
-#endif
-
 SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *ptr)
     : q_ptr(ptr),
       memory_(nullptr),
@@ -86,14 +88,14 @@ SingleApplicationPrivate::~SingleApplicationPrivate() {
 
   if (memory_ != nullptr) {
     memory_->lock();
-    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
     if (server_ != nullptr) {
       server_->close();
       delete server_;
-      inst->primary = false;
-      inst->primaryPid = -1;
-      inst->primaryUser[0] = '\0';
-      inst->checksum = blockChecksum();
+      instance->primary = false;
+      instance->primaryPid = -1;
+      instance->primaryUser[0] = '\0';
+      instance->checksum = blockChecksum();
     }
     memory_->unlock();
 
@@ -142,7 +144,7 @@ QString SingleApplicationPrivate::getUsername() {
 void SingleApplicationPrivate::genBlockServerName() {
 
   QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication", 17);
+  appData.addData("SingleApplication");
   appData.addData(SingleApplication::app_t::applicationName().toUtf8());
   appData.addData(SingleApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleApplication::app_t::organizationDomain().toUtf8());
@@ -152,7 +154,15 @@ void SingleApplicationPrivate::genBlockServerName() {
   }
 
   if (!(options_ & SingleApplication::Mode::ExcludeAppPath)) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_UNIX)
+    const QByteArray appImagePath = qgetenv("APPIMAGE");
+    if (appImagePath.isEmpty()) {
+      appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
+    }
+    else {
+      appData.addData(appImagePath);
+    };
+#elif defined(Q_OS_WIN)
     appData.addData(SingleApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
     appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
@@ -171,26 +181,24 @@ void SingleApplicationPrivate::genBlockServerName() {
 
 void SingleApplicationPrivate::initializeMemoryBlock() const {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  inst->primary = false;
-  inst->secondary = 0;
-  inst->primaryPid = -1;
-  inst->primaryUser[0] = '\0';
-  inst->checksum = blockChecksum();
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  instance->primary = false;
+  instance->secondary = 0;
+  instance->primaryPid = -1;
+  instance->primaryUser[0] = '\0';
+  instance->checksum = blockChecksum();
 
 }
 
 void SingleApplicationPrivate::startPrimary() {
 
-  Q_Q(SingleApplication);
-
   // Reset the number of connections
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->primary = true;
-  inst->primaryPid = q->applicationPid();
-  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
-  inst->checksum = blockChecksum();
+  instance->primary = true;
+  instance->primaryPid = QCoreApplication::applicationPid();
+  qstrncpy(instance->primaryUser, getUsername().toUtf8().data(), sizeof(instance->primaryUser));
+  instance->checksum = blockChecksum();
   instanceNumber_ = 0;
   // Successful creation means that no main process exists
   // So we start a QLocalServer to listen for connections
@@ -212,11 +220,11 @@ void SingleApplicationPrivate::startPrimary() {
 
 void SingleApplicationPrivate::startSecondary() {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->secondary += 1;
-  inst->checksum = blockChecksum();
-  instanceNumber_ = inst->secondary;
+  instance->secondary += 1;
+  instance->checksum = blockChecksum();
+  instanceNumber_ = instance->secondary;
 
 }
 
@@ -263,25 +271,53 @@ bool SingleApplicationPrivate::connectToPrimary(const int timeout, const Connect
   writeStream << instanceNumber_;
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+  quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
 #else
   quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
 
   writeStream << checksum;
 
-  // The header indicates the message length that follows
+  return writeConfirmedMessage(static_cast<int>(timeout - time.elapsed()), initMsg);
+
+}
+
+void SingleApplicationPrivate::writeAck(QLocalSocket *sock) {
+  sock->putChar('\n');
+}
+
+bool SingleApplicationPrivate::writeConfirmedMessage(const int timeout, const QByteArray &msg) const {
+
+  QElapsedTimer time;
+  time.start();
+
+  // Frame 1: The header indicates the message length that follows
   QByteArray header;
   QDataStream headerStream(&header, QIODevice::WriteOnly);
   headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(initMsg.length());
+  headerStream << static_cast<quint64>(msg.length());
 
-  socket_->write(header);
-  socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(static_cast<int>(timeout - time.elapsed()));
+  if (!writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), header)) {
+    return false;
+  }
+
+  // Frame 2: The message
+  return writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), msg);
+
+}
+
+bool SingleApplicationPrivate::writeConfirmedFrame(const int timeout, const QByteArray &msg) const {
+
+  socket_->write(msg);
   socket_->flush();
 
-  return result;
+  bool result = socket_->waitForReadyRead(timeout);
+  if (result) {
+    socket_->read(1);
+    return true;
+  }
+
+  return false;
 
 }
 
@@ -300,8 +336,8 @@ quint16 SingleApplicationPrivate::blockChecksum() const {
 qint64 SingleApplicationPrivate::primaryPid() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = inst->primaryPid;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = instance->primaryPid;
   memory_->unlock();
 
   return pid;
@@ -311,8 +347,8 @@ qint64 SingleApplicationPrivate::primaryPid() const {
 QString SingleApplicationPrivate::primaryUser() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = inst->primaryUser;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = instance->primaryUser;
   memory_->unlock();
 
   return QString::fromUtf8(username);
@@ -328,26 +364,30 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
   QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    const ConnectionInfo info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
+
+  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
-    nextConnSocket->deleteLater();
   });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    const ConnectionInfo info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
+      case StageInitHeader:
+        readMessageHeader(nextConnSocket, StageInitBody);
         break;
-      case StageBody:
+      case StageInitBody:
         readInitMessageBody(nextConnSocket);
         break;
-      case StageConnected:
-        slotDataAvailable(nextConnSocket, info.instanceId);
+      case StageConnectedHeader:
+        readMessageHeader(nextConnSocket, StageConnectedBody);
+        break;
+      case StageConnectedBody:
+        this->slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -356,7 +396,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
 
 }
 
-void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
+void SingleApplicationPrivate::readMessageHeader(QLocalSocket *sock, const SingleApplicationPrivate::ConnectionStage nextStage) {
 
   if (!connectionMap_.contains(sock)) {
     return;
@@ -373,30 +413,34 @@ void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   quint64 msgLen = 0;
   headerStream >> msgLen;
   ConnectionInfo &info = connectionMap_[sock];
-  info.stage = StageBody;
+  info.stage = nextStage;
   info.msgLen = msgLen;
 
-  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
-    readInitMessageBody(sock);
+  writeAck(sock);
+
+}
+
+bool SingleApplicationPrivate::isFrameComplete(QLocalSocket *sock) {
+
+  if (!connectionMap_.contains(sock)) {
+    return false;
   }
 
+  const ConnectionInfo &info = connectionMap_[sock];
+  return (sock->bytesAvailable() >= static_cast<qint64>(info.msgLen));
+
 }
 
 void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
   Q_Q(SingleApplication);
 
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
+  if (!isFrameComplete(sock)) {
     return;
   }
 
   // Read the message body
-  QByteArray msgBytes = sock->read(static_cast<qint64>(info.msgLen));
+  QByteArray msgBytes = sock->readAll();
   QDataStream readStream(msgBytes);
   readStream.setVersion(QDataStream::Qt_5_8);
 
@@ -431,23 +475,34 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
     return;
   }
 
+  ConnectionInfo &info = connectionMap_[sock];
   info.instanceId = instanceId;
-  info.stage = StageConnected;
+  info.stage = StageConnectedHeader;
 
   if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplication::Mode::SecondaryNotification)) {
-    Q_EMIT q->instanceStarted();
+    emit q->instanceStarted();
   }
 
-  if (sock->bytesAvailable() > 0) {
-    slotDataAvailable(sock, instanceId);
-  }
+  writeAck(sock);
 
 }
 
 void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleApplication);
-  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
+  if (!isFrameComplete(dataSocket)) {
+    return;
+  }
+
+  const QByteArray message = dataSocket->readAll();
+
+  writeAck(dataSocket);
+
+  ConnectionInfo &info = connectionMap_[dataSocket];
+  info.stage = StageConnectedHeader;
+
+  emit q->receivedMessage(instanceId, message);
 
 }
 
@@ -465,7 +520,7 @@ void SingleApplicationPrivate::randomSleep() {
   QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
 #else
   qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+  QThread::msleep(qrand() % 11 + 8);
 #endif
 
 }

3rdparty/singleapplication/singleapplication_p.h

@@ -71,9 +71,10 @@ class SingleApplicationPrivate : public QObject {
     Reconnect = 3
   };
   enum ConnectionStage : quint8 {
-    StageHeader = 0,
-    StageBody = 1,
-    StageConnected = 2,
+    StageInitHeader = 0,
+    StageInitBody = 1,
+    StageConnectedHeader = 2,
+    StageConnectedBody = 3,
   };
   Q_DECLARE_PUBLIC(SingleApplication)
 
@@ -89,8 +90,12 @@ class SingleApplicationPrivate : public QObject {
   quint16 blockChecksum() const;
   qint64 primaryPid() const;
   QString primaryUser() const;
-  void readInitMessageHeader(QLocalSocket *socket);
+  bool isFrameComplete(QLocalSocket *sock);
+  void readMessageHeader(QLocalSocket *socket, const ConnectionStage nextStage);
   void readInitMessageBody(QLocalSocket *socket);
+  void writeAck(QLocalSocket *sock);
+  bool writeConfirmedFrame(const int timeout, const QByteArray &msg) const;
+  bool writeConfirmedMessage(const int timeout, const QByteArray &msg) const;
   static void randomSleep();
 
   SingleApplication *q_ptr;

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -54,7 +54,7 @@
  * @param options Optional flags to toggle specific behaviour
  * @param timeout Maximum time blocking functions are allowed during app load
  */
-SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
+SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], const bool allowSecondary, const Options options, const int timeout)
     : app_t(argc, argv),
       d_ptr(new SingleCoreApplicationPrivate(this)) {
 
@@ -67,7 +67,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
   d->genBlockServerName();
 
   // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
-  d->randomSleep();
+  SingleCoreApplicationPrivate::randomSleep();
 
 #ifdef Q_OS_UNIX
   // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
@@ -106,14 +106,14 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
     }
   }
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(d->memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(d->memory_->data());
   QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
   forever {
     // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == inst->checksum) break;
+    if (d->blockChecksum() == instance->checksum) break;
 
     // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
     if (time.elapsed() > 5000) {
@@ -127,14 +127,14 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
       qDebug() << "SingleCoreApplication: Unable to unlock memory for random wait.";
       qDebug() << d->memory_->errorString();
     }
-    d->randomSleep();
+    SingleCoreApplicationPrivate::randomSleep();
     if (!d->memory_->lock()) {
       qCritical() << "SingleCoreApplication: Unable to lock memory after random wait.";
       abortSafely();
     }
   }
 
-  if (!inst->primary) {
+  if (!instance->primary) {
     d->startPrimary();
     if (!d->memory_->unlock()) {
       qDebug() << "SingleCoreApplication: Unable to unlock memory after primary start.";
@@ -178,8 +178,8 @@ SingleCoreApplication::~SingleCoreApplication() {
  * Checks if the current application instance is primary.
  * @return Returns true if the instance is primary, false otherwise.
  */
-bool SingleCoreApplication::isPrimary() {
-  Q_D(SingleCoreApplication);
+bool SingleCoreApplication::isPrimary() const {
+  Q_D(const SingleCoreApplication);
   return d->server_ != nullptr;
 }
 
@@ -187,8 +187,8 @@ bool SingleCoreApplication::isPrimary() {
  * Checks if the current application instance is secondary.
  * @return Returns true if the instance is secondary, false otherwise.
  */
-bool SingleCoreApplication::isSecondary() {
-  Q_D(SingleCoreApplication);
+bool SingleCoreApplication::isSecondary() const {
+  Q_D(const SingleCoreApplication);
   return d->server_ == nullptr;
 }
 
@@ -197,8 +197,8 @@ bool SingleCoreApplication::isSecondary() {
  * It is reset when the first (primary) instance of your app starts and only incremented afterwards.
  * @return Returns a unique instance id.
  */
-quint32 SingleCoreApplication::instanceId() {
-  Q_D(SingleCoreApplication);
+quint32 SingleCoreApplication::instanceId() const {
+  Q_D(const SingleCoreApplication);
   return d->instanceNumber_;
 }
 
@@ -207,8 +207,8 @@ quint32 SingleCoreApplication::instanceId() {
  * Especially useful when SingleCoreApplication is coupled with OS. specific APIs.
  * @return Returns the primary instance PID.
  */
-qint64 SingleCoreApplication::primaryPid() {
-  Q_D(SingleCoreApplication);
+qint64 SingleCoreApplication::primaryPid() const {
+  Q_D(const SingleCoreApplication);
   return d->primaryPid();
 }
 
@@ -216,8 +216,8 @@ qint64 SingleCoreApplication::primaryPid() {
  * Returns the username the primary instance is running as.
  * @return Returns the username the primary instance is running as.
  */
-QString SingleCoreApplication::primaryUser() {
-  Q_D(SingleCoreApplication);
+QString SingleCoreApplication::primaryUser() const {
+  Q_D(const SingleCoreApplication);
   return d->primaryUser();
 }
 
@@ -225,9 +225,8 @@ QString SingleCoreApplication::primaryUser() {
  * Returns the username the current instance is running as.
  * @return Returns the username the current instance is running as.
  */
-QString SingleCoreApplication::currentUser() {
-  Q_D(SingleCoreApplication);
-  return d->getUsername();
+QString SingleCoreApplication::currentUser() const {
+  return SingleCoreApplicationPrivate::getUsername();
 }
 
 /**
@@ -248,11 +247,7 @@ bool SingleCoreApplication::sendMessage(const QByteArray &message, const int tim
     return false;
   }
 
-  d->socket_->write(message);
-  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
-  d->socket_->flush();
-  return dataWritten;
-
+  return d->writeConfirmedMessage(timeout, message);
 }
 
 /**
@@ -265,6 +260,7 @@ void SingleCoreApplication::abortSafely() {
 
   qCritical() << "SingleCoreApplication: " << d->memory_->error() << d->memory_->errorString();
   delete d;
+
   ::exit(EXIT_FAILURE);
 
 }

3rdparty/singleapplication/singlecoreapplication.h

@@ -45,10 +45,10 @@ class SingleCoreApplicationPrivate;
  * @brief The SingleCoreApplication class handles multiple instances of the same Application
  * @see QCoreApplication
  */
-class SingleCoreApplication : public QCoreApplication {
+class SingleCoreApplication : public QCoreApplication {  // clazy:exclude=ctor-missing-parent-argument
   Q_OBJECT
 
-  typedef QCoreApplication app_t;
+  using app_t = QCoreApplication;
 
  public:
   /**
@@ -96,37 +96,37 @@ class SingleCoreApplication : public QCoreApplication {
    * @brief Returns if the instance is the primary instance
    * @returns {bool}
    */
-  bool isPrimary();
+  bool isPrimary() const;
 
   /**
    * @brief Returns if the instance is a secondary instance
    * @returns {bool}
    */
-  bool isSecondary();
+  bool isSecondary() const;
 
   /**
    * @brief Returns a unique identifier for the current instance
    * @returns {qint32}
    */
-  quint32 instanceId();
+  quint32 instanceId() const;
 
   /**
    * @brief Returns the process ID (PID) of the primary instance
    * @returns {qint64}
    */
-  qint64 primaryPid();
+  qint64 primaryPid() const;
 
   /**
    * @brief Returns the username of the user running the primary instance
    * @returns {QString}
    */
-  QString primaryUser();
+  QString primaryUser() const;
 
   /**
    * @brief Returns the username of the current user
    * @returns {QString}
    */
-  QString currentUser();
+  QString currentUser() const;
 
   /**
    * @brief Sends a message to the primary instance. Returns true on success.

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -44,6 +44,14 @@
 #  include <pwd.h>
 #endif
 
+#ifdef Q_OS_WIN
+#  ifndef NOMINMAX
+#    define NOMINMAX 1
+#  endif
+#  include <windows.h>
+#  include <lmcons.h>
+#endif
+
 #include <QObject>
 #include <QThread>
 #include <QIODevice>
@@ -53,7 +61,6 @@
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
-#include <QDir>
 #include <QElapsedTimer>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #  include <QRandomGenerator>
@@ -64,11 +71,6 @@
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
 
-#ifdef Q_OS_WIN
-#  include <windows.h>
-#  include <lmcons.h>
-#endif
-
 SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *ptr)
     : q_ptr(ptr),
       memory_(nullptr),
@@ -86,14 +88,14 @@ SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
 
   if (memory_ != nullptr) {
     memory_->lock();
-    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
     if (server_ != nullptr) {
       server_->close();
       delete server_;
-      inst->primary = false;
-      inst->primaryPid = -1;
-      inst->primaryUser[0] = '\0';
-      inst->checksum = blockChecksum();
+      instance->primary = false;
+      instance->primaryPid = -1;
+      instance->primaryUser[0] = '\0';
+      instance->checksum = blockChecksum();
     }
     memory_->unlock();
 
@@ -142,7 +144,7 @@ QString SingleCoreApplicationPrivate::getUsername() {
 void SingleCoreApplicationPrivate::genBlockServerName() {
 
   QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication", 17);
+  appData.addData("SingleApplication");
   appData.addData(SingleCoreApplication::app_t::applicationName().toUtf8());
   appData.addData(SingleCoreApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleCoreApplication::app_t::organizationDomain().toUtf8());
@@ -152,7 +154,15 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
   }
 
   if (!(options_ & SingleCoreApplication::Mode::ExcludeAppPath)) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_UNIX)
+    const QByteArray appImagePath = qgetenv("APPIMAGE");
+    if (appImagePath.isEmpty()) {
+      appData.addData(SingleCoreApplication::app_t::applicationFilePath().toUtf8());
+    }
+    else {
+      appData.addData(appImagePath);
+    };
+#elif defined(Q_OS_WIN)
     appData.addData(SingleCoreApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
     appData.addData(SingleCoreApplication::app_t::applicationFilePath().toUtf8());
@@ -171,26 +181,24 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
 
 void SingleCoreApplicationPrivate::initializeMemoryBlock() const {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  inst->primary = false;
-  inst->secondary = 0;
-  inst->primaryPid = -1;
-  inst->primaryUser[0] = '\0';
-  inst->checksum = blockChecksum();
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  instance->primary = false;
+  instance->secondary = 0;
+  instance->primaryPid = -1;
+  instance->primaryUser[0] = '\0';
+  instance->checksum = blockChecksum();
 
 }
 
 void SingleCoreApplicationPrivate::startPrimary() {
 
-  Q_Q(SingleCoreApplication);
-
   // Reset the number of connections
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->primary = true;
-  inst->primaryPid = q->applicationPid();
-  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
-  inst->checksum = blockChecksum();
+  instance->primary = true;
+  instance->primaryPid = QCoreApplication::applicationPid();
+  qstrncpy(instance->primaryUser, getUsername().toUtf8().data(), sizeof(instance->primaryUser));
+  instance->checksum = blockChecksum();
   instanceNumber_ = 0;
   // Successful creation means that no main process exists
   // So we start a QLocalServer to listen for connections
@@ -212,11 +220,11 @@ void SingleCoreApplicationPrivate::startPrimary() {
 
 void SingleCoreApplicationPrivate::startSecondary() {
 
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
 
-  inst->secondary += 1;
-  inst->checksum = blockChecksum();
-  instanceNumber_ = inst->secondary;
+  instance->secondary += 1;
+  instance->checksum = blockChecksum();
+  instanceNumber_ = instance->secondary;
 
 }
 
@@ -263,25 +271,53 @@ bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const Con
   writeStream << instanceNumber_;
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+  quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
 #else
   quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
 
   writeStream << checksum;
 
-  // The header indicates the message length that follows
+  return writeConfirmedMessage(static_cast<int>(timeout - time.elapsed()), initMsg);
+
+}
+
+void SingleCoreApplicationPrivate::writeAck(QLocalSocket *sock) {
+  sock->putChar('\n');
+}
+
+bool SingleCoreApplicationPrivate::writeConfirmedMessage(const int timeout, const QByteArray &msg) const {
+
+  QElapsedTimer time;
+  time.start();
+
+  // Frame 1: The header indicates the message length that follows
   QByteArray header;
   QDataStream headerStream(&header, QIODevice::WriteOnly);
   headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(initMsg.length());
+  headerStream << static_cast<quint64>(msg.length());
 
-  socket_->write(header);
-  socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(timeout - static_cast<int>(time.elapsed()));
+  if (!writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), header)) {
+    return false;
+  }
+
+  // Frame 2: The message
+  return writeConfirmedFrame(static_cast<int>(timeout - time.elapsed()), msg);
+
+}
+
+bool SingleCoreApplicationPrivate::writeConfirmedFrame(const int timeout, const QByteArray &msg) const {
+
+  socket_->write(msg);
   socket_->flush();
 
-  return result;
+  bool result = socket_->waitForReadyRead(timeout);
+  if (result) {
+    socket_->read(1);
+    return true;
+  }
+
+  return false;
 
 }
 
@@ -300,8 +336,8 @@ quint16 SingleCoreApplicationPrivate::blockChecksum() const {
 qint64 SingleCoreApplicationPrivate::primaryPid() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = inst->primaryPid;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = instance->primaryPid;
   memory_->unlock();
 
   return pid;
@@ -311,8 +347,8 @@ qint64 SingleCoreApplicationPrivate::primaryPid() const {
 QString SingleCoreApplicationPrivate::primaryUser() const {
 
   memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = inst->primaryUser;
+  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = instance->primaryUser;
   memory_->unlock();
 
   return QString::fromUtf8(username);
@@ -328,26 +364,30 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
   QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    const ConnectionInfo info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
+
+  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
-    nextConnSocket->deleteLater();
   });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    const ConnectionInfo info = connectionMap_[nextConnSocket];
+    const ConnectionInfo &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
+      case StageInitHeader:
+        readMessageHeader(nextConnSocket, StageInitBody);
         break;
-      case StageBody:
+      case StageInitBody:
         readInitMessageBody(nextConnSocket);
         break;
-      case StageConnected:
-        slotDataAvailable(nextConnSocket, info.instanceId);
+      case StageConnectedHeader:
+        readMessageHeader(nextConnSocket, StageConnectedBody);
+        break;
+      case StageConnectedBody:
+        this->slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -356,7 +396,7 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
 
 }
 
-void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
+void SingleCoreApplicationPrivate::readMessageHeader(QLocalSocket *sock, SingleCoreApplicationPrivate::ConnectionStage nextStage) {
 
   if (!connectionMap_.contains(sock)) {
     return;
@@ -373,30 +413,34 @@ void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   quint64 msgLen = 0;
   headerStream >> msgLen;
   ConnectionInfo &info = connectionMap_[sock];
-  info.stage = StageBody;
+  info.stage = nextStage;
   info.msgLen = msgLen;
 
-  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
-    readInitMessageBody(sock);
+  writeAck(sock);
+
+}
+
+bool SingleCoreApplicationPrivate::isFrameComplete(QLocalSocket *sock) {
+
+  if (!connectionMap_.contains(sock)) {
+    return false;
   }
 
+  ConnectionInfo &info = connectionMap_[sock];
+  return (sock->bytesAvailable() >= static_cast<qint64>(info.msgLen));
+
 }
 
 void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
   Q_Q(SingleCoreApplication);
 
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
+  if (!isFrameComplete(sock)) {
     return;
   }
 
   // Read the message body
-  QByteArray msgBytes = sock->read(static_cast<qint64>(info.msgLen));
+  QByteArray msgBytes = sock->readAll();
   QDataStream readStream(msgBytes);
   readStream.setVersion(QDataStream::Qt_5_8);
 
@@ -431,23 +475,34 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
     return;
   }
 
+  ConnectionInfo &info = connectionMap_[sock];
   info.instanceId = instanceId;
-  info.stage = StageConnected;
+  info.stage = StageConnectedHeader;
 
   if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleCoreApplication::Mode::SecondaryNotification)) {
-    Q_EMIT q->instanceStarted();
+    emit q->instanceStarted();
   }
 
-  if (sock->bytesAvailable() > 0) {
-    slotDataAvailable(sock, instanceId);
-  }
+  writeAck(sock);
 
 }
 
 void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleCoreApplication);
-  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
+  if (!isFrameComplete(dataSocket)) {
+    return;
+  }
+
+  const QByteArray message = dataSocket->readAll();
+
+  writeAck(dataSocket);
+
+  ConnectionInfo &info = connectionMap_[dataSocket];
+  info.stage = StageConnectedHeader;
+
+  emit q->receivedMessage(instanceId, message);
 
 }
 
@@ -465,7 +520,7 @@ void SingleCoreApplicationPrivate::randomSleep() {
   QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
 #else
   qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+  QThread::msleep(qrand() % 11 + 8);
 #endif
 
 }

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -71,9 +71,10 @@ class SingleCoreApplicationPrivate : public QObject {
     Reconnect = 3
   };
   enum ConnectionStage : quint8 {
-    StageHeader = 0,
-    StageBody = 1,
-    StageConnected = 2,
+    StageInitHeader = 0,
+    StageInitBody = 1,
+    StageConnectedHeader = 2,
+    StageConnectedBody = 3,
   };
   Q_DECLARE_PUBLIC(SingleCoreApplication)
 
@@ -89,8 +90,12 @@ class SingleCoreApplicationPrivate : public QObject {
   quint16 blockChecksum() const;
   qint64 primaryPid() const;
   QString primaryUser() const;
-  void readInitMessageHeader(QLocalSocket *socket);
+  bool isFrameComplete(QLocalSocket *sock);
+  void readMessageHeader(QLocalSocket *socket, const ConnectionStage nextStage);
   void readInitMessageBody(QLocalSocket *socket);
+  void writeAck(QLocalSocket *sock);
+  bool writeConfirmedFrame(const int timeout, const QByteArray &msg) const;
+  bool writeConfirmedMessage(const int timeout, const QByteArray &msg) const;
   static void randomSleep();
 
   SingleCoreApplication *q_ptr;

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
@@ -58,8 +69,7 @@ else()
     -Wformat=2
     -Wdisabled-optimization
     $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
-    $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
-    $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
+    $<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
   )
 endif()
 
@@ -87,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)
@@ -94,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)
@@ -117,6 +136,9 @@ endif()
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
+if(UNIX)
+  pkg_check_modules(GIO_UNIX gio-unix-2.0)
+endif()
 pkg_check_modules(LIBCDIO libcdio)
 pkg_check_modules(GSTREAMER gstreamer-1.0)
 pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
@@ -155,7 +177,7 @@ if(DBUS_FOUND AND NOT WIN32)
   list(APPEND QT_COMPONENTS DBus)
 endif()
 set(QT_OPTIONAL_COMPONENTS Test)
-set(QT_MIN_VERSION 5.8)
+set(QT_MIN_VERSION 5.9)
 
 if(BUILD_WITH_QT6 OR QT_VERSION_MAJOR EQUAL 6)
   set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
@@ -292,7 +314,6 @@ set(SINGLEAPPLICATION_LIBRARIES singleapplication)
 set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
 
 if(APPLE)
-  find_library(SPARKLE Sparkle PATHS "/usr/local/opt/sparkle")
   add_subdirectory(3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
@@ -300,7 +321,7 @@ if(APPLE)
   add_subdirectory(ext/macdeploycheck)
 endif()
 
-if(NOT SPARKLE AND (APPLE OR WIN32))
+if(WIN32)
   if(BUILD_WITH_QT6)
     pkg_check_modules(QTSPARKLE qtsparkle-qt6)
   else()
@@ -311,6 +332,12 @@ if(NOT SPARKLE AND (APPLE OR WIN32))
   endif()
 endif()
 
+if(WIN32 AND MSVC)
+  add_subdirectory(3rdparty/getopt)
+  set(GETOPT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/getopt)
+  set(GETOPT_LIBRARIES getopt)
+endif()
+
 if(WIN32 AND NOT MSVC)
   # RC compiler
   string(REPLACE "gcc" "windres" CMAKE_RC_COMPILER_INIT ${CMAKE_C_COMPILER})
@@ -391,6 +418,11 @@ optional_component(GIO ON "Devices: GIO device backend"
   DEPENDS "Unix or Windows" "NOT APPLE"
 )
 
+optional_component(GIO_UNIX ON "Devices: GIO device backend (Unix support)"
+  DEPENDS "libgio-unix" GIO_UNIX_FOUND
+  DEPENDS "Unix" "UNIX"
+)
+
 optional_component(LIBGPOD ON "Devices: iPod classic support"
   DEPENDS "libgpod" LIBGPOD_FOUND
   DEPENDS "gdk-pixbuf" GDK_PIXBUF_FOUND
@@ -400,11 +432,6 @@ optional_component(LIBMTP ON "Devices: MTP support"
   DEPENDS "libmtp" LIBMTP_FOUND
 )
 
-optional_component(SPARKLE ON "Sparkle integration"
-  DEPENDS "macOS" APPLE
-  DEPENDS "Sparkle" SPARKLE
-)
-
 if(BUILD_WITH_QT6)
   optional_component(TRANSLATIONS ON "Translations"
     DEPENDS "gettext" GETTEXT_FOUND
@@ -419,9 +446,9 @@ endif()
 
 option(INSTALL_TRANSLATIONS "Install translations" OFF)
 
-optional_component(SUBSONIC ON "Subsonic support")
-optional_component(TIDAL ON "Tidal support")
-optional_component(QOBUZ ON "Qobuz support")
+optional_component(SUBSONIC ON "Streaming: Subsonic")
+optional_component(TIDAL ON "Streaming: Tidal")
+optional_component(QOBUZ ON "Streaming: Qobuz")
 
 optional_component(MOODBAR ON "Moodbar"
   DEPENDS "fftw3" FFTW3_FOUND
@@ -482,12 +509,13 @@ endif()
 
 # Set up definitions
 
-add_definitions(-DBOOST_BIND_NO_PLACEHOLDERS)
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_STRICT_ITERATORS)
-add_definitions(-DQT_USE_QSTRINGBUILDER)
-add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_NO_CAST_TO_ASCII)
+add_definitions(
+  -DBOOST_BIND_NO_PLACEHOLDERS
+  -DQT_STRICT_ITERATORS
+  -DQT_USE_QSTRINGBUILDER
+  -DQT_NO_URL_CAST_FROM_STRING
+  -DQT_NO_CAST_TO_ASCII
+)
 
 if(WIN32)
   add_definitions(-DUNICODE)
@@ -510,6 +538,10 @@ if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
   add_subdirectory(tests)
 endif()
 
+if(LINUX AND LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
+  add_subdirectory(debian)
+endif()
+
 # Uninstall support
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 
@@ -518,7 +550,7 @@ add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/c
 # Show a summary of what we have enabled
 summary_show()
 if(NOT HAVE_GSTREAMER AND NOT HAVE_VLC)
-  message(FATAL_ERROR "You need to have either GStreamer or VLC to compile!")
+  message(FATAL_ERROR "You need to have either GStreamer or libvlc to compile!")
 elseif(NOT HAVE_GSTREAMER)
   message(WARNING "GStreamer is the only engine that is fully implemented. Using other engines is possible but not recommended.")
 endif()

Changelog

@@ -2,6 +2,138 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 1.0.9 (2022.09.03):
+
+  Bugfixes:
+    * Fixed parsing album title from radio stream metadata (#1023).
+    * (macOS) Fixed Strawberry not starting, incorrect rpath for libgcc_s.1.1.dylib (#1025).
+    * (macOS) Fixed HTTP streaming.
+
+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:
+    * Fixed smart playlist filetype search.
+    * Fixed Radio Paradise URLs to use HTTPS instead of HTTP.
+    * Fixed horizontal scrolling not affecting currently playing track (#952).
+    * Fixed keep running in the background when window is closed with Wayland (#964).
+    * Fixed percent-encoding of URLs when loading and saving XSPF playlists (#821).
+    * Fixed fancy tabbar context menu showing on right clicks outside of tabbar when a song is playing.
+    * Fixed possible duplicating songs in the database when moving songs to the collection using the organize feature.
+    * (Windows|MSVC) Fixed moodbar fftw3 crash with (older) CPU's that does not support AVX2 (#944).
+    * (Windows|MSVC) Fixed using libiconv for converting characters when organizing files like with MinGW.
+
+  Enhancements
+    * Show more details in error dialog on GStreamer errors (#958).
+    * Allow setting blur amount of playlist background image up to 100px (#939).
+    * Include 128x128 icon sizes (#954).
+    * Show right click copy context menu in context view on top text and lyrics (#965).
+    * Improve fading between album covers in context view.
+    * Added option for overwriting database playcounts in collection settings (#962).
+    * Added option for disabling bar on currently playing track (#972).
+    * (Debian) Added Qt 6 support to debian files and build with Qt 6 for Debian Bookworm, Ubuntu Jammy and newer.
+    * (Windows|MSVC) Added libav/ffmpeg plugin.
+
+Version 1.0.4 (2022.04.10)
+
+  Bugfixes:
+    * Fixed use-after-free memory in ALSA PCM device finder.
+    * Translate global shortcuts.
+    * (Windows) Fixed registering 0-9 numpad keys in global shortcuts.
+
+  Enhancements
+    * Added save all playlists action.
+    * (Windows) Made updater support both MSVC and MinGW.
+    * (Windows) Added HLS support.
+
+  Other:
+    * Removed use of custom font in context.
+
+Version 1.0.3 (2022.03.24)
+
+  Bugfixes:
+    * Remove slash and backslash from filenames when saving album covers using album directory cover filenames (#903).
+    * Remove playlist file-extensions from accepted audio file extensions (#909).
+    * Fixed Qobuz requests only receiving the first 50 albums (#922).
+    * (Windows|MinGW) Fixed streaming stopping at the end of each track. libsoup downgraded from 3.0 to 2.74.
+    * (Windows|MSVC) Fixed initial database schema failure caused by CRLF line-endings in schema files.
+
+  New features
+    * Added support for bs2b (Improved headphone listening of stereo audio records using Bauer stereophonic-to-binaural DSP) (#249).
+
+Version 1.0.2 (2022.02.20)
+
+  Bugfixes:
+    * Fixed showing menu when clicking icon for collection and internet search tool buttons
+    * Fixed ignoring devices with system mounts as defined by GIO (#410).
+    * Fixed updating database when deleting songs from filesystem devices.
+    * Fixed unregistered metatype when listing songs from MTP devices with Qt 6.
+    * Fixed using entered password when testing Subsonic settings before pressing save (#879).
+    * Fixed downloading Subsonic album covers.
+    * Fixed subsonic album covers downloaded several times for each album when MD5 authentication was enabled (#885).
+    * Fixed volume going to 100% when pressing volume down with MRPIS2 and global shortcuts (#884).
+    * Fixed incorrect rounding when setting volume through MPRIS2 (#894).
+    * Fixed delete from disk not showing up in the menu when one or more CUE songs were selected.
+    * Fixed possible crashes when switching songs when fading is enabled (#890).
+    * Fixed X11 global shortcuts not working unless window was in focus with Qt 6.2 and higher (#893).
+    * Fixed scrobbler re-sending scrobbles to fast on error (#898).
+
+  Enhancements
+    * Log Qt version on startup.
+    * Added button for deleting existing Subsonic songs (#883).
+    * Make collection watcher ignore files with "qt_temp" filename and tmp extension.
+    * Require Qt 5.9 or higher.
+    * Added scrollbars to edit tag dialog (#888).
+    * Added advanced settings for configuring collection watcher.
+    * Disable open audio CD menu when compiled without audio CD support.
+    * Replaced use of deprecated QMouseEvent constructor as of Qt 6.4.
+    * Replaced use of deprecated QCryptographicHash::addData overload as of Qt 6.4.
+
+  Removed features:
+    * Removed broken "nomedia" / "nomusic" file handling.
+
 Version 1.0.1 (2022.01.08)
 
   Bugfixes:

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,8 +23,10 @@ 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, questions and feature requests please use our forum on https://forum.strawberrymusicplayer.org/ that is better suited for discussion. It also better allows answers from the community instead of just the developers on GitHub.
+* 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/).
 
 ### :moneybag:	Sponsoring:
 
@@ -66,18 +69,18 @@ It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
 To build Strawberry from source you need the following installed on your system with the additional development packages/headers:
 
 * [CMake](https://cmake.org/)
-* [GNU Make](https://www.gnu.org/software/make/)
-* [GCC](https://gcc.gnu.org/) or [clang](https://clang.llvm.org/) compiler
+* [GCC](https://gcc.gnu.org/), [Clang](https://clang.llvm.org/) or [MSVC](https://visualstudio.microsoft.com/vs/features/cplusplus/) compiler
 * [Boost](https://www.boost.org/)
 * [GLib](https://developer.gnome.org/glib/)
-* [Protobuf](https://developers.google.com/protocol-buffers/)
-* [Qt 5.8 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
+* [Qt 5.9 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
 * [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
-* [ALSA (Linux required)](https://www.alsa-project.org/)
-* [D-Bus (Linux required)](https://www.freedesktop.org/wiki/Software/dbus/)
+* [Protobuf](https://developers.google.com/protocol-buffers/)
+* [ALSA (Required on Linux)](https://www.alsa-project.org/)
+* [D-Bus (Required on Linux)](https://www.freedesktop.org/wiki/Software/dbus/)
 * [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org)
 * [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:
 
@@ -88,8 +91,7 @@ Optional dependencies:
 * MTP devices: [libmtp](http://libmtp.sourceforge.net/)
 * iPod Classic devices: [libgpod](http://www.gtkpod.org/libgpod/)
 
-Either GStreamer or VLC engine is required, but only GStreamer is fully implemented, and works best, it is therefore recommended to use GStreamer.
-You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav.
+You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav to support all audio formats.
 
 ### :wrench:	Compiling from source
 
@@ -101,15 +103,15 @@ You should also install the gstreamer plugins base and good, and optionally bad,
 
     cd strawberry
     mkdir build && cd build
-    cmake ..
+    cmake .. -DBUILD_WITH_QT6=ON
     make -j$(nproc)
     sudo make install
-    
-To compile with Qt 6 use:
 
-    cmake .. -DBUILD_WITH_QT6=ON
+Strawberry is backwards compatible with Qt 5, to compile with Qt 5 use:
+
+    cmake .. -DBUILD_WITH_QT5=ON
 
 ### :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/Deb.cmake

@@ -2,18 +2,5 @@ find_program(LSB_RELEASE_EXEC lsb_release)
 find_program(DPKG_BUILDPACKAGE dpkg-buildpackage)
 
 if (LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
-  execute_process(COMMAND env LC_ALL=C date "+%a, %-d %b %Y %H:%M:%S %z" OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -cs"
-    OUTPUT_VARIABLE DEB_CODENAME
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
-  if (DEB_CODENAME AND DEB_DATE)
-    add_custom_target(deb
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us
-    )
-  endif()
-
+  add_custom_target(deb WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us)
 endif()

cmake/Dmg.cmake

@@ -21,10 +21,7 @@ if(MACDEPLOYQT_EXECUTABLE)
     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/strawberry.app/Contents/{Frameworks,Resources}
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/strawberry.icns ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources/
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3
-      -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
-      -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gio-modules/libgiognutls.so
-      #-executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner
+    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     DEPENDS strawberry strawberry-tagreader copy_gstreamer_plugins macdeployqt
   )

cmake/Rpm.cmake

@@ -12,10 +12,17 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
     OUTPUT_VARIABLE DIST_RELEASE
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\.//g' | cut -d' ' -f3"
-    OUTPUT_VARIABLE DIST_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
+  if (${DIST_NAME} STREQUAL "openmandrivalinux")
+    execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\./0/g' | cut -d' ' -f3"
+      OUTPUT_VARIABLE DIST_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  else()
+    execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\.//g' | cut -d' ' -f3"
+      OUTPUT_VARIABLE DIST_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  endif()
   if (DIST_NAME)
 
     message(STATUS "Distro Name: ${DIST_NAME}")
@@ -44,6 +51,8 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
       set(RPM_DISTRO "el${DIST_VERSION}")
     elseif (${DIST_NAME} STREQUAL "mageia" AND DIST_RELEASE)
       set(RPM_DISTRO "mga${DIST_RELEASE}")
+    elseif (${DIST_NAME} STREQUAL "openmandrivalinux" AND DIST_VERSION)
+      set(RPM_DISTRO "omv${DIST_VERSION}")
     endif()
 
     if(NOT RPM_DISTRO)

cmake/Version.cmake

@@ -1,6 +1,6 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 1)
+set(STRAWBERRY_VERSION_PATCH 9)
 #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>
@@ -46,7 +37,6 @@
         <file>pictures/rainbowdash.png</file>
         <file>pictures/star-on.png</file>
         <file>pictures/star-off.png</file>
-        <file>fonts/HumongousofEternitySt.ttf</file>
         <file>mood/sample.mood</file>
         <file>text/ghosts.txt</file>
     </qresource>

data/icons.qrc

@@ -24,6 +24,7 @@
         <file>icons/128x128/document-open-folder.png</file>
         <file>icons/128x128/document-open.png</file>
         <file>icons/128x128/document-save.png</file>
+        <file>icons/128x128/document-save-all.png</file>
         <file>icons/128x128/document-search.png</file>
         <file>icons/128x128/download.png</file>
         <file>icons/128x128/edit-clear-list.png</file>
@@ -120,6 +121,7 @@
         <file>icons/64x64/document-open-folder.png</file>
         <file>icons/64x64/document-open.png</file>
         <file>icons/64x64/document-save.png</file>
+        <file>icons/64x64/document-save-all.png</file>
         <file>icons/64x64/document-search.png</file>
         <file>icons/64x64/download.png</file>
         <file>icons/64x64/edit-clear-list.png</file>
@@ -218,6 +220,7 @@
         <file>icons/48x48/document-open-remote.png</file>
         <file>icons/48x48/document-open.png</file>
         <file>icons/48x48/document-save.png</file>
+        <file>icons/48x48/document-save-all.png</file>
         <file>icons/48x48/document-search.png</file>
         <file>icons/48x48/download.png</file>
         <file>icons/48x48/edit-clear-list.png</file>
@@ -319,6 +322,7 @@
         <file>icons/32x32/document-open-remote.png</file>
         <file>icons/32x32/document-open.png</file>
         <file>icons/32x32/document-save.png</file>
+        <file>icons/32x32/document-save-all.png</file>
         <file>icons/32x32/document-search.png</file>
         <file>icons/32x32/download.png</file>
         <file>icons/32x32/edit-clear-list.png</file>
@@ -420,6 +424,7 @@
         <file>icons/22x22/document-open-remote.png</file>
         <file>icons/22x22/document-open.png</file>
         <file>icons/22x22/document-save.png</file>
+        <file>icons/22x22/document-save-all.png</file>
         <file>icons/22x22/document-search.png</file>
         <file>icons/22x22/download.png</file>
         <file>icons/22x22/edit-clear-list.png</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);

data/style/strawberry.css

@@ -31,39 +31,40 @@
   background-color: %palette-base;
 }
 
+#context-scrollarea {
+  background-color: %palette-base;
+}
+
 QToolButton {
   border: 2px solid transparent;
   border-radius: 3px;
   padding: 1px;
 }
 
-QToolButton::menu-button {
-  width: 16px;
-  border: none;
-}
-
-QToolButton[popupMode="1"] {
-  padding-right: 16px;
-}
-
 QToolButton:hover {
   border: 2px solid %palette-highlight;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton:hover[popupMode="1"] {
-  padding-right: 16px;
-}
-
 QToolButton:pressed {
   border: 2px solid %palette-highlight-darker;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton:pressed[popupMode="1"] {
+QToolButton[popupMode="MenuButtonPopup"], QToolButton:hover[popupMode="MenuButtonPopup"], QToolButton:pressed[popupMode="MenuButtonPopup"] {
   padding-right: 16px;
 }
 
+/* For backwards compatibility with Qt 5 as it does not support property name */
+QToolButton[popupMode="1"], QToolButton:hover[popupMode="1"], QToolButton:pressed[popupMode="1"] {
+  padding-right: 16px;
+}
+
+QToolButton::menu-button {
+  width: 16px;
+  border: none;
+}
+
 macos {
   font-size: 11pt;
 }
@@ -71,4 +72,3 @@ macos {
 macos QMenu {
   font-size: 13pt;
 }
-

debian/CMakeLists.txt

@@ -0,0 +1,22 @@
+if(LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
+
+  execute_process(COMMAND env LC_ALL=C date "+%a, %-d %b %Y %H:%M:%S %z" OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -cs" OUTPUT_VARIABLE DEB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if(DEB_CODENAME AND DEB_DATE)
+
+    if(BUILD_WITH_QT5)
+      set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qtbase5-dev,qtbase5-dev-tools,qttools5-dev,qttools5-dev-tools,libqt5x11extras5-dev)
+      set(DEBIAN_DEPENDS_QT_PACKAGES libqt5sql5-sqlite)
+    endif()
+    if(BUILD_WITH_QT6)
+      set(DEBIAN_BUILD_DEPENDS_QT_PACKAGES qt6-base-dev,qt6-base-dev-tools,qt6-tools-dev,qt6-tools-dev-tools,qt6-l10n-tools)
+      set(DEBIAN_DEPENDS_QT_PACKAGES libqt6sql6-sqlite,qt6-qpa-plugins)
+    endif()
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.in ${CMAKE_CURRENT_SOURCE_DIR}/control @ONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in ${CMAKE_CURRENT_SOURCE_DIR}/changelog)
+  
+  endif()
+
+endif()

debian/control.in

@@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 11),
                make,
                cmake,
                gcc,
+               g++,
                protobuf-compiler,
                libglib2.0-dev,
                libdbus-1-dev,
@@ -16,11 +17,8 @@ Build-Depends: debhelper (>= 11),
                libasound2-dev,
                libpulse-dev,
                libtag1-dev,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtbase5-dev-tools,
-               qttools5-dev,
-               libqt5x11extras5-dev,
+               libicu-dev,
+               @DEBIAN_BUILD_DEPENDS_QT_PACKAGES@,
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
                libcdio-dev,
@@ -28,20 +26,19 @@ Build-Depends: debhelper (>= 11),
                libmtp-dev,
                libchromaprint-dev,
                libfftw3-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.6.1
 
 Package: strawberry
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libsqlite3-0,
-         libqt5sql5-sqlite,
+         @DEBIAN_DEPENDS_QT_PACKAGES@,
          gstreamer1.0-plugins-base,
          gstreamer1.0-plugins-good,
          gstreamer1.0-alsa,
          gstreamer1.0-pulseaudio
 Homepage: http://www.strawberrymusicplayer.org/
-Description: Audio player and music collection organizer
+Description: music player and music collection organizer
  Strawberry is a music player aimed at music collectors and audiophiles.
  .
  Features:
@@ -49,14 +46,13 @@ Description: Audio player and music collection organizer
   - Supports WAV, FLAC, WavPack, Ogg Vorbis, Speex, MPC, TrueAudio, AIFF, MP4, MP3 and ASF
   - Audio CD playback
   - Native desktop notifications
-  - Playlist management
-  - Playlists in multiple formats
+  - Playlist management and playlists in multiple formats
+  - Smart and dynamic playlists
   - Advanced audio output and device configuration for bit-perfect playback on Linux
   - Edit tags on audio files
   - Automatically retrieve tags from MusicBrainz
   - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
   - Song lyrics from AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
-  - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
   - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic

debian/copyright

@@ -1,10 +1,11 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: strawberry
 Upstream-Contact: Jonas Kvinge <jonas@jkvinge.net>
-Source: https://www.strawberrymusicplayer.org/
+Source: https://github.com/strawberrymusicplayer/strawberry
 
 Files: *
 Copyright: 2010-2015, David Sansome <me@davidsansome.com>
+           2012-2014, 2017-2022 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/core/timeconstants.h
@@ -13,14 +14,13 @@ Files: src/core/timeconstants.h
        ext/libstrawberry-common/core/messagehandler.cpp
        ext/libstrawberry-common/core/messagehandler.h
 Copyright: 2011, 2012, David Sansome <me@davidsansome.com>
+           2018-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: Apache-2.0
 
 Files: src/core/main.h
        src/core/iconloader.cpp
        src/core/iconloader.h
        src/core/iconmapper.h
-       src/config.h.in
-       src/version.h.in
        src/context/contextview.cpp
        src/context/contextview.h
        src/context/contextalbum.cpp
@@ -29,6 +29,8 @@ Files: src/core/main.h
        src/engine/enginetype.h
        src/engine/alsadevicefinder.cpp
        src/engine/alsadevicefinder.h
+       src/engine/alsapcmdevicefinder.cpp
+       src/engine/alsapcmdevicefinder.h
        src/engine/mmdevicefinder.cpp
        src/engine/mmdevicefinder.h
        src/engine/devicefinder.cpp
@@ -69,11 +71,17 @@ Files: src/core/main.h
        src/covermanager/spotifycoverprovider.h
        src/covermanager/musixmatchcoverprovider.cpp
        src/covermanager/musixmatchcoverprovider.h
-       src/globalshortcuts/globalshortcutsbackend-system.cpp
-       src/globalshortcuts/globalshortcutsbackend-system.h
+       src/globalshortcuts/globalshortcutsbackend-kde.cpp
+       src/globalshortcuts/globalshortcutsbackend-kde.h
+       src/globalshortcuts/globalshortcutsbackend-mate.cpp
+       src/globalshortcuts/globalshortcutsbackend-mate.h
+       src/globalshortcuts/globalshortcutsbackend-x11.cpp
+       src/globalshortcuts/globalshortcutsbackend-x11.h
+       src/globalshortcuts/globalshortcutsbackend-win.cpp
+       src/globalshortcuts/globalshortcutsbackend-win.h
        src/globalshortcuts/globalshortcut.cpp
        src/globalshortcuts/globalshortcut.h
-       src/globalshortcuts/globalshortcut-X11.cpp
+       src/globalshortcuts/globalshortcut-x11.cpp
        src/globalshortcuts/globalshortcut-win.cpp
        src/globalshortcuts/keymapper_x11.h
        src/globalshortcuts/keymapper_win.h
@@ -81,132 +89,21 @@ Files: src/core/main.h
        src/scrobbler/*
        src/subsonic/*
        src/tidal/*
+       src/qobuz/*
+       src/radios/*
        src/transcoder/transcoderoptionswavpack.cpp
        src/transcoder/transcoderoptionswavpack.h
-Copyright: 2012-2014, 2017-2020, Jonas Kvinge <jonas@jkvinge.net>
-License: GPL-3+
-
-Files: src/core/main.cpp
-       src/core/mainwindow.cpp
-       src/core/mainwindow.h
-       src/core/player.cpp
-       src/core/player.h
-       src/core/song.cpp
-       src/core/song.h
-       src/core/songloader.cpp
-       src/core/songloader.h
-       src/core/urlhandler.cpp
-       src/core/urlhandler.h
-       src/core/utilities.cpp
-       src/core/utilities.h
-       src/core/networkaccessmanager.cpp
-       src/core/networkaccessmanager.h
-       src/core/threadsafenetworkdiskcache.cpp
-       src/core/threadsafenetworkdiskcache.h
-       src/core/filesystemmusicstorage.cpp
-       src/core/filesystemmusicstorage.h
-       src/core/stylesheetloader.cpp
-       src/core/stylesheetloader.h
-       src/engine/gstenginepipeline.cpp
-       src/engine/gstenginepipeline.h
-       src/engine/vlcengine.cpp
-       src/engine/vlcengine.h
-       src/collection/collectionwatcher.cpp
-       src/collection/collectionwatcher.h
-       src/collection/collectionbackend.cpp
-       src/collection/collectionbackend.h
-       src/collection/collectionmodel.cpp
-       src/collection/collectionmodel.h
-       src/context/contextalbumsmodel.cpp
-       src/context/contextalbumsview.cpp
-       src/context/contextalbumsmodel.h
-       src/context/contextalbumsview.h
-       src/widgets/playingwidget.cpp
-       src/widgets/playingwidget.h
-       src/osd/osdbase.cpp
-       src/osd/osdbase.h
-       src/osd/osdpretty.cpp
-       src/osd/osdpretty.h
-       src/osd/osddbus.cpp
-       src/osd/osddbus.h
-       src/osd/osdmac.cpp
-       src/osd/osdmac.h
-       src/dialogs/about.cpp
-       src/dialogs/about.h
-       src/playlist/playlist.cpp
-       src/playlist/playlist.h
-       src/playlist/playlistitem.cpp
-       src/playlist/playlistitem.h
-       src/playlist/playlistdelegates.cpp
-       src/playlist/playlistdelegates.h
-       src/playlist/playlistbackend.cpp
-       src/playlist/playlistbackend.h
-       src/playlist/playlistview.cpp
-       src/playlist/playlistview.h
-       src/playlist/songplaylistitem.cpp
-       src/playlist/songplaylistitem.h
-       src/internet/internetplaylistitem.cpp
-       src/internet/internetsearch.cpp
-       src/internet/internetsearch.h
-       src/internet/internetsearchview.cpp
-       src/internet/internetsearchview.h
-       src/internet/internetservices.cpp
-       src/internet/internetservices.h
-       src/internet/internetsongsview.cpp
-       src/internet/internetsongsview.h
-       src/internet/internetcollectionview.cpp
-       src/internet/internetcollectionview.h
-       ext/libstrawberry-tagreader/tagreader.cpp
-       ext/libstrawberry-tagreader/tagreader.h
-       src/device/devicemanager.cpp
-       src/device/devicemanager.h
-       src/device/deviceinfo.cpp
-       src/device/deviceinfo.h
-       src/device/deviceproperties.cpp
-       src/device/deviceproperties.h
-       src/device/deviceview.cpp
-       src/device/deviceview.h
-       src/device/connecteddevice.cpp
-       src/device/connecteddevice.h
-       src/device/mtpconnection.cpp
-       src/device/mtpconnection.h
-       src/device/mtpdevice.cpp
-       src/device/mtpdevice.h
-       src/globalshortcuts/globalshortcutsmanager.cpp
-       src/globalshortcuts/globalshortcutsmanager.h
-       src/settings/shortcutssettingspage.cpp
-       src/settings/shortcutssettingspage.h
-       src/settings/appearancesettingspage.cpp
-       src/settings/appearancesettingspage.h
-       src/organize/organize.cpp
-       src/organize/organize.h
-       src/organize/organizedialog.cpp
-       src/organize/organizedialog.h
-       src/organize/organizeerrordialog.cpp
-       src/organize/organizeerrordialog.h
-       src/transcoder/transcoder.cpp
-       src/transcoder/transcoder.h
-       src/musicbrainz/musicbrainzclient.cpp
-       src/musicbrainz/musicbrainzclient.h
-       src/covermanager/albumcoverloader.cpp
-       src/covermanager/albumcoverloader.h
-       src/covermanager/currentalbumcoverloader.cpp
-       src/covermanager/currentalbumcoverloader.h
-       src/covermanager/albumcoverchoicecontroller.cpp
-       src/covermanager/albumcoverchoicecontroller.h
-       src/covermanager/albumcoverfetchersearch.cpp
-       src/covermanager/albumcoverfetchersearch.h
-       src/covermanager/coverproviders.cpp
-       src/covermanager/coverproviders.h
-       src/covermanager/coverprovider.cpp
-       src/covermanager/coverprovider.h
-Copyright: 2010, 2012-2014 David Sansome <me@davidsansome.com>
-           2012-2014, 2017-2020 Jonas Kvinge <jonas@jkvinge.net>
+       ext/libstrawberry-tagreader/tagreadertagparser.cpp
+       ext/libstrawberry-tagreader/tagreadertagparser.h
+       ext/macdeploycheck/*
+       src/widgets/resizabletextedit.cpp
+       src/widgets/resizabletextedit.h
+Copyright: 2012-2014, 2017-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/engine/enginebase.cpp
        src/engine/enginebase.h
-Copyright: 2017, 2018, Jonas Kvinge <jonas@jkvinge.net>
+Copyright: 2017-2021, Jonas Kvinge <jonas@jkvinge.net>
            2010, David Sansome <me@davidsansome.com>
            2004, 2005, Max Howell, <max.howell@methylblue.com>
            2003, Mark Kretschmann <markey@web.de>
@@ -214,7 +111,7 @@ License: GPL-3+
 
 Files: src/engine/gstengine.cpp
        src/engine/gstengine.h
-Copyright: 2017, 2018, Jonas Kvinge <jonas@jkvinge.net>
+Copyright: 2017-2021, Jonas Kvinge <jonas@jkvinge.net>
            2006, Paul Cifarelli <paul@cifarelli.net>
            2005, Jakub Stachowski <qbast@go2.pl>
            2003-2005, Mark Kretschmann <markey@web.de>
@@ -230,7 +127,7 @@ Files: src/core/application.cpp
        src/core/application.h
 Copyright: 2012, David Sansome <me@davidsansome.com>
            2012, 2014, John Maguire <john.maguire@gmail.com>
-           2018, Jonas Kvinge <jonas@jkvinge.net>
+           2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/core/appearance.cpp
@@ -244,13 +141,7 @@ Copyright: 2012, Martin Björklund <mbj4668@gmail.com>
            2016, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: ext/libstrawberry-common/core/arraysize.h
-       ext/libstrawberry-common/core/scoped_nsautorelease_pool.h
-       ext/libstrawberry-common/core/scoped_nsautorelease_pool.mm
-Copyright: 2010, 2011, 2014, The Chromium Authors.
-License: BSD-style
-
-Files: ext/libstrawberry-common/core/lazy.h
+Files: src/core/lazy.h
 Copyright: 2016, John Maguire <john.maguire@gmail.com>
 License: GPL-3+
 
@@ -298,12 +189,16 @@ Copyright: 2011, Tyler Rhodes <tyler.s.rhodes@gmail.com>
            2015, Arun Narayanankutty <n.arun.lifescience@gmail.com>
 License: GPL-2+
 
-Files: src/collection/savedgroupingmanager.h
+Files: src/collection/savedgroupingmanager.*
 Copyright: 2015, Nick Lanham <nick@afternight.org>
+           2019-2021 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: src/core/scoped_cftyperef.h
+Files: src/core/arraysize.h
+       src/core/scoped_cftyperef.h
        src/core/scoped_nsobject.h
+       src/core/scoped_nsautorelease_pool.h
+       src/core/scoped_nsautorelease_pool.mm
 Copyright: 2010, 2011, 2014, The Chromium Authors.
 License: BSD-style
 
@@ -322,7 +217,7 @@ Files: src/internet/localredirectserver.cpp
        src/internet/localredirectserver.h
 Copyright: 2012, 2014, John Maguire <john.maguire@gmail.com>
            2014, Krzysztof Sobiecki <sobkas@gmail.com>
-           2018-2019, Jonas Kvinge <jonas@jkvinge.net>
+           2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/transcoder/transcoderoptionsopus.cpp
@@ -337,12 +232,17 @@ Files: src/widgets/clickablelabel.cpp
 Copyright: 2010, 2011, Andrea Decorte <adecorte@gmail.com>
 License: GPL-3+
 
-Files: src/widgets/sliderwidget.cpp
-       src/widgets/sliderwidget.h
+Files: src/widgets/volumeslider.cpp
+       src/widgets/volumeslider.h
 Copyright: 2005, Gábor Lehel
            2003, Mark Kretschmann <markey@web.de>
 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
 Copyright: 2016 The Qt Company Ltd.
@@ -358,6 +258,7 @@ License: GPL-2+
 Files: src/widgets/qsearchfield_nonmac.cpp
        src/widgets/qsearchfield_mac.mm
        src/widgets/qsearchfield.h
+       src/widgets/qocoa_mac.h
 Copyright: 2011, Mike McQuaid <mike@mikemcquaid.com>
 License: Expat
 
@@ -367,7 +268,7 @@ Copyright: 2010, Spotify AB
 License: BSD-3-clause
 
 Files: 3rdparty/singleapplication/*
-Copyright: 2015-2018, Itay Grudev
+Copyright: 2015-2022, Itay Grudev
 License: MIT
 
 

debian/copyright-scan-patterns.yml

@@ -4,14 +4,14 @@ ignore:
   - Changelog
   - COPYING
   - CMakeLists.txt
-  - Dockerfile
+  - cmake_uninstall.cmake.in
+  - .clang-format
   - .gitignore
-  - .travis.yml
+  - .github
   - /debian/
   - /cmake/
   - /data/
   - /dist/
-  - /snap/
 
   suffixes:
   - jpg

debian/rules

@@ -5,7 +5,6 @@
 
 override_dh_auto_clean:
 	rm -f dist/macos/Info.plist
-	rm -f dist/unix/PKGBUILD
 	rm -f dist/unix/strawberry.spec
 	rm -f dist/scripts/maketarball.sh
 	rm -f dist/windows/strawberry.nsi

dist/CMakeLists.txt

@@ -2,10 +2,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CUR
 if(RPM_DISTRO AND RPM_DATE)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec @ONLY)
 endif(RPM_DISTRO AND RPM_DATE)
-if(DEB_CODENAME AND DEB_DATE)
-  configure_file(${CMAKE_SOURCE_DIR}/debian/changelog.in ${CMAKE_SOURCE_DIR}/debian/changelog)
-endif(DEB_CODENAME AND DEB_DATE)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD @ONLY)
 
 if(APPLE)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)

dist/macos/macgstcopy.sh

@@ -39,8 +39,12 @@ fi
 cp -v -f "${GST_PLUGIN_SCANNER}" "${bundledir}/Contents/PlugIns/" || exit 1
 
 gst_plugins="
+libgstaes.dylib
+libgstaiff.dylib
 libgstapetag.dylib
 libgstapp.dylib
+libgstasf.dylib
+libgstasfmux.dylib
 libgstaudioconvert.dylib
 libgstaudiofx.dylib
 libgstaudiomixer.dylib
@@ -48,46 +52,46 @@ libgstaudioparsers.dylib
 libgstaudiorate.dylib
 libgstaudioresample.dylib
 libgstaudiotestsrc.dylib
-libgstaudiovisualizers.dylib
-libgstauparse.dylib
-libgstautoconvert.dylib
 libgstautodetect.dylib
+libgstbs2b.dylib
+libgstcdio.dylib
 libgstcoreelements.dylib
+libgstdash.dylib
 libgstequalizer.dylib
+libgstflac.dylib
+libgstfaac.dylib
+libgstfaad.dylib
+libgstfdkaac.dylib
 libgstgio.dylib
 libgsticydemux.dylib
 libgstid3demux.dylib
-libgstlevel.dylib
+libgstisomp4.dylib
+libgstlame.dylib
+libgstlibav.dylib
+libgstmpg123.dylib
+libgstmusepack.dylib
+libgstogg.dylib
+libgstopenmpt.dylib
+libgstopus.dylib
+libgstopusparse.dylib
 libgstosxaudio.dylib
-libgstplayback.dylib
-libgstrawparse.dylib
-libgstreplaygain.dylib
-libgstsoup.dylib
-libgstspectrum.dylib
-libgsttypefindfunctions.dylib
-libgstvolume.dylib
-libgstxingmux.dylib
-libgsttcp.dylib
-libgstudp.dylib
 libgstpbtypes.dylib
+libgstplayback.dylib
+libgstreplaygain.dylib
 libgstrtp.dylib
 libgstrtsp.dylib
-libgstflac.dylib
-libgstwavparse.dylib
-libgstfaad.dylib
-libgstogg.dylib
-libgstopus.dylib
-libgstasf.dylib
+libgstsoup.dylib
+libgstspectrum.dylib
 libgstspeex.dylib
 libgsttaglib.dylib
+libgsttcp.dylib
+libgsttypefindfunctions.dylib
+libgstudp.dylib
+libgstvolume.dylib
 libgstvorbis.dylib
-libgstisomp4.dylib
-libgstlibav.dylib
-libgstaiff.dylib
-libgstlame.dylib
-libgstopusparse.dylib
-libgstfaac.dylib
-libgstmusepack.dylib
+libgstwavpack.dylib
+libgstwavparse.dylib
+libgstxingmux.dylib;
 "
 
 gst_plugins=$(echo "$gst_plugins" | tr '\n' ' ' | sed -e 's/^ //g' | sed -e 's/  / /g')

dist/scripts/maketarball.sh.in

@@ -11,10 +11,33 @@ if ! [ "$gitrev" = "ON" ]; then
   exclude_vcs="--exclude-vcs"
 fi
 
+cmds="gtar tar"
+for cmd in $cmds
+do
+  which $cmd >/dev/null 2>&1
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  result=$($cmd --version 2>&1 | head -n1)
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  echo "$result" | grep "^.* (GNU tar) .*$" >/dev/null 2>&1
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  TAR=$cmd
+done
+
+if [ "$TAR" = "" ]; then
+  echo "ERROR: Missing GNU Tar"
+  exit 1
+fi
+
 echo "Creating $name-$version.tar.xz..."
 
 rm -f "$name-$version.tar.xz"
-tar -cJf $name-$version.tar.xz \
+${TAR} -cJf $name-$version.tar.xz \
     --transform "s,^$rootnoslash,$name-$version," $exclude_vcs \
     --exclude=".directory" \
     --exclude="*.tar" \
@@ -26,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" \
@@ -33,11 +57,11 @@ 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" \
     --exclude="$root/dist/scripts/maketarball.sh" \
-    --exclude="$root/dist/unix/PKGBUILD" \
     --exclude="$root/dist/macos/Info.plist" \
     --exclude="$root/dist/windows/windres.rc" \
     --exclude="$root/src/translations/translations.pot" \

dist/unix/PKGBUILD.in

@@ -1,56 +0,0 @@
-# Maintainer: Jonas Kvinge <jonas@jkvinge.net>
-pkgname=strawberry
-pkgver=@STRAWBERRY_VERSION_PAC_V@
-pkgrel=@STRAWBERRY_VERSION_PAC_R@
-pkgdesc="A music player aimed at audio enthusiasts and music collectors"
-arch=(x86_64)
-url="https://www.strawberrymusicplayer.org/"
-license=(GPL3)
-makedepends=(git cmake make gcc boost gettext qt5-tools)
-depends=(
-  desktop-file-utils
-  hicolor-icon-theme
-  gnutls
-  udisks2
-  protobuf
-  qt5-base
-  qt5-x11extras
-  sqlite3
-  alsa-lib
-  libpulse
-  dbus
-  taglib
-  gstreamer
-  gst-plugins-base
-  gst-plugins-good
-  vlc
-  chromaprint
-  libgpod
-  libcdio
-  libmtp
-  fftw
-)
-optdepends=(
-  gst-plugins-bad
-  gst-plugins-ugly
-  gst-libav
-)
-provides=(strawberry)
-conflicts=(strawberry)
-source=("strawberry-@STRAWBERRY_VERSION_PACKAGE@.tar.xz")
-sha256sums=('SKIP')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-@STRAWBERRY_VERSION_PACKAGE@ -DCMAKE_INSTALL_PREFIX=/usr
-  make -j$(nproc)
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

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

@@ -1,6 +1,6 @@
 Name:           strawberry
 Version:        @STRAWBERRY_VERSION_RPM_V@
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} || "%{?_vendor}" == "openmandriva"
 Release:        @STRAWBERRY_VERSION_RPM_R@%{?dist}
 %else
 Release:        @STRAWBERRY_VERSION_RPM_R@.@RPM_DISTRO@
@@ -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)
@@ -138,7 +140,7 @@ Features:
   export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
 %endif
 %{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
-%if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7)
+%if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7) || "%{?_vendor}" == "openmandriva"
   %make_build
 %else
   %cmake_build
@@ -148,7 +150,7 @@ Features:
 %if 0%{?centos}
   %make_install
 %else
-%if 0%{?mageia}
+%if 0%{?mageia} || "%{?_vendor}" == "openmandriva"
   %make_install -C build
 %else
   %cmake_install

dist/windows/Registry.nsh

@@ -0,0 +1,186 @@
+!define registry::Open `!insertmacro registry::Open`
+
+!macro registry::Open _PATH _OPTIONS _HANDLE
+	registry::_Open /NOUNLOAD `${_PATH}` `${_OPTIONS}`
+	Pop ${_HANDLE}
+!macroend
+
+
+!define registry::Find `!insertmacro registry::Find`
+
+!macro registry::Find _HANDLE _PATH _VALUEORKEY _STRING _TYPE
+	registry::_Find /NOUNLOAD `${_HANDLE}`
+	Pop ${_PATH}
+	Pop ${_VALUEORKEY}
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+
+
+!define registry::Close `!insertmacro registry::Close`
+
+!macro registry::Close _HANDLE
+	registry::_Close /NOUNLOAD `${_HANDLE}`
+!macroend
+
+
+!define registry::KeyExists `!insertmacro registry::KeyExists`
+
+!macro registry::KeyExists _PATH _ERR
+	registry::_KeyExists /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::Read `!insertmacro registry::Read`
+
+!macro registry::Read _PATH _VALUE _STRING _TYPE
+	registry::_Read /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+
+
+!define registry::Write `!insertmacro registry::Write`
+
+!macro registry::Write _PATH _VALUE _STRING _TYPE _ERR
+	registry::_Write /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}` `${_TYPE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::ReadExtra `!insertmacro registry::ReadExtra`
+
+!macro registry::ReadExtra _PATH _VALUE _NUMBER _STRING _TYPE
+	registry::_ReadExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_NUMBER}`
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+
+
+!define registry::WriteExtra `!insertmacro registry::WriteExtra`
+
+!macro registry::WriteExtra _PATH _VALUE _STRING _ERR
+	registry::_WriteExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::CreateKey `!insertmacro registry::CreateKey`
+
+!macro registry::CreateKey _PATH _ERR
+	registry::_CreateKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::DeleteValue `!insertmacro registry::DeleteValue`
+
+!macro registry::DeleteValue _PATH _VALUE _ERR
+	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::DeleteKey `!insertmacro registry::DeleteKey`
+
+!macro registry::DeleteKey _PATH _ERR
+	registry::_DeleteKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::DeleteKeyEmpty `!insertmacro registry::DeleteKeyEmpty`
+
+!macro registry::DeleteKeyEmpty _PATH _ERR
+	registry::_DeleteKeyEmpty /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::CopyValue `!insertmacro registry::CopyValue`
+
+!macro registry::CopyValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
+	registry::_CopyValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::MoveValue `!insertmacro registry::MoveValue`
+
+!macro registry::MoveValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
+	registry::_MoveValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::CopyKey `!insertmacro registry::CopyKey`
+
+!macro registry::CopyKey _PATH_SOURCE _PATH_TARGET _ERR
+	registry::_CopyKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::MoveKey `!insertmacro registry::MoveKey`
+
+!macro registry::MoveKey _PATH_SOURCE _PATH_TARGET _ERR
+	registry::_MoveKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::SaveKey `!insertmacro registry::SaveKey`
+
+!macro registry::SaveKey _PATH _FILE _OPTIONS _ERR
+	registry::_SaveKey /NOUNLOAD `${_PATH}` `${_FILE}` `${_OPTIONS}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::RestoreKey `!insertmacro registry::RestoreKey`
+
+!macro registry::RestoreKey _FILE _ERR
+	registry::_RestoreKey /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define registry::StrToHex `!insertmacro registry::StrToHexA`
+!define registry::StrToHexA `!insertmacro registry::StrToHexA`
+
+!macro registry::StrToHexA _STRING _HEX_STRING
+	registry::_StrToHexA /NOUNLOAD `${_STRING}`
+	Pop ${_HEX_STRING}
+!macroend
+
+
+!define registry::StrToHexW `!insertmacro registry::StrToHexW`
+
+!macro registry::StrToHexW _STRING _HEX_STRING
+	registry::_StrToHexW /NOUNLOAD `${_STRING}`
+	Pop ${_HEX_STRING}
+!macroend
+
+
+!define registry::HexToStr `!insertmacro registry::HexToStrA`
+!define registry::HexToStrA `!insertmacro registry::HexToStrA`
+
+!macro registry::HexToStrA _HEX_STRING _STRING
+	registry::_HexToStrA /NOUNLOAD `${_HEX_STRING}`
+	Pop ${_STRING}
+!macroend
+
+!define registry::HexToStrW `!insertmacro registry::HexToStrW`
+
+!macro registry::HexToStrW _HEX_STRING _STRING
+	registry::_HexToStrW /NOUNLOAD `${_HEX_STRING}`
+	Pop ${_STRING}
+!macroend
+
+
+!define registry::Unload `!insertmacro registry::Unload`
+
+!macro registry::Unload
+	registry::_Unload
+!macroend

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/gstmoodbar/gstfastspectrum.cpp

@@ -50,7 +50,10 @@ enum {
 }  // namespace
 
 #define gst_fastspectrum_parent_class parent_class
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 G_DEFINE_TYPE(GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
+#pragma GCC diagnostic pop
 
 static void gst_fastspectrum_finalize(GObject *object);
 static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);

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/logging.cpp

@@ -61,7 +61,7 @@ static const char *kMessageHandlerMagic = "__logging_message__";
 static const size_t kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
 static QtMessageHandler sOriginalMessageHandler = nullptr;
 
-template <class T>
+template<class T>
 static T CreateLogger(Level level, const QString &class_name, int line, const char *category);
 
 void GLog(const char *domain, int level, const char *message, void*) {
@@ -88,7 +88,7 @@ void GLog(const char *domain, int level, const char *message, void*) {
 
 }
 
-template <class T>
+template<class T>
 class DebugBase : public QDebug {
  public:
   DebugBase() : QDebug(sNullDevice) {}
@@ -314,11 +314,11 @@ QString LinuxDemangle(const QString &symbol) {
 QString DarwinDemangle(const QString &symbol);
 QString DarwinDemangle(const QString &symbol) {
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+#  if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
   QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
-#else
+#  else
   QStringList split = symbol.split(' ', QString::SkipEmptyParts);
-#endif
+#  endif
   QString mangled_function = split[3];
   return CXXDemangle(mangled_function);
 
@@ -379,7 +379,7 @@ QDebug CreateLoggerError(int line, const char *pretty_function, const char *cate
 
 namespace {
 
-template <typename T>
+template<typename T>
 QString print_duration(T duration, const std::string &unit) {
   return QString("%1%2").arg(duration.count()).arg(unit.c_str());
 }

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.
@@ -79,7 +76,7 @@ class _MessageHandlerBase : public QObject {
 
 // Reads and writes uint32 length encoded MessageType messages to a socket.
 // You should subclass this and implement the MessageArrived(MessageType) method.
-template <typename MT>
+template<typename MT>
 class AbstractMessageHandler : public _MessageHandlerBase {
  public:
   AbstractMessageHandler(QIODevice *device, QObject *parent);
@@ -115,11 +112,11 @@ class AbstractMessageHandler : public _MessageHandlerBase {
   QMap<int, ReplyType*> pending_replies_;
 };
 
-template <typename MT>
+template<typename MT>
 AbstractMessageHandler<MT>::AbstractMessageHandler(QIODevice *device, QObject *parent)
     : _MessageHandlerBase(device, parent) {}
 
-template <typename MT>
+template<typename MT>
 void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
   Q_ASSERT(QThread::currentThread() == thread());
 
@@ -127,7 +124,7 @@ void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
   WriteMessage(QByteArray(data.data(), data.size()));
 }
 
-template <typename MT>
+template<typename MT>
 void AbstractMessageHandler<MT>::SendMessageAsync(const MessageType &message) {
   std::string data = message.SerializeAsString();
   QMetaObject::invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));

ext/libstrawberry-common/core/messagereply.h

@@ -56,7 +56,7 @@ class _MessageReplyBase : public QObject {
 };
 
 // A reply future class that is returned immediately for requests that will occur in the background.  Similar to QNetworkReply.
-template <typename MessageType>
+template<typename MessageType>
 class MessageReply : public _MessageReplyBase {
  public:
   explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr);

ext/libstrawberry-common/core/workerpool.h

@@ -70,7 +70,7 @@ class _WorkerPoolBase : public QObject {
 // A local socket server is started for each process, and the address is passed to the process as argv[1].
 // The process is expected to connect back to the socket server, and when it does a HandlerType is created for it.
 // Instances of HandlerType are created in the WorkerPool's thread.
-template <typename HandlerType>
+template<typename HandlerType>
 class WorkerPool : public _WorkerPoolBase {
  public:
   explicit WorkerPool(QObject *parent = nullptr);
@@ -121,9 +121,9 @@ class WorkerPool : public _WorkerPoolBase {
   // Must only ever be called on my thread.
   void StartOneWorker(Worker *worker);
 
-  template <typename T>
+  template<typename T>
   Worker *FindWorker(T Worker::*member, T value) {
-    for (typename QList<Worker>::iterator it = workers_.begin() ; it != workers_.end() ; ++it) {
+    for (typename QList<Worker>::iterator it = workers_.begin(); it != workers_.end(); ++it) {
       if ((*it).*member == value) {
         return &(*it);
       }
@@ -131,7 +131,7 @@ class WorkerPool : public _WorkerPoolBase {
     return nullptr;
   }
 
-  template <typename T>
+  template<typename T>
   void DeleteQObjectPointerLater(T **p) {
     if (*p) {
       (*p)->deleteLater();
@@ -158,15 +158,15 @@ class WorkerPool : public _WorkerPoolBase {
   QAtomicInt next_id_;
 
   QMutex message_queue_mutex_;
-  QQueue<ReplyType*> message_queue_;
+  QQueue<ReplyType *> message_queue_;
 };
 
 
-template <typename HandlerType>
+template<typename HandlerType>
 WorkerPool<HandlerType>::WorkerPool(QObject *parent)
-  : _WorkerPoolBase(parent),
-    next_worker_(0),
-    next_id_(0) {
+    : _WorkerPoolBase(parent),
+      next_worker_(0),
+      next_id_(0) {
 
   worker_count_ = qBound(1, QThread::idealThreadCount() / 2, 4);
   local_server_name_ = qApp->applicationName().toLower();
@@ -177,7 +177,7 @@ WorkerPool<HandlerType>::WorkerPool(QObject *parent)
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 WorkerPool<HandlerType>::~WorkerPool() {
 
   for (const Worker &worker : workers_) {
@@ -208,30 +208,30 @@ WorkerPool<HandlerType>::~WorkerPool() {
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SetWorkerCount(const int count) {
   Q_ASSERT(workers_.isEmpty());
   worker_count_ = count;
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SetLocalServerName(const QString &local_server_name) {
   Q_ASSERT(workers_.isEmpty());
   local_server_name_ = local_server_name;
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SetExecutableName(const QString &executable_name) {
   Q_ASSERT(workers_.isEmpty());
   executable_name_ = executable_name;
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::Start() {
   QMetaObject::invokeMethod(this, "DoStart");
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::DoStart() {
 
   Q_ASSERT(workers_.isEmpty());
@@ -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
@@ -270,7 +274,7 @@ void WorkerPool<HandlerType>::DoStart() {
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -311,10 +315,9 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 #endif
 
   worker->process_->start(executable_path_, QStringList() << worker->local_server_->fullServerName());
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::NewConnection() {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -342,7 +345,7 @@ void WorkerPool<HandlerType>::NewConnection() {
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -370,7 +373,7 @@ void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::ProcessReadyReadStandardOutput() {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -383,7 +386,7 @@ void WorkerPool<HandlerType>::ProcessReadyReadStandardOutput() {
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::ProcessReadyReadStandardError() {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -426,7 +429,7 @@ WorkerPool<HandlerType>::SendMessageWithReply(MessageType *message) {
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SendQueuedMessages() {
 
   QMutexLocker l(&message_queue_mutex_);
@@ -448,7 +451,7 @@ void WorkerPool<HandlerType>::SendQueuedMessages() {
 
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 HandlerType *WorkerPool<HandlerType>::NextHandler() const {
 
   for (int i = 0; i < workers_.count(); ++i) {

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>
@@ -113,6 +114,7 @@ class TagLibFileRefFactory : public FileRefFactory {
     return new TagLib::FileRef(QFile::encodeName(filename).constData());
 #endif
   }
+
  private:
   Q_DISABLE_COPY(TagLibFileRefFactory)
 };
@@ -130,11 +132,11 @@ TagLib::String QStringToTaglibString(const QString &s) {
 }  // namespace
 
 namespace {
-const char *kMP4_OriginalYear_ID =   "----:com.apple.iTunes:ORIGINAL YEAR";
+const char *kMP4_OriginalYear_ID = "----:com.apple.iTunes:ORIGINAL YEAR";
 const char *kMP4_FMPS_Playcount_ID = "----:com.apple.iTunes:FMPS_Playcount";
-const char *kMP4_FMPS_Rating_ID =    "----:com.apple.iTunes:FMPS_Rating";
-const char *kASF_OriginalDate_ID =   "WM/OriginalReleaseTime";
-const char *kASF_OriginalYear_ID =   "WM/OriginalReleaseYear";
+const char *kMP4_FMPS_Rating_ID = "----:com.apple.iTunes:FMPS_Rating";
+const char *kASF_OriginalDate_ID = "WM/OriginalReleaseTime";
+const char *kASF_OriginalYear_ID = "WM/OriginalReleaseYear";
 }  // namespace
 
 
@@ -184,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);
@@ -194,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()));
@@ -247,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();
@@ -265,7 +270,7 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
     if (tag) Decode(tag->comment(), song->mutable_comment());
   }
 
-  else if (TagLib::WavPack::File *file_wavpack = dynamic_cast<TagLib::WavPack::File *>(fileref->file())) {
+  else if (TagLib::WavPack::File *file_wavpack = dynamic_cast<TagLib::WavPack::File*>(fileref->file())) {
     song->set_bitdepth(file_wavpack->audioProperties()->bitsPerSample());
     if (file_wavpack->APETag()) {
       ParseAPETag(file_wavpack->APETag()->itemListMap(), &disc, &compilation, song);
@@ -306,7 +311,9 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
 
       if (!map["TCMP"].isEmpty()) compilation = TStringToQString(map["TCMP"].front()->toString()).trimmed();
 
-      if (!map["TDOR"].isEmpty()) { song->set_originalyear(map["TDOR"].front()->toString().substr(0, 4).toInt()); }
+      if (!map["TDOR"].isEmpty()) {
+        song->set_originalyear(map["TDOR"].front()->toString().substr(0, 4).toInt());
+      }
       else if (!map["TORY"].isEmpty()) {
         song->set_originalyear(map["TORY"].front()->toString().substr(0, 4).toInt());
       }
@@ -321,7 +328,7 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
       if (!map["APIC"].isEmpty()) song->set_art_automatic(kEmbeddedCover);
 
       // Find a suitable comment tag.  For now we ignore iTunNORM comments.
-      for (uint i = 0 ; i < map["COMM"].size() ; ++i) {
+      for (uint i = 0; i < map["COMM"].size(); ++i) {
         const TagLib::ID3v2::CommentsFrame *frame = dynamic_cast<const TagLib::ID3v2::CommentsFrame*>(map["COMM"][i]);
 
         if (frame && TStringToQString(frame->description()) != "iTunNORM") {
@@ -450,7 +457,7 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
       }
 
       if (attributes_map.contains("FMPS/Rating")) {
-        const TagLib::ASF::AttributeList& attributes = attributes_map["FMPS/Rating"];
+        const TagLib::ASF::AttributeList &attributes = attributes_map["FMPS/Rating"];
         if (!attributes.isEmpty()) {
           float rating = TStringToQString(attributes.front().toString()).toFloat();
           if (song->rating() <= 0 && rating > 0) {
@@ -508,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) {
@@ -517,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());
@@ -679,7 +682,7 @@ bool TagReaderTagLib::SaveFile(const QString &filename, const spb::tagreader::So
   else if (TagLib::MP4::File *file_mp4 = dynamic_cast<TagLib::MP4::File*>(fileref->file())) {
     TagLib::MP4::Tag *tag = file_mp4->tag();
     if (!tag) return false;
-    tag->setItem("disk", TagLib::MP4::Item(song.disc() <= 0 -1 ? 0 : song.disc(), 0));
+    tag->setItem("disk", TagLib::MP4::Item(song.disc() <= 0 - 1 ? 0 : song.disc(), 0));
     tag->setItem("\251wrt", TagLib::StringList(TagLib::String(song.composer(), TagLib::String::UTF8)));
     tag->setItem("\251grp", TagLib::StringList(TagLib::String(song.grouping(), TagLib::String::UTF8)));
     tag->setItem("\251lyr", TagLib::StringList(TagLib::String(song.lyrics(), TagLib::String::UTF8)));
@@ -743,7 +746,7 @@ void TagReaderTagLib::SetTextFrame(const char *id, const std::string &value, Tag
   }
 
   // Update and add the frames
-  for (int i = 0 ; i < frames_buffer.size() ; ++i) {
+  for (int i = 0; i < frames_buffer.size(); ++i) {
     TagLib::ID3v2::TextIdentificationFrame *frame = new TagLib::ID3v2::TextIdentificationFrame(frames_buffer.at(i));
     if (i == 0) {
       frame->setText(StdStringToTaglibString(value));
@@ -799,7 +802,7 @@ void TagReaderTagLib::SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3
   }
 
   // Update and add the frames
-  for (int i = 0 ; i < frames_buffer.size() ; ++i) {
+  for (int i = 0; i < frames_buffer.size(); ++i) {
     TagLib::ID3v2::UnsynchronizedLyricsFrame *frame = new TagLib::ID3v2::UnsynchronizedLyricsFrame(frames_buffer.at(i));
     if (i == 0) {
       frame->setText(StdStringToTaglibString(value));
@@ -983,7 +986,7 @@ bool TagReaderTagLib::SaveEmbeddedArt(const QString &filename, const QByteArray
 
     // Remove existing covers
     TagLib::ID3v2::FrameList apiclist = tag->frameListMap()["APIC"];
-    for (TagLib::ID3v2::FrameList::ConstIterator it = apiclist.begin() ; it != apiclist.end() ; ++it ) {
+    for (TagLib::ID3v2::FrameList::ConstIterator it = apiclist.begin(); it != apiclist.end(); ++it) {
       TagLib::ID3v2::AttachedPictureFrame *frame = dynamic_cast<TagLib::ID3v2::AttachedPictureFrame*>(*it);
       tag->removeFrame(frame, false);
     }
@@ -994,7 +997,7 @@ bool TagReaderTagLib::SaveEmbeddedArt(const QString &filename, const QByteArray
       frontcover = new TagLib::ID3v2::AttachedPictureFrame("APIC");
       frontcover->setType(TagLib::ID3v2::AttachedPictureFrame::FrontCover);
       frontcover->setMimeType("image/jpeg");
-      frontcover->setPicture(TagLib::ByteVector(data.constData(), data.count()));
+      frontcover->setPicture(TagLib::ByteVector(data.constData(), data.size()));
       tag->addFrame(frontcover);
     }
   }
@@ -1008,7 +1011,7 @@ bool TagReaderTagLib::SaveEmbeddedArt(const QString &filename, const QByteArray
       if (tag->contains("covr")) tag->removeItem("covr");
     }
     else {
-      covers.append(TagLib::MP4::CoverArt(TagLib::MP4::CoverArt::JPEG, TagLib::ByteVector(data.constData(), data.count())));
+      covers.append(TagLib::MP4::CoverArt(TagLib::MP4::CoverArt::JPEG, TagLib::ByteVector(data.constData(), data.size())));
       tag->setItem("covr", covers);
     }
   }
@@ -1038,30 +1041,6 @@ TagLib::ID3v2::PopularimeterFrame *TagReaderTagLib::GetPOPMFrameFromTag(TagLib::
 
 }
 
-float TagReaderTagLib::ConvertPOPMRating(const int POPM_rating) {
-
-  if (POPM_rating < 0x01) return 0.0;
-  else if (POPM_rating < 0x40) return 0.20;
-  else if (POPM_rating < 0x80) return 0.40;
-  else if (POPM_rating < 0xC0) return 0.60;
-  else if (POPM_rating < 0xFC) return 0.80;
-
-  return 1.0;
-
-}
-
-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;
 
@@ -75,13 +74,11 @@ class TagReaderTagLib : public TagReaderBase {
   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
   void SetUserTextFrame(const QString &description, const QString &value, TagLib::ID3v2::Tag *tag) const;
   void SetUserTextFrame(const std::string &description, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUnsyncLyricsFrame(const std::string& value, TagLib::ID3v2::Tag* tag) const;
+  void SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const;
 
   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);
+  static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag *tag);
 
  private:
   FileRefFactory *factory_;

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) {
@@ -151,7 +156,7 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
 
     const auto tracks = taginfo.tracks();
     for (const auto track : tracks) {
-      switch(track->format().general) {
+      switch (track->format().general) {
         case TagParser::GeneralMediaFormat::Flac:
           song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_FLAC);
           break;
@@ -174,7 +179,7 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
           song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGSPEEX);
           break;
         case TagParser::GeneralMediaFormat::Mpeg1Audio:
-          switch(track->format().sub) {
+          switch (track->format().sub) {
             case TagParser::SubFormats::Mpeg1Layer3:
               song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_MPEG);
               break;
@@ -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

@@ -91,7 +91,7 @@ int main(int argc, char **argv) {
       qLog(Error) << "First line" << first_line << "does not match" << filepath;
       success = false;
     }
-    QRegularExpression regexp(QStringLiteral("^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), current version (\\d+\\.\\d+\\.\\d+)(, weak)?\\)$"));
+    QRegularExpression regexp(QStringLiteral("^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), current version (\\d+\\.\\d+\\.\\d+)(, weak|, reexport)?\\)$"));
     for (const QString &output_line : output_lines) {
 
       //qDebug() << "Final check on" << filepath << output_line;
@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
       QRegularExpressionMatch match = regexp.match(output_line);
       if (match.hasMatch()) {
         QString library = match.captured(1);
-        if (QFileInfo(library).fileName() == QFileInfo(filepath).fileName()) { // It's this.
+        if (QFileInfo(library).fileName() == QFileInfo(filepath).fileName()) {  // It's this.
           continue;
         }
         else if (library.startsWith("@executable_path")) {
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
         else if (library.startsWith("@rpath")) {
           QString real_path = library;
           real_path = real_path.replace("@rpath", bundle_path + "/Contents/Frameworks");
-          if (!QFile(real_path).exists() && !real_path.endsWith("QtSvg")) { // FIXME: Ignore broken svg image plugin.
+          if (!QFile(real_path).exists() && !real_path.endsWith("QtSvg")) {  // FIXME: Ignore broken svg image plugin.
             qLog(Error) << real_path << "does not exist for" << filepath;
             success = false;
           }
@@ -127,10 +127,7 @@ int main(int argc, char **argv) {
             success = false;
           }
         }
-        else if (library.startsWith("/System/Library/") || library.startsWith("/usr/lib/")) { // System library
-          continue;
-        }
-        else if (library.endsWith("libgcc_s.1.dylib")) {  // fftw points to it for some reason.
+        else if (library.startsWith("/System/Library/") || library.startsWith("/usr/lib/")) {  // System library
           continue;
         }
         else {

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/main.cpp

@@ -21,7 +21,7 @@
 #include <QtGlobal>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-#include <sys/time.h>
+#  include <sys/time.h>
 #endif
 #include <iostream>
 

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -28,34 +28,17 @@
 #include "tagreaderworker.h"
 
 TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
-  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {}
+    : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {}
 
 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)
@@ -12,6 +12,7 @@ set(SOURCES
   core/commandlineoptions.cpp
   core/database.cpp
   core/sqlquery.cpp
+  core/sqlrow.cpp
   core/metatypes.cpp
   core/deletefiles.cpp
   core/filesystemmusicstorage.cpp
@@ -59,8 +60,6 @@ set(SOURCES
 
   context/contextview.cpp
   context/contextalbum.cpp
-  context/contextalbumsmodel.cpp
-  context/contextalbumsview.cpp
 
   collection/collection.cpp
   collection/collectionmodel.cpp
@@ -73,7 +72,6 @@ set(SOURCES
   collection/collectionfilterwidget.cpp
   collection/collectionplaylistitem.cpp
   collection/collectionquery.cpp
-  collection/sqlrow.cpp
   collection/savedgroupingmanager.cpp
   collection/groupbydialog.cpp
   collection/collectiontask.cpp
@@ -188,6 +186,7 @@ set(SOURCES
   dialogs/deleteconfirmationdialog.cpp
   dialogs/lastfmimportdialog.cpp
   dialogs/snapdialog.cpp
+  dialogs/saveplaylistsdialog.cpp
 
   widgets/autoexpandingtreeview.cpp
   widgets/busyindicator.cpp
@@ -212,6 +211,7 @@ set(SOURCES
   widgets/tracksliderslider.cpp
   widgets/loginstatewidget.cpp
   widgets/ratingwidget.cpp
+  widgets/resizabletextedit.cpp
 
   osd/osdbase.cpp
   osd/osdpretty.cpp
@@ -298,8 +298,6 @@ set(HEADERS
 
   context/contextview.h
   context/contextalbum.h
-  context/contextalbumsmodel.h
-  context/contextalbumsview.h
 
   collection/collection.h
   collection/collectionmodel.h
@@ -420,6 +418,7 @@ set(HEADERS
   dialogs/deleteconfirmationdialog.h
   dialogs/lastfmimportdialog.h
   dialogs/snapdialog.h
+  dialogs/saveplaylistsdialog.h
 
   widgets/autoexpandingtreeview.h
   widgets/busyindicator.h
@@ -445,6 +444,7 @@ set(HEADERS
   widgets/qsearchfield.h
   widgets/ratingwidget.h
   widgets/forcescrollperpixel.h
+  widgets/resizabletextedit.h
 
   osd/osdbase.h
   osd/osdpretty.h
@@ -544,6 +544,7 @@ set(UI
   dialogs/userpassdialog.ui
   dialogs/lastfmimportdialog.ui
   dialogs/snapdialog.ui
+  dialogs/saveplaylistsdialog.ui
 
   widgets/trackslider.ui
   widgets/fileview.ui
@@ -943,10 +944,14 @@ link_directories(
   ${SQLITE_LIBRARY_DIRS}
   ${SINGLEAPPLICATION_LIBRARY_DIRS}
   ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
-  ${QTSPARKLE_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()
@@ -986,6 +991,10 @@ if(HAVE_GIO)
   link_directories(${GIO_LIBRARY_DIRS})
 endif()
 
+if(HAVE_GIO_UNIX)
+  link_directories(${GIO_UNIX_LIBRARY_DIRS})
+endif()
+
 if(HAVE_AUDIOCD)
   link_directories(${LIBCDIO_LIBRARY_DIRS})
 endif()
@@ -1006,6 +1015,10 @@ if(USE_TAGPARSER AND TAGPARSER_FOUND)
   link_directories(${TAGPARSER_LIBRARY_DIRS})
 endif()
 
+if(HAVE_QTSPARKLE)
+  link_directories(${QTSPARKLE_LIBRARY_DIRS})
+endif()
+
 add_library(strawberry_lib STATIC
   ${SOURCES}
   ${MOC}
@@ -1022,6 +1035,7 @@ target_include_directories(strawberry_lib SYSTEM PUBLIC
   ${GOBJECT_INCLUDE_DIRS}
   ${GNUTLS_INCLUDE_DIRS}
   ${SQLITE_INCLUDE_DIRS}
+  ${PROTOBUF_INCLUDE_DIRS}
 )
 
 if(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
@@ -1049,12 +1063,21 @@ target_link_libraries(strawberry_lib PUBLIC
   ${QT_LIBRARIES}
   ${SINGLEAPPLICATION_LIBRARIES}
   ${SINGLECOREAPPLICATION_LIBRARIES}
-  ${QTSPARKLE_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})
@@ -1113,6 +1136,11 @@ if(HAVE_GIO)
   target_link_libraries(strawberry_lib PRIVATE ${GIO_LIBRARIES})
 endif()
 
+if(HAVE_GIO_UNIX)
+  target_include_directories(strawberry_lib SYSTEM PRIVATE ${GIO_UNIX_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${GIO_UNIX_LIBRARIES})
+endif()
+
 if(HAVE_AUDIOCD)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBCDIO_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${LIBCDIO_LIBRARIES})
@@ -1128,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"
@@ -1143,19 +1167,25 @@ if(APPLE)
     "-framework ScriptingBridge"
   )
   target_link_libraries(strawberry_lib PRIVATE ${SPMEDIAKEYTAP_LIBRARIES})
-  if(HAVE_SPARKLE)
-    target_include_directories(strawberry_lib SYSTEM PRIVATE ${SPARKLE}/Headers)
-    target_link_libraries(strawberry_lib PRIVATE ${SPARKLE})
-  endif()
 endif()
 
 if(WIN32)
   target_link_libraries(strawberry_lib PRIVATE dsound dwmapi)
   if(MSVC)
     target_link_libraries(strawberry_lib PRIVATE sqlite3)
+    if (GETOPT_INCLUDE_DIRS)
+      target_include_directories(strawberry_lib SYSTEM PRIVATE ${GETOPT_INCLUDE_DIRS})
+    endif()
+    if(GETOPT_LIBRARIES)
+      target_link_libraries(strawberry_lib PRIVATE ${GETOPT_LIBRARIES})
+    endif()
   endif()
 endif()
 
+if(HAVE_QTSPARKLE)
+  target_include_directories(strawberry_lib SYSTEM PRIVATE ${QTSPARKLE_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${QTSPARKLE_LIBRARIES})
+endif()
 
 ###############################################################################
 

src/analyzer/analyzerbase.cpp

@@ -32,10 +32,11 @@
 #include <QVector>
 #include <QPainter>
 #include <QPalette>
+#include <QBasicTimer>
+#include <QShowEvent>
+#include <QHideEvent>
 #include <QTimerEvent>
-#include <QtEvents>
 
-#include "core/logging.h"
 #include "engine/enginebase.h"
 
 // INSTRUCTIONS Base2D
@@ -47,27 +48,42 @@
 //
 // TODO:
 // Make an INSTRUCTIONS file
-// can't mod scope in analyze you have to use transform
-// for 2D use setErasePixmap Qt function insetead of m_background
-
-// make the linker happy only for gcc < 4.0
-#if !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 0)) && \
-    !defined(Q_OS_WIN32)
-template class Analyzer::Base<QWidget>;
-#endif
+// can't mod scope in analyze you have to use transform for 2D use setErasePixmap Qt function insetead of m_background
 
 Analyzer::Base::Base(QWidget *parent, const uint scopeSize)
     : QWidget(parent),
-      timeout_(40),
       fht_(new FHT(scopeSize)),
       engine_(nullptr),
       lastscope_(512),
       new_frame_(false),
-      is_playing_(false) {}
+      is_playing_(false),
+      timeout_(40) {
 
-void Analyzer::Base::hideEvent(QHideEvent*) { timer_.stop(); }
+  setAttribute(Qt::WA_OpaquePaintEvent, true);
 
-void Analyzer::Base::showEvent(QShowEvent*) { timer_.start(timeout(), this); }
+}
+
+Analyzer::Base::~Base() {
+  delete fht_;
+}
+
+void Analyzer::Base::showEvent(QShowEvent*) {
+  timer_.start(timeout(), this);
+}
+
+void Analyzer::Base::hideEvent(QHideEvent*) {
+  timer_.stop();
+}
+
+void Analyzer::Base::ChangeTimeout(const int timeout) {
+
+  timeout_ = timeout;
+  if (timer_.isActive()) {
+    timer_.stop();
+    timer_.start(timeout_, this);
+  }
+
+}
 
 void Analyzer::Base::transform(Scope &scope) {
 
@@ -80,7 +96,7 @@ void Analyzer::Base::transform(Scope &scope) {
   }
 
   fht_->logSpectrum(scope.data(), aux.data());
-  fht_->scale(scope.data(), 1.0 / 20);
+  fht_->scale(scope.data(), 1.0F / 20);
 
   scope.resize(fht_->size() / 2);  // second half of values are rubbish
 
@@ -161,7 +177,7 @@ int Analyzer::Base::resizeForBands(const int bands) {
   }
   else {
     exp = 9;
-}
+  }
 
   resizeExponent(exp);
   return fht_->size() / 2;
@@ -193,10 +209,6 @@ void Analyzer::Base::demo(QPainter &p) {
 
 }
 
-void Analyzer::Base::polishEvent() {
-  init();
-}
-
 void Analyzer::interpolate(const Scope &inVec, Scope &outVec) {
 
   double pos = 0.0;

src/analyzer/analyzerbase.h

@@ -44,8 +44,8 @@
 
 class QHideEvent;
 class QShowEvent;
-class QTimerEvent;
 class QPaintEvent;
+class QTimerEvent;
 
 namespace Analyzer {
 
@@ -55,19 +55,13 @@ class Base : public QWidget {
   Q_OBJECT
 
  public:
-  ~Base() override { delete fht_; }
+  ~Base() override;
 
   int timeout() const { return timeout_; }
 
   void set_engine(EngineBase *engine) { engine_ = engine; }
 
-  void changeTimeout(int newTimeout) {
-    timeout_ = newTimeout;
-    if (timer_.isActive()) {
-      timer_.stop();
-      timer_.start(timeout_, this);
-    }
-  }
+  void ChangeTimeout(const int timeout);
 
   virtual void framerateChanged() {}
 
@@ -76,10 +70,8 @@ class Base : public QWidget {
 
   void hideEvent(QHideEvent*) override;
   void showEvent(QShowEvent*) override;
-  void paintEvent(QPaintEvent*) override;
-  void timerEvent(QTimerEvent*) override;
-
-  void polishEvent();
+  void paintEvent(QPaintEvent *e) override;
+  void timerEvent(QTimerEvent *e) override;
 
   int resizeExponent(int);
   int resizeForBands(const int);
@@ -90,13 +82,13 @@ class Base : public QWidget {
 
  protected:
   QBasicTimer timer_;
-  int timeout_;
   FHT *fht_;
   EngineBase *engine_;
   Scope lastscope_;
 
   bool new_frame_;
   bool is_playing_;
+  int timeout_;
 };
 
 void interpolate(const Scope&, Scope&);

src/analyzer/analyzercontainer.cpp

@@ -33,7 +33,6 @@
 #include <QActionGroup>
 #include <QSettings>
 #include <QtEvents>
-#include <QtDebug>
 
 #include "analyzercontainer.h"
 
@@ -153,7 +152,7 @@ void AnalyzerContainer::ChangeAnalyzer(const int id) {
   current_analyzer_->set_engine(engine_);
   // Even if it is not supposed to happen, I don't want to get a dbz error
   current_framerate_ = current_framerate_ == 0 ? kMediumFramerate : current_framerate_;
-  current_analyzer_->changeTimeout(1000 / current_framerate_);
+  current_analyzer_->ChangeTimeout(1000 / current_framerate_);
 
   layout()->addWidget(current_analyzer_);
 
@@ -166,7 +165,7 @@ void AnalyzerContainer::ChangeFramerate(int new_framerate) {
   if (current_analyzer_) {
     // Even if it is not supposed to happen, I don't want to get a dbz error
     new_framerate = new_framerate == 0 ? kMediumFramerate : new_framerate;
-    current_analyzer_->changeTimeout(1000 / new_framerate);
+    current_analyzer_->ChangeTimeout(1000 / new_framerate);
 
     // notify the current analyzer that the framerate has changed
     current_analyzer_->framerateChanged();

src/analyzer/analyzercontainer.h

@@ -74,7 +74,7 @@ class AnalyzerContainer : public QWidget {
   void Load();
   void Save();
   void SaveFramerate(const int framerate);
-  template <typename T>
+  template<typename T>
   void AddAnalyzerType();
   void AddFramerate(const QString &name, const int framerate);
 
@@ -96,10 +96,9 @@ class AnalyzerContainer : public QWidget {
 
   Analyzer::Base *current_analyzer_;
   EngineBase *engine_;
-
 };
 
-template <typename T>
+template<typename T>
 void AnalyzerContainer::AddAnalyzerType() {
 
   int id = analyzer_types_.count();

src/analyzer/blockanalyzer.cpp

@@ -63,8 +63,7 @@ BlockAnalyzer::BlockAnalyzer(QWidget *parent)
   setMaximumWidth(kMaxColumns * (kWidth + 1) - 1);
 
   // mxcl says null pixmaps cause crashes, so let's play it safe
-  std::fill(fade_bars_.begin(), fade_bars_.end(),  QPixmap(1, 1));
-
+  std::fill(fade_bars_.begin(), fade_bars_.end(), QPixmap(1, 1));
 }
 
 void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
@@ -89,7 +88,7 @@ void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
   if (rows_ != oldRows) {
     barpixmap_ = QPixmap(kWidth, rows_ * (kHeight + 1));
 
-    std::fill(fade_bars_.begin(), fade_bars_.end(),  QPixmap(kWidth, rows_ * (kHeight + 1)));
+    std::fill(fade_bars_.begin(), fade_bars_.end(), QPixmap(kWidth, rows_ * (kHeight + 1)));
 
     yscale_.resize(rows_ + 1);
 
@@ -130,7 +129,7 @@ void BlockAnalyzer::transform(Analyzer::Scope &s) {
   for (uint x = 0; x < s.size(); ++x) s[x] *= 2;
 
   fht_->spectrum(s.data());
-  fht_->scale(s.data(), 1.0 / 20);
+  fht_->scale(s.data(), 1.0F / 20);
 
   // the second half is pretty dull, so only show it if the user has a large analyzer by setting to scope_.size() if large we prevent interpolation of large analyzers, this is good!
   s.resize(scope_.size() <= kMaxColumns / 2 ? kMaxColumns / 2 : scope_.size());

src/analyzer/blockanalyzer.h

@@ -65,14 +65,14 @@ class BlockAnalyzer : public Analyzer::Base {
  private:
   QPixmap *bar() { return &barpixmap_; }
 
-  int columns_, rows_;      // number of rows and columns of blocks
-  int y_;                   // y-offset from top of widget
+  int columns_, rows_;  // number of rows and columns of blocks
+  int y_;               // y-offset from top of widget
   QPixmap barpixmap_;
   QPixmap topbarpixmap_;
   QPixmap background_;
   QPixmap canvas_;
-  Analyzer::Scope scope_;    // so we don't create a vector every frame
-  QVector<double> store_;     // current bar heights
+  Analyzer::Scope scope_;  // so we don't create a vector every frame
+  QVector<double> store_;  // current bar heights
   QVector<double> yscale_;
 
   QVector<QPixmap> fade_bars_;

src/analyzer/boomanalyzer.cpp

@@ -102,7 +102,7 @@ void BoomAnalyzer::resizeEvent(QResizeEvent *e) {
 void BoomAnalyzer::transform(Scope &s) {
 
   fht_->spectrum(s.data());
-  fht_->scale(s.data(), 1.0 / 50);
+  fht_->scale(s.data(), 1.0F / 50);
 
   s.resize(scope_.size() <= static_cast<quint64>(kMaxBandCount) / 2 ? kMaxBandCount / 2 : scope_.size());
 

src/analyzer/rainbowanalyzer.cpp

@@ -43,12 +43,12 @@
 
 using Analyzer::Scope;
 
-const int Rainbow::RainbowAnalyzer::kHeight[] = {21, 33};
-const int Rainbow::RainbowAnalyzer::kWidth[] = {34, 53};
-const int Rainbow::RainbowAnalyzer::kFrameCount[] = {6, 16};
-const int Rainbow::RainbowAnalyzer::kRainbowHeight[] = {21, 16};
-const int Rainbow::RainbowAnalyzer::kRainbowOverlap[] = {13, 15};
-const int Rainbow::RainbowAnalyzer::kSleepingHeight[] = {24, 33};
+const int Rainbow::RainbowAnalyzer::kHeight[] = { 21, 33 };
+const int Rainbow::RainbowAnalyzer::kWidth[] = { 34, 53 };
+const int Rainbow::RainbowAnalyzer::kFrameCount[] = { 6, 16 };
+const int Rainbow::RainbowAnalyzer::kRainbowHeight[] = { 21, 16 };
+const int Rainbow::RainbowAnalyzer::kRainbowOverlap[] = { 13, 15 };
+const int Rainbow::RainbowAnalyzer::kSleepingHeight[] = { 24, 33 };
 
 const char *Rainbow::NyanCatAnalyzer::kName = "Nyanalyzer Cat";
 const char *Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";

src/analyzer/rainbowanalyzer.h

@@ -93,7 +93,7 @@ class RainbowAnalyzer : public Analyzer::Base {
 
  private:
   // "constants" that get initialized in the constructor
-  float band_scale_[kRainbowBands]{};
+  float band_scale_[kRainbowBands] {};
   QPen colors_[kRainbowBands];
 
   // Rainbow Nyancat & Dash
@@ -104,7 +104,7 @@ class RainbowAnalyzer : public Analyzer::Base {
   int frame_;
 
   // The y positions of each point on the rainbow.
-  float history_[kHistorySize * kRainbowBands]{};
+  float history_[kHistorySize * kRainbowBands] {};
 
   // A cache of the last frame's rainbow,
   // so it can be used in the next frame.
@@ -142,6 +142,6 @@ class RainbowDashAnalyzer : public RainbowAnalyzer {
 
   static const char *kName;
 };
-}
+}  // namespace Rainbow
 
 #endif  // RAINBOWANALYZER_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"
@@ -59,6 +58,8 @@ SCollection::SCollection(Application *app, QObject *parent)
       watcher_(nullptr),
       watcher_thread_(nullptr),
       original_thread_(nullptr),
+      io_priority_(Utilities::IoPriority::IOPRIO_CLASS_IDLE),
+      thread_priority_(QThread::Priority::IdlePriority),
       save_playcounts_to_files_(false),
       save_ratings_to_files_(false) {
 
@@ -94,11 +95,18 @@ void SCollection::Init() {
 
   watcher_ = new CollectionWatcher(Song::Source_Collection);
   watcher_thread_ = new Thread(this);
-  watcher_thread_->SetIoPriority(Utilities::IOPRIO_CLASS_IDLE);
+
+#ifndef Q_OS_WIN32
+  if (io_priority_ != Utilities::IoPriority::IOPRIO_CLASS_NONE) {
+    watcher_thread_->SetIoPriority(io_priority_);
+  }
+#endif
 
   watcher_->moveToThread(watcher_thread_);
-  watcher_thread_->start(QThread::IdlePriority);
-  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_;
+
+  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_ << "with I/O priority" << io_priority_ << "and thread priority" << thread_priority_;
+
+  watcher_thread_->start(thread_priority_);
 
   watcher_->set_backend(backend_);
   watcher_->set_task_manager(app_->task_manager());
@@ -176,6 +184,8 @@ void SCollection::ReloadSettings() {
 
   QSettings s;
   s.beginGroup(CollectionSettingsPage::kSettingsGroup);
+  io_priority_ = static_cast<Utilities::IoPriority>(s.value("io_priority", Utilities::IOPRIO_CLASS_IDLE).toInt());
+  thread_priority_ = static_cast<QThread::Priority>(s.value("thread_priority", QThread::Priority::IdlePriority).toInt());
   save_playcounts_to_files_ = s.value("save_playcounts", false).toBool();
   save_ratings_to_files_ = s.value("save_ratings", false).toBool();
   s.endGroup();

src/collection/collection.h

@@ -28,10 +28,10 @@
 #include <QList>
 #include <QHash>
 #include <QString>
+#include <QThread>
 
 #include "core/song.h"
-
-class QThread;
+#include "core/utilities.h"
 
 class Application;
 class Thread;
@@ -99,6 +99,8 @@ class SCollection : public QObject {
 
   QList<QObject*> wait_for_exit_;
 
+  Utilities::IoPriority io_priority_;
+  QThread::Priority thread_priority_;
   bool save_playcounts_to_files_;
   bool save_ratings_to_files_;
 };

src/collection/collectionbackend.cpp

@@ -47,10 +47,10 @@
 #include "core/database.h"
 #include "core/scopedtransaction.h"
 #include "core/song.h"
+#include "core/sqlrow.h"
 #include "smartplaylists/smartplaylistsearch.h"
 
 #include "directory.h"
-#include "sqlrow.h"
 #include "collectionbackend.h"
 #include "collectionquery.h"
 #include "collectiontask.h"
@@ -335,8 +335,8 @@ void CollectionBackend::AddDirectory(const QString &path) {
   q.prepare(QString("INSERT INTO %1 (path, subdirs) VALUES (:path, 1)").arg(dirs_table_));
   q.BindValue(":path", db_path);
   if (!q.Exec()) {
-   db_->ReportErrors(q);
-   return;
+    db_->ReportErrors(q);
+    return;
   }
 
   Directory dir;
@@ -634,15 +634,13 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
         added_songs << new_song;
 
         continue;
-
       }
-
     }
 
     // Create new song
 
     int id = -1;
-    { // Insert the row and create a new ID
+    {  // Insert the row and create a new ID
       SqlQuery q(db);
       q.prepare(QString("INSERT INTO %1 (" + Song::kColumnSpec + ") VALUES (" + Song::kBindSpec + ")").arg(songs_table_));
       song.BindToQuery(&q);
@@ -656,7 +654,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
 
     if (id == -1) return;
 
-    { // Add to the FTS index
+    {  // Add to the FTS index
       SqlQuery q(db);
       q.prepare(QString("INSERT INTO %1 (ROWID, " + Song::kFtsColumnSpec + ") VALUES (:id, " + Song::kFtsBindSpec + ")").arg(fts_table_));
       q.BindValue(":id", id);
@@ -1345,7 +1343,7 @@ void CollectionBackend::CompilationsNeedUpdating() {
     if (album.isEmpty()) continue;
 
     // Find the directory the song is in
-    QString directory = url.toString(QUrl::PreferLocalFile|QUrl::RemoveFilename);
+    QString directory = url.toString(QUrl::PreferLocalFile | QUrl::RemoveFilename);
 
     CompilationInfo &info = compilation_info[directory + album];
     info.urls << url;
@@ -1481,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();
 
@@ -1801,6 +1799,12 @@ void CollectionBackend::ResetStatistics(const int id) {
 
 }
 
+void CollectionBackend::DeleteAllAsync() {
+
+  QMetaObject::invokeMethod(this, "DeleteAll", Qt::QueuedConnection);
+
+}
+
 void CollectionBackend::DeleteAll() {
 
   {

src/collection/collectionbackend.h

@@ -197,7 +197,7 @@ class CollectionBackend : public CollectionBackendInterface {
   void IncrementSkipCountAsync(const int id, const float progress);
   void ResetStatisticsAsync(const int id);
 
-  void DeleteAll();
+  void DeleteAllAsync();
 
   Song GetSongBySongId(const QString &song_id);
   SongList GetSongsBySongId(const QStringList &song_ids);
@@ -234,6 +234,7 @@ class CollectionBackend : public CollectionBackendInterface {
   void IncrementPlayCount(const int id);
   void IncrementSkipCount(const int id, const float progress);
   void ResetStatistics(const int id);
+  void DeleteAll();
   void SongPathChanged(const Song &song, const QFileInfo &new_file, const std::optional<int> new_collection_directory_id);
 
   SongList GetSongsBy(const QString &artist, const QString &album, const QString &title);

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) {
@@ -68,24 +74,23 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
   QString available_fields = Song::kFtsColumns.join(", ").replace(QRegularExpression("\\bfts"), "");
 
   ui_->search_field->setToolTip(
-  QString("<html><head/><body><p>") +
-  tr("Prefix a word with a field name to limit the search to that field, e.g.:") +
-  QString(" ") +
-  QString("<span style=\"font-weight:600;\">") +
-  tr("artist") +
-  QString(":") +
-  QString("</span><span style=\"font-style:italic;\">Strawbs</span>") +
-  QString(" ") +
-  tr("searches the collection for all artists that contain the word") +
-  QString(" Strawbs.") +
-  QString("</p><p><span style=\"font-weight:600;\">") +
-  tr("Available fields") +
-  QString(": ") +
-  "</span><span style=\"font-style:italic;\">" +
-  available_fields +
-  QString("</span>.") +
-  QString("</p></body></html>")
-  );
+    QString("<html><head/><body><p>") +
+    tr("Prefix a word with a field name to limit the search to that field, e.g.:") +
+    QString(" ") +
+    QString("<span style=\"font-weight:600;\">") +
+    tr("artist") +
+    QString(":") +
+    QString("</span><span style=\"font-style:italic;\">Strawbs</span>") +
+    QString(" ") +
+    tr("searches the collection for all artists that contain the word") +
+    QString(" Strawbs.") +
+    QString("</p><p><span style=\"font-weight:600;\">") +
+    tr("Available fields") +
+    QString(": ") +
+    "</span><span style=\"font-style:italic;\">" +
+    available_fields +
+    QString("</span>.") +
+    QString("</p></body></html>"));
 
   QObject::connect(ui_->search_field, &QSearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed);
   QObject::connect(filter_delay_, &QTimer::timeout, this, &CollectionFilterWidget::FilterDelayTimeout);
@@ -115,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);
 
@@ -136,6 +136,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
   ui_->options->setMenu(collection_menu_);
 
   QObject::connect(ui_->search_field, &QSearchField::textChanged, this, &CollectionFilterWidget::FilterTextChanged);
+  QObject::connect(ui_->options, &QToolButton::clicked, ui_->options, &QToolButton::showMenu);
 
   ReloadSettings();
 
@@ -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,18 +177,33 @@ 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() {
 
   QSettings s;
@@ -199,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_);
@@ -221,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() {
 
@@ -230,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);
@@ -240,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);
 
@@ -268,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();
@@ -317,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();
 
@@ -367,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();
   }
 
@@ -387,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;