Release 1.0.18

Bumps [vmactions/freebsd-vm](https://github.com/vmactions/freebsd-vm) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/vmactions/freebsd-vm/releases)
- [Commits](https://github.com/vmactions/freebsd-vm/compare/v0.3.0...v0.3.1)

---
updated-dependencies:
- dependency-name: vmactions/freebsd-vm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.clang-format

@@ -1,105 +1,216 @@
-BasedOnStyle: Chromium
-Language: Cpp
-Standard: Cpp11
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
 AccessModifierOffset: -1
-AlignAfterOpenBracket: false
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignConsecutiveMacros: true
-AlignEscapedNewlines: true
-AlignOperands: false
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignEscapedNewlines: Left
+AlignOperands:   DontAlign
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: false
-AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: true
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLambdasOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
 AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: No
+AttributeMacros:
+  - __capability
 BinPackArguments: true
 BinPackParameters: true
-BreakBeforeBraces: false
-BreakBeforeBinaryOperators: false
-BreakBeforeBraces: Stroustrup
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializers: BeforeColon
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
-ColumnLimit: 0
+ColumnLimit:     0
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 2
 Cpp11BracedListStyle: false
 DeriveLineEnding: true
-DerivePointerAlignment: true
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: true
+DerivePointerAlignment: false
+DisableFormat:   true
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: BinPack
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+AllowAllConstructorInitializersOnNextLine: true
 FixNamespaceComments: true
-IncludeBlocks: Preserve
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
 IndentCaseLabels: true
+IndentCaseBlocks: false
 IndentGotoLabels: true
 IndentPPDirectives: AfterHash
-IndentWidth: 2
+IndentExternBlock: AfterExternBlock
+IndentRequiresClause: true
+IndentWidth:     2
 IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 100
 NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: false
+ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 0
 PenaltyBreakBeforeFirstCallParameter: 0
 PenaltyBreakComment: 0
 PenaltyBreakFirstLessLess: 0
+PenaltyBreakOpenParenthesis: 0
 PenaltyBreakString: 0
 PenaltyBreakTemplateDeclaration: 0
 PenaltyExcessCharacter: 0
 PenaltyReturnTypeOnItsOwnLine: 0
+PenaltyIndentedWhitespace: 0
 PointerAlignment: Right
-ReflowComments: false
-SortIncludes: false
+PPIndentWidth:   -1
+ReferenceAlignment: Pointer
+ReflowComments:  false
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    false
+SortJavaStaticImport: Before
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: true
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeRangeBasedForLoopColon: true
-SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
+SpacesInAngles:  Never
 SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-UseCRLF: false
-UseTab: Never
-BreakBeforeBraces: Custom
-BraceWrapping:
-  AfterFunction: false
-  AfterCaseLabel: false
-  AfterStruct: false
-  AfterClass: false
-  AfterEnum: false
-  AfterUnion: false
-  AfterControlStatement: Never
-  AfterNamespace: false
-  AfterObjCDeclaration: false
-  AfterExternBlock: false
-  BeforeCatch: false
-  BeforeElse: true
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: Both
+Standard:        Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseCRLF:         false
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+...
+

.github/ISSUE_TEMPLATE.md

@@ -7,11 +7,9 @@ assignees: ''
 
 ---
 
-See the FAQ before opening an issue: https://wiki.strawberrymusicplayer.org/wiki/FAQ
-Check the Changelog to see if the issue is already fixed: https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog
-If it's already fixed, try the latest development build from: https://builds.strawberrymusicplayer.org/
-For technical issues, questions and discussion please use the forum on https://forum.strawberrymusicplayer.org/
-Any issues related to feature requests will be closed. See the README for more details.
+- [ ] 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.

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily

3rdparty/README.md

@@ -1,15 +1,13 @@
 3rdparty libraries located in this directory
 ============================================
 
-singleapplication
+KDSingleApplication
 -----------------
 This is a small static library used by Strawberry to prevent it from starting twice per user session.
 If the user tries to start strawberry twice, the main window will maximize instead of starting another instance.
-If you dynamically link to your systems version, you'll need two versions, one defined as QApplication and
-one as a QCoreApplication.
-It is included here because it is not packed by distros and is also used on macOS and Windows.
+It is also used to pass command-line options through to the first instance.
 
-URL: https://github.com/itay-grudev/SingleApplication
+URL: https://github.com/KDAB/KDSingleApplication/
 
 
 SPMediaKeyTap
@@ -27,4 +25,4 @@ Can safely be deleted on other platforms.
 
 getopt
 ------
-getopt included only when compiling with MSVC on Windows.
+getopt included only when compiling on Windows.

3rdparty/getopt/CMakeLists.txt

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

3rdparty/getopt/getopt.c

@@ -1,562 +0,0 @@
-/*	$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.cpp

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

3rdparty/getopt/getopt.h

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

3rdparty/kdsingleapplication/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.7)
+set(SOURCES kdsingleapplication.cpp kdsingleapplication_localsocket.cpp)
+set(HEADERS kdsingleapplication.h kdsingleapplication_localsocket_p.h)
+qt_wrap_cpp(MOC ${HEADERS})
+add_library(kdsingleapplication STATIC ${SOURCES} ${MOC})
+target_compile_definitions(kdsingleapplication PRIVATE -DKDSINGLEAPPLICATION_STATIC_BUILD)
+target_include_directories(kdsingleapplication PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(kdsingleapplication PUBLIC ${QtCore_LIBRARIES} ${QtNetwork_LIBRARIES} )

3rdparty/kdsingleapplication/LICENSE

@@ -0,0 +1,6 @@
+KDSingleApplication is (C) 2019-2023, Klarälvdalens Datakonsult AB,
+and is available under the terms of the MIT license.
+
+See the full license text in the LICENSES folder.
+
+Contact KDAB at <info@kdab.com> to inquire about commercial licensing.

3rdparty/kdsingleapplication/README.md

@@ -0,0 +1,53 @@
+# KDSingleApplication
+
+`KDSingleApplication` is a helper class for single-instance policy applications
+written by [KDAB](https://www.kdab.com).
+
+## Usage
+
+Currently the documentation is woefully lacking, but see the examples or tests
+for inspiration. Basically it involves:
+
+1. Create a `Q(Core|Gui)Application` object.
+2. Create a `KDSingleApplication` object.
+3. Check if the current instance is *primary* (or "master") or
+   *secondary* (or "slave") by calling `isPrimaryInstance`:
+    * the *primary* instance needs to listen from messages coming from the
+      secondary instances, by connecting a slot to the `messageReceived` signal;
+    * the *secondary* instances can send messages to the primary instance
+      by calling `sendMessage`.
+
+## Licensing
+
+KDSingleApplication is (C) 2019-2023, Klarälvdalens Datakonsult AB, and is available
+under the terms of the [MIT license](LICENSES/MIT.txt).
+
+Contact KDAB at <info@kdab.com> if you need different licensing options.
+
+## Get Involved
+
+KDAB will happily accept external contributions.
+
+Please submit your contributions or issue reports from our GitHub space at
+<https://github.com/KDAB/KDSingleApplication>.
+
+## About KDAB
+
+KDSingleApplication is supported and maintained by Klarälvdalens Datakonsult AB (KDAB).
+
+The KDAB Group is the global No.1 software consultancy for Qt, C++ and
+OpenGL applications across desktop, embedded and mobile platforms.
+
+The KDAB Group provides consulting and mentoring for developing Qt applications
+from scratch and in porting from all popular and legacy frameworks to Qt.
+We continue to help develop parts of Qt and are one of the major contributors
+to the Qt Project. We can give advanced or standard trainings anywhere
+around the globe on Qt as well as C++, OpenGL, 3D and more.
+
+Please visit <https://www.kdab.com> to meet the people who write code like this.
+
+Stay up-to-date with KDAB product announcements:
+
+* [KDAB Newsletter](https://news.kdab.com)
+* [KDAB Blogs](https://www.kdab.com/category/blogs)
+* [KDAB on Twitter](https://twitter.com/KDABQt)

3rdparty/kdsingleapplication/kdsingleapplication.cpp

@@ -0,0 +1,106 @@
+/*
+  This file is part of KDSingleApplication.
+
+  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+
+  SPDX-License-Identifier: MIT
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "kdsingleapplication.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFileInfo>
+
+// TODO: make this pluggable.
+#include "kdsingleapplication_localsocket_p.h"
+
+// Avoiding dragging in Qt private APIs for now, so this does not inherit
+// from QObjectPrivate.
+class KDSingleApplicationPrivate
+{
+public:
+    explicit KDSingleApplicationPrivate(const QString &name, KDSingleApplication *q);
+
+    QString name() const
+    {
+        return m_name;
+    }
+
+    bool isPrimaryInstance() const
+    {
+        return m_impl.isPrimaryInstance();
+    }
+
+    bool sendMessage(const QByteArray &message, int timeout)
+    {
+        return m_impl.sendMessage(message, timeout);
+    }
+
+private:
+    Q_DECLARE_PUBLIC(KDSingleApplication)
+
+    KDSingleApplication *q_ptr;
+    QString m_name;
+
+    KDSingleApplicationLocalSocket m_impl;
+};
+
+KDSingleApplicationPrivate::KDSingleApplicationPrivate(const QString &name, KDSingleApplication *q)
+    : q_ptr(q)
+    , m_name(name)
+    , m_impl(name)
+{
+    if (Q_UNLIKELY(name.isEmpty()))
+        qFatal("KDSingleApplication requires a non-empty application name");
+
+    if (isPrimaryInstance()) {
+        QObject::connect(&m_impl, &KDSingleApplicationLocalSocket::messageReceived,
+                         q, &KDSingleApplication::messageReceived);
+    }
+}
+
+static QString extractExecutableName(const QString &applicationFilePath)
+{
+    return QFileInfo(applicationFilePath).fileName();
+}
+
+KDSingleApplication::KDSingleApplication(QObject *parent)
+    : KDSingleApplication(extractExecutableName(QCoreApplication::applicationFilePath()), parent)
+{
+}
+
+KDSingleApplication::KDSingleApplication(const QString &name, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new KDSingleApplicationPrivate(name, this))
+{
+}
+
+QString KDSingleApplication::name() const
+{
+    Q_D(const KDSingleApplication);
+    return d->name();
+}
+
+bool KDSingleApplication::isPrimaryInstance() const
+{
+    Q_D(const KDSingleApplication);
+    return d->isPrimaryInstance();
+}
+
+bool KDSingleApplication::sendMessage(const QByteArray &message)
+{
+    return sendMessageWithTimeout(message, 5000);
+}
+
+bool KDSingleApplication::sendMessageWithTimeout(const QByteArray &message, int timeout)
+{
+    Q_ASSERT(!isPrimaryInstance());
+
+    Q_D(KDSingleApplication);
+    return d->sendMessage(message, timeout);
+}
+
+
+KDSingleApplication::~KDSingleApplication() = default;

3rdparty/kdsingleapplication/kdsingleapplication.h

@@ -0,0 +1,48 @@
+/*
+  This file is part of KDSingleApplication.
+
+  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+
+  SPDX-License-Identifier: MIT
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+#ifndef KDSINGLEAPPLICATION_H
+#define KDSINGLEAPPLICATION_H
+
+#include <QtCore/QObject>
+
+#include <memory>
+
+#include "kdsingleapplication_lib.h"
+
+class KDSingleApplicationPrivate;
+
+class KDSINGLEAPPLICATION_EXPORT KDSingleApplication : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(bool isPrimaryInstance READ isPrimaryInstance CONSTANT)
+
+public:
+    explicit KDSingleApplication(QObject *parent = nullptr);
+    explicit KDSingleApplication(const QString &name, QObject *parent = nullptr);
+    ~KDSingleApplication();
+
+    QString name() const;
+    bool isPrimaryInstance() const;
+
+public Q_SLOTS:
+    // avoid default arguments and overloads, as they don't mix with connections
+    bool sendMessage(const QByteArray &message);
+    bool sendMessageWithTimeout(const QByteArray &message, int timeout);
+
+Q_SIGNALS:
+    void messageReceived(const QByteArray &message);
+
+private:
+    Q_DECLARE_PRIVATE(KDSingleApplication)
+    std::unique_ptr<KDSingleApplicationPrivate> d_ptr;
+};
+
+#endif // KDSINGLEAPPLICATION_H

3rdparty/kdsingleapplication/kdsingleapplication_lib.h

@@ -0,0 +1,23 @@
+/*
+  This file is part of KDSingleApplication.
+
+  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+
+  SPDX-License-Identifier: MIT
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+#ifndef KDSINGLEAPPLICATION_LIB_H
+#define KDSINGLEAPPLICATION_LIB_H
+
+#include <QtCore/QtGlobal>
+
+#if defined(KDSINGLEAPPLICATION_STATIC_BUILD)
+#define KDSINGLEAPPLICATION_EXPORT
+#elif defined(KDSINGLEAPPLICATION_SHARED_BUILD)
+#define KDSINGLEAPPLICATION_EXPORT Q_DECL_EXPORT
+#else
+#define KDSINGLEAPPLICATION_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // KDSINGLEAPPLICATION_LIB_H

3rdparty/kdsingleapplication/kdsingleapplication_localsocket.cpp

@@ -0,0 +1,315 @@
+/*
+  This file is part of KDSingleApplication.
+
+  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+
+  SPDX-License-Identifier: MIT
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "kdsingleapplication_localsocket_p.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QDeadlineTimer>
+#include <QtCore/QTimer>
+#include <QtCore/QLockFile>
+#include <QtCore/QDataStream>
+
+#include <QtCore/QtDebug>
+#include <QtCore/QLoggingCategory>
+
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+
+#include <chrono>
+#include <algorithm>
+
+#ifdef Q_OS_UNIX
+// for ::getuid()
+#  include <sys/types.h>
+#  include <unistd.h>
+#endif
+
+#ifdef Q_OS_WIN
+#  include <qt_windows.h>
+#endif
+
+namespace {
+static constexpr auto LOCALSOCKET_CONNECTION_TIMEOUT = std::chrono::seconds(5);
+static constexpr char LOCALSOCKET_PROTOCOL_VERSION = 2;
+}  // namespace
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#endif
+Q_LOGGING_CATEGORY(kdsaLocalSocket, "kdsingleapplication.localsocket", QtWarningMsg)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+KDSingleApplicationLocalSocket::KDSingleApplicationLocalSocket(const QString &name, QObject *parent)
+    : QObject(parent)
+{
+#if defined(Q_OS_UNIX)
+    /* cppcheck-suppress useInitializationList */
+    m_socketName = QStringLiteral("kdsingleapp-%1-%2")
+                       .arg(::getuid())
+                       .arg(name);
+#elif defined(Q_OS_WIN)
+    // I'm not sure of a "global session identifier" on Windows; are
+    // multiple logins from the same user a possibility? For now, following this:
+    // https://docs.microsoft.com/en-us/windows/desktop/devnotes/getting-the-session-id-of-the-current-process
+
+    DWORD sessionId;
+    BOOL haveSessionId = ProcessIdToSessionId(GetCurrentProcessId(), &sessionId);
+
+    m_socketName = QString::fromUtf8("kdsingleapp-%1-%2")
+                       .arg(haveSessionId ? sessionId : 0)
+                       .arg(name);
+#else
+#error "KDSingleApplication has not been ported to this platform"
+#endif
+
+    const QString lockFilePath =
+        QDir::tempPath() + QLatin1Char('/') + m_socketName + QLatin1String(".lock");
+
+    qCDebug(kdsaLocalSocket) << "Socket name is" << m_socketName;
+    qCDebug(kdsaLocalSocket) << "Lock file path is" << lockFilePath;
+
+    std::unique_ptr<QLockFile> lockFile(new QLockFile(lockFilePath));
+    lockFile->setStaleLockTime(0);
+
+    if (!lockFile->tryLock()) {
+        // someone else has the lock => we're secondary
+        qCDebug(kdsaLocalSocket) << "Secondary instance";
+        return;
+    }
+
+    qCDebug(kdsaLocalSocket) << "Primary instance";
+
+    std::unique_ptr<QLocalServer> server = std::make_unique<QLocalServer>();
+    if (!server->listen(m_socketName)) {
+        // maybe the primary crashed, leaving a stale socket; delete it and try again
+        QLocalServer::removeServer(m_socketName);
+        if (!server->listen(m_socketName)) {
+            // TODO: better error handling.
+            qWarning("KDSingleApplication: unable to make the primary instance listen on %ls: %ls",
+                     qUtf16Printable(m_socketName),
+                     qUtf16Printable(server->errorString()));
+
+            return;
+        }
+    }
+
+    connect(server.get(), &QLocalServer::newConnection,
+            this, &KDSingleApplicationLocalSocket::handleNewConnection);
+
+    m_lockFile = std::move(lockFile);
+    m_localServer = std::move(server);
+}
+
+KDSingleApplicationLocalSocket::~KDSingleApplicationLocalSocket() = default;
+
+bool KDSingleApplicationLocalSocket::isPrimaryInstance() const
+{
+    return m_localServer != nullptr;
+}
+
+bool KDSingleApplicationLocalSocket::sendMessage(const QByteArray &message, int timeout)
+{
+    Q_ASSERT(!isPrimaryInstance());
+    QLocalSocket socket;
+
+    qCDebug(kdsaLocalSocket) << "Preparing to send message" << message << "with timeout" << timeout;
+
+    QDeadlineTimer deadline(timeout);
+
+    // There is an inherent race here with the setup of the server side.
+    // Even if the socket lock is held by the server, the server may not
+    // be listening yet. So this connection may fail; keep retrying
+    // until we hit the timeout.
+    do {
+        socket.connectToServer(m_socketName);
+        if (socket.waitForConnected(static_cast<int>(deadline.remainingTime())))
+            break;
+    } while (!deadline.hasExpired());
+
+    qCDebug(kdsaLocalSocket) << "Socket state:" << socket.state() << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
+
+    if (deadline.hasExpired()) {
+        qCWarning(kdsaLocalSocket) << "Connection timed out";
+        return false;
+    }
+
+    socket.write(&LOCALSOCKET_PROTOCOL_VERSION, 1);
+
+    {
+        QByteArray encodedMessage;
+        QDataStream ds(&encodedMessage, QIODevice::WriteOnly);
+        ds << message;
+        socket.write(encodedMessage);
+    }
+
+    qCDebug(kdsaLocalSocket) << "Wrote message in the socket"
+                             << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
+
+    // There is no acknowledgement mechanism here.
+    // Should there be one?
+
+    while (socket.bytesToWrite() > 0) {
+        if (!socket.waitForBytesWritten(static_cast<int>(deadline.remainingTime()))) {
+            qCWarning(kdsaLocalSocket) << "Message to primary timed out";
+            return false;
+        }
+    }
+
+    qCDebug(kdsaLocalSocket) << "Bytes written, now disconnecting"
+                             << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
+
+    socket.disconnectFromServer();
+
+    if (socket.state() == QLocalSocket::UnconnectedState) {
+        qCDebug(kdsaLocalSocket) << "Disconnected -- success!";
+        return true;
+    }
+
+    if (!socket.waitForDisconnected(static_cast<int>(deadline.remainingTime()))) {
+        qCWarning(kdsaLocalSocket) << "Disconnection from primary timed out";
+        return false;
+    }
+
+    qCDebug(kdsaLocalSocket) << "Disconnected -- success!";
+
+    return true;
+}
+
+void KDSingleApplicationLocalSocket::handleNewConnection()
+{
+    Q_ASSERT(m_localServer);
+
+    QLocalSocket *socket = nullptr;
+    while ((socket = m_localServer->nextPendingConnection())) {
+        qCDebug(kdsaLocalSocket) << "Got new connection on" << m_socketName << "state" << socket->state();
+
+        Connection c(socket);
+        socket = c.socket.get();
+
+        c.readDataConnection = QObjectConnectionHolder(
+            connect(socket, &QLocalSocket::readyRead,
+                    this, &KDSingleApplicationLocalSocket::readDataFromSecondary));
+
+        c.secondaryDisconnectedConnection = QObjectConnectionHolder(
+            connect(socket, &QLocalSocket::disconnected,
+                    this, &KDSingleApplicationLocalSocket::secondaryDisconnected));
+
+        c.abortConnection = QObjectConnectionHolder(
+            connect(c.timeoutTimer.get(), &QTimer::timeout,
+                    this, &KDSingleApplicationLocalSocket::abortConnectionToSecondary));
+
+        m_clients.push_back(std::move(c));
+
+        // Note that by the time we get here, the socket could've already been closed,
+        // and no signals emitted (hello, Windows!). Read what's already in the socket.
+        if (readDataFromSecondarySocket(socket))
+            return;
+
+        if (socket->state() == QLocalSocket::UnconnectedState)
+            secondarySocketDisconnected(socket);
+    }
+}
+
+template<typename Container>
+static auto findConnectionBySocket(Container &container, QLocalSocket *socket)
+{
+    auto i = std::find_if(container.begin(),
+                          container.end(),
+                          [socket](const auto &c) { return c.socket.get() == socket; });
+    Q_ASSERT(i != container.end());
+    return i;
+}
+
+template<typename Container>
+static auto findConnectionByTimer(Container &container, QTimer *timer)
+{
+    auto i = std::find_if(container.begin(),
+                          container.end(),
+                          [timer](const auto &c) { return c.timeoutTimer.get() == timer; });
+    Q_ASSERT(i != container.end());
+    return i;
+}
+
+void KDSingleApplicationLocalSocket::readDataFromSecondary()
+{
+    QLocalSocket *socket = static_cast<QLocalSocket *>(sender());
+    readDataFromSecondarySocket(socket);
+}
+
+bool KDSingleApplicationLocalSocket::readDataFromSecondarySocket(QLocalSocket *socket)
+{
+    auto i = findConnectionBySocket(m_clients, socket);
+    Connection &c = *i;
+    c.readData.append(socket->readAll());
+
+    qCDebug(kdsaLocalSocket) << "Got more data from a secondary. Data read so far:" << c.readData;
+
+    const QByteArray &data = c.readData;
+
+    if (data.size() >= 1) {
+        if (data[0] != LOCALSOCKET_PROTOCOL_VERSION) {
+            qCDebug(kdsaLocalSocket) << "Got an invalid protocol version";
+            m_clients.erase(i);
+            return true;
+        }
+    }
+
+    QDataStream ds(data);
+    ds.skipRawData(1);
+
+    ds.startTransaction();
+    QByteArray message;
+    ds >> message;
+
+    if (ds.commitTransaction()) {
+        qCDebug(kdsaLocalSocket) << "Got a complete message:" << message;
+        Q_EMIT messageReceived(message);
+        m_clients.erase(i);
+        return true;
+    }
+
+    return false;
+}
+
+void KDSingleApplicationLocalSocket::secondaryDisconnected()
+{
+    QLocalSocket *socket = static_cast<QLocalSocket *>(sender());
+    secondarySocketDisconnected(socket);
+}
+
+void KDSingleApplicationLocalSocket::secondarySocketDisconnected(QLocalSocket *socket)
+{
+    auto i = findConnectionBySocket(m_clients, socket);
+    Connection c = std::move(*i);
+    m_clients.erase(i);
+
+    qCDebug(kdsaLocalSocket) << "Secondary disconnected. Data read:" << c.readData;
+}
+
+void KDSingleApplicationLocalSocket::abortConnectionToSecondary()
+{
+    QTimer *timer = static_cast<QTimer *>(sender());
+
+    auto i = findConnectionByTimer(m_clients, timer);
+    Connection c = std::move(*i);
+    m_clients.erase(i);
+
+    qCDebug(kdsaLocalSocket) << "Secondary timed out. Data read:" << c.readData;
+}
+
+KDSingleApplicationLocalSocket::Connection::Connection(QLocalSocket *_socket)
+    : socket(_socket)
+    , timeoutTimer(new QTimer)
+{
+    timeoutTimer->start(LOCALSOCKET_CONNECTION_TIMEOUT);
+}

3rdparty/kdsingleapplication/kdsingleapplication_localsocket_p.h

@@ -0,0 +1,126 @@
+/*
+  This file is part of KDSingleApplication.
+
+  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+
+  SPDX-License-Identifier: MIT
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#ifndef KDSINGLEAPPLICATION_LOCALSOCKET_P_H
+#define KDSINGLEAPPLICATION_LOCALSOCKET_P_H
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
+
+QT_BEGIN_NAMESPACE
+class QLockFile;
+class QLocalServer;
+class QLocalSocket;
+class QTimer;
+QT_END_NAMESPACE
+
+#include <memory>
+#include <vector>
+
+struct QObjectDeleteLater
+{
+    void operator()(QObject *o)
+    {
+        o->deleteLater();
+    }
+};
+
+class QObjectConnectionHolder
+{
+    Q_DISABLE_COPY(QObjectConnectionHolder)
+    QMetaObject::Connection c;
+
+public:
+    QObjectConnectionHolder()
+    {
+    }
+
+    explicit QObjectConnectionHolder(QMetaObject::Connection _c)
+        : c(std::move(_c))
+    {
+    }
+
+    ~QObjectConnectionHolder()
+    {
+        QObject::disconnect(c);
+    }
+
+    QObjectConnectionHolder(QObjectConnectionHolder &&other) noexcept
+        : c(std::exchange(other.c, {}))
+    {
+    }
+
+    QObjectConnectionHolder &operator=(QObjectConnectionHolder &&other) noexcept
+    {
+        QObjectConnectionHolder moved(std::move(other));
+        swap(moved);
+        return *this;
+    }
+
+    void swap(QObjectConnectionHolder &other) noexcept
+    {
+        using std::swap;
+        swap(c, other.c);
+    }
+};
+
+class KDSingleApplicationLocalSocket : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit KDSingleApplicationLocalSocket(const QString &name,
+                                            QObject *parent = nullptr);
+    ~KDSingleApplicationLocalSocket();
+
+    bool isPrimaryInstance() const;
+
+public Q_SLOTS:
+    bool sendMessage(const QByteArray &message, int timeout);
+
+Q_SIGNALS:
+    void messageReceived(const QByteArray &message);
+
+private:
+    void handleNewConnection();
+    void readDataFromSecondary();
+    bool readDataFromSecondarySocket(QLocalSocket *socket);
+    void secondaryDisconnected();
+    void secondarySocketDisconnected(QLocalSocket *socket);
+    void abortConnectionToSecondary();
+
+    QString m_socketName;
+
+    std::unique_ptr<QLockFile> m_lockFile; // protects m_localServer
+    std::unique_ptr<QLocalServer> m_localServer;
+
+    struct Connection
+    {
+        explicit Connection(QLocalSocket *s);
+
+        std::unique_ptr<QLocalSocket, QObjectDeleteLater> socket;
+        std::unique_ptr<QTimer, QObjectDeleteLater> timeoutTimer;
+        QByteArray readData;
+
+        // socket/timeoutTimer are deleted via deleteLater (as we delete them
+        // in slots connected to their signals). Before the deleteLater is acted upon,
+        // they may emit further signals, triggering logic that it's not supposed
+        // to be triggered (as the Connection has already been destroyed).
+        // Use this Holder to break the connections.
+        QObjectConnectionHolder readDataConnection;
+        QObjectConnectionHolder secondaryDisconnectedConnection;
+        QObjectConnectionHolder abortConnection;
+    };
+
+    std::vector<Connection> m_clients;
+};
+
+#endif // KDSINGLEAPPLICATION_LOCALSOCKET_P_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;
@@ -1301,7 +1315,7 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
                                                   << "libgstfdkaac.dylib"
                                                   << "libgstflac.dylib"
                                                   << "libgstgio.dylib"
-                                                  << "libgstgme.dylib"
+                                                  //<< "libgstgme.dylib"
                                                   << "libgsthls.dylib"
                                                   << "libgsticydemux.dylib"
                                                   << "libgstid3demux.dylib"
@@ -1474,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);
@@ -1488,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,36 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-
-check_function_exists(geteuid HAVE_GETEUID)
-check_function_exists(getpwuid HAVE_GETPWUID)
-
-set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
-set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
-qt_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
-target_include_directories(singleapplication PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-target_link_libraries(singleapplication PRIVATE
-  ${QtCore_LIBRARIES}
-  ${QtWidgets_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
-)
-
-set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
-set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
-qt_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
-target_include_directories(singlecoreapplication PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-target_link_libraries(singlecoreapplication PRIVATE
-  ${QtCore_LIBRARIES}
-  ${QtNetwork_LIBRARIES}
-)
-
-configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h")

3rdparty/singleapplication/LICENSE

@@ -1,24 +0,0 @@
-The MIT License (MIT)
-
-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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Note: Some of the examples include code not distributed under the terms of the
-MIT License.

3rdparty/singleapplication/README.md

@@ -1,305 +0,0 @@
-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` 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)
-instances and can send data to the primary instance from secondary instances.
-
-Usage
------
-
-The `SingleApplication` class inherits from whatever `Q[Core|Gui]Application`
-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.
-
-You can use the library as if you use any other `QCoreApplication` derived
-class:
-
-```cpp
-#include <QApplication>
-#include <SingleApplication.h>
-
-int main( int argc, char* argv[] )
-{
-    SingleApplication app( argc, argv );
-
-    return app.exec();
-}
-```
-
-To include the library files I would recommend that you add it as a git
-submodule to your project. Here is how:
-
-```bash
-git submodule add https://github.com/itay-grudev/SingleApplication.git singleapplication
-```
-
-**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
-been started, for example.
-
-```cpp
-// window is a QWindow instance
-QObject::connect(
-    &app,
-    &SingleApplication::instanceStarted,
-    &window,
-    &QWindow::raise
-);
-```
-
-Using `SingleApplication::instance()` is a neat way to get the
-`SingleApplication` instance for binding to it's signals anywhere in your
-program.
-
-__Note:__ On Windows the ability to bring the application windows to the
-foreground is restricted. See [Windows specific implementations](Windows.md)
-for a workaround and an example implementation.
-
-
-Secondary Instances
--------------------
-
-If you want to be able to launch additional Secondary Instances (not related to
-your Primary Instance) you have to enable that with the third parameter of the
-`SingleApplication` constructor. The default is `false` meaning no Secondary
-Instances. Here is an example of how you would start a Secondary Instance send
-a message with the command line arguments to the primary instance and then shut
-down.
-
-```cpp
-int main(int argc, char *argv[])
-{
-    SingleApplication app( argc, argv, true );
-
-    if( app.isSecondary() ) {
-        app.sendMessage(  app.arguments().join(' ')).toUtf8() );
-        app.exit( 0 );
-    }
-
-    return app.exec();
-}
-```
-
-*__Note:__ A secondary instance won't cause the emission of the
-`instanceStarted()` signal by default. See `SingleApplication::Mode` for more
-details.*
-
-You can check whether your instance is a primary or secondary with the following
-methods:
-
-```cpp
-app.isPrimary();
-// or
-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, QString userData = QString() )
-```
-
-Depending on whether `allowSecondary` is set, this constructor may terminate
-your app if there is already a primary instance running. Additional `Options`
-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. 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.*
-
-*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
-and the secondary instance.*
-
-*__Note:__ Operating system can restrict the shared memory blocks to the same
-user, in which case the User/System modes will have no effect and the block will
-be user wide.*
-
----
-
-```cpp
-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. Returns `true` if the message has been sent
-successfully. If the message can't be sent or the function timeouts - returns `false`.
-
----
-
-```cpp
-bool SingleApplication::isPrimary()
-```
-
-Returns if the instance is the primary instance.
-
----
-
-```cpp
-bool SingleApplication::isSecondary()
-```
-Returns if the instance is a secondary instance.
-
----
-
-```cpp
-quint32 SingleApplication::instanceId()
-```
-
-Returns a unique identifier for the current instance.
-
----
-
-```cpp
-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
-void SingleApplication::instanceStarted()
-```
-
-Triggered whenever a new instance had been started, except for secondary
-instances if the `Mode::SecondaryNotification` flag is not specified.
-
----
-
-```cpp
-void SingleApplication::receivedMessage( quint32 instanceId, QByteArray message )
-```
-
-Triggered whenever there is a message received from a secondary instance.
-
----
-
-### Flags
-
-```cpp
-enum SingleApplication::Mode
-```
-
-*   `Mode::User` - The SingleApplication block should apply user wide. This adds
-    user specific data to the key used for the shared memory and server name.
-    This is the default functionality.
-*   `Mode::System` – The SingleApplication block applies system-wide.
-*   `Mode::SecondaryNotification` – Whether to trigger `instanceStarted()` even
-    whenever secondary instances are started.
-*   `Mode::ExcludeAppPath` – Excludes the application path from the server name
-    (and memory block) hash.
-*   `Mode::ExcludeAppVersion` – Excludes the application version from the server
-    name (and memory block) hash.
-
-*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
-and the secondary instance.*
-
-*__Note:__ Operating system can restrict the shared memory blocks to the same
-user, in which case the User/System modes will have no effect and the block will
-be user wide.*
-
----
-
-Versioning
-----------
-
-Each major version introduces either very significant changes or is not
-backwards compatible with the previous version. Minor versions only add
-additional features, bug fixes or performance improvements and are backwards
-compatible with the previous release. See [`CHANGELOG.md`](CHANGELOG.md) for
-more details.
-
-Implementation
---------------
-
-The library is implemented with a QSharedMemory block which is thread safe and
-guarantees a race condition will not occur. It also uses a QLocalSocket to
-notify the main process that a new instance had been spawned and thus invoke the
-`instanceStarted()` signal and for messaging the primary instance.
-
-Additionally the library can recover from being forcefully killed on *nix
-systems and will reset the memory block given that there are no other
-instances running.
-
-License
--------
-This library and it's supporting documentation are released under
-`The MIT License (MIT)` with the exception of the Qt calculator examples which
-is distributed under the BSD license.

3rdparty/singleapplication/config.h.in

@@ -1,2 +0,0 @@
-#cmakedefine HAVE_GETEUID
-#cmakedefine HAVE_GETPWUID

3rdparty/singleapplication/singleapplication.cpp

@@ -1,266 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#include <cstdlib>
-#include <limits>
-
-#include <QtGlobal>
-#include <QApplication>
-#include <QThread>
-#include <QSharedMemory>
-#include <QLocalSocket>
-#include <QByteArray>
-#include <QElapsedTimer>
-#include <QtDebug>
-
-#include "singleapplication.h"
-#include "singleapplication_p.h"
-
-/**
- * @brief Constructor. Checks and fires up LocalServer or closes the program if another instance already exists
- * @param argc
- * @param argv
- * @param allowSecondary Whether to enable secondary instance support
- * @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[], const bool allowSecondary, const Options options, const int timeout)
-    : app_t(argc, argv),
-      d_ptr(new SingleApplicationPrivate(this)) {
-
-  Q_D(SingleApplication);
-
-  // Store the current mode of the program
-  d->options_ = options;
-
-  // Generating an application ID used for identifying the shared memory block and QLocalServer
-  d->genBlockServerName();
-
-  // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
-  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.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-  d->memory_->attach();
-  delete d->memory_;
-#endif
-
-  // Guarantee thread safe behaviour with a shared memory block.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-
-  // Create a shared memory block
-  if (d->memory_->create(sizeof(InstancesInfo))) {
-    // Initialize the shared memory block
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleApplication: Unable to lock memory block after create.";
-      abortSafely();
-    }
-    d->initializeMemoryBlock();
-  }
-  else {
-    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
-      // Attempt to attach to the memory segment
-      if (!d->memory_->attach()) {
-        qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-        abortSafely();
-      }
-      if (!d->memory_->lock()) {
-        qCritical() << "SingleApplication: Unable to lock memory block after attach.";
-        abortSafely();
-      }
-    }
-    else {
-      qCritical() << "SingleApplication: Unable to create block.";
-      abortSafely();
-    }
-  }
-
-  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() == instance->checksum) break;
-
-    // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
-    if (time.elapsed() > 5000) {
-      qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
-      d->initializeMemoryBlock();
-    }
-
-    // Otherwise wait for a random period and try again.
-    // The random sleep here limits the probability of a collision between two racing apps and allows the app to initialise faster
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
-      qDebug() << d->memory_->errorString();
-    }
-    SingleApplicationPrivate::randomSleep();
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleApplication: Unable to lock memory after random wait.";
-      abortSafely();
-    }
-  }
-
-  if (!instance->primary) {
-    d->startPrimary();
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  // Check if another instance can be started
-  if (allowSecondary) {
-    d->startSecondary();
-    if (d->options_ & Mode::SecondaryNotification) {
-      d->connectToPrimary(timeout, SingleApplicationPrivate::SecondaryInstance);
-    }
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  if (!d->memory_->unlock()) {
-    qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
-    qDebug() << d->memory_->errorString();
-  }
-
-  d->connectToPrimary(timeout, SingleApplicationPrivate::NewInstance);
-
-  delete d;
-
-  ::exit(EXIT_SUCCESS);
-
-}
-
-SingleApplication::~SingleApplication() {
-  Q_D(SingleApplication);
-  delete d;
-}
-
-/**
- * Checks if the current application instance is primary.
- * @return Returns true if the instance is primary, false otherwise.
- */
-bool SingleApplication::isPrimary() const {
-  Q_D(const SingleApplication);
-  return d->server_ != nullptr;
-}
-
-/**
- * Checks if the current application instance is secondary.
- * @return Returns true if the instance is secondary, false otherwise.
- */
-bool SingleApplication::isSecondary() const {
-  Q_D(const SingleApplication);
-  return d->server_ == nullptr;
-}
-
-/**
- * Allows you to identify an instance by returning unique consecutive instance ids.
- * 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() const {
-  Q_D(const SingleApplication);
-  return d->instanceNumber_;
-}
-
-/**
- * Returns the OS PID (Process Identifier) of the process running the primary instance.
- * Especially useful when SingleApplication is coupled with OS. specific APIs.
- * @return Returns the primary instance PID.
- */
-qint64 SingleApplication::primaryPid() const {
-  Q_D(const SingleApplication);
-  return d->primaryPid();
-}
-
-/**
- * Returns the username the primary instance is running as.
- * @return Returns the username the primary instance is running as.
- */
-QString SingleApplication::primaryUser() const {
-  Q_D(const SingleApplication);
-  return d->primaryUser();
-}
-
-/**
- * Returns the username the current instance is running as.
- * @return Returns the username the current instance is running as.
- */
-QString SingleApplication::currentUser() const {
-  return SingleApplicationPrivate::getUsername();
-}
-
-/**
- * Sends message to the Primary Instance.
- * @param message The message to send.
- * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfully, false otherwise.
- */
-bool SingleApplication::sendMessage(const QByteArray &message, const int timeout) {
-
-  Q_D(SingleApplication);
-
-  // Nobody to connect to
-  if (isPrimary()) return false;
-
-  // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect)) {
-    return false;
-  }
-
-  return d->writeConfirmedMessage(timeout, message);
-}
-
-/**
- * Cleans up the shared memory block and exits with a failure.
- * This function halts program execution.
- */
-void SingleApplication::abortSafely() {
-
-  Q_D(SingleApplication);
-
-  qCritical() << "SingleApplication: " << d->memory_->error() << d->memory_->errorString();
-  delete d;
-
-  ::exit(EXIT_FAILURE);
-
-}

3rdparty/singleapplication/singleapplication.h

@@ -1,152 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#ifndef SINGLEAPPLICATION_H
-#define SINGLEAPPLICATION_H
-
-#include <QtGlobal>
-#include <QApplication>
-#include <QFlags>
-#include <QByteArray>
-
-class SingleApplicationPrivate;
-
-/**
- * @brief The SingleApplication class handles multiple instances of the same Application
- * @see QApplication
- */
-class SingleApplication : public QApplication {  // clazy:exclude=ctor-missing-parent-argument
-  Q_OBJECT
-
-  using app_t = QApplication;
-
- public:
-  /**
-   * @brief Mode of operation of SingleApplication.
-   * Whether the block should be user-wide or system-wide and whether the
-   * primary instance should be notified when a secondary instance had been
-   * started.
-   * @note Operating system can restrict the shared memory blocks to the same
-   * user, in which case the User/System modes will have no effect and the
-   * block will be user wide.
-   * @enum
-   */
-  enum Mode {
-    User = 1 << 0,
-    System = 1 << 1,
-    SecondaryNotification = 1 << 2,
-    ExcludeAppVersion = 1 << 3,
-    ExcludeAppPath = 1 << 4
-  };
-  Q_DECLARE_FLAGS(Options, Mode)
-
-  /**
-   * @brief Intitializes a SingleApplication instance with argc command line
-   * arguments in argv
-   * @arg {int &} argc - Number of arguments in argv
-   * @arg {const char *[]} argv - Supplied command line arguments
-   * @arg {bool} allowSecondary - Whether to start the instance as secondary
-   * if there is already a primary instance.
-   * @arg {Mode} mode - Whether for the SingleApplication block to be applied
-   * User wide or System wide.
-   * @arg {int} timeout - Timeout to wait in milliseconds.
-   * @note argc and argv may be changed as Qt removes arguments that it
-   * recognizes
-   * @note Mode::SecondaryNotification only works if set on both the primary
-   * instance and the secondary instance.
-   * @note The timeout is just a hint for the maximum time of blocking
-   * 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.
-   */
-  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() const;
-
-  /**
-   * @brief Returns if the instance is a secondary instance
-   * @returns {bool}
-   */
-  bool isSecondary() const;
-
-  /**
-   * @brief Returns a unique identifier for the current instance
-   * @returns {qint32}
-   */
-  quint32 instanceId() const;
-
-  /**
-   * @brief Returns the process ID (PID) of the primary instance
-   * @returns {qint64}
-   */
-  qint64 primaryPid() const;
-
-  /**
-   * @brief Returns the username of the user running the primary instance
-   * @returns {QString}
-   */
-  QString primaryUser() const;
-
-  /**
-   * @brief Returns the username of the current user
-   * @returns {QString}
-   */
-  QString currentUser() const;
-
-  /**
-   * @brief Sends a message to the primary instance. Returns true on success.
-   * @param {int} timeout - Timeout for connecting
-   * @returns {bool}
-   * @note sendMessage() will return false if invoked from the primary
-   * instance.
-   */
-  bool sendMessage(const QByteArray &message, const int timeout = 1000);
-
- signals:
-  void instanceStarted();
-  void receivedMessage(quint32 instanceId, QByteArray message);
-
- private:
-  SingleApplicationPrivate *d_ptr;
-  Q_DECLARE_PRIVATE(SingleApplication)
-  void abortSafely();
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
-
-#endif  // SINGLEAPPLICATION_H

3rdparty/singleapplication/singleapplication_p.cpp

@@ -1,526 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#include "config.h"
-
-#include <QtGlobal>
-
-#include <cstdlib>
-#include <cstddef>
-
-#ifdef Q_OS_UNIX
-#  include <unistd.h>
-#  include <sys/types.h>
-#  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>
-#include <QSharedMemory>
-#include <QByteArray>
-#include <QDataStream>
-#include <QCryptographicHash>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QElapsedTimer>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#  include <QRandomGenerator>
-#else
-#  include <QDateTime>
-#endif
-
-#include "singleapplication.h"
-#include "singleapplication_p.h"
-
-SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *ptr)
-    : q_ptr(ptr),
-      memory_(nullptr),
-      socket_(nullptr),
-      server_(nullptr),
-      instanceNumber_(-1) {}
-
-SingleApplicationPrivate::~SingleApplicationPrivate() {
-
-  if (socket_ != nullptr) {
-    socket_->close();
-    delete socket_;
-    socket_ = nullptr;
-  }
-
-  if (memory_ != nullptr) {
-    memory_->lock();
-    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-    if (server_ != nullptr) {
-      server_->close();
-      delete server_;
-      instance->primary = false;
-      instance->primaryPid = -1;
-      instance->primaryUser[0] = '\0';
-      instance->checksum = blockChecksum();
-    }
-    memory_->unlock();
-
-    delete memory_;
-    memory_ = nullptr;
-  }
-
-}
-
-QString SingleApplicationPrivate::getUsername() {
-
-#ifdef Q_OS_UNIX
-  QString username;
-#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
-  struct passwd *pw = getpwuid(geteuid());
-  if (pw) {
-    username = QString::fromLocal8Bit(pw->pw_name);
-  }
-#endif
-  if (username.isEmpty()) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-    username = qEnvironmentVariable("USER");
-#else
-    username = QString::fromLocal8Bit(qgetenv("USER"));
-#endif
-  }
-  return username;
-#endif
-
-#ifdef Q_OS_WIN
-  wchar_t username[UNLEN + 1];
-  // Specifies size of the buffer on input
-  DWORD usernameLength = UNLEN + 1;
-  if (GetUserNameW(username, &usernameLength)) {
-    return QString::fromWCharArray(username);
-  }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  return qEnvironmentVariable("USERNAME");
-#else
-  return QString::fromLocal8Bit(qgetenv("USERNAME"));
-#endif
-#endif
-
-}
-
-void SingleApplicationPrivate::genBlockServerName() {
-
-  QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication");
-  appData.addData(SingleApplication::app_t::applicationName().toUtf8());
-  appData.addData(SingleApplication::app_t::organizationName().toUtf8());
-  appData.addData(SingleApplication::app_t::organizationDomain().toUtf8());
-
-  if (!(options_ & SingleApplication::Mode::ExcludeAppVersion)) {
-    appData.addData(SingleApplication::app_t::applicationVersion().toUtf8());
-  }
-
-  if (!(options_ & SingleApplication::Mode::ExcludeAppPath)) {
-#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());
-#endif
-  }
-
-  // User level block requires a user specific data in the hash
-  if (options_ & SingleApplication::Mode::User) {
-    appData.addData(getUsername().toUtf8());
-  }
-
-  // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
-  blockServerName_ = appData.result().toBase64().replace("/", "_");
-
-}
-
-void SingleApplicationPrivate::initializeMemoryBlock() const {
-
-  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() {
-
-  // Reset the number of connections
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  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
-  QLocalServer::removeServer(blockServerName_);
-  server_ = new QLocalServer();
-
-  // Restrict access to the socket according to the SingleApplication::Mode::User flag on User level or no restrictions
-  if (options_ & SingleApplication::Mode::User) {
-    server_->setSocketOptions(QLocalServer::UserAccessOption);
-  }
-  else {
-    server_->setSocketOptions(QLocalServer::WorldAccessOption);
-  }
-
-  server_->listen(blockServerName_);
-  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleApplicationPrivate::slotConnectionEstablished);
-
-}
-
-void SingleApplicationPrivate::startSecondary() {
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  instance->secondary += 1;
-  instance->checksum = blockChecksum();
-  instanceNumber_ = instance->secondary;
-
-}
-
-bool SingleApplicationPrivate::connectToPrimary(const int timeout, const ConnectionType connectionType) {
-
-  QElapsedTimer time;
-  time.start();
-
-  // Connect to the Local Server of the Primary Instance if not already connected.
-  if (socket_ == nullptr) {
-    socket_ = new QLocalSocket();
-  }
-
-  if (socket_->state() == QLocalSocket::ConnectedState) return true;
-
-  if (socket_->state() != QLocalSocket::ConnectedState) {
-
-    forever {
-      randomSleep();
-
-      if (socket_->state() != QLocalSocket::ConnectingState) {
-        socket_->connectToServer(blockServerName_);
-      }
-
-      if (socket_->state() == QLocalSocket::ConnectingState) {
-        socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
-      }
-
-      // If connected break out of the loop
-      if (socket_->state() == QLocalSocket::ConnectedState) break;
-
-      // If elapsed time since start is longer than the method timeout return
-      if (time.elapsed() >= timeout) return false;
-    }
-  }
-
-  // Initialisation message according to the SingleApplication protocol
-  QByteArray initMsg;
-  QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
-  writeStream.setVersion(QDataStream::Qt_5_8);
-
-  writeStream << blockServerName_.toLatin1();
-  writeStream << static_cast<quint8>(connectionType);
-  writeStream << instanceNumber_;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
-#else
-  quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-#endif
-
-  writeStream << checksum;
-
-  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>(msg.length());
-
-  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();
-
-  bool result = socket_->waitForReadyRead(timeout);
-  if (result) {
-    socket_->read(1);
-    return true;
-  }
-
-  return false;
-
-}
-
-quint16 SingleApplicationPrivate::blockChecksum() const {
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
-#else
-  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
-#endif
-
-  return checksum;
-
-}
-
-qint64 SingleApplicationPrivate::primaryPid() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = instance->primaryPid;
-  memory_->unlock();
-
-  return pid;
-
-}
-
-QString SingleApplicationPrivate::primaryUser() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = instance->primaryUser;
-  memory_->unlock();
-
-  return QString::fromUtf8(username);
-
-}
-
-/**
- * @brief Executed when a connection has been made to the LocalServer
- */
-void SingleApplicationPrivate::slotConnectionEstablished() {
-
-  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
-  connectionMap_.insert(nextConnSocket, ConnectionInfo());
-
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    slotClientConnectionClosed(nextConnSocket, info.instanceId);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
-
-  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
-    connectionMap_.remove(nextConnSocket);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    switch (info.stage) {
-      case StageInitHeader:
-        readMessageHeader(nextConnSocket, StageInitBody);
-        break;
-      case StageInitBody:
-        readInitMessageBody(nextConnSocket);
-        break;
-      case StageConnectedHeader:
-        readMessageHeader(nextConnSocket, StageConnectedBody);
-        break;
-      case StageConnectedBody:
-        this->slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
-    };
-  });
-
-}
-
-void SingleApplicationPrivate::readMessageHeader(QLocalSocket *sock, const SingleApplicationPrivate::ConnectionStage nextStage) {
-
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  if (sock->bytesAvailable() < static_cast<qint64>(sizeof(quint64))) {
-    return;
-  }
-
-  QDataStream headerStream(sock);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-
-  // Read the header to know the message length
-  quint64 msgLen = 0;
-  headerStream >> msgLen;
-  ConnectionInfo &info = connectionMap_[sock];
-  info.stage = nextStage;
-  info.msgLen = msgLen;
-
-  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 (!isFrameComplete(sock)) {
-    return;
-  }
-
-  // Read the message body
-  QByteArray msgBytes = sock->readAll();
-  QDataStream readStream(msgBytes);
-  readStream.setVersion(QDataStream::Qt_5_8);
-
-  // server name
-  QByteArray latin1Name;
-  readStream >> latin1Name;
-
-  // connection type
-  ConnectionType connectionType = InvalidConnection;
-  quint8 connTypeVal = InvalidConnection;
-  readStream >> connTypeVal;
-  connectionType = static_cast<ConnectionType>(connTypeVal);
-
-  // instance id
-  quint32 instanceId = 0;
-  readStream >> instanceId;
-
-  // checksum
-  quint16 msgChecksum = 0;
-  readStream >> msgChecksum;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
-#else
-  const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
-#endif
-
-  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
-
-  if (!isValid) {
-    sock->close();
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  info.instanceId = instanceId;
-  info.stage = StageConnectedHeader;
-
-  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplication::Mode::SecondaryNotification)) {
-    emit q->instanceStarted();
-  }
-
-  writeAck(sock);
-
-}
-
-void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
-
-  Q_Q(SingleApplication);
-
-  if (!isFrameComplete(dataSocket)) {
-    return;
-  }
-
-  const QByteArray message = dataSocket->readAll();
-
-  writeAck(dataSocket);
-
-  ConnectionInfo &info = connectionMap_[dataSocket];
-  info.stage = StageConnectedHeader;
-
-  emit q->receivedMessage(instanceId, message);
-
-}
-
-void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
-
-  if (closedSocket->bytesAvailable() > 0) {
-    slotDataAvailable(closedSocket, instanceId);
-  }
-
-}
-
-void SingleApplicationPrivate::randomSleep() {
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
-#else
-  qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-  QThread::msleep(qrand() % 11 + 8);
-#endif
-
-}

3rdparty/singleapplication/singleapplication_p.h

@@ -1,116 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#ifndef SINGLEAPPLICATION_P_H
-#define SINGLEAPPLICATION_P_H
-
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QHash>
-
-#include "singleapplication.h"
-
-class QLocalServer;
-class QLocalSocket;
-class QSharedMemory;
-
-struct InstancesInfo {
-  bool primary;
-  quint32 secondary;
-  qint64 primaryPid;
-  char primaryUser[128];
-  quint16 checksum;
-};
-
-struct ConnectionInfo {
-  explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
-  quint64 msgLen;
-  quint32 instanceId;
-  quint8 stage;
-};
-
-class SingleApplicationPrivate : public QObject {
-  Q_OBJECT
-
- public:
-  enum ConnectionType : quint8 {
-    InvalidConnection = 0,
-    NewInstance = 1,
-    SecondaryInstance = 2,
-    Reconnect = 3
-  };
-  enum ConnectionStage : quint8 {
-    StageInitHeader = 0,
-    StageInitBody = 1,
-    StageConnectedHeader = 2,
-    StageConnectedBody = 3,
-  };
-  Q_DECLARE_PUBLIC(SingleApplication)
-
-  explicit SingleApplicationPrivate(SingleApplication *ptr);
-  ~SingleApplicationPrivate() override;
-
-  static QString getUsername();
-  void genBlockServerName();
-  void initializeMemoryBlock() const;
-  void startPrimary();
-  void startSecondary();
-  bool connectToPrimary(const int timeout, const ConnectionType connectionType);
-  quint16 blockChecksum() const;
-  qint64 primaryPid() const;
-  QString primaryUser() const;
-  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;
-  QSharedMemory *memory_;
-  QLocalSocket *socket_;
-  QLocalServer *server_;
-  quint32 instanceNumber_;
-  QString blockServerName_;
-  SingleApplication::Options options_;
-  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
-
- public slots:
-  void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, const quint32);
-  void slotClientConnectionClosed(QLocalSocket*, const quint32);
-};
-
-#endif  // SINGLEAPPLICATION_P_H

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -1,266 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#include <cstdlib>
-#include <limits>
-
-#include <QtGlobal>
-#include <QCoreApplication>
-#include <QThread>
-#include <QSharedMemory>
-#include <QLocalSocket>
-#include <QByteArray>
-#include <QElapsedTimer>
-#include <QtDebug>
-
-#include "singlecoreapplication.h"
-#include "singlecoreapplication_p.h"
-
-/**
- * @brief Constructor. Checks and fires up LocalServer or closes the program if another instance already exists
- * @param argc
- * @param argv
- * @param allowSecondary Whether to enable secondary instance support
- * @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[], const bool allowSecondary, const Options options, const int timeout)
-    : app_t(argc, argv),
-      d_ptr(new SingleCoreApplicationPrivate(this)) {
-
-  Q_D(SingleCoreApplication);
-
-  // Store the current mode of the program
-  d->options_ = options;
-
-  // Generating an application ID used for identifying the shared memory block and QLocalServer
-  d->genBlockServerName();
-
-  // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
-  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.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-  d->memory_->attach();
-  delete d->memory_;
-#endif
-
-  // Guarantee thread safe behaviour with a shared memory block.
-  d->memory_ = new QSharedMemory(d->blockServerName_);
-
-  // Create a shared memory block
-  if (d->memory_->create(sizeof(InstancesInfo))) {
-    // Initialize the shared memory block
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleCoreApplication: Unable to lock memory block after create.";
-      abortSafely();
-    }
-    d->initializeMemoryBlock();
-  }
-  else {
-    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
-      // Attempt to attach to the memory segment
-      if (!d->memory_->attach()) {
-        qCritical() << "SingleCoreApplication: Unable to attach to shared memory block.";
-        abortSafely();
-      }
-      if (!d->memory_->lock()) {
-        qCritical() << "SingleCoreApplication: Unable to lock memory block after attach.";
-        abortSafely();
-      }
-    }
-    else {
-      qCritical() << "SingleCoreApplication: Unable to create block.";
-      abortSafely();
-    }
-  }
-
-  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() == instance->checksum) break;
-
-    // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
-    if (time.elapsed() > 5000) {
-      qWarning() << "SingleCoreApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
-      d->initializeMemoryBlock();
-    }
-
-    // Otherwise wait for a random period and try again.
-    // The random sleep here limits the probability of a collision between two racing apps and allows the app to initialise faster
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleCoreApplication: Unable to unlock memory for random wait.";
-      qDebug() << d->memory_->errorString();
-    }
-    SingleCoreApplicationPrivate::randomSleep();
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleCoreApplication: Unable to lock memory after random wait.";
-      abortSafely();
-    }
-  }
-
-  if (!instance->primary) {
-    d->startPrimary();
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleCoreApplication: Unable to unlock memory after primary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  // Check if another instance can be started
-  if (allowSecondary) {
-    d->startSecondary();
-    if (d->options_ & Mode::SecondaryNotification) {
-      d->connectToPrimary(timeout, SingleCoreApplicationPrivate::SecondaryInstance);
-    }
-    if (!d->memory_->unlock()) {
-      qDebug() << "SingleCoreApplication: Unable to unlock memory after secondary start.";
-      qDebug() << d->memory_->errorString();
-    }
-    return;
-  }
-
-  if (!d->memory_->unlock()) {
-    qDebug() << "SingleCoreApplication: Unable to unlock memory at end of execution.";
-    qDebug() << d->memory_->errorString();
-  }
-
-  d->connectToPrimary(timeout, SingleCoreApplicationPrivate::NewInstance);
-
-  delete d;
-
-  ::exit(EXIT_SUCCESS);
-
-}
-
-SingleCoreApplication::~SingleCoreApplication() {
-  Q_D(SingleCoreApplication);
-  delete d;
-}
-
-/**
- * Checks if the current application instance is primary.
- * @return Returns true if the instance is primary, false otherwise.
- */
-bool SingleCoreApplication::isPrimary() const {
-  Q_D(const SingleCoreApplication);
-  return d->server_ != nullptr;
-}
-
-/**
- * Checks if the current application instance is secondary.
- * @return Returns true if the instance is secondary, false otherwise.
- */
-bool SingleCoreApplication::isSecondary() const {
-  Q_D(const SingleCoreApplication);
-  return d->server_ == nullptr;
-}
-
-/**
- * Allows you to identify an instance by returning unique consecutive instance ids.
- * 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() const {
-  Q_D(const SingleCoreApplication);
-  return d->instanceNumber_;
-}
-
-/**
- * Returns the OS PID (Process Identifier) of the process running the primary instance.
- * Especially useful when SingleCoreApplication is coupled with OS. specific APIs.
- * @return Returns the primary instance PID.
- */
-qint64 SingleCoreApplication::primaryPid() const {
-  Q_D(const SingleCoreApplication);
-  return d->primaryPid();
-}
-
-/**
- * Returns the username the primary instance is running as.
- * @return Returns the username the primary instance is running as.
- */
-QString SingleCoreApplication::primaryUser() const {
-  Q_D(const SingleCoreApplication);
-  return d->primaryUser();
-}
-
-/**
- * Returns the username the current instance is running as.
- * @return Returns the username the current instance is running as.
- */
-QString SingleCoreApplication::currentUser() const {
-  return SingleCoreApplicationPrivate::getUsername();
-}
-
-/**
- * Sends message to the Primary Instance.
- * @param message The message to send.
- * @param timeout the maximum timeout in milliseconds for blocking functions.
- * @return true if the message was sent successfully, false otherwise.
- */
-bool SingleCoreApplication::sendMessage(const QByteArray &message, const int timeout) {
-
-  Q_D(SingleCoreApplication);
-
-  // Nobody to connect to
-  if (isPrimary()) return false;
-
-  // Make sure the socket is connected
-  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect)) {
-    return false;
-  }
-
-  return d->writeConfirmedMessage(timeout, message);
-}
-
-/**
- * Cleans up the shared memory block and exits with a failure.
- * This function halts program execution.
- */
-void SingleCoreApplication::abortSafely() {
-
-  Q_D(SingleCoreApplication);
-
-  qCritical() << "SingleCoreApplication: " << d->memory_->error() << d->memory_->errorString();
-  delete d;
-
-  ::exit(EXIT_FAILURE);
-
-}

3rdparty/singleapplication/singlecoreapplication.h

@@ -1,152 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#ifndef SINGLECOREAPPLICATION_H
-#define SINGLECOREAPPLICATION_H
-
-#include <QtGlobal>
-#include <QCoreApplication>
-#include <QFlags>
-#include <QByteArray>
-
-class SingleCoreApplicationPrivate;
-
-/**
- * @brief The SingleCoreApplication class handles multiple instances of the same Application
- * @see QCoreApplication
- */
-class SingleCoreApplication : public QCoreApplication {  // clazy:exclude=ctor-missing-parent-argument
-  Q_OBJECT
-
-  using app_t = QCoreApplication;
-
- public:
-  /**
-   * @brief Mode of operation of SingleCoreApplication.
-   * Whether the block should be user-wide or system-wide and whether the
-   * primary instance should be notified when a secondary instance had been
-   * started.
-   * @note Operating system can restrict the shared memory blocks to the same
-   * user, in which case the User/System modes will have no effect and the
-   * block will be user wide.
-   * @enum
-   */
-  enum Mode {
-    User = 1 << 0,
-    System = 1 << 1,
-    SecondaryNotification = 1 << 2,
-    ExcludeAppVersion = 1 << 3,
-    ExcludeAppPath = 1 << 4
-  };
-  Q_DECLARE_FLAGS(Options, Mode)
-
-  /**
-   * @brief Intitializes a SingleCoreApplication instance with argc command line
-   * arguments in argv
-   * @arg {int &} argc - Number of arguments in argv
-   * @arg {const char *[]} argv - Supplied command line arguments
-   * @arg {bool} allowSecondary - Whether to start the instance as secondary
-   * if there is already a primary instance.
-   * @arg {Mode} mode - Whether for the SingleCoreApplication block to be applied
-   * User wide or System wide.
-   * @arg {int} timeout - Timeout to wait in milliseconds.
-   * @note argc and argv may be changed as Qt removes arguments that it
-   * recognizes
-   * @note Mode::SecondaryNotification only works if set on both the primary
-   * instance and the secondary instance.
-   * @note The timeout is just a hint for the maximum time of blocking
-   * operations. It does not guarantee that the SingleCoreApplication
-   * initialisation will be completed in given time, though is a good hint.
-   * Usually 4*timeout would be the worst case (fail) scenario.
-   */
-  explicit SingleCoreApplication(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
-  ~SingleCoreApplication() override;
-
-  /**
-   * @brief Returns if the instance is the primary instance
-   * @returns {bool}
-   */
-  bool isPrimary() const;
-
-  /**
-   * @brief Returns if the instance is a secondary instance
-   * @returns {bool}
-   */
-  bool isSecondary() const;
-
-  /**
-   * @brief Returns a unique identifier for the current instance
-   * @returns {qint32}
-   */
-  quint32 instanceId() const;
-
-  /**
-   * @brief Returns the process ID (PID) of the primary instance
-   * @returns {qint64}
-   */
-  qint64 primaryPid() const;
-
-  /**
-   * @brief Returns the username of the user running the primary instance
-   * @returns {QString}
-   */
-  QString primaryUser() const;
-
-  /**
-   * @brief Returns the username of the current user
-   * @returns {QString}
-   */
-  QString currentUser() const;
-
-  /**
-   * @brief Sends a message to the primary instance. Returns true on success.
-   * @param {int} timeout - Timeout for connecting
-   * @returns {bool}
-   * @note sendMessage() will return false if invoked from the primary
-   * instance.
-   */
-  bool sendMessage(const QByteArray &message, const int timeout = 1000);
-
- signals:
-  void instanceStarted();
-  void receivedMessage(quint32 instanceId, QByteArray message);
-
- private:
-  SingleCoreApplicationPrivate *d_ptr;
-  Q_DECLARE_PRIVATE(SingleCoreApplication)
-  void abortSafely();
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(SingleCoreApplication::Options)
-
-#endif  // SINGLECOREAPPLICATION_H

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -1,526 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#include "config.h"
-
-#include <QtGlobal>
-
-#include <cstdlib>
-#include <cstddef>
-
-#ifdef Q_OS_UNIX
-#  include <unistd.h>
-#  include <sys/types.h>
-#  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>
-#include <QSharedMemory>
-#include <QByteArray>
-#include <QDataStream>
-#include <QCryptographicHash>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QElapsedTimer>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#  include <QRandomGenerator>
-#else
-#  include <QDateTime>
-#endif
-
-#include "singlecoreapplication.h"
-#include "singlecoreapplication_p.h"
-
-SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *ptr)
-    : q_ptr(ptr),
-      memory_(nullptr),
-      socket_(nullptr),
-      server_(nullptr),
-      instanceNumber_(-1) {}
-
-SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
-
-  if (socket_ != nullptr) {
-    socket_->close();
-    delete socket_;
-    socket_ = nullptr;
-  }
-
-  if (memory_ != nullptr) {
-    memory_->lock();
-    InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-    if (server_ != nullptr) {
-      server_->close();
-      delete server_;
-      instance->primary = false;
-      instance->primaryPid = -1;
-      instance->primaryUser[0] = '\0';
-      instance->checksum = blockChecksum();
-    }
-    memory_->unlock();
-
-    delete memory_;
-    memory_ = nullptr;
-  }
-
-}
-
-QString SingleCoreApplicationPrivate::getUsername() {
-
-#ifdef Q_OS_UNIX
-  QString username;
-#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
-  struct passwd *pw = getpwuid(geteuid());
-  if (pw) {
-    username = QString::fromLocal8Bit(pw->pw_name);
-  }
-#endif
-  if (username.isEmpty()) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-    username = qEnvironmentVariable("USER");
-#else
-    username = QString::fromLocal8Bit(qgetenv("USER"));
-#endif
-  }
-  return username;
-#endif
-
-#ifdef Q_OS_WIN
-  wchar_t username[UNLEN + 1];
-  // Specifies size of the buffer on input
-  DWORD usernameLength = UNLEN + 1;
-  if (GetUserNameW(username, &usernameLength)) {
-    return QString::fromWCharArray(username);
-  }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  return qEnvironmentVariable("USERNAME");
-#else
-  return QString::fromLocal8Bit(qgetenv("USERNAME"));
-#endif
-#endif
-
-}
-
-void SingleCoreApplicationPrivate::genBlockServerName() {
-
-  QCryptographicHash appData(QCryptographicHash::Sha256);
-  appData.addData("SingleApplication");
-  appData.addData(SingleCoreApplication::app_t::applicationName().toUtf8());
-  appData.addData(SingleCoreApplication::app_t::organizationName().toUtf8());
-  appData.addData(SingleCoreApplication::app_t::organizationDomain().toUtf8());
-
-  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppVersion)) {
-    appData.addData(SingleCoreApplication::app_t::applicationVersion().toUtf8());
-  }
-
-  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppPath)) {
-#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());
-#endif
-  }
-
-  // User level block requires a user specific data in the hash
-  if (options_ & SingleCoreApplication::Mode::User) {
-    appData.addData(getUsername().toUtf8());
-  }
-
-  // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
-  blockServerName_ = appData.result().toBase64().replace("/", "_");
-
-}
-
-void SingleCoreApplicationPrivate::initializeMemoryBlock() const {
-
-  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() {
-
-  // Reset the number of connections
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  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
-  QLocalServer::removeServer(blockServerName_);
-  server_ = new QLocalServer();
-
-  // Restrict access to the socket according to the SingleCoreApplication::Mode::User flag on User level or no restrictions
-  if (options_ & SingleCoreApplication::Mode::User) {
-    server_->setSocketOptions(QLocalServer::UserAccessOption);
-  }
-  else {
-    server_->setSocketOptions(QLocalServer::WorldAccessOption);
-  }
-
-  server_->listen(blockServerName_);
-  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleCoreApplicationPrivate::slotConnectionEstablished);
-
-}
-
-void SingleCoreApplicationPrivate::startSecondary() {
-
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-
-  instance->secondary += 1;
-  instance->checksum = blockChecksum();
-  instanceNumber_ = instance->secondary;
-
-}
-
-bool SingleCoreApplicationPrivate::connectToPrimary(const int timeout, const ConnectionType connectionType) {
-
-  QElapsedTimer time;
-  time.start();
-
-  // Connect to the Local Server of the Primary Instance if not already connected.
-  if (socket_ == nullptr) {
-    socket_ = new QLocalSocket();
-  }
-
-  if (socket_->state() == QLocalSocket::ConnectedState) return true;
-
-  if (socket_->state() != QLocalSocket::ConnectedState) {
-
-    forever {
-      randomSleep();
-
-      if (socket_->state() != QLocalSocket::ConnectingState) {
-        socket_->connectToServer(blockServerName_);
-      }
-
-      if (socket_->state() == QLocalSocket::ConnectingState) {
-        socket_->waitForConnected(static_cast<int>(timeout - time.elapsed()));
-      }
-
-      // If connected break out of the loop
-      if (socket_->state() == QLocalSocket::ConnectedState) break;
-
-      // If elapsed time since start is longer than the method timeout return
-      if (time.elapsed() >= timeout) return false;
-    }
-  }
-
-  // Initialisation message according to the SingleCoreApplication protocol
-  QByteArray initMsg;
-  QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
-  writeStream.setVersion(QDataStream::Qt_5_8);
-
-  writeStream << blockServerName_.toLatin1();
-  writeStream << static_cast<quint8>(connectionType);
-  writeStream << instanceNumber_;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
-#else
-  quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-#endif
-
-  writeStream << checksum;
-
-  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>(msg.length());
-
-  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();
-
-  bool result = socket_->waitForReadyRead(timeout);
-  if (result) {
-    socket_->read(1);
-    return true;
-  }
-
-  return false;
-
-}
-
-quint16 SingleCoreApplicationPrivate::blockChecksum() const {
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
-#else
-  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
-#endif
-
-  return checksum;
-
-}
-
-qint64 SingleCoreApplicationPrivate::primaryPid() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = instance->primaryPid;
-  memory_->unlock();
-
-  return pid;
-
-}
-
-QString SingleCoreApplicationPrivate::primaryUser() const {
-
-  memory_->lock();
-  InstancesInfo *instance = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = instance->primaryUser;
-  memory_->unlock();
-
-  return QString::fromUtf8(username);
-
-}
-
-/**
- * @brief Executed when a connection has been made to the LocalServer
- */
-void SingleCoreApplicationPrivate::slotConnectionEstablished() {
-
-  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
-  connectionMap_.insert(nextConnSocket, ConnectionInfo());
-
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    slotClientConnectionClosed(nextConnSocket, info.instanceId);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
-
-  QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this]() {
-    connectionMap_.remove(nextConnSocket);
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    const ConnectionInfo &info = connectionMap_[nextConnSocket];
-    switch (info.stage) {
-      case StageInitHeader:
-        readMessageHeader(nextConnSocket, StageInitBody);
-        break;
-      case StageInitBody:
-        readInitMessageBody(nextConnSocket);
-        break;
-      case StageConnectedHeader:
-        readMessageHeader(nextConnSocket, StageConnectedBody);
-        break;
-      case StageConnectedBody:
-        this->slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
-    };
-  });
-
-}
-
-void SingleCoreApplicationPrivate::readMessageHeader(QLocalSocket *sock, SingleCoreApplicationPrivate::ConnectionStage nextStage) {
-
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  if (sock->bytesAvailable() < static_cast<qint64>(sizeof(quint64))) {
-    return;
-  }
-
-  QDataStream headerStream(sock);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-
-  // Read the header to know the message length
-  quint64 msgLen = 0;
-  headerStream >> msgLen;
-  ConnectionInfo &info = connectionMap_[sock];
-  info.stage = nextStage;
-  info.msgLen = msgLen;
-
-  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 (!isFrameComplete(sock)) {
-    return;
-  }
-
-  // Read the message body
-  QByteArray msgBytes = sock->readAll();
-  QDataStream readStream(msgBytes);
-  readStream.setVersion(QDataStream::Qt_5_8);
-
-  // server name
-  QByteArray latin1Name;
-  readStream >> latin1Name;
-
-  // connection type
-  ConnectionType connectionType = InvalidConnection;
-  quint8 connTypeVal = InvalidConnection;
-  readStream >> connTypeVal;
-  connectionType = static_cast<ConnectionType>(connTypeVal);
-
-  // instance id
-  quint32 instanceId = 0;
-  readStream >> instanceId;
-
-  // checksum
-  quint16 msgChecksum = 0;
-  readStream >> msgChecksum;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
-#else
-  const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
-#endif
-
-  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
-
-  if (!isValid) {
-    sock->close();
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  info.instanceId = instanceId;
-  info.stage = StageConnectedHeader;
-
-  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleCoreApplication::Mode::SecondaryNotification)) {
-    emit q->instanceStarted();
-  }
-
-  writeAck(sock);
-
-}
-
-void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
-
-  Q_Q(SingleCoreApplication);
-
-  if (!isFrameComplete(dataSocket)) {
-    return;
-  }
-
-  const QByteArray message = dataSocket->readAll();
-
-  writeAck(dataSocket);
-
-  ConnectionInfo &info = connectionMap_[dataSocket];
-  info.stage = StageConnectedHeader;
-
-  emit q->receivedMessage(instanceId, message);
-
-}
-
-void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
-
-  if (closedSocket->bytesAvailable() > 0) {
-    slotDataAvailable(closedSocket, instanceId);
-  }
-
-}
-
-void SingleCoreApplicationPrivate::randomSleep() {
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-  QThread::msleep(QRandomGenerator::global()->bounded(8U, 18U));
-#else
-  qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-  QThread::msleep(qrand() % 11 + 8);
-#endif
-
-}

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -1,116 +0,0 @@
-// The MIT License (MIT)
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//
-//  W A R N I N G !!!
-//  -----------------
-//
-// This is a modified version of SingleApplication,
-// The original version is at:
-//
-// https://github.com/itay-grudev/SingleApplication
-//
-//
-
-#ifndef SINGLECOREAPPLICATION_P_H
-#define SINGLECOREAPPLICATION_P_H
-
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QHash>
-
-#include "singlecoreapplication.h"
-
-class QLocalServer;
-class QLocalSocket;
-class QSharedMemory;
-
-struct InstancesInfo {
-  bool primary;
-  quint32 secondary;
-  qint64 primaryPid;
-  char primaryUser[128];
-  quint16 checksum;
-};
-
-struct ConnectionInfo {
-  explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
-  quint64 msgLen;
-  quint32 instanceId;
-  quint8 stage;
-};
-
-class SingleCoreApplicationPrivate : public QObject {
-  Q_OBJECT
-
- public:
-  enum ConnectionType : quint8 {
-    InvalidConnection = 0,
-    NewInstance = 1,
-    SecondaryInstance = 2,
-    Reconnect = 3
-  };
-  enum ConnectionStage : quint8 {
-    StageInitHeader = 0,
-    StageInitBody = 1,
-    StageConnectedHeader = 2,
-    StageConnectedBody = 3,
-  };
-  Q_DECLARE_PUBLIC(SingleCoreApplication)
-
-  explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr);
-  ~SingleCoreApplicationPrivate() override;
-
-  static QString getUsername();
-  void genBlockServerName();
-  void initializeMemoryBlock() const;
-  void startPrimary();
-  void startSecondary();
-  bool connectToPrimary(const int timeout, const ConnectionType connectionType);
-  quint16 blockChecksum() const;
-  qint64 primaryPid() const;
-  QString primaryUser() const;
-  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;
-  QSharedMemory *memory_;
-  QLocalSocket *socket_;
-  QLocalServer *server_;
-  quint32 instanceNumber_;
-  QString blockServerName_;
-  SingleCoreApplication::Options options_;
-  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
-
- public slots:
-  void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, const quint32);
-  void slotClientConnectionClosed(QLocalSocket*, const quint32);
-};
-
-#endif  // SINGLECOREAPPLICATION_P_H

CMakeLists.txt

@@ -1,8 +1,11 @@
+cmake_minimum_required(VERSION 3.7)
+
 project(strawberry)
 
-cmake_minimum_required(VERSION 3.7)
-cmake_policy(SET CMP0054 NEW)
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 NEW)
+endif()
+if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
 
@@ -15,13 +18,13 @@ include(cmake/Summary.cmake)
 include(cmake/OptionalSource.cmake)
 include(cmake/ParseArguments.cmake)
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(LINUX ON)
 endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   set(FREEBSD ON)
 endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
   set(OPENBSD ON)
 endif()
 
@@ -71,23 +74,22 @@ else()
     $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
     $<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
   )
-endif()
-
-option(BUILD_WERROR "Build with -Werror" OFF)
-if(BUILD_WERROR)
-  list(APPEND COMPILE_OPTIONS -Werror)
+  option(BUILD_WERROR "Build with -Werror" OFF)
+  if(BUILD_WERROR)
+    list(APPEND COMPILE_OPTIONS -Werror)
+  endif()
 endif()
 
 add_compile_options(${COMPILE_OPTIONS})
 
-if(${CMAKE_BUILD_TYPE} MATCHES "Release")
+if(CMAKE_BUILD_TYPE MATCHES "Release")
   add_definitions(-DNDEBUG)
   add_definitions(-DQT_NO_DEBUG_OUTPUT)
 endif()
 
-if(APPLE)
-  set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-  set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
+option(USE_RPATH "Use RPATH" APPLE)
+if(USE_RPATH)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()
 
 find_program(CCACHE_EXECUTABLE NAMES ccache)
@@ -115,9 +117,14 @@ else()
   find_package(Iconv)
 endif()
 find_package(GnuTLS REQUIRED)
-find_package(Protobuf REQUIRED)
-if(NOT Protobuf_PROTOC_EXECUTABLE)
-  message(FATAL_ERROR "Missing protobuf compiler.")
+if(NOT APPLE)
+  find_package(Protobuf CONFIG)
+endif()
+if(NOT Protobuf_FOUND)
+  find_package(Protobuf REQUIRED)
+endif()
+if(NOT TARGET protobuf::protoc)
+  message(FATAL_ERROR "Missing Protobuf compiler.")
 endif()
 if(LINUX)
   find_package(ALSA REQUIRED)
@@ -177,7 +184,7 @@ if(DBUS_FOUND AND NOT WIN32)
   list(APPEND QT_COMPONENTS DBus)
 endif()
 set(QT_OPTIONAL_COMPONENTS Test)
-set(QT_MIN_VERSION 5.9)
+set(QT_MIN_VERSION 5.12)
 
 if(BUILD_WITH_QT6 OR QT_VERSION_MAJOR EQUAL 6)
   set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
@@ -274,6 +281,24 @@ if(X11_FOUND)
   else()
     message(STATUS "Missing qpa/qplatformnativeinterface.h header.")
   endif()
+
+  # Check for QX11Application (Qt 6 compiled with XCB).
+  if(BUILD_WITH_QT6 AND Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.2.0)
+    set(CMAKE_REQUIRED_FLAGS "-std=c++17")
+    set(CMAKE_REQUIRED_LIBRARIES ${QtCore_LIBRARIES} ${QtGui_LIBRARIES})
+    check_cxx_source_compiles("
+    #include <QGuiApplication>
+    int main() {
+      (void)qApp->nativeInterface<QNativeInterface::QX11Application>();
+      return 0;
+    }
+    "
+      HAVE_QX11APPLICATION
+      )
+    unset(CMAKE_REQUIRED_FLAGS)
+    unset(CMAKE_REQUIRED_LIBRARIES)
+  endif()
+
 endif(X11_FOUND)
 
 option(USE_TAGLIB "Build with TagLib" OFF)
@@ -308,10 +333,10 @@ if(NOT TAGLIB_FOUND AND NOT TAGPARSER_FOUND)
 endif()
 
 # SingleApplication
-add_subdirectory(3rdparty/singleapplication)
-set(SINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/singleapplication)
-set(SINGLEAPPLICATION_LIBRARIES singleapplication)
-set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
+add_subdirectory(3rdparty/kdsingleapplication)
+set(SINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/kdsingleapplication)
+set(SINGLEAPPLICATION_LIBRARIES kdsingleapplication)
+add_definitions(-DKDSINGLEAPPLICATION_STATIC_BUILD)
 
 if(APPLE)
   add_subdirectory(3rdparty/SPMediaKeyTap)
@@ -332,10 +357,11 @@ if(WIN32)
   endif()
 endif()
 
-if(WIN32 AND MSVC)
+if(WIN32)
   add_subdirectory(3rdparty/getopt)
   set(GETOPT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/getopt)
   set(GETOPT_LIBRARIES getopt)
+  add_definitions(-DSTATIC_GETOPT -D_UNICODE)
 endif()
 
 if(WIN32 AND NOT MSVC)
@@ -376,12 +402,12 @@ optional_component(VLC ON "Engine: VLC backend"
 
 optional_component(SONGFINGERPRINTING ON "Song fingerprinting and tracking"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
-  DEPENDS "gstreamer" GSTREAMER_FOUND
+  DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
 optional_component(MUSICBRAINZ ON "MusicBrainz integration"
   DEPENDS "chromaprint" CHROMAPRINT_FOUND
-  DEPENDS "gstreamer" GSTREAMER_FOUND
+  DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
 if(X11_FOUND OR HAVE_DBUS OR APPLE OR WIN32)
@@ -392,21 +418,17 @@ optional_component(GLOBALSHORTCUTS ON "Global shortcuts"
   DEPENDS "D-Bus, X11, Windows or macOS" HAVE_GLOBALSHORTCUTS_SUPPORT
 )
 
-if(BUILD_WITH_QT6 AND (Qt6Core_VERSION VERSION_EQUAL 6.2.0 OR Qt6Core_VERSION VERSION_GREATER 6.2.0))
-  optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts" DEPENDS "X11" X11_FOUND)
-else()
-  if(HAVE_X11EXTRAS OR HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
-    set(HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H ON)
-  endif()
-  optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
-    DEPENDS "X11" X11_FOUND
-    DEPENDS "Qt >= 6.2, X11Extras or qpa/qplatformnativeinterface.h header" HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H
-  )
+if(HAVE_QX11APPLICATION OR HAVE_X11EXTRAS OR HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+  set(X11_GLOBALSHORTCUTS_REQUIREMENT_FOUND ON)
 endif()
+optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
+  DEPENDS "X11" X11_FOUND
+  DEPENDS "QX11Application, X11Extras or qpa/qplatformnativeinterface.h header" X11_GLOBALSHORTCUTS_REQUIREMENT_FOUND
+)
 
 optional_component(AUDIOCD ON "Devices: Audio CD support"
   DEPENDS "libcdio" LIBCDIO_FOUND
-  DEPENDS "gstreamer" GSTREAMER_FOUND
+  DEPENDS "gstreamer" HAVE_GSTREAMER
 )
 
 optional_component(UDISKS2 ON "Devices: UDisks2 backend"
@@ -505,6 +527,8 @@ if(NOT CMAKE_CROSSCOMPILING)
       SQLITE_FTS5_TEST
     )
   endif()
+  unset(CMAKE_REQUIRED_FLAGS)
+  unset(CMAKE_REQUIRED_LIBRARIES)
 endif()
 
 # Set up definitions
@@ -512,9 +536,12 @@ endif()
 add_definitions(
   -DBOOST_BIND_NO_PLACEHOLDERS
   -DQT_STRICT_ITERATORS
+  -DQT_NO_CAST_FROM_BYTEARRAY
   -DQT_USE_QSTRINGBUILDER
   -DQT_NO_URL_CAST_FROM_STRING
   -DQT_NO_CAST_TO_ASCII
+  -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+  -DQT_NO_FOREACH
 )
 
 if(WIN32)

CONTRIBUTING.md

@@ -0,0 +1,112 @@
+# Contribution guidelines
+
+Strawberry is an free and open-source project, it is possible and encouraged to participate in the development.
+You can also participate by answering questions, reporting bugs or helping with documentation.
+
+
+## Submitting a pull request
+
+You should start by creating a fork of the Strawberry repository using the GitHub
+fork button, after that you can clone the repository from your fork.
+Replace "username" with your own.
+
+
+### Clone the repository
+
+    git clone git@github.com:username/strawberry.git
+    cd strawberry
+
+
+### Setup the remote
+
+    git remote add upstream git@github.com:strawberrymusicplayer/strawberry.git
+
+
+### Create a new branch
+
+This creates a new branch from the master branch that you use for specific
+changes.
+
+    git checkout -b your-branch
+
+
+### Stage changes
+
+Once you've finished working on a specific change, stage the changes for
+a specific commit.
+
+Always keep your commits relevant to the pull request, and each commit as
+small as possible.
+
+    git add -p
+
+
+### Commit changes
+
+    git commit
+
+
+### Commit messages
+
+The first line should start with "Class:", which referer to the class
+that is changed. Don't use a trailing period after the first line.
+If this change affects more than one class, omit the class and write a
+more general message.
+You only need to include a main description (body) for larger changes
+where the one line is not enough to describe everything.
+The main description starts after two newlines, it is normal prose and
+should use normal punctuation and capital letters where appropriate.
+
+An example of the expected format for git commit messages is as follows:
+
+```
+class: Short explanation of the commit
+
+Longer explanation explaining exactly what's changed, why it's changed,
+and what bugs were fixed.
+
+Fixes #1234
+```
+
+
+### Push the changes to GitHub
+
+Once you've finished working on the changes, push the branch
+to the Git repository and open a new pull request.
+
+
+    git push origin your-branch
+
+
+### Update your fork's master branch
+
+    git checkout master
+    git pull --rebase origin master
+    git fetch upstream
+    git merge upstream/master
+    git push origin master
+
+
+### Update your branch
+
+    git checkout your-branch
+    git fetch upstream
+    git rebase upstream/master
+    git push origin your-branch --force-with-lease
+
+
+### Rebase your branch
+
+If you need fix any issues with your commits, you need to rebase your
+branch to squash any commits, or to change the commit message.
+
+    git checkout your-branch
+    git log
+    git rebase -i commit_sha~
+    git push origin your-branch --force-with-lease
+
+
+### Delete your fork
+
+If you do not plan to work more on Strawberry, please delete your fork from GitHub
+once the pull requests are merged.

Changelog

@@ -2,6 +2,168 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 1.0.18 (2023.07.02):
+
+  Bugfixes:
+    * Fixed reading disc from QObuz songs (#1168).
+    * Fixed volume being reset on playback with PulseAudio (#1174).
+    * Fixed <br> tags in SQL query error message.
+    * Fixed compile with Qt 6 without XCB (QX11Application).
+    * Fixed smart playlist editor not properly loading search terms (#1172).
+    * Fixed use of fixed icon for playlist favorite star icon (#1178).
+    * Possible fix for collection thumbnails using disk cache having identical covers for albums with hashtag (#) in the album title (#1183).
+    * Fixed listenbrainz scrobbling for songs with multiple artist mbids.
+    * Fixed listenbrainz scrobbling for songs without duration.
+    * Fixed gapless playback sometimes not working.
+    * Fixed writing PNG images as embedded covers (#1209).
+    * Fixed greyscale album covers not working in OSD D-Bus (#1205).
+    * Fixed collection thumbnail disk cache with Qt 6.5.1 and newer.
+    * Fixed moodbar disk cache with Qt 6.5.1 and newer.
+    * Fixed playlist edit tag F2 shortcut only working for title tag (#1210).
+    * Append number to filename if the destination file already exist when transcoding audio (#1200).
+    * Fixed abseil linking issues with protobuf 1.22.0 and newer.
+    * (macOS) Fixed "Show this message" checkbox having no affect on Rosetta warning dialog (#1180).
+    * (macOS) Disable unused D-Bus.
+    * (Windows) Fixed command line options not working with diacritics (#1191).
+    * (Windows) Fixed issue with saving album covers in album directory being saved in temp directory instead.
+    * (Windows) Fixed crash when trying a play a song which doesn't exist, gstreamer issue #1683 (#1214).
+
+  Enhancements:
+    * Reduce memory overhead with album cover handling (#1046).
+    * Improved listenbrainz error handling.
+    * Show error dialog for listenbrainz errors similar to last.fm/libre.fm.
+    * Reduce NetworkAccessManager instances.
+    * Replace SingleApplication with KDSingleApplication.
+    * Require Qt 5.12 or higher.
+    * Add new database fields for art_embedded and art_unset.
+    * Rewrite album cover loader.
+    * Move cover filename settings from collection to covers settings.
+    * Add setting to set priorities for album cover types.
+    * Add rating filtering to playlist search (#1212).
+    * (Windows|MSVC) Add WSAPI2 plugin.
+
+Version 1.0.17 (2023.03.29):
+
+  Bugfixes:
+    * Fixed over-sized context album cover with device pixel ratio higher than 1.0 (#1166).
+    * Fixed playing widget fading from a blurry previous cover with device pixel ratio higher than 1.0.
+    * Made playlist source icon, album cover manager and OSD pretty cover respect device pixel ratio.
+
+Version 1.0.16 (2023.03.27):
+
+  Bugfixes:
+    * Fixed lyrics from Musixmatch.
+    * Fixed possible file corruption when saving both tags and embedded cover using the tag editor (#1158).
+    * Fixed compile without GStreamer.
+    * Fixed context and playing now album art rendering on High DPI displays (#1161).
+    * Fixed setting source properties (device, user-agent, ssl-strict) with GStreamer 1.22 (playbin3) and higher (#1148).
+    * Fixed rescan songs feature not ignoring mtime.
+    * Search lyrics by artist instead of album artist by default.
+
+  Code improvements:
+    * Replace use of deprecated QSqlDatabase::exec().
+
+  Added features:
+    * Added backend setting for strict SSL mode.
+    * Read AcoustID and MusicBrainz tags.
+    * Submit MusicBrainz tags with ListenBrainz.
+
+Version 1.0.15 (2023.03.04):
+
+  Bugfixes:
+    * Fixed playlist column showing invalid last played date for streams.
+    * Fixed crash when the audio bin failed to initialize (#1123, #1133).
+    * Fixed duplicated filename when organizing files using dot in the filename (#1136).
+    * Fixed tag inline editing for streams (#1130).
+    * Fixed resetting play statistics using tag edit dialog (#1124).
+    * Fixed compilation songs not showing if group by was set to other than (Album) Artist / Album (#1140).
+
+  Enhancements:
+    * Added lyrics from stands4 (lyrics.com).
+    * Added Sonogram analyzer.
+    * Use GStreamer playbin3 with GStreamer 1.22.0 and higher.
+
+  Code improvements:
+    * Made use of C++11 enum class where possible.
+    * Use new QNativeIpcKey based QSharedMemory constructor with Qt 6.6 and higher.
+
+Version 1.0.14 (2023.01.13):
+
+  Bugfixes:
+    * Fix initial volume not set when using Auto as output (#1104).
+    * Fix saving moodbar if the URL contains host, ie.: UNC paths for SMB (#1101).
+    * Fix CollectionBackendTest compile error (#1100).
+    * Remove explicitly enabling debug messages (#1106).
+
+Version 1.0.13 (2023.01.09):
+
+  Bugfixes:
+    * Fixed volume synchronization leading to infinite loop resulting in crash when adjusting volume while playing (#1089).
+    * Fixed incorrect volume.
+    * Fixed collection organizing incorrectly handling slashes inside {} brackets for variables (#1091).
+    * Fixed saving relative playlists to non-existing playlist files (#1092).
+    * Fixed intermittent crash on collection model query (#1095).
+    * Require system icons for fancy tabbar and settings sidebar to be larger than 22x22 (#1084).
+
+Version 1.0.12 (2023.01.02):
+
+  Bugfixes:
+    * Fixed crash when adjusting volume with mouse wheel (#1089).
+    * Fixed playback stopping in certain cases where the next track was unavailable (#958).
+    * (Windows) Apply patch for fonts too large on High DPI screen (QTBUG-108593).
+
+  Removed features:
+    * Removed appearance settings for changing palette colors, it was never properly implemented.
+
+Version 1.0.11 (2022.12.30):
+
+  Bugfixes:
+    * Capitalize GLib application name so it appears nicely in GNOME and PulseAudio Volume Control (#1066).
+    * Fixed missing application icon for PulseAudio Volume Control (#1066).
+    * Ignore errors for missing albums when updating Tidal collection if there are results (#1061).
+    * Only run periodic collection scan when moitoring collection setting is on.
+    * Fixed an edge case where the context headline text was being cut short (#1067).
+    * Made "Show in file browser" support SpaceFM filemanager (#1073).
+    * Fixed incorrect tab order in edit tag dialog (#1075).
+    * Changed "FMPS_PlayCount" to "FMPS_Playcount" when saving tag (#1074).
+    * Fixed compilation tag read and write for MP4 (#1076).
+    * Removed incorrect use of "TPE1" for performer when reading ID3 tags (#1076).
+    * Disable tag fields for unsupported tags in tag editor.
+    * Don't allow organizing files without unique tags (track or title) for filename (#1077).
+    * Don't remove disc from album title when creating cover hash to allow different covers for each disc on an album (#1069).
+    * Fixed incorrect relative paths for song filenames when saving playlists if the saved playlist location is a symablic link to the song filename (#1071).
+    * Scrobble "Various Artists" as album artist (#1082).
+
+  Enhancements:
+    * Use system volume instead of own software volume when available (#1037).
+    * Improved Tidal and Qobuz support with timed requests.
+    * Support MPRIS2 xesam:userRating.
+
+Version 1.0.10 (2022.10.21):
+
+  Bugfixes:
+    * Fixed "Could not open settings file for writing: No such file or directory" error before settings file is created.
+    * Fixed visual glitch on currently playing track (#1051).
+    * Fixed "Unknown error" on Tidal search (#1047).
+    * Fixed incomplete lyrics from Genius.
+    * Fixed icons not showing in the file view on some systems (#1024).
+    * Fixed issues with context and playing widget stopping when using VLC (#1054).
+    * (macOS) Fixed search field related crash when playlist toolbar is turned off.
+
+  Enhancements:
+    * Fixed narrowing conversions in connects.
+    * Fixed casts from QByteArray.
+    * Removed subdir for generated dbus files
+    * Removed use of fixed font in context (#1040).
+    * Improve Musixmatch lyrics search.
+
+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:
@@ -225,7 +387,7 @@ Version 0.9.3 (2021.04.18)
   Bugfixes:
     * Fix "Show in file browser" to work with thunar.
     * Check that the clicked rating position is to the right or left of the rectangle.
-    * Fix rescan when collection directory is removed and readded.
+    * Fix rescan when collection directory is removed and re-added.
     * Create GLib main event loop on non-glib systems to fix stream discoverer.
     * (macOS) Fix intermittent abort on startup.
     * (macOS) Fix Tidal and Qobuz search field not showing.
@@ -562,7 +724,7 @@ Version 0.6.10 (2020.05.01)
     * Made font and font sizes in context configurable.
     * Splitting artist and song title to the relevant metadata when artist and song title is sent as title separated by a dash in streams.
     * Added label to show collection pixmap disk cache used in settings.
-    * Icreased default collection pixmap disk cache to 360.
+    * Increased default collection pixmap disk cache to 360.
 
   New features:
     * Added back Tidal streaming support.
@@ -630,7 +792,7 @@ Version 0.6.7 (2019.11.27)
     * Fixed "Pressing Previous in player" behaviour setting
     * Fixed updating compilations where there are spaces or special characters in filenames
     * Fixed cases where songs were stuck in "Various Artists" because not all songs in
-      the same compilation was removed from the model before readded with actual artist.
+      the same compilation was removed from the model before re-added with actual artist.
     * Fixed a bug when importing playlists where metadata was reset
     * Fixed scrobbler to also scrobble songs without album title
     * Fixed text for replay gain setting not loading in backend setting
@@ -983,7 +1145,7 @@ Version 0.1.5 (2018.05.16)
 
 
 Version 0.1.4 (2018.05.14)
-    * Fixed compliation with clang compiler
+    * Fixed compilation with clang compiler
     * This release is mainly to get it working on openbsd and freebsd.
 
 

README.md

@@ -1,4 +1,4 @@
-:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/C/C++%20CI/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
+:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/build/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
 =======================
 [![Sponsor](https://img.shields.io/badge/-Sponsor-green?logo=github)](https://github.com/sponsors/jonaski)
 [![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
@@ -51,7 +51,7 @@ Funding developers is a way to contribute to open source projects you appreciate
   * Edit tags on audio files
   * Fetch tags from MusicBrainz
   * Album cover art from [Last.fm](https://www.last.fm/), [Musicbrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/), [Musixmatch](https://www.musixmatch.com/), [Deezer](https://www.deezer.com/), [Tidal](https://www.tidal.com/), [Qobuz](https://www.qobuz.com/) and [Spotify](https://www.spotify.com/)
-  * Song lyrics from [AudD](https://audd.io/), [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/)
+  * Song lyrics from [Lyrics.com](https://www.lyrics.com/), [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
@@ -69,10 +69,11 @@ 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/)
-* [GCC](https://gcc.gnu.org/), [Clang](https://clang.llvm.org/) or [MSVC](https://visualstudio.microsoft.com/vs/features/cplusplus/) compiler
+* C/C++ compiler ([GCC](https://gcc.gnu.org/), [Clang](https://clang.llvm.org/) or [MSVC](https://visualstudio.microsoft.com/vs/features/cplusplus/))
+* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/) or [pkgconf](https://github.com/pkgconf/pkgconf)
 * [Boost](https://www.boost.org/)
 * [GLib](https://developer.gnome.org/glib/)
-* [Qt 5.9 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
+* [Qt 6 or Qt 5.12 or higher with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
 * [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
 * [Protobuf](https://developers.google.com/protocol-buffers/)
 * [ALSA (Required on Linux)](https://www.alsa-project.org/)
@@ -102,16 +103,18 @@ You should also install the gstreamer plugins base and good, and optionally bad,
 ### Compile and install:
 
     cd strawberry
-    mkdir build && cd build
+    mkdir build
+    cd build
     cmake .. -DBUILD_WITH_QT6=ON
-    make -j$(nproc)
+    make -j $(nproc)
     sudo make install
 
 Strawberry is backwards compatible with Qt 5, to compile with Qt 5 use:
 
     cmake .. -DBUILD_WITH_QT5=ON
 
+To compile on Windows with Visual Studio 2019 or 2022, see https://github.com/strawberrymusicplayer/strawberry-msvc
+
 ### :penguin:	Packaging status
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)
-

cmake/Version.cmake

@@ -1,6 +1,6 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 8)
+set(STRAWBERRY_VERSION_PATCH 18)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)
@@ -14,10 +14,6 @@ set(STRAWBERRY_VERSION_RPM_R   "1")
 set(STRAWBERRY_VERSION_PAC_V   "${majorminorpatch}")
 set(STRAWBERRY_VERSION_PAC_R   "1")
 
-if(${STRAWBERRY_VERSION_PATCH} EQUAL "0")
-  set(STRAWBERRY_VERSION_DISPLAY "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}")
-endif(${STRAWBERRY_VERSION_PATCH} EQUAL "0")
-
 if(STRAWBERRY_VERSION_PRERELEASE)
   set(STRAWBERRY_VERSION_DISPLAY "${STRAWBERRY_VERSION_DISPLAY} ${STRAWBERRY_VERSION_PRERELEASE}")
   set(STRAWBERRY_VERSION_RPM_R   "0.${STRAWBERRY_VERSION_PRERELEASE}")

data/data.qrc

@@ -7,6 +7,8 @@
         <file>schema/schema-13.sql</file>
         <file>schema/schema-14.sql</file>
         <file>schema/schema-15.sql</file>
+        <file>schema/schema-16.sql</file>
+        <file>schema/schema-17.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>style/smartplaylistsearchterm.css</file>

data/schema/device-schema.sql

@@ -59,15 +59,31 @@ CREATE TABLE device_%deviceid_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -80,4 +96,4 @@ CREATE VIRTUAL TABLE device_%deviceid_fts USING fts5(
   tokenize = "unicode61 remove_diacritics 1"
 );
 
-UPDATE devices SET schema_version=3 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=4 WHERE ROWID=%deviceid;

data/schema/schema-16.sql

@@ -0,0 +1,217 @@
+ALTER TABLE songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE subsonic_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE tidal_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE qobuz_songs ADD COLUMN musicbrainz_work_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN acoustid_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN acoustid_fingerprint TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_album_artist_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_artist_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_original_artist_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_album_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_original_album_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_recording_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_track_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_disc_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_release_group_id TEXT;
+
+ALTER TABLE playlist_items ADD COLUMN musicbrainz_work_id TEXT;
+
+UPDATE schema_version SET version=16;

data/schema/schema-17.sql

@@ -0,0 +1,45 @@
+ALTER TABLE songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE subsonic_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE subsonic_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE tidal_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_songs ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE qobuz_songs ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+ALTER TABLE playlist_items ADD COLUMN art_embedded INTEGER DEFAULT 0;
+
+ALTER TABLE playlist_items ADD COLUMN art_unset INTEGER DEFAULT 0;
+
+UPDATE songs SET art_embedded = 1 WHERE art_automatic = 'file:(embedded)';
+
+UPDATE songs SET art_automatic = '' WHERE art_automatic = 'file:(embedded)';
+
+UPDATE songs SET art_unset = 1 WHERE art_manual = 'file:(unset)';
+
+UPDATE songs SET art_manual = '' WHERE art_manual = 'file:(unset)';
+
+UPDATE schema_version SET version=17;

data/schema/schema.sql

@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS schema_version (
 
 DELETE FROM schema_version;
 
-INSERT INTO schema_version (version) VALUES (15);
+INSERT INTO schema_version (version) VALUES (17);
 
 CREATE TABLE IF NOT EXISTS directories (
   path TEXT NOT NULL,
@@ -67,15 +67,31 @@ CREATE TABLE IF NOT EXISTS songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -129,15 +145,31 @@ CREATE TABLE IF NOT EXISTS subsonic_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -191,15 +223,31 @@ CREATE TABLE IF NOT EXISTS tidal_artists_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -253,15 +301,31 @@ CREATE TABLE IF NOT EXISTS tidal_albums_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -315,15 +379,31 @@ CREATE TABLE IF NOT EXISTS tidal_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -377,15 +457,31 @@ CREATE TABLE IF NOT EXISTS qobuz_artists_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -439,15 +535,31 @@ CREATE TABLE IF NOT EXISTS qobuz_albums_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -501,15 +613,31 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 
@@ -583,15 +711,31 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   compilation_off INTEGER DEFAULT 0,
   compilation_effective INTEGER DEFAULT 0,
 
+  art_embedded INTEGER DEFAULT 0,
   art_automatic TEXT,
   art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER,
 
   cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  rating INTEGER DEFAULT -1,
+
+  acoustid_id TEXT,
+  acoustid_fingerprint TEXT,
+
+  musicbrainz_album_artist_id TEXT,
+  musicbrainz_artist_id TEXT,
+  musicbrainz_original_artist_id TEXT,
+  musicbrainz_album_id TEXT,
+  musicbrainz_original_album_id TEXT,
+  musicbrainz_recording_id TEXT,
+  musicbrainz_track_id TEXT,
+  musicbrainz_disc_id TEXT,
+  musicbrainz_release_group_id TEXT,
+  musicbrainz_work_id TEXT
 
 );
 

data/style/strawberry.css

@@ -64,11 +64,3 @@ QToolButton::menu-button {
   width: 16px;
   border: none;
 }
-
-macos {
-  font-size: 11pt;
-}
-
-macos QMenu {
-  font-size: 13pt;
-}

debian/control.in

@@ -3,6 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Jonas Kvinge <jonas@jkvinge.net>
 Build-Depends: debhelper (>= 11),
+               git,
                make,
                cmake,
                gcc,
@@ -17,7 +18,7 @@ Build-Depends: debhelper (>= 11),
                libasound2-dev,
                libpulse-dev,
                libtag1-dev,
-               libicu-devel,
+               libicu-dev,
                @DEBIAN_BUILD_DEPENDS_QT_PACKAGES@,
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
@@ -52,7 +53,7 @@ Description: music player and music collection organizer
   - 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
+  - Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
   - Audio analyzer
   - Audio equalizer
   - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic

debian/copyright

@@ -5,10 +5,10 @@ Source: https://github.com/strawberrymusicplayer/strawberry
 
 Files: *
 Copyright: 2010-2015, David Sansome <me@davidsansome.com>
-           2012-2014, 2017-2022 Jonas Kvinge <jonas@jkvinge.net>
+           2012-2014, 2017-2023 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: src/core/timeconstants.h
+Files: src/utilities/timeconstants.h
        ext/libstrawberry-common/core/logging.cpp
        ext/libstrawberry-common/core/logging.h
        ext/libstrawberry-common/core/messagehandler.cpp
@@ -25,8 +25,6 @@ Files: src/core/main.h
        src/context/contextview.h
        src/context/contextalbum.cpp
        src/context/contextalbum.h
-       src/engine/enginetype.cpp
-       src/engine/enginetype.h
        src/engine/alsadevicefinder.cpp
        src/engine/alsadevicefinder.h
        src/engine/alsapcmdevicefinder.cpp
@@ -37,6 +35,8 @@ Files: src/core/main.h
        src/engine/devicefinder.h
        src/engine/enginedevice.cpp
        src/engine/enginedevice.h
+       src/engine/enginemetadata.cpp
+       src/engine/enginemetadata.h
        src/internet/internetservice.cpp
        src/internet/internetservice.h
        src/internet/internettabsview.cpp
@@ -98,7 +98,7 @@ Files: src/core/main.h
        ext/macdeploycheck/*
        src/widgets/resizabletextedit.cpp
        src/widgets/resizabletextedit.h
-Copyright: 2012-2014, 2017-2022, Jonas Kvinge <jonas@jkvinge.net>
+Copyright: 2012-2014, 2017-2023, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/engine/enginebase.cpp
@@ -130,11 +130,6 @@ Copyright: 2012, David Sansome <me@davidsansome.com>
            2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: src/core/appearance.cpp
-       src/core/appearance.h
-Copyright: 2012, Arnaud Bienner <arnaud.bienner@gmail.com>
-License: GPL-3+
-
 Files: src/covermanager/discogscoverprovider.cpp
        src/covermanager/discogscoverprovider.h
 Copyright: 2012, Martin Björklund <mbj4668@gmail.com>
@@ -232,9 +227,14 @@ Files: src/widgets/clickablelabel.cpp
 Copyright: 2010, 2011, Andrea Decorte <adecorte@gmail.com>
 License: GPL-3+
 
-Files: src/widgets/volumeslider.cpp
+Files: src/widgets/sliderslider.cpp
+       src/widgets/sliderslider.h
+       src/widgets/prettyslider.cpp
+       src/widgets/prettyslider.h
+       src/widgets/volumeslider.cpp
        src/widgets/volumeslider.h
-Copyright: 2005, Gábor Lehel
+Copyright: 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
+           2005, Gábor Lehel
            2003, Mark Kretschmann <markey@web.de>
 License: GPL-2+
 
@@ -267,8 +267,8 @@ Copyright: 2010, Spotify AB
            2011, Joachim Bengtsson
 License: BSD-3-clause
 
-Files: 3rdparty/singleapplication/*
-Copyright: 2015-2022, Itay Grudev
+Files: 3rdparty/kdsingleapplication/*
+Copyright: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 License: MIT
 
 
@@ -376,7 +376,7 @@ License: Apache-2.0
   On Debian systems, the complete text of the Apache 2.0 license can be
   found in the file
   `/usr/share/common-licenses/Apache-2.0`.
- 
+
 License: BSD-3-clause
  Copyright (c) The Regents of the University of California.
  All rights reserved.

dist/macos/Info.plist.in

@@ -33,7 +33,7 @@
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.music</string>
   <key>LSMinimumSystemVersion</key>
-  <string>10.13.4</string>
+  <string>11.0</string>
   <key>SUFeedURL</key>
   <string>https://www.strawberrymusicplayer.org/sparkle-macos</string>
   <key>SUPublicEDKey</key>

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

@@ -29,7 +29,7 @@
       <li>Edit tags on audio files</li>
       <li>Automatically retrieve tags from MusicBrainz</li>
       <li>Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify</li>
-      <li>Song lyrics from AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com</li>
+      <li>Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com</li>
       <li>Support for multiple backends</li>
       <li>Audio analyzer and equalizer</li>
       <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
@@ -50,6 +50,6 @@
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
     <releases>
-        <release version="1.0.0" date="2021-10-16"/>
+        <release version="1.0.18" date="2023-07-02"/>
     </releases>
 </component>

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -3,12 +3,15 @@ Version=1.0
 Type=Application
 Name=Strawberry
 GenericName=Strawberry Music Player
+GenericName[ru]=Музыкальный проигрыватель Strawberry
 Comment=Plays music
+Comment[ru]=Прослушивание музыки
 Exec=strawberry %U
 TryExec=strawberry
 Icon=strawberry
 Terminal=false
 Categories=AudioVideo;Player;Qt;Audio;
+Keywords=Audio;Player;
 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
@@ -17,19 +20,24 @@ Actions=Play-Pause;Stop;StopAfterCurrent;Previous;Next;
 [Desktop Action Play-Pause]
 Name=Play/Pause
 Exec=strawberry --play-pause
+Name[ru]=Играть/пауза
 
 [Desktop Action Stop]
 Name=Stop
 Exec=strawberry --stop
+Name[ru]=Стоп
 
 [Desktop Action StopAfterCurrent]
 Name=Stop after this track
 Exec=strawberry --stop-after-current
+Name[ru]=Стоп после этого трека
 
 [Desktop Action Previous]
 Name=Previous
 Exec=strawberry --previous
+Name[ru]=Предыдущий
 
 [Desktop Action Next]
 Name=Next
 Exec=strawberry --next
+Name[ru]=Следующий

dist/unix/strawberry.1

@@ -29,7 +29,7 @@ Features:
 .br
 - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
 .br
-- Song lyrics from AudD, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
+- Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
 .br
 - Support for multiple backends
 .br

dist/unix/strawberry.spec.in

@@ -119,7 +119,7 @@ Features:
   - 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
+  - Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
   - Support for multiple backends
   - Audio analyzer
   - Audio equalizer

dist/windows/strawberry.nsi.in

@@ -1,57 +1,68 @@
-!define build_type ""
-!define compiler "unknown"
-!define arch "unknown"
-
-!if "@ARCH@" == "x86"
-  !define arch_x86
-  !undef arch
-  !define arch "x86"
-!endif
-
-!if "@ARCH@" == "i686-w64-mingw32.shared"
-  !define arch_x86
-  !undef arch
-  !define arch "x86"
-!endif
-
-!if "@ARCH@" == "x86_64"
-  !define arch_x64
-  !undef arch
-  !define arch "x64"
-!endif
-
-!if "@ARCH@" == "x86_64-w64-mingw32.shared"
-  !define arch_x64
-  !undef arch
-  !define arch "x64"
-!endif
-
 !if "@MINGW@" == "1"
   !define mingw
-  !undef compiler
   !define compiler "mingw"
 !endif
 
 !if "@MSVC@" == "1"
   !define msvc
-  !undef compiler
   !define compiler "msvc"
 !endif
 
+
+!if "@ARCH@" == "x86"
+  !define arch_x86
+!else if "@ARCH@" == "i686"
+  !define arch_x86
+!else if "@ARCH@" == "i686-w64-mingw32.shared"
+  !define arch_x86
+!else if "@ARCH@" == "x64"
+  !define arch_x64
+!else if "@ARCH@" == "x86_64"
+  !define arch_x64
+!else if "@ARCH@" == "x86_64-w64-mingw32.shared"
+  !define arch_x64
+!endif
+
+!ifdef arch_x86
+  !define arch "x86"
+!endif
+
+!ifdef arch_x64
+  !define arch "x64"
+!endif
+
+
 !if "@CMAKE_BUILD_TYPE@" == "Release"
   !define release
-!endif
-
-!if "@CMAKE_BUILD_TYPE@" == "RelWithDebInfo"
+!else if "@CMAKE_BUILD_TYPE@" == "RelWithDebInfo"
   !define release
+!else if "@CMAKE_BUILD_TYPE@" == "Debug"
+  !define debug
 !endif
 
-!if "@CMAKE_BUILD_TYPE@" == "Debug"
-  !define debug
-  !undef build_type
+!ifdef release
+  !define build_type ""
+!endif
+
+!ifdef debug
   !define build_type "-Debug"
 !endif
 
+
+!ifndef compiler
+  !error "Missing compiler."
+!endif
+
+!ifndef build_type
+  !error "Missing build type."
+!endif
+
+!ifndef arch
+  !error "Missing arch."
+!endif
+
+
+
 !ifdef debug
   !define PRODUCT_NAME "Strawberry Music Player Debug"
   !define PRODUCT_NAME_SHORT "Strawberry"
@@ -241,11 +252,11 @@ Section "Strawberry" Strawberry
   File "libssl-3-x64.dll"
 !endif
 
-  File "avcodec-59.dll"
-  File "avfilter-8.dll"
-  File "avformat-59.dll"
-  File "avutil-57.dll"
-  File "libFLAC-8.dll"
+  File "avcodec-60.dll"
+  File "avfilter-9.dll"
+  File "avformat-60.dll"
+  File "avutil-58.dll"
+  File "libFLAC-12.dll"
   File "libbrotlicommon.dll"
   File "libbrotlidec.dll"
   File "libbrotlienc.dll"
@@ -301,7 +312,6 @@ Section "Strawberry" Strawberry
   File "libopus-0.dll"
   File "liborc-0.4-0.dll"
   File "libpng16-16.dll"
-  File "libprotobuf-32.dll"
   File "libpsl-5.dll"
   File "libqtsparkle-qt6.dll"
   File "libsoup-3.0-0.dll"
@@ -312,7 +322,7 @@ Section "Strawberry" Strawberry
   File "libtag.dll"
   File "libtasn1-6.dll"
   File "libtwolame-0.dll"
-  File "libunistring-2.dll"
+  File "libunistring-5.dll"
   File "libvorbis-0.dll"
   File "libvorbisenc-2.dll"
   File "libvorbisfile-3.dll"
@@ -320,11 +330,51 @@ Section "Strawberry" Strawberry
   File "libwinpthread-1.dll"
   File "libxml2-2.dll"
   File "libzstd.dll"
-  File "postproc-56.dll"
+  File "postproc-57.dll"
   File "swresample-4.dll"
-  File "swscale-6.dll"
+  File "swscale-7.dll"
   File "zlib1.dll"
 
+  File "libabsl_base.dll"
+  File "libabsl_city.dll"
+  File "libabsl_cord.dll"
+  File "libabsl_cord_internal.dll"
+  File "libabsl_cordz_handle.dll"
+  File "libabsl_cordz_info.dll"
+  File "libabsl_crc32c.dll"
+  File "libabsl_crc_cord_state.dll"
+  File "libabsl_crc_internal.dll"
+  File "libabsl_die_if_null.dll"
+  File "libabsl_examine_stack.dll"
+  File "libabsl_hash.dll"
+  File "libabsl_int128.dll"
+  File "libabsl_log_globals.dll"
+  File "libabsl_log_internal_check_op.dll"
+  File "libabsl_log_internal_format.dll"
+  File "libabsl_log_internal_globals.dll"
+  File "libabsl_log_internal_log_sink_set.dll"
+  File "libabsl_log_internal_message.dll"
+  File "libabsl_log_internal_nullguard.dll"
+  File "libabsl_log_internal_proto.dll"
+  File "libabsl_log_sink.dll"
+  File "libabsl_low_level_hash.dll"
+  File "libabsl_malloc_internal.dll"
+  File "libabsl_raw_hash_set.dll"
+  File "libabsl_raw_logging_internal.dll"
+  File "libabsl_spinlock_wait.dll"
+  File "libabsl_stacktrace.dll"
+  File "libabsl_status.dll"
+  File "libabsl_statusor.dll"
+  File "libabsl_strerror.dll"
+  File "libabsl_str_format_internal.dll"
+  File "libabsl_strings.dll"
+  File "libabsl_strings_internal.dll"
+  File "libabsl_symbolize.dll"
+  File "libabsl_synchronization.dll"
+  File "libabsl_throw_delegate.dll"
+  File "libabsl_time.dll"
+  File "libabsl_time_zone.dll"
+
 !ifdef debug
   File "gdb.exe"
   File "libexpat-1.dll"
@@ -334,6 +384,7 @@ Section "Strawberry" Strawberry
   File "libpcre2-16d.dll"
   File "libreadline8.dll"
   File "libtermcap.dll"
+  File "libabsl_graphcycles_internal.dll"
 !else
   File "libpcre2-8.dll"
   File "libpcre2-16.dll"
@@ -358,7 +409,6 @@ Section "Strawberry" Strawberry
   File "avcodec-58.dll"
   File "avfilter-7.dll"
   File "avformat-58.dll"
-  File "avresample-4.dll"
   File "avutil-56.dll"
   File "brotlicommon.dll"
   File "brotlidec.dll"
@@ -389,11 +439,12 @@ Section "Strawberry" Strawberry
   File "gsttag-1.0-0.dll"
   File "gsturidownloader-1.0-0.dll"
   File "gstvideo-1.0-0.dll"
+  File "gstwinrt-1.0-0.dll"
   File "harfbuzz.dll"
   File "intl-8.dll"
+  File "jpeg62.dll"
   File "libbs2b.dll"
   File "libfaac_dll.dll"
-  File "libiconv.dll"
   File "liblzma.dll"
   File "libmp3lame.dll"
   File "libopenmpt.dll"
@@ -415,11 +466,12 @@ Section "Strawberry" Strawberry
   File "vorbis.dll"
   File "vorbisfile.dll"
   File "wavpackdll.dll"
+  File "abseil_dll.dll"
 
 !ifdef release
   File "freetype.dll"
+  File "libiconv.dll"
   File "libpng16.dll"
-  File "libprotobuf.dll"
   File "libxml2.dll"
   File "pcre2-8.dll"
   File "pcre2-16.dll"
@@ -428,8 +480,8 @@ Section "Strawberry" Strawberry
 !endif
 !ifdef debug
   File "freetyped.dll"
+  File "libiconvd.dll"
   File "libpng16d.dll"
-  File "libprotobufd.dll"
   File "libxml2d.dll"
   File "pcre2-8d.dll"
   File "pcre2-16d.dll"
@@ -437,15 +489,26 @@ Section "Strawberry" Strawberry
   File "zlibd.dll"
 !endif
 
+  ; Used by libfftw3-3.dll because fftw is compiled with MinGW.
+!ifdef arch_x86
+  File "libgcc_s_sjlj-1.dll"
+  File "libwinpthread-1.dll"
+!endif
+
 !endif ; MSVC
 
   ; Common files
 
-  File "icudt71.dll"
+  File "icudt73.dll"
   File "libfftw3-3.dll"
+!ifdef debug
+  File "libprotobufd.dll"
+!else
+  File "libprotobuf.dll"
+!endif
 !ifdef msvc && debug
-  File "icuin71d.dll"
-  File "icuuc71d.dll"
+  File "icuin73d.dll"
+  File "icuuc73d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
   File "Qt6Guid.dll"
@@ -453,8 +516,8 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
-  File "icuin71.dll"
-  File "icuuc71.dll"
+  File "icuin73.dll"
+  File "icuuc73.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
   File "Qt6Gui.dll"
@@ -677,6 +740,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstvolume.dll" "gstreamer-plugins\gstvolume.dll"
   File "/oname=gstvorbis.dll" "gstreamer-plugins\gstvorbis.dll"
   File "/oname=gstwasapi.dll" "gstreamer-plugins\gstwasapi.dll"
+  File "/oname=gstwasapi2.dll" "gstreamer-plugins\gstwasapi2.dll"
   File "/oname=gstwavenc.dll" "gstreamer-plugins\gstwavenc.dll"
   File "/oname=gstwavpack.dll" "gstreamer-plugins\gstwavpack.dll"
   File "/oname=gstwavparse.dll" "gstreamer-plugins\gstwavparse.dll"
@@ -743,11 +807,11 @@ Section "Uninstall"
   Delete "$INSTDIR\libssl-3-x64.dll"
 !endif
 
-  Delete "$INSTDIR\avcodec-59.dll"
-  Delete "$INSTDIR\avfilter-8.dll"
-  Delete "$INSTDIR\avformat-59.dll"
-  Delete "$INSTDIR\avutil-57.dll"
-  Delete "$INSTDIR\libFLAC-8.dll"
+  Delete "$INSTDIR\avcodec-60.dll"
+  Delete "$INSTDIR\avfilter-9.dll"
+  Delete "$INSTDIR\avformat-60.dll"
+  Delete "$INSTDIR\avutil-58.dll"
+  Delete "$INSTDIR\libFLAC-12.dll"
   Delete "$INSTDIR\libbrotlicommon.dll"
   Delete "$INSTDIR\libbrotlidec.dll"
   Delete "$INSTDIR\libbrotlienc.dll"
@@ -803,7 +867,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libopus-0.dll"
   Delete "$INSTDIR\liborc-0.4-0.dll"
   Delete "$INSTDIR\libpng16-16.dll"
-  Delete "$INSTDIR\libprotobuf-32.dll"
   Delete "$INSTDIR\libpsl-5.dll"
   Delete "$INSTDIR\libqtsparkle-qt6.dll"
   Delete "$INSTDIR\libsoup-3.0-0.dll"
@@ -814,7 +877,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libtag.dll"
   Delete "$INSTDIR\libtasn1-6.dll"
   Delete "$INSTDIR\libtwolame-0.dll"
-  Delete "$INSTDIR\libunistring-2.dll"
+  Delete "$INSTDIR\libunistring-5.dll"
   Delete "$INSTDIR\libvorbis-0.dll"
   Delete "$INSTDIR\libvorbisenc-2.dll"
   Delete "$INSTDIR\libvorbisfile-3.dll"
@@ -822,11 +885,51 @@ Section "Uninstall"
   Delete "$INSTDIR\libwinpthread-1.dll"
   Delete "$INSTDIR\libxml2-2.dll"
   Delete "$INSTDIR\libzstd.dll"
-  Delete "$INSTDIR\postproc-56.dll"
+  Delete "$INSTDIR\postproc-57.dll"
   Delete "$INSTDIR\swresample-4.dll"
-  Delete "$INSTDIR\swscale-6.dll"
+  Delete "$INSTDIR\swscale-7.dll"
   Delete "$INSTDIR\zlib1.dll"
 
+  Delete "$INSTDIR\libabsl_base.dll"
+  Delete "$INSTDIR\libabsl_city.dll"
+  Delete "$INSTDIR\libabsl_cord.dll"
+  Delete "$INSTDIR\libabsl_cord_internal.dll"
+  Delete "$INSTDIR\libabsl_cordz_handle.dll"
+  Delete "$INSTDIR\libabsl_cordz_info.dll"
+  Delete "$INSTDIR\libabsl_crc32c.dll"
+  Delete "$INSTDIR\libabsl_crc_cord_state.dll"
+  Delete "$INSTDIR\libabsl_crc_internal.dll"
+  Delete "$INSTDIR\libabsl_die_if_null.dll"
+  Delete "$INSTDIR\libabsl_examine_stack.dll"
+  Delete "$INSTDIR\libabsl_hash.dll"
+  Delete "$INSTDIR\libabsl_int128.dll"
+  Delete "$INSTDIR\libabsl_log_globals.dll"
+  Delete "$INSTDIR\libabsl_log_internal_check_op.dll"
+  Delete "$INSTDIR\libabsl_log_internal_format.dll"
+  Delete "$INSTDIR\libabsl_log_internal_globals.dll"
+  Delete "$INSTDIR\libabsl_log_internal_log_sink_set.dll"
+  Delete "$INSTDIR\libabsl_log_internal_message.dll"
+  Delete "$INSTDIR\libabsl_log_internal_nullguard.dll"
+  Delete "$INSTDIR\libabsl_log_internal_proto.dll"
+  Delete "$INSTDIR\libabsl_log_sink.dll"
+  Delete "$INSTDIR\libabsl_low_level_hash.dll"
+  Delete "$INSTDIR\libabsl_malloc_internal.dll"
+  Delete "$INSTDIR\libabsl_raw_hash_set.dll"
+  Delete "$INSTDIR\libabsl_raw_logging_internal.dll"
+  Delete "$INSTDIR\libabsl_spinlock_wait.dll"
+  Delete "$INSTDIR\libabsl_stacktrace.dll"
+  Delete "$INSTDIR\libabsl_status.dll"
+  Delete "$INSTDIR\libabsl_statusor.dll"
+  Delete "$INSTDIR\libabsl_strerror.dll"
+  Delete "$INSTDIR\libabsl_str_format_internal.dll"
+  Delete "$INSTDIR\libabsl_strings.dll"
+  Delete "$INSTDIR\libabsl_strings_internal.dll"
+  Delete "$INSTDIR\libabsl_symbolize.dll"
+  Delete "$INSTDIR\libabsl_synchronization.dll"
+  Delete "$INSTDIR\libabsl_throw_delegate.dll"
+  Delete "$INSTDIR\libabsl_time.dll"
+  Delete "$INSTDIR\libabsl_time_zone.dll"
+
 !ifdef debug
   Delete "$INSTDIR\gdb.exe"
   Delete "$INSTDIR\libexpat-1.dll"
@@ -836,6 +939,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libpcre2-16d.dll"
   Delete "$INSTDIR\libreadline8.dll"
   Delete "$INSTDIR\libtermcap.dll"
+  Delete "$INSTDIR\libabsl_graphcycles_internal.dll"
 !else
   Delete "$INSTDIR\libpcre2-8.dll"
   Delete "$INSTDIR\libpcre2-16.dll"
@@ -860,7 +964,6 @@ Section "Uninstall"
   Delete "$INSTDIR\avcodec-58.dll"
   Delete "$INSTDIR\avfilter-7.dll"
   Delete "$INSTDIR\avformat-58.dll"
-  Delete "$INSTDIR\avresample-4.dll"
   Delete "$INSTDIR\avutil-56.dll"
   Delete "$INSTDIR\brotlicommon.dll"
   Delete "$INSTDIR\brotlidec.dll"
@@ -891,11 +994,12 @@ Section "Uninstall"
   Delete "$INSTDIR\gsttag-1.0-0.dll"
   Delete "$INSTDIR\gsturidownloader-1.0-0.dll"
   Delete "$INSTDIR\gstvideo-1.0-0.dll"
+  Delete "$INSTDIR\gstwinrt-1.0-0.dll"
   Delete "$INSTDIR\harfbuzz.dll"
   Delete "$INSTDIR\intl-8.dll"
+  Delete "$INSTDIR\jpeg62.dll"
   Delete "$INSTDIR\libbs2b.dll"
   Delete "$INSTDIR\libfaac_dll.dll"
-  Delete "$INSTDIR\libiconv.dll"
   Delete "$INSTDIR\liblzma.dll"
   Delete "$INSTDIR\libmp3lame.dll"
   Delete "$INSTDIR\libopenmpt.dll"
@@ -917,11 +1021,12 @@ Section "Uninstall"
   Delete "$INSTDIR\vorbis.dll"
   Delete "$INSTDIR\vorbisfile.dll"
   Delete "$INSTDIR\wavpackdll.dll"
+  Delete "$INSTDIR\abseil_dll.dll"
 
 !ifdef release
   Delete "$INSTDIR\freetype.dll"
+  Delete "$INSTDIR\libiconv.dll"
   Delete "$INSTDIR\libpng16.dll"
-  Delete "$INSTDIR\libprotobuf.dll"
   Delete "$INSTDIR\libxml2.dll"
   Delete "$INSTDIR\pcre2-8.dll"
   Delete "$INSTDIR\pcre2-16.dll"
@@ -930,8 +1035,8 @@ Section "Uninstall"
 !endif
 !ifdef debug
   Delete "$INSTDIR\freetyped.dll"
+  Delete "$INSTDIR\libiconvd.dll"
   Delete "$INSTDIR\libpng16d.dll"
-  Delete "$INSTDIR\libprotobufd.dll"
   Delete "$INSTDIR\libxml2d.dll"
   Delete "$INSTDIR\pcre2-8d.dll"
   Delete "$INSTDIR\pcre2-16d.dll"
@@ -939,15 +1044,25 @@ Section "Uninstall"
   Delete "$INSTDIR\zlibd.dll"
 !endif
 
+!ifdef arch_x86
+  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
+  Delete "$INSTDIR\libwinpthread-1.dll"
+!endif
+
 !endif ; MSVC
 
   ; Common files
 
-  Delete "$INSTDIR\icudt71.dll"
+  Delete "$INSTDIR\icudt73.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
+!ifdef debug
+  Delete "$INSTDIR\libprotobufd.dll"
+!else
+  Delete "$INSTDIR\libprotobuf.dll"
+!endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin71d.dll"
-  Delete "$INSTDIR\icuuc71d.dll"
+  Delete "$INSTDIR\icuin73d.dll"
+  Delete "$INSTDIR\icuuc73d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
   Delete "$INSTDIR\Qt6Guid.dll"
@@ -955,8 +1070,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin71.dll"
-  Delete "$INSTDIR\icuuc71.dll"
+  Delete "$INSTDIR\icuin73.dll"
+  Delete "$INSTDIR\icuuc73.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
   Delete "$INSTDIR\Qt6Gui.dll"
@@ -1114,6 +1229,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstvolume.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwasapi.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstwasapi2.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavparse.dll"

ext/gstmoodbar/gstfastspectrum.cpp

@@ -50,10 +50,14 @@ enum {
 }  // namespace
 
 #define gst_fastspectrum_parent_class parent_class
+#ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
 G_DEFINE_TYPE(GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER)
+#ifdef __GNUC__
 #pragma GCC diagnostic pop
+#endif
 
 static void gst_fastspectrum_finalize(GObject *object);
 static void gst_fastspectrum_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
@@ -82,9 +86,9 @@ static void gst_fastspectrum_class_init(GstFastSpectrumClass *klass) {
 
   filter_class->setup = GST_DEBUG_FUNCPTR(gst_fastspectrum_setup);
 
-  g_object_class_install_property(gobject_class, PROP_INTERVAL, g_param_spec_uint64("interval", "Interval", "Interval of time between message posts (in nanoseconds)", 1, G_MAXUINT64, DEFAULT_INTERVAL, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property(gobject_class, PROP_INTERVAL, g_param_spec_uint64("interval", "Interval", "Interval of time between message posts (in nanoseconds)", 1, G_MAXUINT64, DEFAULT_INTERVAL, static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
-  g_object_class_install_property(gobject_class, PROP_BANDS, g_param_spec_uint("bands", "Bands", "Number of frequency bands", 0, G_MAXUINT, DEFAULT_BANDS, GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property(gobject_class, PROP_BANDS, g_param_spec_uint("bands", "Bands", "Number of frequency bands", 0, G_MAXUINT, DEFAULT_BANDS, static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   GST_DEBUG_CATEGORY_INIT(gst_fastspectrum_debug, "spectrum", 0, "audio spectrum analyser element");
 

ext/gstmoodbar/gstfastspectrum.h

@@ -47,7 +47,7 @@ class QMutex;
 
 typedef void (*GstFastSpectrumInputData)(const guint8 *in, double *out, guint len, double max_value, guint op, guint nfft);
 
-typedef std::function<void(double *magnitudes, int size)> OutputCallback;
+using OutputCallback = std::function<void(double *magnitudes, int size)>;
 
 struct GstFastSpectrum {
   GstAudioFilter parent;

ext/libstrawberry-common/core/logging.cpp

@@ -126,7 +126,8 @@ class LoggedDebug : public DebugBase<LoggedDebug> {
 static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QString &message) {
 
   if (message.startsWith(kMessageHandlerMagic)) {
-    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message.toUtf8().data() + kMessageHandlerMagicLength);
+    QByteArray message_data = message.toUtf8();
+    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message_data.constData() + kMessageHandlerMagicLength);
     fflush(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout);
     return;
   }

ext/libstrawberry-common/core/messagehandler.h

@@ -82,8 +82,8 @@ class AbstractMessageHandler : public _MessageHandlerBase {
   AbstractMessageHandler(QIODevice *device, QObject *parent);
   ~AbstractMessageHandler() override { AbstractMessageHandler::AbortAll(); }
 
-  typedef MT MessageType;
-  typedef MessageReply<MT> ReplyType;
+  using MessageType = MT;
+  using ReplyType = MessageReply<MT>;
 
   // Serialises the message and writes it to the socket.
   // This version MUST be called from the thread in which the AbstractMessageHandler was created.

ext/libstrawberry-common/core/workerpool.h

@@ -37,9 +37,7 @@
 #include <QString>
 #include <QStringList>
 #include <QAtomicInt>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#  include <QRandomGenerator>
-#endif
+#include <QRandomGenerator>
 
 #include "core/logging.h"
 
@@ -76,8 +74,8 @@ class WorkerPool : public _WorkerPoolBase {
   explicit WorkerPool(QObject *parent = nullptr);
   ~WorkerPool() override;
 
-  typedef typename HandlerType::MessageType MessageType;
-  typedef typename HandlerType::ReplyType ReplyType;
+  using MessageType = typename HandlerType::MessageType;
+  using ReplyType = typename HandlerType::ReplyType;
 
   // Sets the name of the worker executable.  This is looked for first in the current directory, and then in $PATH.
   // You must call this before calling Start().
@@ -165,10 +163,10 @@ class WorkerPool : public _WorkerPoolBase {
 template<typename HandlerType>
 WorkerPool<HandlerType>::WorkerPool(QObject *parent)
     : _WorkerPoolBase(parent),
+      worker_count_(1),
       next_worker_(0),
       next_id_(0) {
 
-  worker_count_ = qBound(1, QThread::idealThreadCount() / 2, 4);
   local_server_name_ = qApp->applicationName().toLower();
 
   if (local_server_name_.isEmpty()) {
@@ -228,7 +226,7 @@ void WorkerPool<HandlerType>::SetExecutableName(const QString &executable_name)
 
 template<typename HandlerType>
 void WorkerPool<HandlerType>::Start() {
-  QMetaObject::invokeMethod(this, "DoStart");
+  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::DoStart);
 }
 
 template<typename HandlerType>
@@ -294,11 +292,7 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 
   // Create a server, find an unused name and start listening
   forever {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     const quint32 unique_number = QRandomGenerator::global()->bounded(static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
-#else
-    const quint32 unique_number = qrand() ^ (static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
-#endif
     const QString name = QString("%1_%2").arg(local_server_name_).arg(unique_number);
 
     if (worker->local_server_->listen(name)) {
@@ -423,7 +417,7 @@ WorkerPool<HandlerType>::SendMessageWithReply(MessageType *message) {
   }
 
   // Wake up the main thread
-  QMetaObject::invokeMethod(this, "SendQueuedMessages", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &WorkerPool<HandlerType>::SendQueuedMessages, Qt::QueuedConnection);
 
   return reply;
 

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,7 +1,15 @@
 cmake_minimum_required(VERSION 3.7)
 
-set(MESSAGES tagreadermessages.proto)
-set(SOURCES tagreaderbase.cpp)
+# Workaround a bug in protobuf-generate.cmake (https://github.com/protocolbuffers/protobuf/issues/12450)
+if(NOT protobuf_PROTOC_EXE)
+  set(protobuf_PROTOC_EXE "protobuf::protoc")
+endif()
+
+if(NOT Protobuf_LIBRARIES)
+  set(Protobuf_LIBRARIES protobuf::libprotobuf protobuf::libprotoc)
+endif()
+
+set(SOURCES tagreaderbase.cpp tagreadermessages.proto)
 
 if(USE_TAGLIB AND TAGLIB_FOUND)
   list(APPEND SOURCES tagreadertaglib.cpp tagreadergme.cpp)
@@ -11,8 +19,6 @@ if(USE_TAGPARSER AND TAGPARSER_FOUND)
   list(APPEND SOURCES tagreadertagparser.cpp)
 endif()
 
-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
-
 link_directories(
   ${GLIB_LIBRARY_DIRS}
   ${PROTOBUF_LIBRARY_DIRS}
@@ -43,9 +49,10 @@ target_include_directories(libstrawberry-tagreader PRIVATE
 
 target_link_libraries(libstrawberry-tagreader PRIVATE
   ${GLIB_LIBRARIES}
-  ${PROTOBUF_LIBRARY}
+  ${Protobuf_LIBRARIES}
   ${QtCore_LIBRARIES}
   ${QtNetwork_LIBRARIES}
+  ${QtGui_LIBRARIES}
   libstrawberry-common
 )
 
@@ -58,3 +65,5 @@ if(USE_TAGPARSER AND TAGPARSER_FOUND)
   target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGPARSER_INCLUDE_DIRS})
   target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGPARSER_LIBRARIES})
 endif()
+
+protobuf_generate(TARGET libstrawberry-tagreader)

ext/libstrawberry-tagreader/tagreaderbase.cpp

@@ -1,5 +1,5 @@
 /* This file is part of Strawberry.
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,19 +19,20 @@
 
 #include <string>
 
-#include "tagreaderbase.h"
+#include <QByteArray>
+#include <QString>
+#include <QIODevice>
+#include <QFile>
+#include <QBuffer>
+#include <QImage>
+#include <QMimeDatabase>
 
-const std::string TagReaderBase::kEmbeddedCover = "(embedded)";
+#include "core/logging.h"
+#include "tagreaderbase.h"
 
 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;
@@ -55,3 +56,88 @@ int TagReaderBase::ConvertToPOPMRating(const float rating) {
   return 0xFF;
 
 }
+
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::SaveFileRequest &request) {
+
+  if (!request.has_save_cover() || !request.save_cover()) {
+    return Cover();
+  }
+
+  const QString song_filename = QString::fromUtf8(request.filename().data(), static_cast<qint64>(request.filename().size()));
+  QString cover_filename;
+  if (request.has_cover_filename()) {
+    cover_filename = QString::fromUtf8(request.cover_filename().data(), static_cast<qint64>(request.cover_filename().size()));
+  }
+  QByteArray cover_data;
+  if (request.has_cover_data()) {
+    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
+  }
+  QString cover_mime_type;
+  if (request.has_cover_mime_type()) {
+    cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast<qint64>(request.cover_mime_type().size()));
+  }
+
+  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
+
+}
+
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::SaveEmbeddedArtRequest &request) {
+
+  const QString song_filename = QString::fromUtf8(request.filename().data(), static_cast<qint64>(request.filename().size()));
+  QString cover_filename;
+  if (request.has_cover_filename()) {
+    cover_filename = QString::fromUtf8(request.cover_filename().data(), static_cast<qint64>(request.cover_filename().size()));
+  }
+  QByteArray cover_data;
+  if (request.has_cover_data()) {
+    cover_data = QByteArray(request.cover_data().data(), static_cast<qint64>(request.cover_data().size()));
+  }
+  QString cover_mime_type;
+  if (request.has_cover_mime_type()) {
+    cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast<qint64>(request.cover_mime_type().size()));
+  }
+
+  return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
+
+}
+
+TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type) {
+
+  if (cover_data.isEmpty() && !cover_filename.isEmpty()) {
+    qLog(Debug) << "Loading cover from" << cover_filename << "for" << song_filename;
+    QFile file(cover_filename);
+    if (!file.open(QIODevice::ReadOnly)) {
+      qLog(Error) << "Failed to open file" << cover_filename << "for reading:" << file.errorString();
+      return Cover();
+    }
+    cover_data = file.readAll();
+    file.close();
+  }
+
+  if (!cover_data.isEmpty()) {
+    if (cover_mime_type.isEmpty()) {
+      cover_mime_type = QMimeDatabase().mimeTypeForData(cover_data).name();
+    }
+    if (cover_mime_type == "image/jpeg") {
+      qLog(Debug) << "Using cover from JPEG data for" << song_filename;
+      return Cover(cover_data, cover_mime_type);
+    }
+    if (cover_mime_type == "image/png") {
+      qLog(Debug) << "Using cover from PNG data for" << song_filename;
+      return Cover(cover_data, cover_mime_type);
+    }
+    // Convert image to JPEG.
+    qLog(Debug) << "Converting cover to JPEG data for" << song_filename;
+    QImage cover_image(cover_data);
+    cover_data.clear();
+    QBuffer buffer(&cover_data);
+    if (buffer.open(QIODevice::WriteOnly)) {
+      cover_image.save(&buffer, "JPEG");
+      buffer.close();
+    }
+    return Cover(cover_data, "image/jpeg");
+  }
+
+  return Cover();
+
+}

ext/libstrawberry-tagreader/tagreaderbase.h

@@ -1,5 +1,5 @@
 /* This file is part of Strawberry.
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,9 +27,6 @@
 
 #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)
@@ -39,24 +36,33 @@ class TagReaderBase {
   explicit TagReaderBase();
   ~TagReaderBase();
 
+  class Cover {
+   public:
+    explicit Cover(const QByteArray &_data = QByteArray(), const QString &_mime_type = QString()) : data(_data), mime_type(_mime_type) {}
+    QByteArray data;
+    QString mime_type;
+    QString error;
+  };
+
   virtual bool IsMediaFile(const QString &filename) 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 bool SaveFile(const spb::tagreader::SaveFileRequest &request) const = 0;
 
   virtual QByteArray LoadEmbeddedArt(const QString &filename) const = 0;
-  virtual bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) = 0;
+  virtual bool SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtRequest &request) const = 0;
 
   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;
+  static Cover LoadCoverFromRequest(const spb::tagreader::SaveFileRequest &request);
+  static Cover LoadCoverFromRequest(const spb::tagreader::SaveEmbeddedArtRequest &request);
+
+ private:
+  static Cover LoadCoverFromRequest(const QString &song_filename, const QString &cover_filename, QByteArray cover_data, QString cover_mime_type);
 
   Q_DISABLE_COPY(TagReaderBase)
 };

ext/libstrawberry-tagreader/tagreadergme.cpp

@@ -29,8 +29,8 @@
 #include <QFile>
 #include <QTextStream>
 
+#include "utilities/timeconstants.h"
 #include "core/logging.h"
-#include "core/timeconstants.h"
 #include "core/messagehandler.h"
 #include "tagreaderbase.h"
 #include "tagreadertaglib.h"
@@ -84,7 +84,8 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
   //  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));
+  const QByteArray id6_status = file.read(1);
+  const bool has_id6 = id6_status.length() >= 1 && id6_status[0] == static_cast<char>(xID6_STATUS::ON);
 
   file.seek(SONG_TITLE_OFFSET);
   song_info->set_title(QString::fromLatin1(file.read(32)).toStdString());
@@ -156,10 +157,10 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
     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());
+    TagReaderTagLib::TStringToStdString(tag->artist(), song_info->mutable_artist());
+    TagReaderTagLib::TStringToStdString(tag->album(), song_info->mutable_album());
+    TagReaderTagLib::TStringToStdString(tag->title(), song_info->mutable_title());
+    TagReaderTagLib::TStringToStdString(tag->genre(), song_info->mutable_genre());
     song_info->set_track(tag->track());
     song_info->set_year(tag->year());
   }
@@ -200,7 +201,7 @@ void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
   QByteArray gd3_head = file.read(4);
   if (gd3_head.size() < 4) return;
 
-  quint64 pt = GME::UnpackBytes32(gd3_head, gd3_head.size());
+  quint64 pt = GME::UnpackBytes32(gd3_head.constData(), gd3_head.size());
 
   file.seek(SAMPLE_COUNT);
   QByteArray sample_count_bytes = file.read(4);
@@ -215,7 +216,7 @@ void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
 
   file.seek(file.pos() + 4);
   QByteArray gd3_length_bytes = file.read(4);
-  quint32 gd3_length = GME::UnpackBytes32(gd3_length_bytes, gd3_length_bytes.size());
+  quint32 gd3_length = GME::UnpackBytes32(gd3_length_bytes.constData(), gd3_length_bytes.size());
 
   QByteArray gd3Data = file.read(gd3_length);
   QTextStream fileTagStream(gd3Data, QIODevice::ReadOnly);
@@ -246,11 +247,11 @@ bool GME::VGM::GetPlaybackLength(const QByteArray &sample_count_bytes, const QBy
   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());
+  quint64 sample_count = GME::UnpackBytes32(sample_count_bytes.constData(), sample_count_bytes.size());
 
   if (sample_count <= 0) return false;
 
-  quint64 loop_sample_count = GME::UnpackBytes32(loop_count_bytes, loop_count_bytes.size());
+  quint64 loop_sample_count = GME::UnpackBytes32(loop_count_bytes.constData(), loop_count_bytes.size());
 
   if (loop_sample_count <= 0) {
     out_length = sample_count * 1000 / SAMPLE_TIMEBASE;
@@ -278,7 +279,7 @@ bool TagReaderGME::ReadFile(const QString &filename, spb::tagreader::SongMetadat
   return GME::ReadFile(fileinfo, song);
 }
 
-bool TagReaderGME::SaveFile(const QString&, const spb::tagreader::SongMetadata&) const {
+bool TagReaderGME::SaveFile(const spb::tagreader::SaveFileRequest&) const {
   return false;
 }
 
@@ -286,7 +287,7 @@ QByteArray TagReaderGME::LoadEmbeddedArt(const QString&) const {
   return QByteArray();
 }
 
-bool TagReaderGME::SaveEmbeddedArt(const QString&, const QByteArray&) {
+bool TagReaderGME::SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtRequest&) const {
   return false;
 }
 

ext/libstrawberry-tagreader/tagreadergme.h

@@ -55,14 +55,22 @@ constexpr int XID6_OFFSET = (0x101C0 + 64);
 
 constexpr int NANO_PER_MS = 1000000;
 
-enum xID6_STATUS {
+enum class xID6_STATUS {
   ON = 0x26,
-  OFF = 0x27,
+  OFF = 0x27
 };
 
-enum xID6_ID { SongName = 0x01, GameName = 0x02, ArtistName = 0x03 };
+enum class xID6_ID {
+  SongName = 0x01,
+  GameName = 0x02,
+  ArtistName = 0x03
+};
 
-enum xID6_TYPE { Length = 0x0, String = 0x1, Integer = 0x4 };
+enum class xID6_TYPE {
+  Length = 0x0,
+  String = 0x1,
+  Integer = 0x4
+};
 
 void Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
 qint16 GetNextMemAddressAlign32bit(qint16 input);
@@ -99,13 +107,13 @@ class TagReaderGME : public TagReaderBase {
   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;
+  bool SaveFile(const spb::tagreader::SaveFileRequest &request) const override;
 
   QByteArray LoadEmbeddedArt(const QString &filename) const override;
-  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+  bool SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtRequest &request) const 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
+#endif  // TAGREADERGME_H

ext/libstrawberry-tagreader/tagreadermessages.proto

@@ -69,29 +69,26 @@ message SongMetadata {
   optional int64 lastplayed = 29;
   optional int64 lastseen = 30;
 
-  optional string art_automatic = 31;
+  optional bool art_embedded = 31;
 
   optional float rating = 32;
 
-  optional bool suspicious_tags = 40;
+  optional string acoustid_id = 33;
+  optional string acoustid_fingerprint = 34;
 
-}
+  optional string musicbrainz_album_artist_id = 35;     // MusicBrainz Release Artist ID (MUSICBRAINZ_ALBUMARTISTID)
+  optional string musicbrainz_artist_id = 36;           // MusicBrainz Artist ID (MUSICBRAINZ_ARTISTID)
+  optional string musicbrainz_original_artist_id = 37;  // MusicBrainz Original Artist ID (MUSICBRAINZ_ORIGINALARTISTID)
+  optional string musicbrainz_album_id = 38;            // MusicBrainz Release ID (MUSICBRAINZ_ALBUMID)
+  optional string musicbrainz_original_album_id = 39;   // MusicBrainz Original Release ID (MUSICBRAINZ_ORIGINALALBUMID)
+  optional string musicbrainz_recording_id = 40;        // MusicBrainz Recording ID (MUSICBRAINZ_TRACKID)
+  optional string musicbrainz_track_id = 41;            // MusicBrainz Track ID (MUSICBRAINZ_RELEASETRACKID)
+  optional string musicbrainz_disc_id = 42;             // MusicBrainz Disc ID (MUSICBRAINZ_DISCID)
+  optional string musicbrainz_release_group_id = 43;    // MusicBrainz Release Group ID (MUSICBRAINZ_RELEASEGROUPID)
+  optional string musicbrainz_work_id = 44;             // MusicBrainz Work ID (MUSICBRAINZ_WORKID)
 
-message ReadFileRequest {
-  optional string filename = 1;
-}
+  optional bool suspicious_tags = 50;
 
-message ReadFileResponse {
-  optional SongMetadata metadata = 1;
-}
-
-message SaveFileRequest {
-  optional string filename = 1;
-  optional SongMetadata metadata = 2;
-}
-
-message SaveFileResponse {
-  optional bool success = 1;
 }
 
 message IsMediaFileRequest {
@@ -100,6 +97,33 @@ message IsMediaFileRequest {
 
 message IsMediaFileResponse {
   optional bool success = 1;
+  optional string error = 2;
+}
+
+message ReadFileRequest {
+  optional string filename = 1;
+}
+
+message ReadFileResponse {
+  optional SongMetadata metadata = 1;
+  optional string error = 2;
+}
+
+message SaveFileRequest {
+  optional string filename = 1;
+  optional bool save_tags = 2;
+  optional bool save_playcount = 3;
+  optional bool save_rating = 4;
+  optional bool save_cover = 5;
+  optional SongMetadata metadata = 6;
+  optional string cover_filename = 7;
+  optional bytes cover_data = 8;
+  optional string cover_mime_type = 9;
+}
+
+message SaveFileResponse {
+  optional bool success = 1;
+  optional string error = 2;
 }
 
 message LoadEmbeddedArtRequest {
@@ -108,15 +132,19 @@ message LoadEmbeddedArtRequest {
 
 message LoadEmbeddedArtResponse {
   optional bytes data = 1;
+  optional string error = 2;
 }
 
 message SaveEmbeddedArtRequest {
   optional string filename = 1;
-  optional bytes data = 2;
+  optional string cover_filename = 2;
+  optional bytes cover_data = 3;
+  optional string cover_mime_type = 4;
 }
 
 message SaveEmbeddedArtResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message SaveSongPlaycountToFileRequest {
@@ -126,6 +154,7 @@ message SaveSongPlaycountToFileRequest {
 
 message SaveSongPlaycountToFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message SaveSongRatingToFileRequest {
@@ -135,6 +164,7 @@ message SaveSongRatingToFileRequest {
 
 message SaveSongRatingToFileResponse {
   optional bool success = 1;
+  optional string error = 2;
 }
 
 message Message {

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -1,6 +1,6 @@
 /* This file is part of Strawberry.
    Copyright 2013, David Sansome <me@davidsansome.com>
-   Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+   Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
 
    Strawberry is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,8 +29,12 @@
 #include <taglib/tstring.h>
 #include <taglib/fileref.h>
 #include <taglib/xiphcomment.h>
+#include <taglib/flacfile.h>
+#include <taglib/mpegfile.h>
+#include <taglib/mp4file.h>
 #include <taglib/apetag.h>
 #include <taglib/apefile.h>
+#include <taglib/asffile.h>
 #include <taglib/id3v2tag.h>
 #include <taglib/popularimeterframe.h>
 
@@ -51,15 +55,15 @@ class TagReaderTagLib : public TagReaderBase {
   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;
+  bool SaveFile(const spb::tagreader::SaveFileRequest &request) const override;
 
   QByteArray LoadEmbeddedArt(const QString &filename) const override;
-  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+  bool SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtRequest &request) const 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;
 
-  static void Decode(const TagLib::String &tag, std::string *output);
+  static void TStringToStdString(const TagLib::String &tag, std::string *output);
 
  private:
   spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
@@ -67,7 +71,7 @@ class TagReaderTagLib : public TagReaderBase {
   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;
 
-  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comment, const spb::tagreader::SongMetadata &song) const;
   void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
 
   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
@@ -80,6 +84,23 @@ class TagReaderTagLib : public TagReaderBase {
 
   static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag *tag);
 
+  void SetPlaycount(TagLib::Ogg::XiphComment *xiph_comment, const spb::tagreader::SongMetadata &song) const;
+  void SetPlaycount(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetPlaycount(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetPlaycount(TagLib::MP4::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetPlaycount(TagLib::ASF::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+
+  void SetRating(TagLib::Ogg::XiphComment *xiph_comment, const spb::tagreader::SongMetadata &song) const;
+  void SetRating(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetRating(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetRating(TagLib::MP4::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SetRating(TagLib::ASF::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+
+  void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const;
+
  private:
   FileRefFactory *factory_;
 

ext/libstrawberry-tagreader/tagreadertagparser.cpp

@@ -22,6 +22,7 @@
 #include <string>
 #include <memory>
 #include <algorithm>
+#include <vector>
 #include <sys/stat.h>
 
 #include <tagparser/mediafileinfo.h>
@@ -41,7 +42,7 @@
 
 #include "core/logging.h"
 #include "core/messagehandler.h"
-#include "core/timeconstants.h"
+#include "utilities/timeconstants.h"
 
 TagReaderTagParser::TagReaderTagParser() = default;
 
@@ -79,7 +80,7 @@ bool TagReaderTagParser::IsMediaFile(const QString &filename) const {
     }
 
     const auto tracks = taginfo.tracks();
-    for (const auto track : tracks) {
+    for (TagParser::AbstractTrack *track : tracks) {
       if (track->mediaType() == TagParser::MediaType::Audio) {
         taginfo.close();
         return true;
@@ -102,16 +103,14 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
   if (!fileinfo.exists() || fileinfo.suffix().compare("bak", Qt::CaseInsensitive) == 0) return false;
 
   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
+  const QByteArray basefilename = fileinfo.fileName().toUtf8();
 
-  song->set_basefilename(DataCommaSizeFromQString(fileinfo.fileName()));
+  song->set_basefilename(basefilename.constData(), basefilename.size());
   song->set_url(url.constData(), url.size());
   song->set_filesize(fileinfo.size());
+
   song->set_mtime(fileinfo.lastModified().isValid() ? std::max(fileinfo.lastModified().toSecsSinceEpoch(), 0LL) : 0LL);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 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() ? 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());
@@ -154,8 +153,8 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
       qLog(Debug) << QString::fromStdString(msg.message());
     }
 
-    const auto tracks = taginfo.tracks();
-    for (const auto track : tracks) {
+    std::vector<TagParser::AbstractTrack*> tracks = taginfo.tracks();
+    for (TagParser::AbstractTrack *track : tracks) {
       switch (track->format().general) {
         case TagParser::GeneralMediaFormat::Flac:
           song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_FLAC);
@@ -209,7 +208,7 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
       return false;
     }
 
-    for (const auto tag : taginfo.tags()) {
+    for (TagParser::Tag *tag : taginfo.tags()) {
       song->set_albumartist(tag->value(TagParser::KnownField::AlbumArtist).toString(TagParser::TagTextEncoding::Utf8));
       song->set_artist(tag->value(TagParser::KnownField::Artist).toString(TagParser::TagTextEncoding::Utf8));
       song->set_album(tag->value(TagParser::KnownField::Album).toString(TagParser::TagTextEncoding::Utf8));
@@ -225,7 +224,7 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
       song->set_track(tag->value(TagParser::KnownField::TrackPosition).toInteger());
       song->set_disc(tag->value(TagParser::KnownField::DiskPosition).toInteger());
       if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
-        song->set_art_automatic(kEmbeddedCover);
+        song->set_art_embedded(true);
       }
       const float rating = ConvertPOPMRating(tag->value(TagParser::KnownField::Rating));
       if (song->rating() <= 0 && rating > 0.0 && rating <= 1.0) {
@@ -256,11 +255,34 @@ bool TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
 
 }
 
-bool TagReaderTagParser::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
+bool TagReaderTagParser::SaveFile(const spb::tagreader::SaveFileRequest &request) const {
 
-  if (filename.isEmpty()) return false;
+  if (request.filename().empty()) return false;
 
-  qLog(Debug) << "Saving tags to" << filename;
+  const QString filename = QString::fromUtf8(request.filename().data(), request.filename().size());
+  const spb::tagreader::SongMetadata song = request.metadata();
+  const bool save_tags = request.has_save_tags() && request.save_tags();
+  const bool save_playcount = request.has_save_playcount() && request.save_playcount();
+  const bool save_rating = request.has_save_rating() && request.save_rating();
+  const bool save_cover = request.has_save_cover() && request.save_cover();
+
+  QStringList save_tags_options;
+  if (save_tags) {
+    save_tags_options << "tags";
+  }
+  if (save_playcount) {
+    save_tags_options << "playcount";
+  }
+  if (save_rating) {
+    save_tags_options << "rating";
+  }
+  if (save_cover) {
+    save_tags_options << "embedded cover";
+  }
+
+  qLog(Debug) << "Saving" << save_tags_options.join(", ") << "to" << filename;
+
+  const QByteArray cover_data = LoadCoverDataFromRequest(request);
 
   try {
     TagParser::MediaFileInfo taginfo;
@@ -295,22 +317,34 @@ bool TagReaderTagParser::SaveFile(const QString &filename, const spb::tagreader:
       taginfo.createAppropriateTags();
     }
 
-    for (const auto tag : taginfo.tags()) {
-      tag->setValue(TagParser::KnownField::AlbumArtist, TagParser::TagValue(song.albumartist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Artist, TagParser::TagValue(song.artist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Album, TagParser::TagValue(song.album(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Title, TagParser::TagValue(song.title(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Genre, TagParser::TagValue(song.genre(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Composer, TagParser::TagValue(song.composer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Performers, TagParser::TagValue(song.performer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Grouping, TagParser::TagValue(song.grouping(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Comment, TagParser::TagValue(song.comment(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::Lyrics, TagParser::TagValue(song.lyrics(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
-      tag->setValue(TagParser::KnownField::TrackPosition, TagParser::TagValue(song.track()));
-      tag->setValue(TagParser::KnownField::DiskPosition, TagParser::TagValue(song.disc()));
-      tag->setValue(TagParser::KnownField::RecordDate, TagParser::TagValue(song.year()));
-      tag->setValue(TagParser::KnownField::ReleaseDate, TagParser::TagValue(song.originalyear()));
+    for (TagParser::Tag *tag : taginfo.tags()) {
+      if (save_tags) {
+        tag->setValue(TagParser::KnownField::AlbumArtist, TagParser::TagValue(song.albumartist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Artist, TagParser::TagValue(song.artist(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Album, TagParser::TagValue(song.album(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Title, TagParser::TagValue(song.title(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Genre, TagParser::TagValue(song.genre(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Composer, TagParser::TagValue(song.composer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Performers, TagParser::TagValue(song.performer(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Grouping, TagParser::TagValue(song.grouping(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Comment, TagParser::TagValue(song.comment(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::Lyrics, TagParser::TagValue(song.lyrics(), TagParser::TagTextEncoding::Utf8, tag->proposedTextEncoding()));
+        tag->setValue(TagParser::KnownField::TrackPosition, TagParser::TagValue(song.track()));
+        tag->setValue(TagParser::KnownField::DiskPosition, TagParser::TagValue(song.disc()));
+        tag->setValue(TagParser::KnownField::RecordDate, TagParser::TagValue(song.year()));
+        tag->setValue(TagParser::KnownField::ReleaseDate, TagParser::TagValue(song.originalyear()));
+      }
+      if (save_playcount) {
+        SaveSongPlaycountToFile(tag, song);
+      }
+      if (save_rating) {
+        SaveSongRatingToFile(tag, song);
+      }
+      if (save_cover) {
+        SaveEmbeddedArt(tag, cover_data);
+      }
     }
+
     taginfo.applyChanges(diag, progress);
     taginfo.close();
 
@@ -358,7 +392,7 @@ QByteArray TagReaderTagParser::LoadEmbeddedArt(const QString &filename) const {
       return QByteArray();
     }
 
-    for (const auto tag : taginfo.tags()) {
+    for (TagParser::Tag *tag : taginfo.tags()) {
       if (!tag->value(TagParser::KnownField::Cover).empty() && tag->value(TagParser::KnownField::Cover).dataSize() > 0) {
         QByteArray data(tag->value(TagParser::KnownField::Cover).dataPointer(), tag->value(TagParser::KnownField::Cover).dataSize());
         taginfo.close();
@@ -379,12 +413,22 @@ QByteArray TagReaderTagParser::LoadEmbeddedArt(const QString &filename) const {
 
 }
 
-bool TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const QByteArray &data) {
+void TagReaderTagParser::SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const {
 
-  if (filename.isEmpty()) return false;
+  tag->setValue(TagParser::KnownField::Cover, TagParser::TagValue(data.toStdString()));
+
+}
+
+bool TagReaderTagParser::SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtRequest &request) const {
+
+  if (request.filename().empty()) return false;
+
+  const QString filename = QString::fromUtf8(request.filename().data(), request.filename().size());
 
   qLog(Debug) << "Saving art to" << filename;
 
+  const QByteArray cover_data = LoadCoverDataFromRequest(request);
+
   try {
 
     TagParser::MediaFileInfo taginfo;
@@ -415,8 +459,8 @@ bool TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const QByteArr
       taginfo.createAppropriateTags();
     }
 
-    for (const auto tag : taginfo.tags()) {
-      tag->setValue(TagParser::KnownField::Cover, TagParser::TagValue(data.toStdString()));
+    for (TagParser::Tag *tag : taginfo.tags()) {
+      SaveEmbeddedArt(tag, cover_data);
     }
 
     taginfo.applyChanges(diag, progress);
@@ -435,8 +479,16 @@ bool TagReaderTagParser::SaveEmbeddedArt(const QString &filename, const QByteArr
 
 }
 
+void TagReaderTagParser::SaveSongPlaycountToFile(TagParser::Tag*, const spb::tagreader::SongMetadata&) const {}
+
 bool TagReaderTagParser::SaveSongPlaycountToFile(const QString&, const spb::tagreader::SongMetadata&) const { return false; }
 
+void TagReaderTagParser::SaveSongRatingToFile(TagParser::Tag *tag, const spb::tagreader::SongMetadata &song) const {
+
+  tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(ConvertToPOPMRating(song.rating())));
+
+}
+
 bool TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
 
     if (filename.isEmpty()) return false;
@@ -476,9 +528,10 @@ bool TagReaderTagParser::SaveSongRatingToFile(const QString &filename, const spb
         taginfo.createAppropriateTags();
       }
 
-      for (const auto tag : taginfo.tags()) {
-        tag->setValue(TagParser::KnownField::Rating, TagParser::TagValue(ConvertToPOPMRating(song.rating())));
+      for (TagParser::Tag *tag : taginfo.tags()) {
+        SaveSongRatingToFile(tag, song);
       }
+
       taginfo.applyChanges(diag, progress);
       taginfo.close();
 

ext/libstrawberry-tagreader/tagreadertagparser.h

@@ -22,6 +22,8 @@
 
 #include <string>
 
+#include <tagparser/tag.h>
+
 #include <QByteArray>
 #include <QString>
 
@@ -40,14 +42,20 @@ class TagReaderTagParser : public TagReaderBase {
   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;
+  bool SaveFile(const spb::tagreader::SaveFileRequest &request) const override;
 
   QByteArray LoadEmbeddedArt(const QString &filename) const override;
-  bool SaveEmbeddedArt(const QString &filename, const QByteArray &data) override;
+  bool SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtRequest &request) const 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;
 
+ private:
+  void SaveSongPlaycountToFile(TagParser::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SaveSongRatingToFile(TagParser::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+  void SaveEmbeddedArt(TagParser::Tag *tag, const QByteArray &data) const;
+
+ public:
   Q_DISABLE_COPY(TagReaderTagParser)
 };
 

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;
@@ -130,9 +130,6 @@ int main(int argc, char **argv) {
         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.
-          continue;
-        }
         else {
           qLog(Error) << "File" << filepath << "points to" << library;
           success = false;
@@ -140,7 +137,7 @@ int main(int argc, char **argv) {
       }
       else {
         qLog(Error) << "Could not parse otool output line:" << output_line;
-        continue;
+        success = false;
       }
     }
   }

ext/strawberry-tagreader/main.cpp

@@ -20,9 +20,6 @@
 
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-#  include <sys/time.h>
-#endif
 #include <iostream>
 
 #include <QCoreApplication>
@@ -46,13 +43,6 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  // Seed random number generator
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-  timeval time;
-  gettimeofday(&time, nullptr);
-  qsrand((time.tv_sec * 1000) + (time.tv_usec / 1000));
-#endif
-
   logging::Init();
   qLog(Info) << "TagReader worker connecting to" << args[1];
 
@@ -67,4 +57,5 @@ int main(int argc, char **argv) {
   TagReaderWorker worker(&socket);
 
   return a.exec();
+  
 }

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -56,36 +56,41 @@ void TagReaderWorker::DeviceClosed() {
 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()));
+    const QString filename = QString::fromUtf8(message.is_media_file_request().filename().data(), static_cast<qint64>(message.is_media_file_request().filename().size()));
+    bool success = reader->IsMediaFile(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());
+    const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.read_file_request().filename().size())));
+    bool success = reader->ReadFile(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());
+    bool success = reader->SaveFile(message.save_file_request());
     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()));
+    const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.load_embedded_art_request().filename().size())));
+    QByteArray data = reader->LoadEmbeddedArt(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())));
+    bool success = reader->SaveEmbeddedArt(message.save_embedded_art_request());
     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());
+    const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.save_song_playcount_to_file_request().filename().size())));
+    bool success = reader->SaveSongPlaycountToFile(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());
+    const QString filename = QString::fromUtf8(message.save_song_rating_to_file_request().filename().data(), static_cast<qint64>(message.save_song_rating_to_file_request().filename().size()));
+    bool success = reader->SaveSongRatingToFile(filename, message.save_song_rating_to_file_request().metadata());
     reply.mutable_save_song_rating_to_file_response()->set_success(success);
     return success;
   }

src/CMakeLists.txt

@@ -7,7 +7,6 @@ endif()
 set(SOURCES
   core/mainwindow.cpp
   core/application.cpp
-  core/appearance.cpp
   core/player.cpp
   core/commandlineoptions.cpp
   core/database.cpp
@@ -35,18 +34,35 @@ set(SOURCES
   core/taskmanager.cpp
   core/thread.cpp
   core/urlhandler.cpp
-  core/utilities.cpp
-  core/imageutils.cpp
   core/iconloader.cpp
   core/standarditemiconloader.cpp
   core/scopedtransaction.cpp
   core/translations.cpp
   core/systemtrayicon.cpp
 
-  engine/enginetype.cpp
+  utilities/strutils.cpp
+  utilities/envutils.cpp
+  utilities/colorutils.cpp
+  utilities/cryptutils.cpp
+  utilities/fileutils.cpp
+  utilities/diskutils.cpp
+  utilities/imageutils.cpp
+  utilities/macaddrutils.cpp
+  utilities/mimeutils.cpp
+  utilities/randutils.cpp
+  utilities/threadutils.cpp
+  utilities/timeutils.cpp
+  utilities/transliterate.cpp
+  utilities/xmlutils.cpp
+  utilities/filemanagerutils.cpp
+  utilities/coverutils.cpp
+  utilities/screenutils.cpp
+
   engine/enginebase.cpp
+  engine/enginedevice.cpp
   engine/devicefinders.cpp
   engine/devicefinder.cpp
+  engine/enginemetadata.cpp
 
   analyzer/fht.cpp
   analyzer/analyzerbase.cpp
@@ -54,6 +70,7 @@ set(SOURCES
   analyzer/blockanalyzer.cpp
   analyzer/boomanalyzer.cpp
   analyzer/rainbowanalyzer.cpp
+  analyzer/sonogram.cpp
 
   equalizer/equalizer.cpp
   equalizer/equalizerslider.cpp
@@ -69,9 +86,11 @@ set(SOURCES
   collection/collectionitemdelegate.cpp
   collection/collectionviewcontainer.cpp
   collection/collectiondirectorymodel.cpp
+  collection/collectionfilteroptions.cpp
   collection/collectionfilterwidget.cpp
   collection/collectionplaylistitem.cpp
   collection/collectionquery.cpp
+  collection/collectionqueryoptions.cpp
   collection/savedgroupingmanager.cpp
   collection/groupbydialog.cpp
   collection/collectiontask.cpp
@@ -128,6 +147,7 @@ set(SOURCES
   covermanager/albumcovermanager.cpp
   covermanager/albumcovermanagerlist.cpp
   covermanager/albumcoverloader.cpp
+  covermanager/albumcoverloaderoptions.cpp
   covermanager/albumcoverfetcher.cpp
   covermanager/albumcoverfetchersearch.cpp
   covermanager/albumcoversearcher.cpp
@@ -152,15 +172,19 @@ set(SOURCES
 
   lyrics/lyricsproviders.cpp
   lyrics/lyricsprovider.cpp
+  lyrics/lyricssearchrequest.h
+  lyrics/lyricssearchresult.h
   lyrics/lyricsfetcher.cpp
   lyrics/lyricsfetchersearch.cpp
   lyrics/jsonlyricsprovider.cpp
-  lyrics/auddlyricsprovider.cpp
   lyrics/ovhlyricsprovider.cpp
   lyrics/lololyricsprovider.cpp
   lyrics/geniuslyricsprovider.cpp
   lyrics/musixmatchlyricsprovider.cpp
   lyrics/chartlyricsprovider.cpp
+  lyrics/lyricscomlyricsprovider.cpp
+
+  providers/musixmatchprovider.cpp
 
   settings/settingsdialog.cpp
   settings/settingspage.cpp
@@ -185,6 +209,7 @@ set(SOURCES
   dialogs/userpassdialog.cpp
   dialogs/deleteconfirmationdialog.cpp
   dialogs/lastfmimportdialog.cpp
+  dialogs/messagedialog.cpp
   dialogs/snapdialog.cpp
   dialogs/saveplaylistsdialog.cpp
 
@@ -203,6 +228,8 @@ set(SOURCES
   widgets/multiloadingindicator.cpp
   widgets/playingwidget.cpp
   widgets/renametablineedit.cpp
+  widgets/sliderslider.cpp
+  widgets/prettyslider.cpp
   widgets/volumeslider.cpp
   widgets/stickyslider.cpp
   widgets/stretchheaderview.cpp
@@ -242,10 +269,10 @@ set(SOURCES
   radios/radioparadiseservice.cpp
 
   scrobbler/audioscrobbler.cpp
-  scrobbler/scrobblerservices.cpp
   scrobbler/scrobblerservice.cpp
   scrobbler/scrobblercache.cpp
   scrobbler/scrobblercacheitem.cpp
+  scrobbler/scrobblemetadata.cpp
   scrobbler/scrobblingapi20.cpp
   scrobbler/lastfmscrobbler.cpp
   scrobbler/librefmscrobbler.cpp
@@ -262,7 +289,6 @@ set(SOURCES
 set(HEADERS
   core/mainwindow.h
   core/application.h
-  core/appearance.h
   core/player.h
   core/database.h
   core/deletefiles.h
@@ -292,6 +318,7 @@ set(HEADERS
   analyzer/blockanalyzer.h
   analyzer/boomanalyzer.h
   analyzer/rainbowanalyzer.h
+  analyzer/sonogram.h
 
   equalizer/equalizer.h
   equalizer/equalizerslider.h
@@ -387,12 +414,12 @@ set(HEADERS
   lyrics/lyricsfetcher.h
   lyrics/lyricsfetchersearch.h
   lyrics/jsonlyricsprovider.h
-  lyrics/auddlyricsprovider.h
   lyrics/ovhlyricsprovider.h
   lyrics/lololyricsprovider.h
   lyrics/geniuslyricsprovider.h
   lyrics/musixmatchlyricsprovider.h
   lyrics/chartlyricsprovider.h
+  lyrics/lyricscomlyricsprovider.h
 
   settings/settingsdialog.h
   settings/settingspage.h
@@ -417,6 +444,7 @@ set(HEADERS
   dialogs/userpassdialog.h
   dialogs/deleteconfirmationdialog.h
   dialogs/lastfmimportdialog.h
+  dialogs/messagedialog.h
   dialogs/snapdialog.h
   dialogs/saveplaylistsdialog.h
 
@@ -434,6 +462,8 @@ set(HEADERS
   widgets/multiloadingindicator.h
   widgets/playingwidget.h
   widgets/renametablineedit.h
+  widgets/sliderslider.h
+  widgets/prettyslider.h
   widgets/volumeslider.h
   widgets/stickyslider.h
   widgets/stretchheaderview.h
@@ -444,7 +474,6 @@ set(HEADERS
   widgets/qsearchfield.h
   widgets/ratingwidget.h
   widgets/forcescrollperpixel.h
-  widgets/resizabletextedit.h
 
   osd/osdbase.h
   osd/osdpretty.h
@@ -473,10 +502,8 @@ set(HEADERS
   radios/radioparadiseservice.h
 
   scrobbler/audioscrobbler.h
-  scrobbler/scrobblerservices.h
   scrobbler/scrobblerservice.h
   scrobbler/scrobblercache.h
-  scrobbler/scrobblercacheitem.h
   scrobbler/scrobblingapi20.h
   scrobbler/lastfmscrobbler.h
   scrobbler/librefmscrobbler.h
@@ -543,7 +570,7 @@ set(UI
   dialogs/addstreamdialog.ui
   dialogs/userpassdialog.ui
   dialogs/lastfmimportdialog.ui
-  dialogs/snapdialog.ui
+  dialogs/messagedialog.ui
   dialogs/saveplaylistsdialog.ui
 
   widgets/trackslider.ui
@@ -570,7 +597,7 @@ option(USE_INSTALL_PREFIX "Look for data in CMAKE_INSTALL_PREFIX" ON)
 
 if(NOT APPLE)
   set(NOT_APPLE ON)
-  optional_source(NOT_APPLE SOURCES widgets/qsearchfield_nonmac.cpp core/qtsystemtrayicon.cpp HEADERS core/qtsystemtrayicon.h)
+  optional_source(NOT_APPLE SOURCES widgets/qsearchfield_qt.cpp core/qtsystemtrayicon.cpp HEADERS core/qtsystemtrayicon.h)
 endif()
 
 if(HAVE_GLOBALSHORTCUTS)
@@ -610,43 +637,42 @@ optional_source(HAVE_VLC SOURCES engine/vlcengine.cpp HEADERS engine/vlcengine.h
 
 # DBUS and MPRIS - Unix specific
 if(UNIX AND HAVE_DBUS)
-  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
 
   optional_source(HAVE_DBUS SOURCES core/mpris2.cpp HEADERS core/mpris2.h)
   optional_source(HAVE_UDISKS2 SOURCES device/udisks2lister.cpp HEADERS device/udisks2lister.h)
 
   # MPRIS 2.0 DBUS interfaces
-  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Player.xml core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
-  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.xml core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root)
-  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.TrackList.xml core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Player.xml core/mpris2.h mpris::Mpris2 mpris2_player Mpris2Player)
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.xml core/mpris2.h mpris::Mpris2 mpris2_root Mpris2Root)
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.TrackList.xml core/mpris2.h mpris::Mpris2 mpris2_tracklist Mpris2TrackList)
 
   # MPRIS 2.1 DBUS interfaces
-  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Playlists.xml core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
+  qt_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Playlists.xml core/mpris2.h mpris::Mpris2 mpris2_playlists Mpris2Playlists)
 
   # org.freedesktop.Notifications DBUS interface
-  qt_add_dbus_interface(SOURCES dbus/org.freedesktop.Notifications.xml dbus/notification)
+  qt_add_dbus_interface(SOURCES dbus/org.freedesktop.Notifications.xml notification)
 
   # org.gnome.SettingsDaemon interface
-  qt_add_dbus_interface(SOURCES dbus/org.gnome.SettingsDaemon.MediaKeys.xml dbus/gnomesettingsdaemon)
+  qt_add_dbus_interface(SOURCES dbus/org.gnome.SettingsDaemon.MediaKeys.xml gnomesettingsdaemon)
 
   # org.mate.SettingsDaemon interface
-  qt_add_dbus_interface(SOURCES dbus/org.mate.SettingsDaemon.MediaKeys.xml dbus/matesettingsdaemon)
+  qt_add_dbus_interface(SOURCES dbus/org.mate.SettingsDaemon.MediaKeys.xml matesettingsdaemon)
 
   # org.kde.KGlobalAccel interface
-  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.xml dbus/kglobalaccel)
-  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.Component.xml dbus/kglobalaccelcomponent)
+  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.xml kglobalaccel)
+  qt_add_dbus_interface(SOURCES dbus/org.kde.KGlobalAccel.Component.xml kglobalaccelcomponent)
 
   if(HAVE_UDISKS2)
-    set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml PROPERTIES NO_NAMESPACE dbus/objectmanager INCLUDE dbus/metatypes.h)
-    set_source_files_properties(dbus/org.freedesktop.UDisks2.Filesystem.xml PROPERTIES NO_NAMESPACE dbus/udisks2filesystem INCLUDE dbus/metatypes.h)
-    set_source_files_properties(dbus/org.freedesktop.UDisks2.Block.xml PROPERTIES NO_NAMESPACE dbus/udisks2block INCLUDE dbus/metatypes.h)
-    set_source_files_properties(dbus/org.freedesktop.UDisks2.Drive.xml PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h)
-    set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h)
-    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.DBus.ObjectManager.xml dbus/objectmanager)
-    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Filesystem.xml dbus/udisks2filesystem)
-    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Block.xml dbus/udisks2block)
-    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Drive.xml dbus/udisks2drive)
-    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Job.xml dbus/udisks2job)
+    set_source_files_properties(dbus/org.freedesktop.DBus.ObjectManager.xml PROPERTIES NO_NAMESPACE objectmanager INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Filesystem.xml PROPERTIES NO_NAMESPACE udisks2filesystem INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Block.xml PROPERTIES NO_NAMESPACE udisks2block INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Drive.xml PROPERTIES NO_NAMESPACE udisks2drive INCLUDE dbus/metatypes.h)
+    set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml PROPERTIES NO_NAMESPACE udisks2job INCLUDE dbus/metatypes.h)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.DBus.ObjectManager.xml objectmanager)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Filesystem.xml udisks2filesystem)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Block.xml udisks2block)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Drive.xml udisks2drive)
+    qt_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks2.Job.xml udisks2job)
   endif(HAVE_UDISKS2)
 
 endif(UNIX AND HAVE_DBUS)
@@ -782,8 +808,8 @@ optional_source(HAVE_AUDIOCD
 # Platform specific - macOS
 optional_source(APPLE
   SOURCES
+    utilities/macosutils.mm
     core/scoped_nsautorelease_pool.mm
-    core/mac_utilities.mm
     core/mac_startup.mm
     core/macsystemtrayicon.mm
     core/macfslistener.mm
@@ -804,12 +830,15 @@ optional_source(APPLE
 # Platform specific - Windows
 optional_source(WIN32
   SOURCES
+    utilities/winutils.cpp
     engine/directsounddevicefinder.cpp
     engine/mmdevicefinder.cpp
+    core/scopedwchararray.cpp
     core/windows7thumbbar.cpp
   HEADERS
     core/windows7thumbbar.h
 )
+optional_source(MSVC SOURCES engine/uwpdevicefinder.cpp)
 
 optional_source(HAVE_SUBSONIC
   SOURCES
@@ -942,8 +971,8 @@ link_directories(
   ${GOBJECT_LIBRARY_DIRS}
   ${GNUTLS_LIBRARY_DIRS}
   ${SQLITE_LIBRARY_DIRS}
+  ${PROTOBUF_LIBRARY_DIRS}
   ${SINGLEAPPLICATION_LIBRARY_DIRS}
-  ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
 )
 
 if(HAVE_ICU)
@@ -1051,7 +1080,6 @@ target_include_directories(strawberry_lib PUBLIC
   ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
   ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
   ${SINGLEAPPLICATION_INCLUDE_DIRS}
-  ${SINGLECOREAPPLICATION_INCLUDE_DIRS}
 )
 
 target_link_libraries(strawberry_lib PUBLIC
@@ -1061,8 +1089,8 @@ target_link_libraries(strawberry_lib PUBLIC
   ${GNUTLS_LIBRARIES}
   ${SQLITE_LIBRARIES}
   ${QT_LIBRARIES}
+  ${Protobuf_LIBRARIES}
   ${SINGLEAPPLICATION_LIBRARIES}
-  ${SINGLECOREAPPLICATION_LIBRARIES}
   libstrawberry-common
   libstrawberry-tagreader
 )
@@ -1172,13 +1200,13 @@ 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()
+    target_link_libraries(strawberry_lib PRIVATE WindowsApp)
+  endif()
+  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()
 

src/analyzer/analyzerbase.cpp

@@ -50,7 +50,7 @@
 // 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
 
-Analyzer::Base::Base(QWidget *parent, const uint scopeSize)
+AnalyzerBase::AnalyzerBase(QWidget *parent, const uint scopeSize)
     : QWidget(parent),
       fht_(new FHT(scopeSize)),
       engine_(nullptr),
@@ -63,19 +63,19 @@ Analyzer::Base::Base(QWidget *parent, const uint scopeSize)
 
 }
 
-Analyzer::Base::~Base() {
+AnalyzerBase::~AnalyzerBase() {
   delete fht_;
 }
 
-void Analyzer::Base::showEvent(QShowEvent*) {
+void AnalyzerBase::showEvent(QShowEvent*) {
   timer_.start(timeout(), this);
 }
 
-void Analyzer::Base::hideEvent(QHideEvent*) {
+void AnalyzerBase::hideEvent(QHideEvent*) {
   timer_.stop();
 }
 
-void Analyzer::Base::ChangeTimeout(const int timeout) {
+void AnalyzerBase::ChangeTimeout(const int timeout) {
 
   timeout_ = timeout;
   if (timer_.isActive()) {
@@ -85,7 +85,7 @@ void Analyzer::Base::ChangeTimeout(const int timeout) {
 
 }
 
-void Analyzer::Base::transform(Scope &scope) {
+void AnalyzerBase::transform(Scope &scope) {
 
   QVector<float> aux(fht_->size());
   if (static_cast<unsigned long int>(aux.size()) >= scope.size()) {
@@ -102,14 +102,14 @@ void Analyzer::Base::transform(Scope &scope) {
 
 }
 
-void Analyzer::Base::paintEvent(QPaintEvent *e) {
+void AnalyzerBase::paintEvent(QPaintEvent *e) {
 
   QPainter p(this);
   p.fillRect(e->rect(), palette().color(QPalette::Window));
 
   switch (engine_->state()) {
-    case Engine::Playing: {
-      const Engine::Scope &thescope = engine_->scope(timeout_);
+    case EngineBase::State::Playing: {
+      const EngineBase::Scope &thescope = engine_->scope(timeout_);
       int i = 0;
 
       // convert to mono here - our built in analyzers need mono, but the engines provide interleaved pcm
@@ -126,7 +126,7 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
 
       break;
     }
-    case Engine::Paused:
+    case EngineBase::State::Paused:
       is_playing_ = false;
       analyze(p, lastscope_, new_frame_);
       break;
@@ -140,7 +140,7 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
 
 }
 
-int Analyzer::Base::resizeExponent(int exp) {
+int AnalyzerBase::resizeExponent(int exp) {
 
   if (exp < 3) {
     exp = 3;
@@ -157,7 +157,7 @@ int Analyzer::Base::resizeExponent(int exp) {
 
 }
 
-int Analyzer::Base::resizeForBands(const int bands) {
+int AnalyzerBase::resizeForBands(const int bands) {
 
   int exp = 0;
   if (bands <= 8) {
@@ -184,7 +184,7 @@ int Analyzer::Base::resizeForBands(const int bands) {
 
 }
 
-void Analyzer::Base::demo(QPainter &p) {
+void AnalyzerBase::demo(QPainter &p) {
 
   static int t = 201;  // FIXME make static to namespace perhaps
 
@@ -209,7 +209,7 @@ void Analyzer::Base::demo(QPainter &p) {
 
 }
 
-void Analyzer::interpolate(const Scope &inVec, Scope &outVec) {
+void AnalyzerBase::interpolate(const Scope &inVec, Scope &outVec) {
 
   double pos = 0.0;
   const double step = static_cast<double>(inVec.size()) / static_cast<double>(outVec.size());
@@ -235,7 +235,7 @@ void Analyzer::interpolate(const Scope &inVec, Scope &outVec) {
 
 }
 
-void Analyzer::initSin(Scope &v, const uint size) {
+void AnalyzerBase::initSin(Scope &v, const uint size) {
 
   double step = (M_PI * 2) / size;
   double radian = 0;
@@ -247,7 +247,7 @@ void Analyzer::initSin(Scope &v, const uint size) {
 
 }
 
-void Analyzer::Base::timerEvent(QTimerEvent *e) {
+void AnalyzerBase::timerEvent(QTimerEvent *e) {
 
   QWidget::timerEvent(e);
   if (e->timerId() != timer_.timerId()) {

src/analyzer/analyzerbase.h

@@ -39,7 +39,6 @@
 #include <QPainter>
 
 #include "analyzer/fht.h"
-#include "engine/engine_fwd.h"
 #include "engine/enginebase.h"
 
 class QHideEvent;
@@ -47,15 +46,11 @@ class QShowEvent;
 class QPaintEvent;
 class QTimerEvent;
 
-namespace Analyzer {
-
-typedef std::vector<float> Scope;
-
-class Base : public QWidget {
+class AnalyzerBase : public QWidget {
   Q_OBJECT
 
  public:
-  ~Base() override;
+  ~AnalyzerBase() override;
 
   int timeout() const { return timeout_; }
 
@@ -66,7 +61,8 @@ class Base : public QWidget {
   virtual void framerateChanged() {}
 
  protected:
-  explicit Base(QWidget*, const uint scopeSize = 7);
+  using Scope = std::vector<float>;
+  explicit AnalyzerBase(QWidget*, const uint scopeSize = 7);
 
   void hideEvent(QHideEvent*) override;
   void showEvent(QShowEvent*) override;
@@ -80,6 +76,9 @@ class Base : public QWidget {
   virtual void analyze(QPainter &p, const Scope&, const bool new_frame) = 0;
   virtual void demo(QPainter &p);
 
+  void interpolate(const Scope&, Scope&);
+  void initSin(Scope&, const uint = 6000);
+
  protected:
   QBasicTimer timer_;
   FHT *fht_;
@@ -91,10 +90,5 @@ class Base : public QWidget {
   int timeout_;
 };
 
-void interpolate(const Scope&, Scope&);
-void initSin(Scope&, const uint = 6000);
-
-}  //  namespace Analyzer
-
 #endif  // ANALYZERBASE_H
 

src/analyzer/analyzercontainer.cpp

@@ -40,10 +40,10 @@
 #include "blockanalyzer.h"
 #include "boomanalyzer.h"
 #include "rainbowanalyzer.h"
+#include "sonogram.h"
 
 #include "core/logging.h"
 #include "engine/enginebase.h"
-#include "engine/enginetype.h"
 
 using namespace std::chrono_literals;
 
@@ -83,8 +83,9 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
   AddAnalyzerType<BlockAnalyzer>();
   AddAnalyzerType<BoomAnalyzer>();
-  AddAnalyzerType<Rainbow::NyanCatAnalyzer>();
-  AddAnalyzerType<Rainbow::RainbowDashAnalyzer>();
+  AddAnalyzerType<NyanCatAnalyzer>();
+  AddAnalyzerType<RainbowDashAnalyzer>();
+  AddAnalyzerType<Sonogram>();
 
   disable_action_ = context_menu_->addAction(tr("No analyzer"), this, &AnalyzerContainer::DisableAnalyzer);
   disable_action_->setCheckable(true);
@@ -102,7 +103,7 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
 void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
-  if (engine_->type() != Engine::EngineType::GStreamer) {
+  if (engine_->type() != EngineBase::Type::GStreamer) {
     return;
   }
 
@@ -148,7 +149,7 @@ void AnalyzerContainer::ChangeAnalyzer(const int id) {
   }
 
   delete current_analyzer_;
-  current_analyzer_ = qobject_cast<Analyzer::Base*>(instance);
+  current_analyzer_ = qobject_cast<AnalyzerBase*>(instance);
   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_;

src/analyzer/analyzercontainer.h

@@ -30,15 +30,13 @@
 #include <QAction>
 #include <QActionGroup>
 
-#include "engine/engine_fwd.h"
+#include "engine/enginebase.h"
 
 class QTimer;
 class QMouseEvent;
 class QWheelEvent;
 
-namespace Analyzer {
-class Base;
-}  // namespace Analyzer
+class AnalyzerBase;
 
 class AnalyzerContainer : public QWidget {
   Q_OBJECT
@@ -53,7 +51,7 @@ class AnalyzerContainer : public QWidget {
   static const char *kSettingsFramerate;
 
  signals:
-  void WheelEvent(int delta);
+  void WheelEvent(const int delta);
 
  protected:
   void mouseReleaseEvent(QMouseEvent*) override;
@@ -94,7 +92,7 @@ class AnalyzerContainer : public QWidget {
   QPoint last_click_pos_;
   bool ignore_next_click_;
 
-  Analyzer::Base *current_analyzer_;
+  AnalyzerBase *current_analyzer_;
   EngineBase *engine_;
 };
 

src/analyzer/blockanalyzer.cpp

@@ -46,7 +46,7 @@ const int BlockAnalyzer::kFadeSize = 90;
 const char *BlockAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Block analyzer");
 
 BlockAnalyzer::BlockAnalyzer(QWidget *parent)
-    : Analyzer::Base(parent, 9),
+    : AnalyzerBase(parent, 9),
       columns_(0),
       rows_(0),
       y_(0),
@@ -124,7 +124,7 @@ void BlockAnalyzer::framerateChanged() {
   determineStep();
 }
 
-void BlockAnalyzer::transform(Analyzer::Scope &s) {
+void BlockAnalyzer::transform(Scope &s) {
 
   for (uint x = 0; x < s.size(); ++x) s[x] *= 2;
 
@@ -136,7 +136,7 @@ void BlockAnalyzer::transform(Analyzer::Scope &s) {
 
 }
 
-void BlockAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
+void BlockAnalyzer::analyze(QPainter &p, const Scope &s, bool new_frame) {
 
   // y = 2 3 2 1 0 2
   //     . . . . # .
@@ -158,7 +158,7 @@ void BlockAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_fram
 
   QPainter canvas_painter(&canvas_);
 
-  Analyzer::interpolate(s, scope_);
+  interpolate(s, scope_);
 
   // Paint the background
   canvas_painter.drawPixmap(0, 0, background_);

src/analyzer/blockanalyzer.h

@@ -37,7 +37,7 @@
 class QWidget;
 class QResizeEvent;
 
-class BlockAnalyzer : public Analyzer::Base {
+class BlockAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
@@ -53,8 +53,8 @@ class BlockAnalyzer : public Analyzer::Base {
   static const char *kName;
 
  protected:
-  void transform(Analyzer::Scope&) override;
-  void analyze(QPainter &p, const Analyzer::Scope&, bool new_frame) override;
+  void transform(Scope&) override;
+  void analyze(QPainter &p, const Scope&, bool new_frame) override;
   void resizeEvent(QResizeEvent*) override;
   virtual void paletteChange(const QPalette&);
   void framerateChanged() override;
@@ -71,7 +71,7 @@ class BlockAnalyzer : public Analyzer::Base {
   QPixmap topbarpixmap_;
   QPixmap background_;
   QPixmap canvas_;
-  Analyzer::Scope scope_;  // so we don't create a vector every frame
+  Scope scope_;  // so we don't create a vector every frame
   QVector<double> store_;  // current bar heights
   QVector<double> yscale_;
 

src/analyzer/boomanalyzer.cpp

@@ -32,13 +32,10 @@
 #include <QPalette>
 #include <QColor>
 
-#include "engine/engine_fwd.h"
 #include "engine/enginebase.h"
 #include "fht.h"
 #include "analyzerbase.h"
 
-using Analyzer::Scope;
-
 const int BoomAnalyzer::kColumnWidth = 4;
 const int BoomAnalyzer::kMaxBandCount = 256;
 const int BoomAnalyzer::kMinBandCount = 32;
@@ -46,7 +43,7 @@ const int BoomAnalyzer::kMinBandCount = 32;
 const char *BoomAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Boom analyzer");
 
 BoomAnalyzer::BoomAnalyzer(QWidget *parent)
-    : Analyzer::Base(parent, 9),
+    : AnalyzerBase(parent, 9),
       bands_(0),
       scope_(kMinBandCount),
       fg_(palette().color(QPalette::Highlight)),
@@ -110,7 +107,7 @@ void BoomAnalyzer::transform(Scope &s) {
 
 void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame) {
 
-  if (!new_frame || engine_->state() == Engine::Paused) {
+  if (!new_frame || engine_->state() == EngineBase::State::Paused) {
     p.drawPixmap(0, 0, canvas_);
     return;
   }
@@ -120,7 +117,7 @@ void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame
   QPainter canvas_painter(&canvas_);
   canvas_.fill(palette().color(QPalette::Window));
 
-  Analyzer::interpolate(scope, scope_);
+  interpolate(scope, scope_);
 
   for (int i = 0, x = 0, y = 0; i < bands_; ++i, x += kColumnWidth + 1) {
     h = log10(scope_[i] * 256.0) * F_;

src/analyzer/boomanalyzer.h

@@ -36,7 +36,7 @@
 class QWidget;
 class QResizeEvent;
 
-class BoomAnalyzer : public Analyzer::Base {
+class BoomAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
@@ -44,8 +44,8 @@ class BoomAnalyzer : public Analyzer::Base {
 
   static const char *kName;
 
-  void transform(Analyzer::Scope &s) override;
-  void analyze(QPainter &p, const Analyzer::Scope&, const bool new_frame) override;
+  void transform(Scope &s) override;
+  void analyze(QPainter &p, const Scope&, const bool new_frame) override;
 
  public slots:
   void changeK_barHeight(int);
@@ -59,7 +59,7 @@ class BoomAnalyzer : public Analyzer::Base {
   static const int kMinBandCount;
 
   int bands_;
-  Analyzer::Scope scope_;
+  Scope scope_;
   QColor fg_;
 
   double K_barHeight_, F_peakSpeed_, F_;

src/analyzer/rainbowanalyzer.cpp

@@ -41,23 +41,21 @@
 #include "fht.h"
 #include "analyzerbase.h"
 
-using Analyzer::Scope;
+const int RainbowAnalyzer::kHeight[] = { 21, 33 };
+const int RainbowAnalyzer::kWidth[] = { 34, 53 };
+const int RainbowAnalyzer::kFrameCount[] = { 6, 16 };
+const int RainbowAnalyzer::kRainbowHeight[] = { 21, 16 };
+const int RainbowAnalyzer::kRainbowOverlap[] = { 13, 15 };
+const int 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 *NyanCatAnalyzer::kName = "Nyanalyzer Cat";
+const char *RainbowDashAnalyzer::kName = "Rainbow Dash";
+const float RainbowAnalyzer::kPixelScale = 0.02F;
 
-const char *Rainbow::NyanCatAnalyzer::kName = "Nyanalyzer Cat";
-const char *Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";
-const float Rainbow::RainbowAnalyzer::kPixelScale = 0.02F;
+RainbowAnalyzer::RainbowType RainbowAnalyzer::rainbowtype;
 
-Rainbow::RainbowAnalyzer::RainbowType Rainbow::RainbowAnalyzer::rainbowtype;
-
-Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
-    : Analyzer::Base(parent, 9),
+RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
+    : AnalyzerBase(parent, 9),
       timer_id_(startTimer(kFrameIntervalMs)),
       frame_(0),
       current_buffer_(0),
@@ -81,20 +79,20 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *par
 
 }
 
-void Rainbow::RainbowAnalyzer::transform(Scope &s) { fht_->spectrum(s.data()); }
+void RainbowAnalyzer::transform(Scope &s) { fht_->spectrum(s.data()); }
 
-void Rainbow::RainbowAnalyzer::timerEvent(QTimerEvent *e) {
+void RainbowAnalyzer::timerEvent(QTimerEvent *e) {
 
   if (e->timerId() == timer_id_) {
     frame_ = (frame_ + 1) % kFrameCount[rainbowtype];
   }
   else {
-    Analyzer::Base::timerEvent(e);
+    AnalyzerBase::timerEvent(e);
   }
 
 }
 
-void Rainbow::RainbowAnalyzer::resizeEvent(QResizeEvent *e) {
+void RainbowAnalyzer::resizeEvent(QResizeEvent *e) {
 
   Q_UNUSED(e);
 
@@ -108,7 +106,7 @@ void Rainbow::RainbowAnalyzer::resizeEvent(QResizeEvent *e) {
 
 }
 
-void Rainbow::RainbowAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
+void RainbowAnalyzer::analyze(QPainter &p, const Scope &s, bool new_frame) {
 
   // Discard the second half of the transform
   const int scope_size = static_cast<int>(s.size() / 2);
@@ -203,8 +201,8 @@ void Rainbow::RainbowAnalyzer::analyze(QPainter &p, const Analyzer::Scope &s, bo
 
 }
 
-Rainbow::NyanCatAnalyzer::NyanCatAnalyzer(QWidget *parent)
-    : RainbowAnalyzer(Rainbow::RainbowAnalyzer::Nyancat, parent) {}
+NyanCatAnalyzer::NyanCatAnalyzer(QWidget *parent)
+    : RainbowAnalyzer(RainbowAnalyzer::Nyancat, parent) {}
 
-Rainbow::RainbowDashAnalyzer::RainbowDashAnalyzer(QWidget *parent)
-    : RainbowAnalyzer(Rainbow::RainbowAnalyzer::Dash, parent) {}
+RainbowDashAnalyzer::RainbowDashAnalyzer(QWidget *parent)
+    : RainbowAnalyzer(RainbowAnalyzer::Dash, parent) {}

src/analyzer/rainbowanalyzer.h

@@ -40,8 +40,7 @@ class QWidget;
 class QTimerEvent;
 class QResizeEvent;
 
-namespace Rainbow {
-class RainbowAnalyzer : public Analyzer::Base {
+class RainbowAnalyzer : public AnalyzerBase {
   Q_OBJECT
 
  public:
@@ -53,8 +52,8 @@ class RainbowAnalyzer : public Analyzer::Base {
   RainbowAnalyzer(const RainbowType rbtype, QWidget *parent);
 
  protected:
-  void transform(Analyzer::Scope&) override;
-  void analyze(QPainter &p, const Analyzer::Scope&, bool new_frame) override;
+  void transform(Scope&) override;
+  void analyze(QPainter &p, const Scope&, bool new_frame) override;
 
   void timerEvent(QTimerEvent *e) override;
   void resizeEvent(QResizeEvent *e) override;
@@ -142,6 +141,5 @@ class RainbowDashAnalyzer : public RainbowAnalyzer {
 
   static const char *kName;
 };
-}  // namespace Rainbow
 
 #endif  // RAINBOWANALYZER_H

src/analyzer/sonogram.cpp

@@ -0,0 +1,94 @@
+/*
+   Strawberry Music Player
+   This file was part of Clementine.
+   Copyright 2004, Melchior FRANZ <mfranz@kde.org>
+   Copyright 2009-2010, David Sansome <davidsansome@gmail.com>
+   Copyright 2010, 2014, John Maguire <john.maguire@gmail.com>
+   Copyright 2014-2015, Mark Furneaux <mark@furneaux.ca>
+   Copyright 2014, Krzysztof Sobiecki <sobkas@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 <QPainter>
+#include <QResizeEvent>
+
+#include "engine/enginebase.h"
+
+#include "sonogram.h"
+
+const char *Sonogram::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Sonogram");
+
+Sonogram::Sonogram(QWidget *parent)
+    : AnalyzerBase(parent, 9) {}
+
+void Sonogram::resizeEvent(QResizeEvent *e) {
+
+  Q_UNUSED(e)
+
+  canvas_ = QPixmap(size());
+  canvas_.fill(palette().color(QPalette::Window));
+
+}
+
+void Sonogram::analyze(QPainter &p, const Scope &s, bool new_frame) {
+
+  if (!new_frame || engine_->state() == EngineBase::State::Paused) {
+    p.drawPixmap(0, 0, canvas_);
+    return;
+  }
+
+  QPainter canvas_painter(&canvas_);
+  canvas_painter.drawPixmap(0, 0, canvas_, 1, 0, width() - 1, -1);
+
+  Scope::const_iterator it = s.begin(), end = s.end();
+
+  for (int y = height() - 1; y;) {
+    QColor c;
+    if (it >= end || *it < .005) {
+      c = palette().color(QPalette::Window);
+    }
+    else if (*it < .05) {
+      c.setHsv(95, 255, 255 - static_cast<int>(*it * 4000.0));
+    }
+    else if (*it < 1.0) {
+      c.setHsv(95 - static_cast<int>(*it * 90.0), 255, 255);
+    }
+    else {
+      c = Qt::red;
+    }
+
+    canvas_painter.setPen(c);
+    canvas_painter.drawPoint(width() - 1, y--);
+
+    if (it < end) ++it;
+  }
+
+  canvas_painter.end();
+
+  p.drawPixmap(0, 0, canvas_);
+
+}
+
+void Sonogram::transform(Scope &scope) {
+
+  fht_->power2(scope.data());
+  fht_->scale(scope.data(), 1.0 / 256);
+  scope.resize(fht_->size() / 2);
+
+}
+
+void Sonogram::demo(QPainter &p) {
+  analyze(p, Scope(fht_->size(), 0), new_frame_);
+}

src/analyzer/sonogram.h

@@ -0,0 +1,49 @@
+/*
+   Strawberry Music Player
+   This file was part of Clementine.
+   Copyright 2004, Melchior FRANZ <mfranz@kde.org>
+   Copyright 2009-2010, David Sansome <davidsansome@gmail.com>
+   Copyright 2014, Krzysztof Sobiecki <sobkas@gmail.com>
+   Copyright 2014, John Maguire <john.maguire@gmail.com>
+   Copyright 2015, Mark Furneaux <mark@furneaux.ca>
+
+   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 SONOGRAM_H
+#define SONOGRAM_H
+
+#include <QPixmap>
+#include <QPainter>
+
+#include "analyzerbase.h"
+
+class Sonogram : public AnalyzerBase {
+  Q_OBJECT
+ public:
+  Q_INVOKABLE explicit Sonogram(QWidget *parent);
+
+  static const char *kName;
+
+ protected:
+  void resizeEvent(QResizeEvent *e) override;
+  void analyze(QPainter &p, const Scope &s, bool new_frame) override;
+  void transform(Scope &scope) override;
+  void demo(QPainter &p) override;
+
+ private:
+  QPixmap canvas_;
+};
+
+#endif  // SONOGRAM_H

src/collection/collection.cpp

@@ -34,9 +34,9 @@
 #include "core/player.h"
 #include "core/tagreaderclient.h"
 #include "core/thread.h"
-#include "core/utilities.h"
 #include "core/song.h"
 #include "core/logging.h"
+#include "utilities/threadutils.h"
 #include "collection.h"
 #include "collectionwatcher.h"
 #include "collectionbackend.h"
@@ -58,8 +58,6 @@ 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) {
 
@@ -69,7 +67,7 @@ SCollection::SCollection(Application *app, QObject *parent)
   backend()->moveToThread(app->database()->thread());
   qLog(Debug) << backend_ << "moved to thread" << app->database()->thread();
 
-  backend_->Init(app->database(), app->task_manager(), Song::Source_Collection, kSongsTable, kFtsTable, kDirsTable, kSubdirsTable);
+  backend_->Init(app->database(), app->task_manager(), Song::Source::Collection, kSongsTable, kFtsTable, kDirsTable, kSubdirsTable);
 
   model_ = new CollectionModel(backend_, app_, this);
 
@@ -93,20 +91,16 @@ SCollection::~SCollection() {
 
 void SCollection::Init() {
 
-  watcher_ = new CollectionWatcher(Song::Source_Collection);
+  watcher_ = new CollectionWatcher(Song::Source::Collection);
   watcher_thread_ = new Thread(this);
 
-#ifndef Q_OS_WIN32
-  if (io_priority_ != Utilities::IoPriority::IOPRIO_CLASS_NONE) {
-    watcher_thread_->SetIoPriority(io_priority_);
-  }
-#endif
+  watcher_thread_->SetIoPriority(Utilities::IoPriority::IOPRIO_CLASS_IDLE);
 
   watcher_->moveToThread(watcher_thread_);
 
-  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_ << "with I/O priority" << io_priority_ << "and thread priority" << thread_priority_;
+  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_;
 
-  watcher_thread_->start(thread_priority_);
+  watcher_thread_->start(QThread::IdlePriority);
 
   watcher_->set_backend(backend_);
   watcher_->set_task_manager(app_->task_manager());
@@ -169,7 +163,9 @@ void SCollection::AbortScan() { watcher_->Stop(); }
 void SCollection::Rescan(const SongList &songs) {
 
   qLog(Debug) << "Rescan" << songs.size() << "songs";
-  if (!songs.isEmpty()) watcher_->RescanTracksAsync(songs);
+  if (!songs.isEmpty()) {
+    watcher_->RescanSongsAsync(songs);
+  }
 
 }
 
@@ -184,8 +180,6 @@ 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();
@@ -219,9 +213,9 @@ void SCollection::SyncPlaycountAndRatingToFiles() {
 
 }
 
-void SCollection::SongsPlaycountChanged(const SongList &songs) {
+void SCollection::SongsPlaycountChanged(const SongList &songs, const bool save_tags) {
 
-  if (save_playcounts_to_files_) {
+  if (save_tags || save_playcounts_to_files_) {
     app_->tag_reader_client()->UpdateSongsPlaycount(songs);
   }
 

src/collection/collection.h

@@ -28,11 +28,10 @@
 #include <QList>
 #include <QHash>
 #include <QString>
-#include <QThread>
 
 #include "core/song.h"
-#include "core/utilities.h"
 
+class QThread;
 class Application;
 class Thread;
 class CollectionBackend;
@@ -78,11 +77,11 @@ class SCollection : public QObject {
 
  private slots:
   void ExitReceived();
-  void SongsPlaycountChanged(const SongList &songs);
+  void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false);
   void SongsRatingChanged(const SongList &songs, const bool save_tags = false);
 
  signals:
-  void Error(QString);
+  void Error(const QString &error);
   void ExitFinished();
 
  private:
@@ -99,8 +98,6 @@ 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

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,8 +50,9 @@
 #include "core/sqlrow.h"
 #include "smartplaylists/smartplaylistsearch.h"
 
-#include "directory.h"
+#include "collectiondirectory.h"
 #include "collectionbackend.h"
+#include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectiontask.h"
 
@@ -59,7 +60,7 @@ CollectionBackend::CollectionBackend(QObject *parent)
     : CollectionBackendInterface(parent),
       db_(nullptr),
       task_manager_(nullptr),
-      source_(Song::Source_Unknown),
+      source_(Song::Source::Unknown),
       original_thread_(nullptr) {
 
   original_thread_ = thread();
@@ -88,7 +89,7 @@ void CollectionBackend::Close() {
 }
 
 void CollectionBackend::ExitAsync() {
-  QMetaObject::invokeMethod(this, "Exit", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::Exit, Qt::QueuedConnection);
 }
 
 void CollectionBackend::Exit() {
@@ -104,31 +105,29 @@ void CollectionBackend::ReportErrors(const CollectionQuery &query) {
 
   const QSqlError sql_error = query.lastError();
   if (sql_error.isValid()) {
-    qLog(Error) << "Unable to execute collection SQL query: " << sql_error;
-    qLog(Error) << "Faulty SQL query: " << query.lastQuery();
-    qLog(Error) << "Bound SQL values: " << query.boundValues();
-    QString error;
-    error += "Unable to execute collection SQL query: " + sql_error.text() + "<br />";
-    error += "Faulty SQL query: " + query.lastQuery();
-    emit Error(error);
+    qLog(Error) << "Unable to execute collection SQL query:" << sql_error;
+    qLog(Error) << "Failed SQL query:" << query.lastQuery();
+    qLog(Error) << "Bound SQL values:" << query.boundValues();
+    emit Error(tr("Unable to execute collection SQL query: %1").arg(sql_error.text()));
+    emit Error(tr("Failed SQL query: %1").arg(query.lastQuery()));
   }
 
 }
 
 void CollectionBackend::LoadDirectoriesAsync() {
-  QMetaObject::invokeMethod(this, "LoadDirectories", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::LoadDirectories, Qt::QueuedConnection);
 }
 
 void CollectionBackend::UpdateTotalSongCountAsync() {
-  QMetaObject::invokeMethod(this, "UpdateTotalSongCount", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::UpdateTotalSongCount, Qt::QueuedConnection);
 }
 
 void CollectionBackend::UpdateTotalArtistCountAsync() {
-  QMetaObject::invokeMethod(this, "UpdateTotalArtistCount", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::UpdateTotalArtistCount, Qt::QueuedConnection);
 }
 
 void CollectionBackend::UpdateTotalAlbumCountAsync() {
-  QMetaObject::invokeMethod(this, "UpdateTotalAlbumCount", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::UpdateTotalAlbumCount, Qt::QueuedConnection);
 }
 
 void CollectionBackend::IncrementPlayCountAsync(const int id) {
@@ -139,18 +138,22 @@ void CollectionBackend::IncrementSkipCountAsync(const int id, const float progre
   QMetaObject::invokeMethod(this, "IncrementSkipCount", Qt::QueuedConnection, Q_ARG(int, id), Q_ARG(float, progress));
 }
 
-void CollectionBackend::ResetStatisticsAsync(const int id) {
-  QMetaObject::invokeMethod(this, "ResetStatistics", Qt::QueuedConnection, Q_ARG(int, id));
+void CollectionBackend::ResetPlayStatisticsAsync(const int id, const bool save_tags) {
+  QMetaObject::invokeMethod(this, "ResetPlayStatistics", Qt::QueuedConnection, Q_ARG(int, id), Q_ARG(bool, save_tags));
+}
+
+void CollectionBackend::ResetPlayStatisticsAsync(const QList<int> &id_list, const bool save_tags) {
+  QMetaObject::invokeMethod(this, "ResetPlayStatistics", Qt::QueuedConnection, Q_ARG(QList<int>, id_list), Q_ARG(bool, save_tags));
 }
 
 void CollectionBackend::LoadDirectories() {
 
-  DirectoryList dirs = GetAllDirectories();
+  CollectionDirectoryList dirs = GetAllDirectories();
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
-  for (const Directory &dir : dirs) {
+  for (const CollectionDirectory &dir : dirs) {
     emit DirectoryDiscovered(dir, SubdirsInDirectory(dir.id, db));
   }
 
@@ -207,12 +210,12 @@ void CollectionBackend::ChangeDirPath(const int id, const QString &old_path, con
 
 }
 
-DirectoryList CollectionBackend::GetAllDirectories() {
+CollectionDirectoryList CollectionBackend::GetAllDirectories() {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
-  DirectoryList ret;
+  CollectionDirectoryList ret;
 
   SqlQuery q(db);
   q.prepare(QString("SELECT ROWID, path FROM %1").arg(dirs_table_));
@@ -222,7 +225,7 @@ DirectoryList CollectionBackend::GetAllDirectories() {
   }
 
   while (q.next()) {
-    Directory dir;
+    CollectionDirectory dir;
     dir.id = q.value(0).toInt();
     dir.path = q.value(1).toString();
 
@@ -232,7 +235,7 @@ DirectoryList CollectionBackend::GetAllDirectories() {
 
 }
 
-SubdirectoryList CollectionBackend::SubdirsInDirectory(const int id) {
+CollectionSubdirectoryList CollectionBackend::SubdirsInDirectory(const int id) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db = db_->Connect();
@@ -240,19 +243,19 @@ SubdirectoryList CollectionBackend::SubdirsInDirectory(const int id) {
 
 }
 
-SubdirectoryList CollectionBackend::SubdirsInDirectory(const int id, QSqlDatabase &db) {
+CollectionSubdirectoryList CollectionBackend::SubdirsInDirectory(const int id, QSqlDatabase &db) {
 
   SqlQuery q(db);
   q.prepare(QString("SELECT path, mtime FROM %1 WHERE directory_id = :dir").arg(subdirs_table_));
   q.BindValue(":dir", id);
   if (!q.Exec()) {
     db_->ReportErrors(q);
-    return SubdirectoryList();
+    return CollectionSubdirectoryList();
   }
 
-  SubdirectoryList subdirs;
+  CollectionSubdirectoryList subdirs;
   while (q.next()) {
-    Subdirectory subdir;
+    CollectionSubdirectory subdir;
     subdir.directory_id = id;
     subdir.path = q.value(0).toString();
     subdir.mtime = q.value(1).toLongLong();
@@ -339,15 +342,15 @@ void CollectionBackend::AddDirectory(const QString &path) {
     return;
   }
 
-  Directory dir;
+  CollectionDirectory dir;
   dir.path = canonical_path;
   dir.id = q.lastInsertId().toInt();
 
-  emit DirectoryDiscovered(dir, SubdirectoryList());
+  emit DirectoryDiscovered(dir, CollectionSubdirectoryList());
 
 }
 
-void CollectionBackend::RemoveDirectory(const Directory &dir) {
+void CollectionBackend::RemoveDirectory(const CollectionDirectory &dir) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
@@ -447,13 +450,13 @@ void CollectionBackend::SongPathChanged(const Song &song, const QFileInfo &new_f
 
 }
 
-void CollectionBackend::AddOrUpdateSubdirs(const SubdirectoryList &subdirs) {
+void CollectionBackend::AddOrUpdateSubdirs(const CollectionSubdirectoryList &subdirs) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
   ScopedTransaction transaction(&db);
-  for (const Subdirectory &subdir : subdirs) {
+  for (const CollectionSubdirectory &subdir : subdirs) {
     if (subdir.mtime == 0) {
       // Delete the subdirectory
       SqlQuery q(db);
@@ -713,7 +716,7 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) {
 
       Song old_song = old_songs[new_song.song_id()];
 
-      if (!new_song.IsMetadataEqual(old_song)) {  // Update existing song.
+      if (!new_song.IsAllMetadataEqual(old_song) || !new_song.IsFingerprintEqual(old_song)) {  // Update existing song.
 
         {
           SqlQuery q(db);
@@ -900,12 +903,12 @@ void CollectionBackend::MarkSongsUnavailable(const SongList &songs, const bool u
 
 }
 
-QStringList CollectionBackend::GetAll(const QString &column, const QueryOptions &opt) {
+QStringList CollectionBackend::GetAll(const QString &column, const CollectionFilterOptions &filter_options) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
-  CollectionQuery query(db, songs_table_, fts_table_, opt);
+  CollectionQuery query(db, songs_table_, fts_table_, filter_options);
   query.SetColumnSpec("DISTINCT " + column);
   query.AddCompilationRequirement(false);
 
@@ -922,12 +925,12 @@ QStringList CollectionBackend::GetAll(const QString &column, const QueryOptions
 
 }
 
-QStringList CollectionBackend::GetAllArtists(const QueryOptions &opt) {
+QStringList CollectionBackend::GetAllArtists(const CollectionFilterOptions &opt) {
 
   return GetAll("artist", opt);
 }
 
-QStringList CollectionBackend::GetAllArtistsWithAlbums(const QueryOptions &opt) {
+QStringList CollectionBackend::GetAllArtistsWithAlbums(const CollectionFilterOptions &opt) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
@@ -967,15 +970,15 @@ QStringList CollectionBackend::GetAllArtistsWithAlbums(const QueryOptions &opt)
 
 }
 
-CollectionBackend::AlbumList CollectionBackend::GetAllAlbums(const QueryOptions &opt) {
+CollectionBackend::AlbumList CollectionBackend::GetAllAlbums(const CollectionFilterOptions &opt) {
   return GetAlbums(QString(), false, opt);
 }
 
-CollectionBackend::AlbumList CollectionBackend::GetAlbumsByArtist(const QString &artist, const QueryOptions &opt) {
+CollectionBackend::AlbumList CollectionBackend::GetAlbumsByArtist(const QString &artist, const CollectionFilterOptions &opt) {
   return GetAlbums(artist, false, opt);
 }
 
-SongList CollectionBackend::GetArtistSongs(const QString &effective_albumartist, const QueryOptions &opt) {
+SongList CollectionBackend::GetArtistSongs(const QString &effective_albumartist, const CollectionFilterOptions &opt) {
 
   QSqlDatabase db(db_->Connect());
   QMutexLocker l(db_->Mutex());
@@ -993,7 +996,7 @@ SongList CollectionBackend::GetArtistSongs(const QString &effective_albumartist,
 
 }
 
-SongList CollectionBackend::GetAlbumSongs(const QString &effective_albumartist, const QString &album, const QueryOptions &opt) {
+SongList CollectionBackend::GetAlbumSongs(const QString &effective_albumartist, const QString &album, const CollectionFilterOptions &opt) {
 
   QSqlDatabase db(db_->Connect());
   QMutexLocker l(db_->Mutex());
@@ -1012,7 +1015,7 @@ SongList CollectionBackend::GetAlbumSongs(const QString &effective_albumartist,
 
 }
 
-SongList CollectionBackend::GetSongsByAlbum(const QString &album, const QueryOptions &opt) {
+SongList CollectionBackend::GetSongsByAlbum(const QString &album, const CollectionFilterOptions &opt) {
 
   QSqlDatabase db(db_->Connect());
   QMutexLocker l(db_->Mutex());
@@ -1285,11 +1288,11 @@ SongList CollectionBackend::GetSongsByFingerprint(const QString &fingerprint) {
 }
 
 
-CollectionBackend::AlbumList CollectionBackend::GetCompilationAlbums(const QueryOptions &opt) {
+CollectionBackend::AlbumList CollectionBackend::GetCompilationAlbums(const CollectionFilterOptions &opt) {
   return GetAlbums(QString(), true, opt);
 }
 
-SongList CollectionBackend::GetCompilationSongs(const QString &album, const QueryOptions &opt) {
+SongList CollectionBackend::GetCompilationSongs(const QString &album, const CollectionFilterOptions &opt) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
@@ -1314,10 +1317,6 @@ SongList CollectionBackend::GetCompilationSongs(const QString &album, const Quer
 
 }
 
-Song::Source CollectionBackend::Source() const {
-  return source_;
-}
-
 void CollectionBackend::CompilationsNeedUpdating() {
 
   QMutexLocker l(db_->Mutex());
@@ -1430,13 +1429,13 @@ bool CollectionBackend::UpdateCompilations(const QSqlDatabase &db, SongList &del
 
 }
 
-CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist, const bool compilation_required, const QueryOptions &opt) {
+CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist, const bool compilation_required, const CollectionFilterOptions &opt) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
   CollectionQuery query(db, songs_table_, fts_table_, opt);
-  query.SetColumnSpec("url, effective_albumartist, album, compilation_effective, art_automatic, art_manual, filetype, cue_path");
+  query.SetColumnSpec("url, filetype, cue_path, effective_albumartist, album, compilation_effective, art_embedded, art_automatic, art_manual, art_unset");
   query.SetOrderBy("effective_albumartist, album, url");
 
   if (compilation_required) {
@@ -1454,42 +1453,48 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
 
   QMap<QString, Album> albums;
   while (query.Next()) {
-    bool is_compilation = query.Value(3).toBool();
 
-    Album info;
+    Album album_info;
     QUrl url = QUrl::fromEncoded(query.Value(0).toByteArray());
+
+    album_info.filetype = static_cast<Song::FileType>(query.Value(1).toInt());
+    const QString filetype = Song::TextForFiletype(album_info.filetype);
+    album_info.cue_path = query.Value(2).toString();
+
+    const bool is_compilation = query.Value(5).toBool();
     if (!is_compilation) {
-      info.album_artist = query.Value(1).toString();
+      album_info.album_artist = query.Value(3).toString();
     }
-    info.album = query.Value(2).toString();
 
-    QString art_automatic = query.Value(4).toString();
+    album_info.album = query.Value(4).toString();
+
+    album_info.art_embedded = query.Value(6).toBool();
+
+    const QString art_automatic = query.Value(7).toString();
     if (art_automatic.contains(QRegularExpression("..+:.*"))) {
-      info.art_automatic = QUrl::fromEncoded(art_automatic.toUtf8());
+      album_info.art_automatic = QUrl::fromEncoded(art_automatic.toUtf8());
     }
     else {
-      info.art_automatic = QUrl::fromLocalFile(art_automatic);
+      album_info.art_automatic = QUrl::fromLocalFile(art_automatic);
     }
 
-    QString art_manual = query.Value(5).toString();
+    const QString art_manual = query.Value(8).toString();
     if (art_manual.contains(QRegularExpression("..+:.*"))) {
-      info.art_manual = QUrl::fromEncoded(art_manual.toUtf8());
+      album_info.art_manual = QUrl::fromEncoded(art_manual.toUtf8());
     }
     else {
-      info.art_manual = QUrl::fromLocalFile(art_manual);
+      album_info.art_manual = QUrl::fromLocalFile(art_manual);
     }
 
-    info.filetype = static_cast<Song::FileType>(query.Value(6).toInt());
-    QString filetype = Song::TextForFiletype(info.filetype);
-    info.cue_path = query.Value(7).toString();
+    album_info.art_unset = query.Value(9).toBool();
 
     QString key;
-    if (!info.album_artist.isEmpty()) {
-      key.append(info.album_artist);
+    if (!album_info.album_artist.isEmpty()) {
+      key.append(album_info.album_artist);
     }
-    if (!info.album.isEmpty()) {
+    if (!album_info.album.isEmpty()) {
       if (!key.isEmpty()) key.append("-");
-      key.append(info.album);
+      key.append(album_info.album);
     }
     if (!filetype.isEmpty()) {
       key.append(filetype);
@@ -1501,8 +1506,8 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
       albums[key].urls.append(url);
     }
     else {
-      info.urls << url;
-      albums.insert(key, info);
+      album_info.urls << url;
+      albums.insert(key, album_info);
     }
 
   }
@@ -1520,8 +1525,8 @@ CollectionBackend::Album CollectionBackend::GetAlbumArt(const QString &effective
   ret.album = album;
   ret.album_artist = effective_albumartist;
 
-  CollectionQuery query(db, songs_table_, fts_table_, QueryOptions());
-  query.SetColumnSpec("art_automatic, art_manual, url");
+  CollectionQuery query(db, songs_table_, fts_table_);
+  query.SetColumnSpec("url, art_embedded, art_automatic, art_manual, art_unset");
   if (!effective_albumartist.isEmpty()) {
     query.AddWhere("effective_albumartist", effective_albumartist);
   }
@@ -1533,22 +1538,24 @@ CollectionBackend::Album CollectionBackend::GetAlbumArt(const QString &effective
   }
 
   if (query.Next()) {
-    ret.art_automatic = QUrl::fromEncoded(query.Value(0).toByteArray());
-    ret.art_manual = QUrl::fromEncoded(query.Value(1).toByteArray());
-    ret.urls << QUrl::fromEncoded(query.Value(2).toByteArray());
+    ret.urls << QUrl::fromEncoded(query.Value(0).toByteArray());
+    ret.art_embedded = query.Value(1).toInt() == 1;
+    ret.art_automatic = QUrl::fromEncoded(query.Value(2).toByteArray());
+    ret.art_manual = QUrl::fromEncoded(query.Value(3).toByteArray());
+    ret.art_unset = query.Value(4).toInt() == 1;
   }
 
   return ret;
 
 }
 
-void CollectionBackend::UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic) {
+void CollectionBackend::UpdateEmbeddedAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_embedded) {
 
-  QMetaObject::invokeMethod(this, "UpdateManualAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(QUrl, cover_url), Q_ARG(bool, clear_art_automatic));
+  QMetaObject::invokeMethod(this, "UpdateEmbeddedAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(bool, art_embedded));
 
 }
 
-void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic) {
+void CollectionBackend::UpdateEmbeddedAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_embedded) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
@@ -1572,15 +1579,11 @@ void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartis
   }
 
   // Update the songs
-  QString sql = QString("UPDATE %1 SET art_manual = :cover").arg(songs_table_);
-  if (clear_art_automatic) {
-    sql += ", art_automatic = ''";
-  }
-  sql += " WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0";
+  QString sql = QString("UPDATE %1 SET art_embedded = :art_embedded, art_unset = 0 WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_);
 
   SqlQuery q(db);
   q.prepare(sql);
-  q.BindValue(":cover", cover_url.isValid() ? cover_url.toString(QUrl::FullyEncoded) : "");
+  q.BindValue(":art_embedded", art_embedded ? 1 : 0);
   q.BindValue(":effective_albumartist", effective_albumartist);
   q.BindValue(":album", album);
 
@@ -1609,18 +1612,17 @@ void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartis
 
 }
 
-void CollectionBackend::UpdateAutomaticAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual) {
+void CollectionBackend::UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) {
 
-  QMetaObject::invokeMethod(this, "UpdateAutomaticAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(QUrl, cover_url), Q_ARG(bool, clear_art_manual));
+  QMetaObject::invokeMethod(this, "UpdateManualAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(QUrl, art_manual));
 
 }
 
-void CollectionBackend::UpdateAutomaticAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual) {
+void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) {
 
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
-  // Get the songs before they're updated
   CollectionQuery query(db, songs_table_, fts_table_);
   query.SetColumnSpec("ROWID, " + Song::kColumnSpec);
   query.AddWhere("effective_albumartist", effective_albumartist);
@@ -1638,16 +1640,124 @@ void CollectionBackend::UpdateAutomaticAlbumArt(const QString &effective_albumar
     deleted_songs << song;
   }
 
-  // Update the songs
-  QString sql = QString("UPDATE %1 SET art_automatic = :cover").arg(songs_table_);
-  if (clear_art_manual) {
-    sql += ", art_manual = ''";
-  }
-  sql += " WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0";
-
   SqlQuery q(db);
-  q.prepare(sql);
-  q.BindValue(":cover", cover_url.isValid() ? cover_url.toString(QUrl::FullyEncoded) : "");
+  q.prepare(QString("UPDATE %1 SET art_manual = :art_manual, art_unset = 0 WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
+  q.BindValue(":art_manual", art_manual.isValid() ? art_manual.toString(QUrl::FullyEncoded) : "");
+  q.BindValue(":effective_albumartist", effective_albumartist);
+  q.BindValue(":album", album);
+
+  if (!q.Exec()) {
+    db_->ReportErrors(q);
+    return;
+  }
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList added_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    added_songs << song;
+  }
+
+  if (!added_songs.isEmpty() || !deleted_songs.isEmpty()) {
+    emit SongsDeleted(deleted_songs);
+    emit SongsDiscovered(added_songs);
+  }
+
+}
+
+void CollectionBackend::UnsetAlbumArtAsync(const QString &effective_albumartist, const QString &album) {
+
+  QMetaObject::invokeMethod(this, "UnsetAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album));
+
+}
+
+void CollectionBackend::UnsetAlbumArt(const QString &effective_albumartist, const QString &album) {
+
+  QMutexLocker l(db_->Mutex());
+  QSqlDatabase db(db_->Connect());
+
+  CollectionQuery query(db, songs_table_, fts_table_);
+  query.SetColumnSpec("ROWID, " + Song::kColumnSpec);
+  query.AddWhere("effective_albumartist", effective_albumartist);
+  query.AddWhere("album", album);
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList deleted_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    deleted_songs << song;
+  }
+
+  SqlQuery q(db);
+  q.prepare(QString("UPDATE %1 SET art_unset = 1, art_manual = '', art_automatic = '', art_embedded = '' WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
+  q.BindValue(":effective_albumartist", effective_albumartist);
+  q.BindValue(":album", album);
+
+  if (!q.Exec()) {
+    db_->ReportErrors(q);
+    return;
+  }
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList added_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    added_songs << song;
+  }
+
+  if (!added_songs.isEmpty() || !deleted_songs.isEmpty()) {
+    emit SongsDeleted(deleted_songs);
+    emit SongsDiscovered(added_songs);
+  }
+
+}
+
+void CollectionBackend::ClearAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool unset) {
+
+  QMetaObject::invokeMethod(this, "ClearAlbumArt", Qt::QueuedConnection, Q_ARG(QString, effective_albumartist), Q_ARG(QString, album), Q_ARG(bool, unset));
+
+}
+
+void CollectionBackend::ClearAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_unset) {
+
+  QMutexLocker l(db_->Mutex());
+  QSqlDatabase db(db_->Connect());
+
+  CollectionQuery query(db, songs_table_, fts_table_);
+  query.SetColumnSpec("ROWID, " + Song::kColumnSpec);
+  query.AddWhere("effective_albumartist", effective_albumartist);
+  query.AddWhere("album", album);
+
+  if (!query.Exec()) {
+    ReportErrors(query);
+    return;
+  }
+
+  SongList deleted_songs;
+  while (query.Next()) {
+    Song song(source_);
+    song.InitFromQuery(query, true);
+    deleted_songs << song;
+  }
+
+  SqlQuery q(db);
+  q.prepare(QString("UPDATE %1 SET art_embedded = 0, art_automatic = '', art_manual = '', art_unset = :art_unset WHERE effective_albumartist = :effective_albumartist AND album = :album AND unavailable = 0").arg(songs_table_));
+  q.BindValue(":art_unset", art_unset ? 1 : 0);
   q.BindValue(":effective_albumartist", effective_albumartist);
   q.BindValue(":album", album);
 
@@ -1656,7 +1766,6 @@ void CollectionBackend::UpdateAutomaticAlbumArt(const QString &effective_albumar
     return;
   }
 
-  // Now get the updated songs
   if (!query.Exec()) {
     ReportErrors(query);
     return;
@@ -1779,29 +1888,54 @@ void CollectionBackend::IncrementSkipCount(const int id, const float progress) {
 
 }
 
-void CollectionBackend::ResetStatistics(const int id) {
+void CollectionBackend::ResetPlayStatistics(const int id, const bool save_tags) {
 
   if (id == -1) return;
 
+  ResetPlayStatistics(QList<int>() << id, save_tags);
+
+}
+
+void CollectionBackend::ResetPlayStatistics(const QList<int> &id_list, const bool save_tags) {
+
+  if (id_list.isEmpty()) return;
+
+  QStringList id_str_list;
+  id_str_list.reserve(id_list.count());
+  for (const int id : id_list) {
+    id_str_list << QString::number(id);
+  }
+
+  const bool success = ResetPlayStatistics(id_str_list);
+  if (success) {
+    const SongList songs = GetSongsById(id_list);
+    emit SongsStatisticsChanged(songs, save_tags);
+  }
+
+}
+
+bool CollectionBackend::ResetPlayStatistics(const QStringList &id_str_list) {
+
+  if (id_str_list.isEmpty()) return false;
+
   QMutexLocker l(db_->Mutex());
   QSqlDatabase db(db_->Connect());
 
   SqlQuery q(db);
-  q.prepare(QString("UPDATE %1 SET playcount = 0, skipcount = 0, lastplayed = -1 WHERE ROWID = :id").arg(songs_table_));
-  q.BindValue(":id", id);
+  q.prepare(QString("UPDATE %1 SET playcount = 0, skipcount = 0, lastplayed = -1 WHERE ROWID IN (:ids)").arg(songs_table_));
+  q.BindValue(":ids", id_str_list.join(","));
   if (!q.Exec()) {
     db_->ReportErrors(q);
-    return;
+    return false;
   }
 
-  Song new_song = GetSongById(id, db);
-  emit SongsStatisticsChanged(SongList() << new_song);
+  return true;
 
 }
 
 void CollectionBackend::DeleteAllAsync() {
 
-  QMetaObject::invokeMethod(this, "DeleteAll", Qt::QueuedConnection);
+  QMetaObject::invokeMethod(this, &CollectionBackend::DeleteAll, Qt::QueuedConnection);
 
 }
 
@@ -1867,7 +2001,7 @@ SongList CollectionBackend::SmartPlaylistsFindSongs(const SmartPlaylistSearch &s
 SongList CollectionBackend::SmartPlaylistsGetAllSongs() {
 
   // Get all the songs!
-  return SmartPlaylistsFindSongs(SmartPlaylistSearch(SmartPlaylistSearch::Type_All, SmartPlaylistSearch::TermList(), SmartPlaylistSearch::Sort_FieldAsc, SmartPlaylistSearchTerm::Field_Artist, -1));
+  return SmartPlaylistsFindSongs(SmartPlaylistSearch(SmartPlaylistSearch::SearchType::All, SmartPlaylistSearch::TermList(), SmartPlaylistSearch::SortType::FieldAsc, SmartPlaylistSearchTerm::Field::Artist, -1));
 
 }
 
@@ -1930,7 +2064,7 @@ void CollectionBackend::UpdateLastPlayed(const QString &artist, const QString &a
 
 }
 
-void CollectionBackend::UpdatePlayCount(const QString &artist, const QString &title, const int playcount) {
+void CollectionBackend::UpdatePlayCount(const QString &artist, const QString &title, const int playcount, const bool save_tags) {
 
   SongList songs = GetSongsBy(artist, QString(), title);
   if (songs.isEmpty()) {
@@ -1952,7 +2086,7 @@ void CollectionBackend::UpdatePlayCount(const QString &artist, const QString &ti
     }
   }
 
-  emit SongsStatisticsChanged(SongList() << songs);
+  emit SongsStatisticsChanged(SongList() << songs, save_tags);
 
 }
 

src/collection/collectionbackend.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,8 +38,9 @@
 
 #include "core/song.h"
 #include "core/sqlquery.h"
+#include "collectionfilteroptions.h"
 #include "collectionquery.h"
-#include "directory.h"
+#include "collectiondirectory.h"
 
 class QThread;
 class TaskManager;
@@ -53,12 +54,14 @@ class CollectionBackendInterface : public QObject {
   explicit CollectionBackendInterface(QObject *parent = nullptr) : QObject(parent) {}
 
   struct Album {
-    Album() {}
-    Album(const QString &_album_artist, const QString &_album, const QUrl &_art_automatic, const QUrl &_art_manual, const QList<QUrl> &_urls, const Song::FileType _filetype, const QString &_cue_path)
+    Album() : art_embedded(false), art_unset(false), filetype(Song::FileType::Unknown) {}
+    Album(const QString &_album_artist, const QString &_album, const bool _art_embedded, const QUrl &_art_automatic, const QUrl &_art_manual, const bool _art_unset, const QList<QUrl> &_urls, const Song::FileType _filetype, const QString &_cue_path)
         : album_artist(_album_artist),
           album(_album),
+          art_embedded(_art_embedded),
           art_automatic(_art_automatic),
           art_manual(_art_manual),
+          art_unset(_art_unset),
           urls(_urls),
           filetype(_filetype),
           cue_path(_cue_path) {}
@@ -66,17 +69,21 @@ class CollectionBackendInterface : public QObject {
     QString album_artist;
     QString album;
 
+    bool art_embedded;
     QUrl art_automatic;
     QUrl art_manual;
+    bool art_unset;
     QList<QUrl> urls;
     Song::FileType filetype;
     QString cue_path;
   };
-  typedef QList<Album> AlbumList;
+  using AlbumList = QList<Album>;
 
   virtual QString songs_table() const = 0;
   virtual QString fts_table() const = 0;
 
+  virtual Song::Source source() const = 0;
+
   virtual Database *db() const = 0;
 
   // Get a list of directories in the collection.  Emits DirectoriesDiscovered.
@@ -88,26 +95,28 @@ class CollectionBackendInterface : public QObject {
 
   virtual SongList FindSongsInDirectory(const int id) = 0;
   virtual SongList SongsWithMissingFingerprint(const int id) = 0;
-  virtual SubdirectoryList SubdirsInDirectory(const int id) = 0;
-  virtual DirectoryList GetAllDirectories() = 0;
+  virtual CollectionSubdirectoryList SubdirsInDirectory(const int id) = 0;
+  virtual CollectionDirectoryList GetAllDirectories() = 0;
   virtual void ChangeDirPath(const int id, const QString &old_path, const QString &new_path) = 0;
 
   virtual SongList GetAllSongs() = 0;
 
-  virtual QStringList GetAllArtists(const QueryOptions &opt = QueryOptions()) = 0;
-  virtual QStringList GetAllArtistsWithAlbums(const QueryOptions &opt = QueryOptions()) = 0;
-  virtual SongList GetArtistSongs(const QString &effective_albumartist, const QueryOptions &opt = QueryOptions()) = 0;
-  virtual SongList GetAlbumSongs(const QString &effective_albumartist, const QString &album, const QueryOptions &opt = QueryOptions()) = 0;
-  virtual SongList GetSongsByAlbum(const QString &album, const QueryOptions &opt = QueryOptions()) = 0;
+  virtual QStringList GetAllArtists(const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
+  virtual QStringList GetAllArtistsWithAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
+  virtual SongList GetArtistSongs(const QString &effective_albumartist, const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
+  virtual SongList GetAlbumSongs(const QString &effective_albumartist, const QString &album, const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
+  virtual SongList GetSongsByAlbum(const QString &album, const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
 
-  virtual SongList GetCompilationSongs(const QString &album, const QueryOptions &opt = QueryOptions()) = 0;
+  virtual SongList GetCompilationSongs(const QString &album, const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
 
-  virtual AlbumList GetAllAlbums(const QueryOptions &opt = QueryOptions()) = 0;
-  virtual AlbumList GetAlbumsByArtist(const QString &artist, const QueryOptions &opt = QueryOptions()) = 0;
-  virtual AlbumList GetCompilationAlbums(const QueryOptions &opt = QueryOptions()) = 0;
+  virtual AlbumList GetAllAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
+  virtual AlbumList GetAlbumsByArtist(const QString &artist, const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
+  virtual AlbumList GetCompilationAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) = 0;
 
-  virtual void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false) = 0;
-  virtual void UpdateAutomaticAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual = false) = 0;
+  virtual void UpdateEmbeddedAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_embedded) = 0;
+  virtual void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) = 0;
+  virtual void UnsetAlbumArtAsync(const QString &effective_albumartist, const QString &album) = 0;
+  virtual void ClearAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_unset) = 0;
 
   virtual Album GetAlbumArt(const QString &effective_albumartist, const QString &album) = 0;
 
@@ -122,7 +131,7 @@ class CollectionBackendInterface : public QObject {
   virtual Song GetSongByUrl(const QUrl &url, const qint64 beginning = 0) = 0;
 
   virtual void AddDirectory(const QString &path) = 0;
-  virtual void RemoveDirectory(const Directory &dir) = 0;
+  virtual void RemoveDirectory(const CollectionDirectory &dir) = 0;
 };
 
 class CollectionBackend : public CollectionBackendInterface {
@@ -139,6 +148,8 @@ class CollectionBackend : public CollectionBackendInterface {
 
   void ReportErrors(const CollectionQuery &query);
 
+  Song::Source source() const override { return source_; }
+
   Database *db() const override { return db_; }
 
   QString songs_table() const override { return songs_table_; }
@@ -155,27 +166,29 @@ class CollectionBackend : public CollectionBackendInterface {
 
   SongList FindSongsInDirectory(const int id) override;
   SongList SongsWithMissingFingerprint(const int id) override;
-  SubdirectoryList SubdirsInDirectory(const int id) override;
-  DirectoryList GetAllDirectories() override;
+  CollectionSubdirectoryList SubdirsInDirectory(const int id) override;
+  CollectionDirectoryList GetAllDirectories() override;
   void ChangeDirPath(const int id, const QString &old_path, const QString &new_path) override;
 
   SongList GetAllSongs() override;
 
-  QStringList GetAll(const QString &column, const QueryOptions &opt = QueryOptions());
-  QStringList GetAllArtists(const QueryOptions &opt = QueryOptions()) override;
-  QStringList GetAllArtistsWithAlbums(const QueryOptions &opt = QueryOptions()) override;
-  SongList GetArtistSongs(const QString &effective_albumartist, const QueryOptions &opt = QueryOptions()) override;
-  SongList GetAlbumSongs(const QString &effective_albumartist, const QString &album, const QueryOptions &opt = QueryOptions()) override;
-  SongList GetSongsByAlbum(const QString &album, const QueryOptions &opt = QueryOptions()) override;
+  QStringList GetAll(const QString &column, const CollectionFilterOptions &filter_options = CollectionFilterOptions());
+  QStringList GetAllArtists(const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
+  QStringList GetAllArtistsWithAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
+  SongList GetArtistSongs(const QString &effective_albumartist, const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
+  SongList GetAlbumSongs(const QString &effective_albumartist, const QString &album, const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
+  SongList GetSongsByAlbum(const QString &album, const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
 
-  SongList GetCompilationSongs(const QString &album, const QueryOptions &opt = QueryOptions()) override;
+  SongList GetCompilationSongs(const QString &album, const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
 
-  AlbumList GetAllAlbums(const QueryOptions &opt = QueryOptions()) override;
-  AlbumList GetCompilationAlbums(const QueryOptions &opt = QueryOptions()) override;
-  AlbumList GetAlbumsByArtist(const QString &artist, const QueryOptions &opt = QueryOptions()) override;
+  AlbumList GetAllAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
+  AlbumList GetCompilationAlbums(const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
+  AlbumList GetAlbumsByArtist(const QString &artist, const CollectionFilterOptions &opt = CollectionFilterOptions()) override;
 
-  void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false) override;
-  void UpdateAutomaticAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual = false) override;
+  void UpdateEmbeddedAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_embedded) override;
+  void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &art_manual) override;
+  void UnsetAlbumArtAsync(const QString &effective_albumartist, const QString &album) override;
+  void ClearAlbumArtAsync(const QString &effective_albumartist, const QString &album, const bool art_unset) override;
 
   Album GetAlbumArt(const QString &effective_albumartist, const QString &album) override;
 
@@ -188,14 +201,15 @@ class CollectionBackend : public CollectionBackendInterface {
   Song GetSongByUrl(const QUrl &url, qint64 beginning = 0) override;
 
   void AddDirectory(const QString &path) override;
-  void RemoveDirectory(const Directory &dir) override;
+  void RemoveDirectory(const CollectionDirectory &dir) override;
 
   bool ExecCollectionQuery(CollectionQuery *query, SongList &songs);
   bool ExecCollectionQuery(CollectionQuery *query, SongMap &songs);
 
   void IncrementPlayCountAsync(const int id);
   void IncrementSkipCountAsync(const int id, const float progress);
-  void ResetStatisticsAsync(const int id);
+  void ResetPlayStatisticsAsync(const int id, const bool save_tags = false);
+  void ResetPlayStatisticsAsync(const QList<int> &id_list, const bool save_tags = false);
 
   void DeleteAllAsync();
 
@@ -207,8 +221,6 @@ class CollectionBackend : public CollectionBackendInterface {
   SongList SmartPlaylistsGetAllSongs();
   SongList SmartPlaylistsFindSongs(const SmartPlaylistSearch &search);
 
-  Song::Source Source() const;
-
   void AddOrUpdateSongsAsync(const SongList &songs);
   void UpdateSongsBySongIDAsync(const SongMap &new_songs);
 
@@ -226,20 +238,24 @@ class CollectionBackend : public CollectionBackendInterface {
   void UpdateMTimesOnly(const SongList &songs);
   void DeleteSongs(const SongList &songs);
   void MarkSongsUnavailable(const SongList &songs, const bool unavailable = true);
-  void AddOrUpdateSubdirs(const SubdirectoryList &subdirs);
+  void AddOrUpdateSubdirs(const CollectionSubdirectoryList &subdirs);
   void CompilationsNeedUpdating();
-  void UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false);
-  void UpdateAutomaticAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_manual = false);
+  void UpdateEmbeddedAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_embedded);
+  void UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &art_manual);
+  void UnsetAlbumArt(const QString &effective_albumartist, const QString &album);
+  void ClearAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_unset);
   void ForceCompilation(const QString &album, const QList<QString> &artists, const bool on);
   void IncrementPlayCount(const int id);
   void IncrementSkipCount(const int id, const float progress);
-  void ResetStatistics(const int id);
+  void ResetPlayStatistics(const int id, const bool save_tags = false);
+  void ResetPlayStatistics(const QList<int> &id_list, const bool save_tags = false);
+  bool ResetPlayStatistics(const QStringList &id_str_list);
   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);
   void UpdateLastPlayed(const QString &artist, const QString &album, const QString &title, const qint64 lastplayed);
-  void UpdatePlayCount(const QString &artist, const QString &title, const int playcount);
+  void UpdatePlayCount(const QString &artist, const QString &title, const int playcount, const bool save_tags = false);
 
   void UpdateSongRating(const int id, const float rating, const bool save_tags = false);
   void UpdateSongsRating(const QList<int> &id_list, const float rating, const bool save_tags = false);
@@ -248,23 +264,23 @@ class CollectionBackend : public CollectionBackendInterface {
   void ExpireSongs(const int directory_id, const int expire_unavailable_songs_days);
 
  signals:
-  void DirectoryDiscovered(Directory, SubdirectoryList);
-  void DirectoryDeleted(Directory);
+  void DirectoryDiscovered(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdir);
+  void DirectoryDeleted(const CollectionDirectory &dir);
 
-  void SongsDiscovered(SongList);
-  void SongsDeleted(SongList);
-  void SongsStatisticsChanged(SongList);
+  void SongsDiscovered(const SongList &songs);
+  void SongsDeleted(const SongList &songs);
+  void SongsStatisticsChanged(const SongList &songs, const bool save_tags = false);
 
   void DatabaseReset();
 
-  void TotalSongCountUpdated(int);
-  void TotalArtistCountUpdated(int);
-  void TotalAlbumCountUpdated(int);
-  void SongsRatingChanged(SongList, bool);
+  void TotalSongCountUpdated(const int count);
+  void TotalArtistCountUpdated(const int count);
+  void TotalAlbumCountUpdated(const int count);
+  void SongsRatingChanged(const SongList &songs, const bool save_tags);
 
   void ExitFinished();
 
-  void Error(QString);
+  void Error(const QString &error);
 
  private:
   struct CompilationInfo {
@@ -278,9 +294,9 @@ class CollectionBackend : public CollectionBackendInterface {
   };
 
   bool UpdateCompilations(const QSqlDatabase &db, SongList &deleted_songs, SongList &added_songs, const QUrl &url, const bool compilation_detected);
-  AlbumList GetAlbums(const QString &artist, const QString &album_artist, const bool compilation_required = false, const QueryOptions &opt = QueryOptions());
-  AlbumList GetAlbums(const QString &artist, const bool compilation_required, const QueryOptions &opt = QueryOptions());
-  SubdirectoryList SubdirsInDirectory(const int id, QSqlDatabase &db);
+  AlbumList GetAlbums(const QString &artist, const QString &album_artist, const bool compilation_required = false, const CollectionFilterOptions &opt = CollectionFilterOptions());
+  AlbumList GetAlbums(const QString &artist, const bool compilation_required, const CollectionFilterOptions &opt = CollectionFilterOptions());
+  CollectionSubdirectoryList SubdirsInDirectory(const int id, QSqlDatabase &db);
 
   Song GetSongById(const int id, QSqlDatabase &db);
   SongList GetSongsById(const QStringList &ids, QSqlDatabase &db);
@@ -297,7 +313,6 @@ class CollectionBackend : public CollectionBackendInterface {
   QString subdirs_table_;
   QString fts_table_;
   QThread *original_thread_;
-
 };
 
 #endif  // COLLECTIONBACKEND_H

src/collection/collectiondirectory.h

@@ -18,43 +18,40 @@
  *
  */
 
-#ifndef DIRECTORY_H
-#define DIRECTORY_H
+#ifndef COLLECTIONDIRECTORY_H
+#define COLLECTIONDIRECTORY_H
 
 #include "config.h"
 
 #include <QMetaType>
 #include <QList>
 #include <QString>
-#include <QSqlQuery>
 
-struct Directory {
-  Directory() : id(-1) {}
+struct CollectionDirectory {
+  CollectionDirectory() : id(-1) {}
 
-  bool operator==(const Directory &other) const {
+  bool operator==(const CollectionDirectory &other) const {
     return path == other.path && id == other.id;
   }
 
   QString path;
   int id;
 };
-Q_DECLARE_METATYPE(Directory)
+Q_DECLARE_METATYPE(CollectionDirectory)
 
-typedef QList<Directory> DirectoryList;
-Q_DECLARE_METATYPE(DirectoryList)
+using CollectionDirectoryList = QList<CollectionDirectory>;
+Q_DECLARE_METATYPE(CollectionDirectoryList)
 
-
-struct Subdirectory {
-  Subdirectory() : directory_id(-1), mtime(0) {}
+struct CollectionSubdirectory {
+  CollectionSubdirectory() : directory_id(-1), mtime(0) {}
 
   int directory_id;
   QString path;
   qint64 mtime;
 };
-Q_DECLARE_METATYPE(Subdirectory)
+Q_DECLARE_METATYPE(CollectionSubdirectory)
 
-typedef QList<Subdirectory> SubdirectoryList;
-Q_DECLARE_METATYPE(SubdirectoryList)
-
-#endif  // DIRECTORY_H
+using CollectionSubdirectoryList = QList<CollectionSubdirectory>;
+Q_DECLARE_METATYPE(CollectionSubdirectoryList)
 
+#endif  // COLLECTIONDIRECTORY_H

src/collection/collectiondirectorymodel.cpp

@@ -29,8 +29,8 @@
 #include "core/filesystemmusicstorage.h"
 #include "core/iconloader.h"
 #include "core/musicstorage.h"
-#include "core/utilities.h"
-#include "directory.h"
+#include "utilities/diskutils.h"
+#include "collectiondirectory.h"
 #include "collectionbackend.h"
 #include "collectiondirectorymodel.h"
 
@@ -46,17 +46,17 @@ CollectionDirectoryModel::CollectionDirectoryModel(CollectionBackend *backend, Q
 
 CollectionDirectoryModel::~CollectionDirectoryModel() = default;
 
-void CollectionDirectoryModel::DirectoryDiscovered(const Directory &dir) {
+void CollectionDirectoryModel::DirectoryDiscovered(const CollectionDirectory &dir) {
 
   QStandardItem *item = new QStandardItem(dir.path);
   item->setData(dir.id, kIdRole);
   item->setIcon(dir_icon_);
-  storage_ << std::make_shared<FilesystemMusicStorage>(dir.path, dir.id);
+  storage_ << std::make_shared<FilesystemMusicStorage>(backend_->source(), dir.path, dir.id);
   appendRow(item);
 
 }
 
-void CollectionDirectoryModel::DirectoryDeleted(const Directory &dir) {
+void CollectionDirectoryModel::DirectoryDeleted(const CollectionDirectory &dir) {
 
   for (int i = 0; i < rowCount(); ++i) {
     if (item(i, 0)->data(kIdRole).toInt() == dir.id) {
@@ -80,7 +80,7 @@ void CollectionDirectoryModel::RemoveDirectory(const QModelIndex &idx) {
 
   if (!backend_ || !idx.isValid()) return;
 
-  Directory dir;
+  CollectionDirectory dir;
   dir.path = idx.data().toString();
   dir.id = idx.data(kIdRole).toInt();
 

src/collection/collectiondirectorymodel.h

@@ -34,7 +34,7 @@
 
 class QModelIndex;
 
-struct Directory;
+struct CollectionDirectory;
 class CollectionBackend;
 class MusicStorage;
 
@@ -53,8 +53,8 @@ class CollectionDirectoryModel : public QStandardItemModel {
 
  private slots:
   // To be called by the backend
-  void DirectoryDiscovered(const Directory &directories);
-  void DirectoryDeleted(const Directory &directories);
+  void DirectoryDiscovered(const CollectionDirectory &directories);
+  void DirectoryDeleted(const CollectionDirectory &directories);
 
  private:
   static const int kIdRole = Qt::UserRole + 1;

src/collection/collectionfilteroptions.cpp

@@ -0,0 +1,42 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2023, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QtGlobal>
+#include <QDateTime>
+
+#include "core/song.h"
+
+#include "collectionfilteroptions.h"
+
+CollectionFilterOptions::CollectionFilterOptions() : filter_mode_(FilterMode::All), max_age_(-1) {}
+
+bool CollectionFilterOptions::Matches(const Song &song) const {
+
+  if (max_age_ != -1) {
+    const qint64 cutoff = QDateTime::currentDateTime().toSecsSinceEpoch() - max_age_;
+    if (song.ctime() <= cutoff) return false;
+  }
+
+  if (!filter_text_.isNull()) {
+    return song.albumartist().contains(filter_text_, Qt::CaseInsensitive) || song.artist().contains(filter_text_, Qt::CaseInsensitive) || song.album().contains(filter_text_, Qt::CaseInsensitive) || song.title().contains(filter_text_, Qt::CaseInsensitive);
+  }
+
+  return true;
+
+}

src/collection/collectionfilteroptions.h

@@ -0,0 +1,65 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2023, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef COLLECTIONFILTEROPTIONS_H
+#define COLLECTIONFILTEROPTIONS_H
+
+#include <QString>
+
+#include "core/song.h"
+
+class CollectionFilterOptions {
+ public:
+
+  explicit CollectionFilterOptions();
+
+  // Filter mode:
+  // - use the all songs table
+  // - use the duplicated songs view; by duplicated we mean those songs for which the (artist, album, title) tuple is found more than once in the songs table
+  // - use the untagged songs view; by untagged we mean those for which at least one of the (artist, album, title) tags is empty
+  // Please note that additional filtering based on FTS table (the filter attribute) won't work in Duplicates and Untagged modes.
+  enum class FilterMode {
+    All,
+    Duplicates,
+    Untagged
+  };
+
+  FilterMode filter_mode() const { return filter_mode_; }
+  int max_age() const { return max_age_; }
+  QString filter_text() const { return filter_text_; }
+
+  void set_filter_mode(const FilterMode filter_mode) {
+    filter_mode_ = filter_mode;
+    filter_text_.clear();
+  }
+  void set_max_age(const int max_age) { max_age_ = max_age; }
+  void set_filter_text(const QString &filter_text) {
+    filter_mode_ = FilterMode::All;
+    filter_text_ = filter_text;
+  }
+
+  bool Matches(const Song &song) const;
+
+ private:
+  FilterMode filter_mode_;
+  int max_age_;
+  QString filter_text_;
+};
+
+#endif  // COLLECTIONFILTEROPTIONS_H

src/collection/collectionfilterwidget.cpp

@@ -46,6 +46,7 @@
 #include "core/iconloader.h"
 #include "core/song.h"
 #include "core/logging.h"
+#include "collectionfilteroptions.h"
 #include "collectionmodel.h"
 #include "collectionquery.h"
 #include "savedgroupingmanager.h"
@@ -53,6 +54,7 @@
 #include "groupbydialog.h"
 #include "ui_collectionfilterwidget.h"
 #include "widgets/qsearchfield.h"
+#include "settings/collectionsettingspage.h"
 #include "settings/appearancesettingspage.h"
 
 CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
@@ -67,7 +69,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
       group_by_group_(nullptr),
       filter_delay_(new QTimer(this)),
       filter_applies_to_model_(true),
-      delay_behaviour_(DelayedOnLargeLibraries) {
+      delay_behaviour_(DelayBehaviour::DelayedOnLargeLibraries) {
 
   ui_->setupUi(this);
 
@@ -177,12 +179,13 @@ 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_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());
+        static_cast<CollectionModel::GroupBy>(s.value(group_by_key(1), static_cast<int>(CollectionModel::GroupBy::AlbumArtist)).toInt()),
+        static_cast<CollectionModel::GroupBy>(s.value(group_by_key(2), static_cast<int>(CollectionModel::GroupBy::AlbumDisc)).toInt()),
+        static_cast<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), false);
+      model_->SetGroupBy(CollectionModel::Grouping(CollectionModel::GroupBy::AlbumArtist, CollectionModel::GroupBy::AlbumDisc, CollectionModel::GroupBy::None), false);
     }
     s.endGroup();
   }
@@ -271,24 +274,24 @@ QActionGroup *CollectionFilterWidget::CreateGroupByActions(const QString &saved_
 
   QActionGroup *ret = new QActionGroup(parent);
 
-  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_Album)));
-  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_AlbumDisc)));
-  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Year - Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_YearAlbum)));
-  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Year - Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_YearAlbumDisc)));
+  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::AlbumArtist, CollectionModel::GroupBy::Album)));
+  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::AlbumArtist, CollectionModel::GroupBy::AlbumDisc)));
+  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Year - Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::AlbumArtist, CollectionModel::GroupBy::YearAlbum)));
+  ret->addAction(CreateGroupByAction(tr("Group by Album artist/Year - Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::AlbumArtist, CollectionModel::GroupBy::YearAlbumDisc)));
 
-  ret->addAction(CreateGroupByAction(tr("Group by Artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Artist, CollectionModel::GroupBy_Album)));
-  ret->addAction(CreateGroupByAction(tr("Group by Artist/Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Artist, CollectionModel::GroupBy_AlbumDisc)));
-  ret->addAction(CreateGroupByAction(tr("Group by Artist/Year - Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Artist, CollectionModel::GroupBy_YearAlbum)));
-  ret->addAction(CreateGroupByAction(tr("Group by Artist/Year - Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Artist, CollectionModel::GroupBy_YearAlbumDisc)));
+  ret->addAction(CreateGroupByAction(tr("Group by Artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Artist, CollectionModel::GroupBy::Album)));
+  ret->addAction(CreateGroupByAction(tr("Group by Artist/Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Artist, CollectionModel::GroupBy::AlbumDisc)));
+  ret->addAction(CreateGroupByAction(tr("Group by Artist/Year - Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Artist, CollectionModel::GroupBy::YearAlbum)));
+  ret->addAction(CreateGroupByAction(tr("Group by Artist/Year - Album - Disc"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Artist, CollectionModel::GroupBy::YearAlbumDisc)));
 
-  ret->addAction(CreateGroupByAction(tr("Group by Genre/Album artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Genre, CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_Album)));
-  ret->addAction(CreateGroupByAction(tr("Group by Genre/Artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Genre, CollectionModel::GroupBy_Artist, CollectionModel::GroupBy_Album)));
+  ret->addAction(CreateGroupByAction(tr("Group by Genre/Album artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Genre, CollectionModel::GroupBy::AlbumArtist, CollectionModel::GroupBy::Album)));
+  ret->addAction(CreateGroupByAction(tr("Group by Genre/Artist/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Genre, CollectionModel::GroupBy::Artist, CollectionModel::GroupBy::Album)));
 
-  ret->addAction(CreateGroupByAction(tr("Group by Album Artist"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist)));
-  ret->addAction(CreateGroupByAction(tr("Group by Artist"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Artist)));
+  ret->addAction(CreateGroupByAction(tr("Group by Album Artist"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::AlbumArtist)));
+  ret->addAction(CreateGroupByAction(tr("Group by Artist"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Artist)));
 
-  ret->addAction(CreateGroupByAction(tr("Group by Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Album)));
-  ret->addAction(CreateGroupByAction(tr("Group by Genre/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy_Genre, CollectionModel::GroupBy_Album)));
+  ret->addAction(CreateGroupByAction(tr("Group by Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Album)));
+  ret->addAction(CreateGroupByAction(tr("Group by Genre/Album"), parent, CollectionModel::Grouping(CollectionModel::GroupBy::Genre, CollectionModel::GroupBy::Album)));
 
   QAction *sep1 = new QAction(parent);
   sep1->setSeparator(true);
@@ -333,7 +336,7 @@ QAction *CollectionFilterWidget::CreateGroupByAction(const QString &text, QObjec
   QAction *ret = new QAction(text, parent);
   ret->setCheckable(true);
 
-  if (grouping.first != CollectionModel::GroupBy_None) {
+  if (grouping.first != CollectionModel::GroupBy::None) {
     ret->setProperty("group_by", QVariant::fromValue(grouping));
   }
 
@@ -455,12 +458,12 @@ void CollectionFilterWidget::SetFilterHint(const QString &hint) {
   ui_->search_field->setPlaceholderText(hint);
 }
 
-void CollectionFilterWidget::SetQueryMode(QueryOptions::QueryMode query_mode) {
+void CollectionFilterWidget::SetFilterMode(CollectionFilterOptions::FilterMode filter_mode) {
 
   ui_->search_field->clear();
-  ui_->search_field->setEnabled(query_mode == QueryOptions::QueryMode_All);
+  ui_->search_field->setEnabled(filter_mode == CollectionFilterOptions::FilterMode::All);
 
-  model_->SetFilterQueryMode(query_mode);
+  model_->SetFilterMode(filter_mode);
 
 }
 
@@ -508,7 +511,7 @@ void CollectionFilterWidget::FilterTextChanged(const QString &text) {
   // Searching with one or two characters can be very expensive on the database even with FTS,
   // so if there are a large number of songs in the database introduce a small delay before actually filtering the model,
   // so if the user is typing the first few characters of something it will be quicker.
-  const bool delay = (delay_behaviour_ == AlwaysDelayed) || (delay_behaviour_ == DelayedOnLargeLibraries && !text.isEmpty() && text.length() < 3 && model_->total_song_count() >= 100000);
+  const bool delay = (delay_behaviour_ == DelayBehaviour::AlwaysDelayed) || (delay_behaviour_ == DelayBehaviour::DelayedOnLargeLibraries && !text.isEmpty() && text.length() < 3 && model_->total_song_count() >= 100000);
 
   if (delay) {
     filter_delay_->start();

src/collection/collectionfilterwidget.h

@@ -32,6 +32,7 @@
 #include <QString>
 
 #include "collectionquery.h"
+#include "collectionqueryoptions.h"
 #include "collectionmodel.h"
 
 class QTimer;
@@ -53,7 +54,7 @@ class CollectionFilterWidget : public QWidget {
 
   static const int kFilterDelay = 500;  // msec
 
-  enum DelayBehaviour {
+  enum class DelayBehaviour {
     AlwaysInstant,
     DelayedOnLargeLibraries,
     AlwaysDelayed,
@@ -88,14 +89,14 @@ class CollectionFilterWidget : public QWidget {
 
  public slots:
   void UpdateGroupByActions();
-  void SetQueryMode(QueryOptions::QueryMode query_mode);
+  void SetFilterMode(CollectionFilterOptions::FilterMode filter_mode);
   void FocusOnFilter(QKeyEvent *e);
 
  signals:
   void UpPressed();
   void DownPressed();
   void ReturnPressed();
-  void Filter(QString text);
+  void Filter(const QString &text);
 
  protected:
   void keyReleaseEvent(QKeyEvent *e) override;

src/collection/collectionmodel.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,9 +49,11 @@
 #include "core/song.h"
 #include "core/sqlrow.h"
 #include "covermanager/albumcoverloader.h"
-#include "collectionquery.h"
-#include "collectionitem.h"
 #include "covermanager/albumcoverloaderoptions.h"
+#include "collectionfilteroptions.h"
+#include "collectionquery.h"
+#include "collectionqueryoptions.h"
+#include "collectionitem.h"
 
 class QSettings;
 
@@ -81,34 +83,34 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   };
 
   // These values get saved in QSettings - don't change them
-  enum GroupBy {
-    GroupBy_None = 0,
-    GroupBy_AlbumArtist = 1,
-    GroupBy_Artist = 2,
-    GroupBy_Album = 3,
-    GroupBy_AlbumDisc = 4,
-    GroupBy_YearAlbum = 5,
-    GroupBy_YearAlbumDisc = 6,
-    GroupBy_OriginalYearAlbum = 7,
-    GroupBy_OriginalYearAlbumDisc = 8,
-    GroupBy_Disc = 9,
-    GroupBy_Year = 10,
-    GroupBy_OriginalYear = 11,
-    GroupBy_Genre = 12,
-    GroupBy_Composer = 13,
-    GroupBy_Performer = 14,
-    GroupBy_Grouping = 15,
-    GroupBy_FileType = 16,
-    GroupBy_Format = 17,
-    GroupBy_Samplerate = 18,
-    GroupBy_Bitdepth = 19,
-    GroupBy_Bitrate = 20,
+  enum class GroupBy {
+    None = 0,
+    AlbumArtist = 1,
+    Artist = 2,
+    Album = 3,
+    AlbumDisc = 4,
+    YearAlbum = 5,
+    YearAlbumDisc = 6,
+    OriginalYearAlbum = 7,
+    OriginalYearAlbumDisc = 8,
+    Disc = 9,
+    Year = 10,
+    OriginalYear = 11,
+    Genre = 12,
+    Composer = 13,
+    Performer = 14,
+    Grouping = 15,
+    FileType = 16,
+    Format = 17,
+    Samplerate = 18,
+    Bitdepth = 19,
+    Bitrate = 20,
     GroupByCount = 21,
   };
   Q_ENUM(GroupBy)
 
   struct Grouping {
-    explicit Grouping(GroupBy f = GroupBy_None, GroupBy s = GroupBy_None, GroupBy t = GroupBy_None)
+    explicit Grouping(GroupBy f = GroupBy::None, GroupBy s = GroupBy::None, GroupBy t = GroupBy::None)
         : first(f), second(s), third(t) {}
 
     GroupBy first;
@@ -179,9 +181,9 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   quint64 icon_cache_disk_size() { return sIconCache->cacheSize(); }
 
   static bool IsArtistGroupBy(const GroupBy group_by) {
-    return group_by == CollectionModel::GroupBy_Artist || group_by == CollectionModel::GroupBy_AlbumArtist;
+    return group_by == CollectionModel::GroupBy::Artist || group_by == CollectionModel::GroupBy::AlbumArtist;
   }
-  static bool IsAlbumGroupBy(const GroupBy group_by) { return group_by == GroupBy_Album || group_by == GroupBy_YearAlbum || group_by == GroupBy_AlbumDisc || group_by == GroupBy_YearAlbumDisc || group_by == GroupBy_OriginalYearAlbum || group_by == GroupBy_OriginalYearAlbumDisc; }
+  static bool IsAlbumGroupBy(const GroupBy group_by) { return group_by == GroupBy::Album || group_by == GroupBy::YearAlbum || group_by == GroupBy::AlbumDisc || group_by == GroupBy::YearAlbumDisc || group_by == GroupBy::OriginalYearAlbum || group_by == GroupBy::OriginalYearAlbumDisc; }
 
   void set_use_lazy_loading(const bool value) { use_lazy_loading_ = value; }
 
@@ -197,15 +199,15 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   static QString ContainerKey(const GroupBy group_by, const bool separate_albums_by_grouping, const Song &song);
 
  signals:
-  void TotalSongCountUpdated(int count);
-  void TotalArtistCountUpdated(int count);
-  void TotalAlbumCountUpdated(int count);
-  void GroupingChanged(CollectionModel::Grouping g, bool separate_albums_by_grouping);
+  void TotalSongCountUpdated(const int count);
+  void TotalArtistCountUpdated(const int count);
+  void TotalAlbumCountUpdated(const int count);
+  void GroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping);
 
  public slots:
-  void SetFilterAge(const int age);
-  void SetFilterText(const QString &text);
-  void SetFilterQueryMode(QueryOptions::QueryMode query_mode);
+  void SetFilterMode(CollectionFilterOptions::FilterMode filter_mode);
+  void SetFilterAge(const int filter_age);
+  void SetFilterText(const QString &filter_text);
 
   void Init(const bool async = true);
   void Reset();
@@ -232,20 +234,21 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result);
 
  private:
-  // Provides some optimisations for loading the list of items in the root.
+  // Provides some optimizations for loading the list of items in the root.
   // This gets called a lot when filtering the playlist, so it's nice to be able to do it in a background thread.
-  QueryResult RunQuery(CollectionItem *parent);
+  CollectionQueryOptions PrepareQuery(CollectionItem *parent);
+  QueryResult RunQuery(const CollectionFilterOptions &filter_options = CollectionFilterOptions(), const CollectionQueryOptions &query_options = CollectionQueryOptions());
   void PostQuery(CollectionItem *parent, const QueryResult &result, const bool signal);
 
-  bool HasCompilations(const QSqlDatabase &db, const CollectionQuery &query);
+  bool HasCompilations(const QSqlDatabase &db, const CollectionFilterOptions &filter_options, const CollectionQueryOptions &query_options);
 
   void BeginReset();
 
   // Functions for working with queries and creating items.
   // When the model is reset or when a node is lazy-loaded the Collection constructs a database query to populate the items.
   // Filters are added for each parent item, restricting the songs returned to a particular album or artist for example.
-  static void InitQuery(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionQuery *q);
-  static void FilterQuery(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionItem *item, CollectionQuery *q);
+  static void SetQueryColumnSpec(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionQueryOptions *query_options);
+  static void AddQueryWhere(const GroupBy group_by, const bool separate_albums_by_grouping, CollectionItem *item, CollectionQueryOptions *query_options);
 
   // Items can be created either from a query that's been run to populate a node, or by a spontaneous SongsDiscovered emission from the backend.
   CollectionItem *ItemFromQuery(const GroupBy group_by, const bool separate_albums_by_grouping, const bool signal, const bool create_divider, CollectionItem *parent, const SqlRow &row, const int container_level);
@@ -264,6 +267,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   // Helpers
   static bool IsCompilationArtistNode(const CollectionItem *node) { return node == node->parent->compilation_artist_node_; }
   QString AlbumIconPixmapCacheKey(const QModelIndex &idx) const;
+  QUrl AlbumIconPixmapDiskCacheKey(const QString &cache_key) const;
   QVariant AlbumIcon(const QModelIndex &idx);
   QVariant data(const CollectionItem *item, const int role) const;
   bool CompareItems(const CollectionItem *a, const CollectionItem *b) const;
@@ -279,7 +283,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   int total_artist_count_;
   int total_album_count_;
 
-  QueryOptions query_options_;
+  CollectionFilterOptions filter_options_;
   Grouping group_by_;
   bool separate_albums_by_grouping_;
 
@@ -306,9 +310,9 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   bool use_disk_cache_;
   bool use_lazy_loading_;
 
-  AlbumCoverLoaderOptions cover_loader_options_;
+  AlbumCoverLoaderOptions::Types cover_types_;
 
-  typedef QPair<CollectionItem*, QString> ItemAndCacheKey;
+  using ItemAndCacheKey = QPair<CollectionItem*, QString>;
   QMap<quint64, ItemAndCacheKey> pending_art_;
   QSet<QString> pending_cache_keys_;
 };

src/collection/collectionplaylistitem.cpp

@@ -29,12 +29,12 @@
 
 class SqlRow;
 
-CollectionPlaylistItem::CollectionPlaylistItem() : PlaylistItem(Song::Source_Collection) {
-  song_.set_source(Song::Source_Collection);
+CollectionPlaylistItem::CollectionPlaylistItem() : PlaylistItem(Song::Source::Collection) {
+  song_.set_source(Song::Source::Collection);
 }
 
-CollectionPlaylistItem::CollectionPlaylistItem(const Song &song) : PlaylistItem(Song::Source_Collection), song_(song) {
-  song_.set_source(Song::Source_Collection);
+CollectionPlaylistItem::CollectionPlaylistItem(const Song &song) : PlaylistItem(Song::Source::Collection), song_(song) {
+  song_.set_source(Song::Source::Collection);
 }
 
 QUrl CollectionPlaylistItem::Url() const { return song_.url(); }
@@ -50,7 +50,7 @@ bool CollectionPlaylistItem::InitFromQuery(const SqlRow &query) {
 
   // Rows from the songs tables come first
   song_.InitFromQuery(query, true);
-  song_.set_source(Song::Source_Collection);
+  song_.set_source(Song::Source::Collection);
   return song_.is_valid();
 
 }

src/collection/collectionplaylistitem.h

@@ -52,7 +52,7 @@ class CollectionPlaylistItem : public PlaylistItem {
 
  protected:
   QVariant DatabaseValue(DatabaseColumn column) const override;
-  Song DatabaseSongMetadata() const override { return Song(Song::Source_Collection); }
+  Song DatabaseSongMetadata() const override { return Song(Song::Source::Collection); }
 
  protected:
   Song song_;

src/collection/collectionquery.cpp

@@ -31,16 +31,16 @@
 #include <QRegularExpression>
 #include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QSqlError>
 
 #include "core/logging.h"
+#include "core/sqlquery.h"
 #include "core/song.h"
 
 #include "collectionquery.h"
+#include "collectionfilteroptions.h"
+#include "collectionqueryoptions.h"
 
-QueryOptions::QueryOptions() : max_age_(-1), query_mode_(QueryMode_All) {}
-
-CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const QueryOptions &options)
+CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const CollectionFilterOptions &filter_options)
     : QSqlQuery(db),
       songs_table_(songs_table),
       fts_table_(fts_table),
@@ -49,7 +49,7 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
       duplicates_only_(false),
       limit_(-1) {
 
-  if (!options.filter().isEmpty()) {
+  if (!filter_options.filter_text().isEmpty()) {
     // We need to munge the filter text a little bit to get it to work as expected with sqlite's FTS5:
     //  1) Append * to all tokens.
     //  2) Prefix "fts" to column names.
@@ -57,9 +57,9 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
 
     // Split on whitespace
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QStringList tokens(options.filter().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts));
+    QStringList tokens(filter_options.filter_text().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts));
 #else
-    QStringList tokens(options.filter().split(QRegularExpression("\\s+"), QString::SkipEmptyParts));
+    QStringList tokens(filter_options.filter_text().split(QRegularExpression("\\s+"), QString::SkipEmptyParts));
 #endif
     QString query;
     for (QString token : tokens) {
@@ -100,49 +100,40 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
     }
   }
 
-  if (options.max_age() != -1) {
-    qint64 cutoff = QDateTime::currentDateTime().toSecsSinceEpoch() - options.max_age();
+  if (filter_options.max_age() != -1) {
+    qint64 cutoff = QDateTime::currentDateTime().toSecsSinceEpoch() - filter_options.max_age();
 
     where_clauses_ << "ctime > ?";
     bound_values_ << cutoff;
   }
 
-  // TODO: Currently you cannot use any QueryMode other than All and FTS at the same time.
+  // TODO: Currently you cannot use any FilterMode other than All and FTS at the same time.
   // Joining songs, duplicated_songs and songs_fts all together takes a huge amount of time.
   // The query takes about 20 seconds on my machine then. Why?
   // Untagged mode could work with additional filtering but I'm disabling it just to be consistent
   // this way filtering is available only in the All mode.
   // Remember though that when you fix the Duplicates + FTS cooperation, enable the filtering in both Duplicates and Untagged modes.
-  duplicates_only_ = options.query_mode() == QueryOptions::QueryMode_Duplicates;
+  duplicates_only_ = filter_options.filter_mode() == CollectionFilterOptions::FilterMode::Duplicates;
 
-  if (options.query_mode() == QueryOptions::QueryMode_Untagged) {
+  if (filter_options.filter_mode() == CollectionFilterOptions::FilterMode::Untagged) {
     where_clauses_ << "(artist = '' OR album = '' OR title ='')";
   }
 
 }
 
-QString CollectionQuery::GetInnerQuery() const {
-  return duplicates_only_
-             ? QString(" INNER JOIN (select * from duplicated_songs) dsongs        "
-                   "ON (%songs_table.artist = dsongs.dup_artist       "
-                   "AND %songs_table.album = dsongs.dup_album     "
-                   "AND %songs_table.title = dsongs.dup_title)    ")
-             : QString();
-}
-
 void CollectionQuery::AddWhere(const QString &column, const QVariant &value, const QString &op) {
 
   // Ignore 'literal' for IN
   if (op.compare("IN", Qt::CaseInsensitive) == 0) {
     QStringList values = value.toStringList();
-    QStringList final;
-    final.reserve(values.count());
+    QStringList final_values;
+    final_values.reserve(values.count());
     for (const QString &single_value : values) {
-      final.append("?");
+      final_values.append("?");
       bound_values_ << single_value;
     }
 
-    where_clauses_ << QString("%1 IN (" + final.join(",") + ")").arg(column);
+    where_clauses_ << QString("%1 IN (" + final_values.join(",") + ")").arg(column);
   }
   else {
     // Do integers inline - sqlite seems to get confused when you pass integers to bound parameters
@@ -187,6 +178,15 @@ void CollectionQuery::AddCompilationRequirement(const bool compilation) {
 
 }
 
+QString CollectionQuery::GetInnerQuery() const {
+  return duplicates_only_
+             ? QString(" INNER JOIN (select * from duplicated_songs) dsongs        "
+                   "ON (%songs_table.artist = dsongs.dup_artist       "
+                   "AND %songs_table.album = dsongs.dup_album     "
+                   "AND %songs_table.title = dsongs.dup_title)    ")
+             : QString();
+}
+
 bool CollectionQuery::Exec() {
 
   QString sql;
@@ -213,32 +213,17 @@ bool CollectionQuery::Exec() {
   sql.replace("%fts_table_noprefix", fts_table_.section('.', -1, -1));
   sql.replace("%fts_table", fts_table_);
 
-  prepare(sql);
+  QSqlQuery::prepare(sql);
 
   // Bind values
   for (const QVariant &value : bound_values_) {
-    addBindValue(value);
+    QSqlQuery::addBindValue(value);
   }
 
-  return exec();
+  return QSqlQuery::exec();
 
 }
 
-bool CollectionQuery::Next() { return next(); }
+bool CollectionQuery::Next() { return QSqlQuery::next(); }
 
-QVariant CollectionQuery::Value(const int column) const { return value(column); }
-
-bool QueryOptions::Matches(const Song &song) const {
-
-  if (max_age_ != -1) {
-    const qint64 cutoff = QDateTime::currentDateTime().toSecsSinceEpoch() - max_age_;
-    if (song.ctime() <= cutoff) return false;
-  }
-
-  if (!filter_.isNull()) {
-    return song.artist().contains(filter_, Qt::CaseInsensitive) || song.album().contains(filter_, Qt::CaseInsensitive) || song.title().contains(filter_, Qt::CaseInsensitive);
-  }
-
-  return true;
-
-}
+QVariant CollectionQuery::Value(const int column) const { return QSqlQuery::value(column); }

src/collection/collectionquery.h

@@ -28,75 +28,23 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QMap>
 #include <QSqlDatabase>
 #include <QSqlQuery>
 
-class Song;
-
-// This structure let's you customize behaviour of any CollectionQuery.
-struct QueryOptions {
-  // Modes of CollectionQuery:
-  // - use the all songs table
-  // - use the duplicated songs view; by duplicated we mean those songs for which the (artist, album, title) tuple is found more than once in the songs table
-  // - use the untagged songs view; by untagged we mean those for which at least one of the (artist, album, title) tags is empty
-  // Please note that additional filtering based on FTS table (the filter attribute) won't work in Duplicates and Untagged modes.
-  enum QueryMode {
-    QueryMode_All,
-    QueryMode_Duplicates,
-    QueryMode_Untagged
-  };
-
-  QueryOptions();
-
-  bool Matches(const Song &song) const;
-
-  QString filter() const { return filter_; }
-  void set_filter(const QString &filter) {
-    filter_ = filter;
-    query_mode_ = QueryMode_All;
-  }
-
-  int max_age() const { return max_age_; }
-  void set_max_age(int max_age) { max_age_ = max_age; }
-
-  QueryMode query_mode() const { return query_mode_; }
-  void set_query_mode(QueryMode query_mode) {
-    query_mode_ = query_mode;
-    filter_ = QString();
-  }
-
- private:
-  QString filter_;
-  int max_age_;
-  QueryMode query_mode_;
-};
+#include "collectionfilteroptions.h"
+#include "collectionqueryoptions.h"
 
 class CollectionQuery : public QSqlQuery {
  public:
-  explicit CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const QueryOptions &options = QueryOptions());
+  explicit CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const CollectionFilterOptions &filter_options = CollectionFilterOptions());
 
-  // Sets contents of SELECT clause on the query (list of columns to get).
-  void SetColumnSpec(const QString &spec) { column_spec_ = spec; }
-
-  // Sets an ORDER BY clause on the query.
-  void SetOrderBy(const QString &order_by) { order_by_ = order_by; }
-
-  // Adds a fragment of WHERE clause. When executed, this Query will connect all the fragments with AND operator.
-  // Please note that IN operator expects a QStringList as value.
-  void AddWhere(const QString &column, const QVariant &value, const QString &op = "=");
-  void AddWhereArtist(const QVariant &value);
-
-  void SetWhereClauses(const QStringList &where_clauses) { where_clauses_ = where_clauses; }
-  void SetBoundValues(const QVariantList &bound_values) { bound_values_ = bound_values; }
-  void SetDuplicatesOnly(const bool duplicates_only) { duplicates_only_ = duplicates_only; }
-  void SetIncludeUnavailable(const bool include_unavailable) { include_unavailable_ = include_unavailable; }
-  void SetLimit(const int limit) { limit_ = limit; }
-  void AddCompilationRequirement(const bool compilation);
+  QVariant Value(const int column) const;
+  QVariant value(const int column) const { return Value(column); }
 
   bool Exec();
+  bool exec() { return QSqlQuery::exec(); }
+
   bool Next();
-  QVariant Value(const int column) const;
 
   QString column_spec() const { return column_spec_; }
   QString order_by() const { return order_by_; }
@@ -107,6 +55,24 @@ class CollectionQuery : public QSqlQuery {
   bool duplicates_only() const { return duplicates_only_; }
   int limit() const { return limit_; }
 
+  // Sets contents of SELECT clause on the query (list of columns to get).
+  void SetColumnSpec(const QString &column_spec) { column_spec_ = column_spec; }
+
+  // Sets an ORDER BY clause on the query.
+  void SetOrderBy(const QString &order_by) { order_by_ = order_by; }
+
+  void SetWhereClauses(const QStringList &where_clauses) { where_clauses_ = where_clauses; }
+  // Adds a fragment of WHERE clause. When executed, this Query will connect all the fragments with AND operator.
+  // Please note that IN operator expects a QStringList as value.
+  void AddWhere(const QString &column, const QVariant &value, const QString &op = "=");
+  void AddWhereArtist(const QVariant &value);
+
+  void SetBoundValues(const QVariantList &bound_values) { bound_values_ = bound_values; }
+  void SetDuplicatesOnly(const bool duplicates_only) { duplicates_only_ = duplicates_only; }
+  void SetIncludeUnavailable(const bool include_unavailable) { include_unavailable_ = include_unavailable; }
+  void SetLimit(const int limit) { limit_ = limit; }
+  void AddCompilationRequirement(const bool compilation);
+
  private:
   QString GetInnerQuery() const;
 

src/collection/collectionqueryoptions.cpp

@@ -0,0 +1,34 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2023, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QVariant>
+#include <QString>
+
+#include "collectionqueryoptions.h"
+#include "collectionfilteroptions.h"
+
+CollectionQueryOptions::CollectionQueryOptions()
+    : compilation_requirement_(CollectionQueryOptions::CompilationRequirement::None),
+      query_have_compilations_(false) {}
+
+void CollectionQueryOptions::AddWhere(const QString &column, const QVariant &value, const QString &op) {
+
+  where_clauses_ << Where(column, value, op);
+
+}

src/collection/collectionqueryoptions.h

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