Release 1.2.1-rc1

Fixes #1581

.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/FUNDING.yml

@@ -1,3 +1,4 @@
 github: jonaski
 patreon: jonaskvinge
+ko_fi: jonaskvinge
 custom: https://paypal.me/jonaskvinge

.github/ISSUE_TEMPLATE.md

@@ -7,12 +7,9 @@ assignees: ''
 
 ---
 
-For technical issues, questions and feature suggestions/requests please use the forum on https://forum.strawberrymusicplayer.org/
-
-Check the Changelog to see if the issue is already fixed:
-https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog
-
-If it's fixed, try the latest development build from: https://builds.strawberrymusicplayer.org/
+- [ ] I have checked the [FAQ](https://wiki.strawberrymusicplayer.org/wiki/FAQ) for answers.
+- [ ] I have checked the [Changelog](https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog) that the issue is not already fixed. 
+- [ ] I believe this issue is a bug, and not a general technical issue, question or feature requests that can be discussed on the [forum](https://forum.strawberrymusicplayer.org/). 
 
 **Describe the bug**
 A clear and concise description of what the bug is.

.github/dependabot.yml

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

.gitignore

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

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "3rdparty/kdsingleapplication/KDSingleApplication"]
+	path = 3rdparty/kdsingleapplication/KDSingleApplication
+	url = https://github.com/KDAB/KDSingleApplication.git
+	branch = master

3rdparty/README.md

@@ -1,25 +1,11 @@
 3rdparty libraries located in this directory
 ============================================
 
-singleapplication
------------------
-This is a small static library used by Strawberry to prevent it from starting twice per user session.
+KDSingleApplication
+-------------------
+A small library used by Strawberry to prevent it from starting twice per user session.
 If the user tries to start strawberry twice, the main window will maximize instead of starting another instance.
-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.
+This 3rdparty copy is used only if KDSingleApplication 1.1 or higher is not found on the system.
 
-URL: https://github.com/itay-grudev/SingleApplication
-
-
-SPMediaKeyTap
--------------
-Used on macOS to exclusively enable strawberry to grab global media shortcuts.
-Can safely be deleted on other platforms.
-
-
-macdeployqt
------------
-A modified version of Qt's official macdeployqt utility that fixes some issues,
-this version also deploys gstreamer plugins.
-Can safely be deleted on other platforms.
+URL: https://github.com/KDAB/KDSingleApplication/

3rdparty/SPMediaKeyTap/CMakeLists.txt

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

3rdparty/SPMediaKeyTap/LICENSE

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

3rdparty/SPMediaKeyTap/README.md

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

3rdparty/SPMediaKeyTap/SPMediaKeyTap.h

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

3rdparty/SPMediaKeyTap/SPMediaKeyTap.m

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

3rdparty/kdsingleapplication/CMakeLists.txt

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

3rdparty/macdeployqt/CMakeLists.txt

@@ -1,7 +0,0 @@
-add_executable(macdeployqt main.cpp shared.cpp)
-target_link_libraries(macdeployqt PRIVATE
-  "-framework AppKit"
-  ${QtCore_LIBRARIES}
-)
-
-#execute_process(COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/macdeployqt ${CMAKE_BINARY_DIR})

3rdparty/macdeployqt/main.cpp

@@ -1,286 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#undef QT_NO_DEBUG_OUTPUT
-#undef QT_NO_WARNING_OUTPUT
-#undef QT_NO_INFO_OUTPUT
-
-#include <QCoreApplication>
-#include <QDir>
-#include <QLibraryInfo>
-
-#include "shared.h"
-
-int main(int argc, char **argv)
-{
-    QCoreApplication app(argc, argv);
-
-    QString appBundlePath;
-    if (argc > 1)
-        appBundlePath = QString::fromLocal8Bit(argv[1]);
-
-    if (argc < 2 || appBundlePath.startsWith("-")) {
-        qDebug() << "Usage: macdeployqt app-bundle [options]";
-        qDebug() << "";
-        qDebug() << "Options:";
-        qDebug() << "   -verbose=<0-3>                : 0 = no output, 1 = error/warning (default), 2 = normal, 3 = debug";
-        qDebug() << "   -no-plugins                   : Skip plugin deployment";
-        qDebug() << "   -dmg                          : Create a .dmg disk image";
-        qDebug() << "   -no-strip                     : Don't run 'strip' on the binaries";
-        qDebug() << "   -use-debug-libs               : Deploy with debug versions of frameworks and plugins (implies -no-strip)";
-        qDebug() << "   -executable=<path>            : Let the given executable use the deployed frameworks too";
-        qDebug() << "   -qmldir=<path>                : Scan for QML imports in the given path";
-        qDebug() << "   -qmlimport=<path>             : Add the given path to the QML module search locations";
-        qDebug() << "   -always-overwrite             : Copy files even if the target file exists";
-        qDebug() << "   -codesign=<ident>             : Run codesign with the given identity on all executables";
-        qDebug() << "   -hardened-runtime             : Enable Hardened Runtime when code signing";
-        qDebug() << "   -timestamp                    : Include a secure timestamp when code signing (requires internet connection)";
-        qDebug() << "   -sign-for-notarization=<ident>: Activate the necessary options for notarization (requires internet connection)";
-        qDebug() << "   -appstore-compliant           : Skip deployment of components that use private API";
-        qDebug() << "   -libpath=<path>               : Add the given path to the library search path";
-        qDebug() << "   -fs=<filesystem>              : Set the filesystem used for the .dmg disk image (defaults to HFS+)";
-        qDebug() << "";
-        qDebug() << "macdeployqt takes an application bundle as input and makes it";
-        qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
-        qDebug() << "the application uses.";
-        qDebug() << "";
-        qDebug() << "Plugins related to a framework are copied in with the";
-        qDebug() << "framework. The accessibility, image formats, and text codec";
-        qDebug() << "plugins are always copied, unless \"-no-plugins\" is specified.";
-        qDebug() << "";
-        qDebug() << "Qt plugins may use private API and will cause the app to be";
-        qDebug() << "rejected from the Mac App store. MacDeployQt will print a warning";
-        qDebug() << "when known incompatible plugins are deployed. Use -appstore-compliant ";
-        qDebug() << "to skip these plugins. Currently two SQL plugins are known to";
-        qDebug() << "be incompatible: qsqlodbc and qsqlpsql.";
-        qDebug() << "";
-        qDebug() << "See the \"Deploying Applications on OS X\" topic in the";
-        qDebug() << "documentation for more information about deployment on OS X.";
-
-        return 1;
-    }
-
-    appBundlePath = QDir::cleanPath(appBundlePath);
-
-    if (QDir().exists(appBundlePath) == false) {
-        qDebug() << "Error: Could not find app bundle" << appBundlePath;
-        return 1;
-    }
-
-    bool plugins = true;
-    bool dmg = false;
-    QByteArray filesystem("HFS+");
-    bool useDebugLibs = false;
-    extern bool runStripEnabled;
-    extern bool alwaysOwerwriteEnabled;
-    extern QStringList librarySearchPath;
-    QStringList additionalExecutables;
-    bool qmldirArgumentUsed = false;
-    QStringList qmlDirs;
-    QStringList qmlImportPaths;
-    extern bool runCodesign;
-    extern QString codesignIdentiy;
-    extern bool hardenedRuntime;
-    extern bool appstoreCompliant;
-    extern bool deployFramework;
-    extern bool secureTimestamp;
-
-    for (int i = 2; i < argc; ++i) {
-        QByteArray argument = QByteArray(argv[i]);
-        if (argument == QByteArray("-no-plugins")) {
-            LogDebug() << "Argument found:" << argument;
-            plugins = false;
-        } else if (argument == QByteArray("-dmg")) {
-            LogDebug() << "Argument found:" << argument;
-            dmg = true;
-        } else if (argument == QByteArray("-no-strip")) {
-            LogDebug() << "Argument found:" << argument;
-            runStripEnabled = false;
-        } else if (argument == QByteArray("-use-debug-libs")) {
-            LogDebug() << "Argument found:" << argument;
-            useDebugLibs = true;
-            runStripEnabled = false;
-        } else if (argument.startsWith(QByteArray("-verbose"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf("=");
-            bool ok = false;
-            int number = argument.mid(index+1).toInt(&ok);
-            if (!ok)
-                LogError() << "Could not parse verbose level";
-            else
-                logLevel = number;
-        } else if (argument.startsWith(QByteArray("-executable"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf('=');
-            if (index == -1)
-                LogError() << "Missing executable path";
-            else
-                additionalExecutables << argument.mid(index+1);
-        } else if (argument.startsWith(QByteArray("-qmldir"))) {
-            LogDebug() << "Argument found:" << argument;
-            qmldirArgumentUsed = true;
-            int index = argument.indexOf('=');
-            if (index == -1)
-                LogError() << "Missing qml directory path";
-            else
-                qmlDirs << argument.mid(index+1);
-        } else if (argument.startsWith(QByteArray("-qmlimport"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf('=');
-            if (index == -1)
-                LogError() << "Missing qml import path";
-            else
-                qmlImportPaths << argument.mid(index+1);
-        } else if (argument.startsWith(QByteArray("-libpath"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf('=');
-            if (index == -1)
-                LogError() << "Missing library search path";
-            else
-                librarySearchPath << argument.mid(index+1);
-        } else if (argument == QByteArray("-always-overwrite")) {
-            LogDebug() << "Argument found:" << argument;
-            alwaysOwerwriteEnabled = true;
-        } else if (argument.startsWith(QByteArray("-codesign"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf("=");
-            if (index < 0 || index >= argument.size()) {
-                LogError() << "Missing code signing identity";
-            } else {
-                runCodesign = true;
-                codesignIdentiy = argument.mid(index+1);
-            }
-        } else if (argument.startsWith(QByteArray("-sign-for-notarization"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf("=");
-            if (index < 0 || index >= argument.size()) {
-                LogError() << "Missing code signing identity";
-            } else {
-                runCodesign = true;
-                hardenedRuntime = true;
-                secureTimestamp = true;
-                codesignIdentiy = argument.mid(index+1);
-            }
-        } else if (argument.startsWith(QByteArray("-hardened-runtime"))) {
-            LogDebug() << "Argument found:" << argument;
-            hardenedRuntime = true;
-        } else if (argument.startsWith(QByteArray("-timestamp"))) {
-            LogDebug() << "Argument found:" << argument;
-            secureTimestamp = true;
-        } else if (argument == QByteArray("-appstore-compliant")) {
-            LogDebug() << "Argument found:" << argument;
-            appstoreCompliant = true;
-
-        // Undocumented option, may not work as intended
-        } else if (argument == QByteArray("-deploy-framework")) {
-            LogDebug() << "Argument found:" << argument;
-            deployFramework = true;
-
-        } else if (argument.startsWith(QByteArray("-fs"))) {
-            LogDebug() << "Argument found:" << argument;
-            int index = argument.indexOf('=');
-            if (index == -1)
-                LogError() << "Missing filesystem type";
-            else
-                filesystem = argument.mid(index+1);
-        } else if (argument.startsWith("-")) {
-            LogError() << "Unknown argument" << argument << "\n";
-            return 1;
-        }
-     }
-
-    DeploymentInfo deploymentInfo = deployQtFrameworks(appBundlePath, additionalExecutables, useDebugLibs);
-
-    if (deploymentInfo.isDebug)
-        useDebugLibs = true;
-
-    if (deployFramework && deploymentInfo.isFramework)
-        fixupFramework(appBundlePath);
-
-    // Convenience: Look for .qml files in the current directory if no -qmldir specified.
-    if (qmlDirs.isEmpty()) {
-        QDir dir;
-        if (!dir.entryList(QStringList() << QStringLiteral("*.qml")).isEmpty()) {
-            qmlDirs += QStringLiteral(".");
-        }
-    }
-
-    if (!qmlDirs.isEmpty()) {
-        bool ok = deployQmlImports(appBundlePath, deploymentInfo, qmlDirs, qmlImportPaths);
-        if (!ok && qmldirArgumentUsed)
-            return 1; // exit if the user explicitly asked for qml import deployment
-
-        // Update deploymentInfo.deployedFrameworks - the QML imports
-        // may have brought in extra frameworks as dependencies.
-        deploymentInfo.deployedFrameworks += findAppFrameworkNames(appBundlePath);
-        deploymentInfo.deployedFrameworks =
-            QSet<QString>(deploymentInfo.deployedFrameworks.begin(),
-                          deploymentInfo.deployedFrameworks.end()).values();
-    }
-
-    // Handle plugins
-    if (plugins) {
-        // Set the plugins search directory
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        deploymentInfo.pluginPath = QLibraryInfo::path(QLibraryInfo::PluginsPath);
-#else
-        deploymentInfo.pluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
-#endif
-        // Sanity checks
-        if (deploymentInfo.pluginPath.isEmpty()) {
-            LogError() << "Missing Qt plugins path\n";
-            return 1;
-        }
-
-        if (!QDir(deploymentInfo.pluginPath).exists()) {
-            LogError() << "Plugins path does not exist" << deploymentInfo.pluginPath << "\n";
-            return 1;
-        }
-
-        // Deploy plugins
-        Q_ASSERT(!deploymentInfo.pluginPath.isEmpty());
-        if (!deploymentInfo.pluginPath.isEmpty()) {
-            LogNormal();
-            deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
-            createQtConf(appBundlePath);
-        }
-    }
-
-    if (runStripEnabled)
-        stripAppBinary(appBundlePath);
-
-    if (runCodesign)
-        codesign(codesignIdentiy, appBundlePath);
-
-    if (dmg) {
-        LogNormal();
-        createDiskImage(appBundlePath, filesystem);
-    }
-
-    return 0;
-}

3rdparty/macdeployqt/shared.h

@@ -1,141 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef MAC_DEPLOMYMENT_SHARED_H
-#define MAC_DEPLOMYMENT_SHARED_H
-
-#include <QString>
-#include <QStringList>
-#include <QDebug>
-#include <QSet>
-#include <QVersionNumber>
-
-extern int logLevel;
-#define LogError()      if (logLevel < 0) {} else qDebug() << "ERROR:"
-#define LogWarning()    if (logLevel < 1) {} else qDebug() << "WARNING:"
-#define LogNormal()     if (logLevel < 2) {} else qDebug() << "Log:"
-#define LogDebug()      if (logLevel < 3) {} else qDebug() << "Log:"
-
-extern bool runStripEnabled;
-
-class FrameworkInfo
-{
-public:
-    bool isDylib;
-    QString frameworkDirectory;
-    QString frameworkName;
-    QString frameworkPath;
-    QString binaryDirectory;
-    QString binaryName;
-    QString binaryPath;
-    QString rpathUsed;
-    QString version;
-    QString installName;
-    QString deployedInstallName;
-    QString sourceFilePath;
-    QString frameworkDestinationDirectory;
-    QString binaryDestinationDirectory;
-
-    bool isDebugLibrary() const
-    {
-        return binaryName.endsWith(QStringLiteral("_debug"));
-    }
-};
-
-class DylibInfo
-{
-public:
-    QString binaryPath;
-    QVersionNumber currentVersion;
-    QVersionNumber compatibilityVersion;
-};
-
-class OtoolInfo
-{
-public:
-    QString installName;
-    QString binaryPath;
-    QVersionNumber currentVersion;
-    QVersionNumber compatibilityVersion;
-    QList<DylibInfo> dependencies;
-};
-
-bool operator==(const FrameworkInfo &a, const FrameworkInfo &b);
-QDebug operator<<(QDebug debug, const FrameworkInfo &info);
-
-class ApplicationBundleInfo
-{
-    public:
-    QString path;
-    QString binaryPath;
-    QStringList libraryPaths;
-};
-
-class DeploymentInfo
-{
-public:
-    QString qtPath;
-    QString pluginPath;
-    QStringList deployedFrameworks;
-    QList<QString> rpathsUsed;
-    bool useLoaderPath;
-    bool isFramework;
-    bool isDebug;
-
-    bool containsModule(const QString &module, const QString &libInFix) const;
-};
-
-inline QDebug operator<<(QDebug debug, const ApplicationBundleInfo &info);
-
-OtoolInfo findDependencyInfo(const QString &binaryPath);
-FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs);
-QString findAppBinary(const QString &appBundlePath);
-QList<FrameworkInfo> getQtFrameworks(const QString &path, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs);
-QList<FrameworkInfo> getQtFrameworks(const QStringList &otoolLines, const QString &appBundlePath, const QList<QString> &rpaths, bool useDebugLibs);
-QString copyFramework(const FrameworkInfo &framework, const QString path);
-DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringList &additionalExecutables, bool useDebugLibs);
-DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs, bool useLoaderPath);
-void createQtConf(const QString &appBundlePath);
-void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs);
-bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInfo, QStringList &qmlDirs, QStringList &qmlImportPaths);
-void changeIdentification(const QString &id, const QString &binaryPath);
-void changeInstallName(const QString &oldName, const QString &newName, const QString &binaryPath);
-void runStrip(const QString &binaryPath);
-void stripAppBinary(const QString &bundlePath);
-QString findAppBinary(const QString &appBundlePath);
-QStringList findAppFrameworkNames(const QString &appBundlePath);
-QStringList findAppFrameworkPaths(const QString &appBundlePath);
-void codesignFile(const QString &identity, const QString &filePath);
-QSet<QString> codesignBundle(const QString &identity,
-                             const QString &appBundlePath,
-                             QList<QString> additionalBinariesContainingRpaths);
-void codesign(const QString &identity, const QString &appBundlePath);
-void createDiskImage(const QString &appBundlePath, const QString &filesystemType);
-void fixupFramework(const QString &appBundlePath);
-
-
-#endif

3rdparty/singleapplication/CMakeLists.txt

@@ -1,38 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-
-if(CMAKE_VERSION VERSION_GREATER 3.0)
-  check_function_exists(geteuid HAVE_GETEUID)
-  check_function_exists(getpwuid HAVE_GETPWUID)
-endif()
-
-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/README.md

@@ -1,265 +0,0 @@
-SingleApplication
-=================
-
-This is a replacement of the QtSingleApplication for `Qt5`.
-
-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.
-
-The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
-instance of your Application is your Primary Instance. It would check if the
-shared memory block exists and if not it will start a `QLocalServer` and listen
-for connections. Each subsequent instance of your application would check if the
-shared memory block exists and if it does, it will connect to the QLocalServer
-to notify the primary instance that a new instance had been started, after which
-it would terminate with status code `0`. In the Primary Instance
-`SingleApplication` would emit the `instanceStarted()` signal upon detecting
-that a new instance had been started.
-
-The library uses `stdlib` to terminate the program with the `exit()` function.
-
-You can use the library as if you use any other `QCoreApplication` derived
-class:
-
-```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 and include it's contents with a `.pri` file. Here is
-how:
-
-```bash
-git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
-```
-
-Then include the `singleapplication.pri` file in your `.pro` project file. Also
-don't forget to specify which `QCoreApplication` class your app is using if it
-is not `QCoreApplication`.
-
-```qmake
-include(singleapplication/singleapplication.pri)
-DEFINES += QAPPLICATION_CLASS=QApplication
-```
-
-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.*
-
-API
----
-
-### Members
-
-```cpp
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100 )
-```
-
-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.
-
-*__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
-
----
-
-```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.
-
-### 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,270 +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[], bool allowSecondary, Options options, 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
-  d->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 *inst = static_cast<InstancesInfo*>(d->memory_->data());
-  QElapsedTimer time;
-  time.start();
-
-  // Make sure the shared memory block is initialised and in consistent state
-  forever {
-    // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == inst->checksum) break;
-
-    // If 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();
-    }
-    d->randomSleep();
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleApplication: Unable to lock memory after random wait.";
-      abortSafely();
-    }
-  }
-
-  if (!inst->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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(SingleApplication);
-  return d->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;
-  }
-
-  d->socket_->write(message);
-  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
-  d->socket_->flush();
-  return dataWritten;
-
-}
-
-/**
- * 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,153 +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
-
-  typedef QApplication app_t;
-
- 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.
-   * @see See the corresponding QAPPLICATION_CLASS constructor for reference
-   */
-  explicit SingleApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
-  ~SingleApplication() override;
-
-  /**
-   * @brief Returns if the instance is the primary instance
-   * @returns {bool}
-   */
-  bool isPrimary();
-
-  /**
-   * @brief Returns if the instance is a secondary instance
-   * @returns {bool}
-   */
-  bool isSecondary();
-
-  /**
-   * @brief Returns a unique identifier for the current instance
-   * @returns {qint32}
-   */
-  quint32 instanceId();
-
-  /**
-   * @brief Returns the process ID (PID) of the primary instance
-   * @returns {qint64}
-   */
-  qint64 primaryPid();
-
-  /**
-   * @brief Returns the username of the user running the primary instance
-   * @returns {QString}
-   */
-  QString primaryUser();
-
-  /**
-   * @brief Returns the username of the current user
-   * @returns {QString}
-   */
-  QString currentUser();
-
-  /**
-   * @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,471 +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
-
-#include <QObject>
-#include <QThread>
-#include <QIODevice>
-#include <QSharedMemory>
-#include <QByteArray>
-#include <QDataStream>
-#include <QCryptographicHash>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QDir>
-#include <QElapsedTimer>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#  include <QRandomGenerator>
-#else
-#  include <QDateTime>
-#endif
-
-#include "singleapplication.h"
-#include "singleapplication_p.h"
-
-#ifdef Q_OS_WIN
-#  include <windows.h>
-#  include <lmcons.h>
-#endif
-
-SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *ptr)
-    : q_ptr(ptr),
-      memory_(nullptr),
-      socket_(nullptr),
-      server_(nullptr),
-      instanceNumber_(-1) {}
-
-SingleApplicationPrivate::~SingleApplicationPrivate() {
-
-  if (socket_ != nullptr) {
-    socket_->close();
-    delete socket_;
-    socket_ = nullptr;
-  }
-
-  if (memory_ != nullptr) {
-    memory_->lock();
-    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-    if (server_ != nullptr) {
-      server_->close();
-      delete server_;
-      inst->primary = false;
-      inst->primaryPid = -1;
-      inst->primaryUser[0] = '\0';
-      inst->checksum = blockChecksum();
-    }
-    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", 17);
-  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)) {
-#ifdef 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 *inst = static_cast<InstancesInfo*>(memory_->data());
-  inst->primary = false;
-  inst->secondary = 0;
-  inst->primaryPid = -1;
-  inst->primaryUser[0] = '\0';
-  inst->checksum = blockChecksum();
-
-}
-
-void SingleApplicationPrivate::startPrimary() {
-
-  Q_Q(SingleApplication);
-
-  // Reset the number of connections
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-
-  inst->primary = true;
-  inst->primaryPid = q->applicationPid();
-  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
-  inst->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 *inst = static_cast<InstancesInfo*>(memory_->data());
-
-  inst->secondary += 1;
-  inst->checksum = blockChecksum();
-  instanceNumber_ = inst->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;
-
-  // The header indicates the message length that follows
-  QByteArray header;
-  QDataStream headerStream(&header, QIODevice::WriteOnly);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(initMsg.length());
-
-  socket_->write(header);
-  socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(static_cast<int>(timeout - time.elapsed()));
-  socket_->flush();
-
-  return result;
-
-}
-
-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 *inst = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = inst->primaryPid;
-  memory_->unlock();
-
-  return pid;
-
-}
-
-QString SingleApplicationPrivate::primaryUser() const {
-
-  memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = inst->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, this, [nextConnSocket, this]() {
-    connectionMap_.remove(nextConnSocket);
-    nextConnSocket->deleteLater();
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    const ConnectionInfo info = connectionMap_[nextConnSocket];
-    switch (info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
-        break;
-      case StageBody:
-        readInitMessageBody(nextConnSocket);
-        break;
-      case StageConnected:
-        slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
-    };
-  });
-
-}
-
-void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
-
-  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 = StageBody;
-  info.msgLen = msgLen;
-
-  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
-    readInitMessageBody(sock);
-  }
-
-}
-
-void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
-
-  Q_Q(SingleApplication);
-
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
-    return;
-  }
-
-  // Read the message body
-  QByteArray msgBytes = sock->read(info.msgLen);
-  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;
-  }
-
-  info.instanceId = instanceId;
-  info.stage = StageConnected;
-
-  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplication::Mode::SecondaryNotification)) {
-    Q_EMIT q->instanceStarted();
-  }
-
-  if (sock->bytesAvailable() > 0) {
-    slotDataAvailable(sock, instanceId);
-  }
-
-}
-
-void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
-
-  Q_Q(SingleApplication);
-  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
-
-}
-
-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(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
-#endif
-
-}

3rdparty/singleapplication/singleapplication_p.h

@@ -1,111 +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 {
-    StageHeader = 0,
-    StageBody = 1,
-    StageConnected = 2,
-  };
-  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;
-  void readInitMessageHeader(QLocalSocket *socket);
-  void readInitMessageBody(QLocalSocket *socket);
-  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,270 +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[], bool allowSecondary, Options options, 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
-  d->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 *inst = static_cast<InstancesInfo*>(d->memory_->data());
-  QElapsedTimer time;
-  time.start();
-
-  // Make sure the shared memory block is initialised and in consistent state
-  forever {
-    // If the shared memory block's checksum is valid continue
-    if (d->blockChecksum() == inst->checksum) break;
-
-    // If 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();
-    }
-    d->randomSleep();
-    if (!d->memory_->lock()) {
-      qCritical() << "SingleCoreApplication: Unable to lock memory after random wait.";
-      abortSafely();
-    }
-  }
-
-  if (!inst->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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(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() {
-  Q_D(SingleCoreApplication);
-  return d->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;
-  }
-
-  d->socket_->write(message);
-  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
-  d->socket_->flush();
-  return dataWritten;
-
-}
-
-/**
- * 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 {
-  Q_OBJECT
-
-  typedef QCoreApplication app_t;
-
- 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();
-
-  /**
-   * @brief Returns if the instance is a secondary instance
-   * @returns {bool}
-   */
-  bool isSecondary();
-
-  /**
-   * @brief Returns a unique identifier for the current instance
-   * @returns {qint32}
-   */
-  quint32 instanceId();
-
-  /**
-   * @brief Returns the process ID (PID) of the primary instance
-   * @returns {qint64}
-   */
-  qint64 primaryPid();
-
-  /**
-   * @brief Returns the username of the user running the primary instance
-   * @returns {QString}
-   */
-  QString primaryUser();
-
-  /**
-   * @brief Returns the username of the current user
-   * @returns {QString}
-   */
-  QString currentUser();
-
-  /**
-   * @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,471 +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
-
-#include <QObject>
-#include <QThread>
-#include <QIODevice>
-#include <QSharedMemory>
-#include <QByteArray>
-#include <QDataStream>
-#include <QCryptographicHash>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QDir>
-#include <QElapsedTimer>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#  include <QRandomGenerator>
-#else
-#  include <QDateTime>
-#endif
-
-#include "singlecoreapplication.h"
-#include "singlecoreapplication_p.h"
-
-#ifdef Q_OS_WIN
-#  include <windows.h>
-#  include <lmcons.h>
-#endif
-
-SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *ptr)
-    : q_ptr(ptr),
-      memory_(nullptr),
-      socket_(nullptr),
-      server_(nullptr),
-      instanceNumber_(-1) {}
-
-SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
-
-  if (socket_ != nullptr) {
-    socket_->close();
-    delete socket_;
-    socket_ = nullptr;
-  }
-
-  if (memory_ != nullptr) {
-    memory_->lock();
-    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-    if (server_ != nullptr) {
-      server_->close();
-      delete server_;
-      inst->primary = false;
-      inst->primaryPid = -1;
-      inst->primaryUser[0] = '\0';
-      inst->checksum = blockChecksum();
-    }
-    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", 17);
-  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)) {
-#ifdef 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 *inst = static_cast<InstancesInfo*>(memory_->data());
-  inst->primary = false;
-  inst->secondary = 0;
-  inst->primaryPid = -1;
-  inst->primaryUser[0] = '\0';
-  inst->checksum = blockChecksum();
-
-}
-
-void SingleCoreApplicationPrivate::startPrimary() {
-
-  Q_Q(SingleCoreApplication);
-
-  // Reset the number of connections
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-
-  inst->primary = true;
-  inst->primaryPid = q->applicationPid();
-  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
-  inst->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 *inst = static_cast<InstancesInfo*>(memory_->data());
-
-  inst->secondary += 1;
-  inst->checksum = blockChecksum();
-  instanceNumber_ = inst->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;
-
-  // The header indicates the message length that follows
-  QByteArray header;
-  QDataStream headerStream(&header, QIODevice::WriteOnly);
-  headerStream.setVersion(QDataStream::Qt_5_8);
-  headerStream << static_cast<quint64>(initMsg.length());
-
-  socket_->write(header);
-  socket_->write(initMsg);
-  bool result = socket_->waitForBytesWritten(timeout - static_cast<int>(time.elapsed()));
-  socket_->flush();
-
-  return result;
-
-}
-
-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 *inst = static_cast<InstancesInfo*>(memory_->data());
-  qint64 pid = inst->primaryPid;
-  memory_->unlock();
-
-  return pid;
-
-}
-
-QString SingleCoreApplicationPrivate::primaryUser() const {
-
-  memory_->lock();
-  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
-  QByteArray username = inst->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, this, [nextConnSocket, this]() {
-    connectionMap_.remove(nextConnSocket);
-    nextConnSocket->deleteLater();
-  });
-
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
-    const ConnectionInfo info = connectionMap_[nextConnSocket];
-    switch (info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
-        break;
-      case StageBody:
-        readInitMessageBody(nextConnSocket);
-        break;
-      case StageConnected:
-        slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
-    };
-  });
-
-}
-
-void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
-
-  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 = StageBody;
-  info.msgLen = msgLen;
-
-  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
-    readInitMessageBody(sock);
-  }
-
-}
-
-void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
-
-  Q_Q(SingleCoreApplication);
-
-  if (!connectionMap_.contains(sock)) {
-    return;
-  }
-
-  ConnectionInfo &info = connectionMap_[sock];
-  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
-    return;
-  }
-
-  // Read the message body
-  QByteArray msgBytes = sock->read(info.msgLen);
-  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;
-  }
-
-  info.instanceId = instanceId;
-  info.stage = StageConnected;
-
-  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleCoreApplication::Mode::SecondaryNotification)) {
-    Q_EMIT q->instanceStarted();
-  }
-
-  if (sock->bytesAvailable() > 0) {
-    slotDataAvailable(sock, instanceId);
-  }
-
-}
-
-void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
-
-  Q_Q(SingleCoreApplication);
-  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
-
-}
-
-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(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
-#endif
-
-}

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -1,111 +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) {}
-  qint64 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 {
-    StageHeader = 0,
-    StageBody = 1,
-    StageConnected = 2,
-  };
-  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;
-  void readInitMessageHeader(QLocalSocket *socket);
-  void readInitMessageBody(QLocalSocket *socket);
-  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

CONTRIBUTING.md

@@ -0,0 +1,115 @@
+# 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 the name of the class that is changed
+followed by a colon then a short explanation of the commit.
+Don't use a trailing period after the first line.
+If this change affects more than one class, omit the class name 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.
+It should explain exactly what's changed, why it's changed,
+and what bugs were fixed.
+
+An example of the expected format for git commit messages is as follows:
+
+```
+StretchHeaderView: Set default section size
+
+As of Qt 6.6.1, style changes are resetting the column sizes. To prevent this, we set a default section size.
+
+Fixes #1328
+```
+
+
+### 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,7 +2,556 @@ Strawberry Music Player
 =======================
 ChangeLog
 
-1.0.0:
+Version 1.2.1-rc1 (2024.11.16):
+
+This release features major restructuring of the codebase, moving source files,
+rewriting CMake build files, dropping Qt 5 support, external tagreader,
+and dropping some unmaintained parts such as VLC.
+
+  Bugfixes:
+
+    * Fixed playback of CUE continuing to play from the same file after the song has finished playing (#1568).
+    * Fixed updating collection song sort text when disc is changed.
+    * Fixed current playing file left open when the next track errored (#1582).
+    * Fixed filter search not finding song containing uppercase "A" (#1599).
+    * Fixed crash when removing album from playlist when using shuffle albums (#1588).
+    * Fixed IDv3 MBID's tags with multiple entries being ignored.
+    * Fixed crash when enabling Tidal, Spotify, Qobuz or Subsonic services.
+    * Fixed passing filenames to strawberry on command line not resolving to absolute paths.
+    * (macOS) Fixed program not starting for users with long usernames.
+
+  Enhancements:
+
+    * Resolve symbolic links when dragging files to the playlist to match collection song.
+    * Replaced Spotify username/password with access token.
+    * Require Qt 6.4 or higher and drop support for Qt 5.
+    * Require TagLib 1.12 or higher.
+    * Use Qt stringliterals.
+    * Move gstfastspectrum to src.
+    * Use standard user temp location for current album cover.
+    * Removed old MacFSListener.
+    * Removed external tagreader and protobuf dependency.
+    * Removed VLC support.
+    * Ported to Qt translation (.ts) files and removed gettext dependency.
+    * Removed deprecated Gnome/Mate SettingsDaemon global shortcuts.
+
+Version 1.1.3 (2024.09.21):
+
+  Bugfixes:
+    * Fixed gstreamer registry lookup leak in Spotify settings.
+    * Fixed all songs in a CUE sheet starting playback at the zero position (#1549).
+    * Fixed playback going to pause and back to play on song change.
+    * Fixed Genius Lyrics login not working (#1554).
+    * Fixed slow collection filter search.
+
+Version 1.1.2 (2024.09.12):
+
+  Bugfixes:
+    * Fixed Tidal Open API cover provider to only login when needed instead of on startup.
+    * Fixed KDE added keyboard accelerator characters (ampersands) appearing in sidebar (#1400, #1389, #1476).
+    * Fixed KDE added keyboard accelerator characters (ampersands) appearing when editing playlist name (#1499).
+    * Fixed collection "Search for this" adding prefix without value (#1510).
+    * Fixed play (-p) command line option not working on startup (#1465).
+    * Fixed scan transaction being started when "Update the collection when Strawberry starts" option is unchecked (#1469)
+    * Fixed Spotify bitrate being limited 128kbit/s.
+    * Fixed Spotify returning too many artists and albums.
+    * Fixed manually switching Spotify songs blocking UI.
+    * Fixed analyzer not being set.
+    * Fixed context top text being updated causing selected text to be unselected.
+    * Fixed filter search to use filename for songs with empty title.
+    * Fixed missing developer in Appstream appdata file.
+    * Fixed MPRIS2 DesktopEntry to return desktop file entry without ".desktop" (#1516)
+    * Fixed WavPack .wvc accepted as valid audio files (#1525).
+    * Fixed dynamic playlist controls not following system colors (#1483).
+    * Fixed freeze on playlist right click (#1478).
+    * Fixed copying songs to a iPod device keeping too many files open (#1527).
+    * Fixed MBIDs from MP4 being parsed incorrectly causing ListenBrainz errors (#1531).
+    * Fixed playlist sorting after filename (#1538).
+
+  Enhancements:
+    * Improved volume adjustment and track seeking using touchpad (#1498).
+    * Use own thread for lyrics parsing.
+    * Added url and filename columns to collection and playlist filter search.
+    * (macOS) Added Spotify.
+
+Version 1.1.1 (2024.07.22):
+
+  Bugfixes:
+    * Fixed compilation songs being split into different albums when using album grouping.
+    * Fixed adding playlist columns not working when stretch mode is disabled (#1085).
+    * Fixed resetting playlist columns.
+    * Fixed adding songs to playlist adding all songs instead of filtered songs.
+    * Fixed collection filter matching entire text instead of individual words.
+
+  Enhancements:
+    * Use same code for collection and playlist filter search.
+
+Version 1.1.0 (2024.07.14):
+
+  Bugfixes:
+    * Fixed crash when pressing CTRL + C (#1359).
+    * Pass on scroll events to page in settings to avoid changing settings when scrolling with mouse (#1380).
+    * Fixed misredered playlist search field with Wayland using scaling (#1255).
+    * Fixed Azlyrics lyrics provider because of website changes.
+    * Fixed Musixmatch lyrics provider because of website changes.
+    * Fixed application exiting when closing file dialog (#1401).
+    * Fixed playlist shuffle randomness (#707).
+    * Fixed playlist shuffle order always the same when restarting playback (#1381).
+    * Fixed dynamic random mix not always ignoring shuffle and repeat mode (#1366).
+    * Fixed manual shuffle while playing not setting current song to new index (##1353).
+    * Fixed volume sync with PA when output is set to auto (#1123).
+    * Fixed mpris:trackid type with KDE 6 (#1397).
+    * Fixed open in file manager feature not handling missing XDG_DATA_DIRS variable.
+    * Fixed collection pixmap disk cache and moodbar cache with newer Qt versions.
+    * Fixed reading common metadata CUE's with multiple files (#1463).
+    * Fixed playlist header stretch mode to only resize the right column of the column being resized.
+    * Fixed adding columns to playlist header not working when not using stretch mode (#1085).
+    * Fixed severe memory leak (!) in context album cover fading (#1464).
+    * Separate albums by different artist in album groupings (#1276).
+    * Removed -new-window parameter from dolphin command for open in file manager (#1412).
+    * Only use playbin3 with GStreamer 1.24 and higher, not with GStreamer 1.22 or lower.
+    * (macOS/Windows) Fixed dash and hls streaming, plugins were missing.
+    * (Windows) Fixed incorrect colors in smart playlist wizard with Fusion in dark mode (#1399).
+    * (Windows) Fixed update window blocking sponsor window on startup.
+
+  Enhancements:
+    * Improve error messages when connecting and copying to devices.
+    * Allow enter to be used with multiselection to add songs to playlist (#1360)
+    * Add song progress to taskbar using D-Bus.
+    * Use API to receive Radio Paradise channels.
+    * Added button for fetching lyrics to tag editor (#1391).
+    * Added option not to skip "A", "An" and "The” when sorting artist names in collection (#1393).
+    * Improved album and title disc, remastered, etc matching and stripping (#1387).
+    * Save volume to settings when adjusting (#1272).
+    * Resolve song from collection using track with Cue in XSPF (#1181).
+    * Added background image to sidebar.
+    * Read metadata from RIFF WAV files (#1424).
+    * Use original path instead of canonical path when adding directories to the collection.
+    * Only apply added/removed collection directories when settings are saved.
+    * Detect and handle different text encodings when reading CUE files (#1429).
+    * The collection has been rewritten and improved (model/filter/search) (#392).
+    * Improve error messages from tag reader.
+    * (Unix) Add experimental GStreamer pipewire support.
+    * (Windows) Add experimental exclusive mode for WASAPI.
+    * (Windows MSVC) Added experimental ASIO support.
+    * (Windows MSVC) Add back WASAPI2.
+
+  New features:
+    * Letras lyrics provider.
+    * Open Tidal API (openapi.tidal.com) cover provider.
+    * Turbine analyzer.
+    * WaveRubber analyzer.
+    * Spotify streaming support.
+
+  Removed features:
+    * Removed now broken lyricsmode.com lyrics provider because of website changes.
+
+Version 1.0.23 (2024.01.11):
+
+  Bugfixes:
+    * Fixed possible duplication of song entries after organizing (#1341).
+    * Fixed possible crash when connecting devices (#1313).
+    * Fixed playlist sorting of original year (#1349).
+    * (macOS) Fixed crash when adding collection directory (QTBUG-120469) (#1350).
+
+  Enhancements:
+    * Treat all stream errors as non-fatal (#1347).
+    * Require KDSingleApplication 1.1.0.
+    * Fix logging of restored unavailable songs.
+
+Version 1.0.22 (2023.12.09):
+
+  Bugfixes:
+    * Fixed KDSingleApplication cmake version check.
+    * Fixed KDSingleApplication Qt 5 detection (#1299).
+    * Fixed timer started in wrong thread (#1302).
+    * Fixed erratic seeking behaviour if buffer duration is set to zero (#1302).
+    * Fixed SCollection related crash on exit with Qt 5 (#1316).
+    * Fixed track about to end related crash on playback failure (#1332).
+    * Fixed playlist column widths not remembered if stretch mode is off with Qt 6.6.1 and higher (#1328).
+    * (Windows) Properly handle silent uninstall (#1323).
+
+  Enhancements:
+    * Increase thread priority for playback threads.
+    * Allow drag and drop of songs to favorite playlists.
+
+Version 1.0.21 (2023.10.21):
+
+  Bugfixes:
+    * Fixed seekbar position resetting to zero before showing actual position when seeking.
+    * Fixed compressed files showing up in collection (#1274).
+    * Fixed connecting devices (#1288).
+    * Fixed device schema missing ebur128 fields.
+    * Fixed collection search by tag not working with space between colon and search term (#1290).
+    * Fixed seeking when 5 seconds is remaining of the song resetting position to beginning (#1258).
+    * Fixed intermittent crash when seeking with Auto as output (#1123).
+    * (Windows) Fixed playlist header colors in dark mode (#1275).
+
+  Enhancements:
+    * Support using system KDSingleApplication when available.
+    * Improved lyrics matching.
+    * (macOS) Fully codesign binaries and DMG.
+
+Version 1.0.20 (2023.09.24):
+
+  Bugfixes:
+    * Fixed appdata validation.
+
+Version 1.0.19 (2023.09.24):
+
+  Bugfixes:
+    * Use shared pointers for objects to fix potential crashes on exit (#1239).
+    * Fixed smart playlist search not matching unrated songs (#1244).
+    * Fixed reading FMPS_Playcount for MP3 ID3v2 tags (#1248).
+    * Always stop playing after 100 errors to prevent flooding the error dialog (#1220).
+    * Fixed volume going to 100% when decreasing volume beyond zero (#1262).
+    * Fixed error dialog sometimes showing empty.
+    * (Windows) Removed broken volume sync (#1220).
+    * (Windows) Fixed shuttering / choppy audio (#1227).
+    * (macOS) Fixed missing search bars (#1221).
+
+  Enhancements:
+    * Add Mpris2 property to read/write rating (#1246).
+    * Capitalize playlist column names (#1264).
+    * Added lyrics from songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com.
+    * (Windows) Add gst-play-1.0.exe for debugging purposes.
+
+  New features
+    * Support performing song loudness analysis using `libebur128` (#1216).
+    * Support song playback loudness normalization, as per EBU R 128 (#1216).
+
+  Other:
+    * Removed last.fm HTTPS workaround and GnuTLS dependency
+    * Removed broken lyrics.com lyrics provider.
+    * (Windows) Use DirectSound as default sink.
+    * (Windows) Remove WASPI2 plugin because of GStreamer bug.
+
+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:
+    * Fixed backslash being appended to filter text when switching playlist (#1005).
+    * Fixed OSD notifications service registering taking too long to timeout when not available.
+    * Fixed radio stream added twice when double-clicked (#1015).
+    * Fixed translating undo and redo buttons (#1017).
+
+  Enhancements:
+    * Use ICU instead of iconv to transliterate characters for filenames.
+    * Make separating albums by grouping tag optional in collection group by album.
+    * Added support for video game music formats VGM and SPC.
+    * Added setting for explicitly turning on HTTP/2 for streaming. Strawberry will set the
+      libsoup SOUP_FORCE_HTTP1 environment variable when the HTTP/2 is not checked (#1016).
+    * (Windows|MSVC) Install Visual C++ runtime redistributable automatically in installer.
+
+Version 1.0.7 (2022.07.25)
+
+  Bugfixes:
+    * Fixed checking file extension case-insensitive when loading and saving playlists.
+    * Fixed reading and saving rating with TagParser.
+    * (macOS/Windows) Fixed playlist column alignment. Applied patch for Qt bug QTBUG-103576 (#999).
+    * (Windows|MinGW) Fixed HLS streaming.
+    * (Windows|MSVC) Fixed MP3 encoding.
+
+  Enhancements
+    * Added option for selecting file extension when saving all playlists.
+
+Version 1.0.6 (2022.07.17)
+
+  Bugfixes:
+    * Fixed certain albums not added to playlist in correct track order from search for Tidal and QObuz.
+    * Fixed songs not added to playlist in numeric order when added from file view with right click (#977).
+    * Fixed "Stop after this track" graying out next track in dynamic mode (#912).
+    * Fixed a gstreamer caps leak when transcoding songs.
+    * Fixed errors in translation files (#994).
+
+  Enhancements
+    * Add songs to the collection even when they have invalid ctime or mtime.
+    * Made ListenBrainz scrobbler respect "Prefer album artist" option (#989).
+    * Send track duration, number, player name and version when scrobbling to ListenBrainz (#995).
+    * (macOS) Added missing HLS streaming plugin.
+
+Version 1.0.5 (2022.06.10)
+
+  Bugfixes:
+    * Fixed smart playlist filetype search.
+    * Fixed Radio Paradise URLs to use HTTPS instead of HTTP.
+    * Fixed horizontal scrolling not affecting currently playing track (#952).
+    * Fixed keep running in the background when window is closed with Wayland (#964).
+    * Fixed percent-encoding of URLs when loading and saving XSPF playlists (#821).
+    * Fixed fancy tabbar context menu showing on right clicks outside of tabbar when a song is playing.
+    * Fixed possible duplicating songs in the database when moving songs to the collection using the organize feature.
+    * (Windows|MSVC) Fixed moodbar fftw3 crash with (older) CPU's that does not support AVX2 (#944).
+    * (Windows|MSVC) Fixed using libiconv for converting characters when organizing files like with MinGW.
+
+  Enhancements
+    * Show more details in error dialog on GStreamer errors (#958).
+    * Allow setting blur amount of playlist background image up to 100px (#939).
+    * Include 128x128 icon sizes (#954).
+    * Show right click copy context menu in context view on top text and lyrics (#965).
+    * Improve fading between album covers in context view.
+    * Added option for overwriting database playcounts in collection settings (#962).
+    * Added option for disabling bar on currently playing track (#972).
+    * (Debian) Added Qt 6 support to debian files and build with Qt 6 for Debian Bookworm, Ubuntu Jammy and newer.
+    * (Windows|MSVC) Added libav/ffmpeg plugin.
+
+Version 1.0.4 (2022.04.10)
+
+  Bugfixes:
+    * Fixed use-after-free memory in ALSA PCM device finder.
+    * Translate global shortcuts.
+    * (Windows) Fixed registering 0-9 numpad keys in global shortcuts.
+
+  Enhancements
+    * Added save all playlists action.
+    * (Windows) Made updater support both MSVC and MinGW.
+    * (Windows) Added HLS support.
+
+  Other:
+    * Removed use of custom font in context.
+
+Version 1.0.3 (2022.03.24)
+
+  Bugfixes:
+    * Remove slash and backslash from filenames when saving album covers using album directory cover filenames (#903).
+    * Remove playlist file-extensions from accepted audio file extensions (#909).
+    * Fixed Qobuz requests only receiving the first 50 albums (#922).
+    * (Windows|MinGW) Fixed streaming stopping at the end of each track. libsoup downgraded from 3.0 to 2.74.
+    * (Windows|MSVC) Fixed initial database schema failure caused by CRLF line-endings in schema files.
+
+  New features
+    * Added support for bs2b (Improved headphone listening of stereo audio records using Bauer stereophonic-to-binaural DSP) (#249).
+
+Version 1.0.2 (2022.02.20)
+
+  Bugfixes:
+    * Fixed showing menu when clicking icon for collection and internet search tool buttons
+    * Fixed ignoring devices with system mounts as defined by GIO (#410).
+    * Fixed updating database when deleting songs from filesystem devices.
+    * Fixed unregistered metatype when listing songs from MTP devices with Qt 6.
+    * Fixed using entered password when testing Subsonic settings before pressing save (#879).
+    * Fixed downloading Subsonic album covers.
+    * Fixed subsonic album covers downloaded several times for each album when MD5 authentication was enabled (#885).
+    * Fixed volume going to 100% when pressing volume down with MRPIS2 and global shortcuts (#884).
+    * Fixed incorrect rounding when setting volume through MPRIS2 (#894).
+    * Fixed delete from disk not showing up in the menu when one or more CUE songs were selected.
+    * Fixed possible crashes when switching songs when fading is enabled (#890).
+    * Fixed X11 global shortcuts not working unless window was in focus with Qt 6.2 and higher (#893).
+    * Fixed scrobbler re-sending scrobbles to fast on error (#898).
+
+  Enhancements
+    * Log Qt version on startup.
+    * Added button for deleting existing Subsonic songs (#883).
+    * Make collection watcher ignore files with "qt_temp" filename and tmp extension.
+    * Require Qt 5.9 or higher.
+    * Added scrollbars to edit tag dialog (#888).
+    * Added advanced settings for configuring collection watcher.
+    * Disable open audio CD menu when compiled without audio CD support.
+    * Replaced use of deprecated QMouseEvent constructor as of Qt 6.4.
+    * Replaced use of deprecated QCryptographicHash::addData overload as of Qt 6.4.
+
+  Removed features:
+    * Removed broken "nomedia" / "nomusic" file handling.
+
+Version 1.0.1 (2022.01.08)
+
+  Bugfixes:
+    * Fixed collection and internet search filter tool button menu arrow overlap (#796).
+    * Fixed stop after this track button with Qt 6 (#795).
+    * Fixed not updating the URL when songs were moved on disk when the fingerprinting feature is enabled.
+    * Fixed SQL query error for songs with an invalid modification time (#815).
+    * Fixed blocky rendering of the currently playing track with high resolution screens (#794).
+    * Fixed incorrect playlist column filesize for radio streams.
+    * Fixed deleting embedded album cover from Ogg songs.
+    * Fixed parsing of Cue tracks with 1-digit minutes (#836).
+    * Fixed updating of playlist summary after reloading items when adding songs from files outside of the collection (#848).
+    * Fixed always saving metadata when saving playlists for Tidal, Qobuz and Subsonic songs independent of playlist setting (#851).
+    * Fixed setting media shortcuts when using kglobalaccel (#849).
+    * Fixed parsing of Genius lyrics when they are sometimes received in a different HTML format.
+    * Fixed saving MP4 specific tags as UTF-8 (#830).
+    * Fixed clearing "manually set" cover when saving album covers embedded from outside of the tag editor (#858).
+    * Fixed aborting collection scan when Strawberry exists to avoid hang on exit.
+    * Fixed resuming collection scan when adding a new directory after collection scan was aborted.
+    * Fixed excluding hidden songs from the collection.
+    * Disabled moodbar for CUE songs since they can not be supported properly (#865).
+    * (Windows) Added gstreamer gstxingmux plugin to fix transcoding to MP3 (#856).
+
+  Enhancements:
+    * Made playlist header column text elided (#801).
+    * Added support for reading and writing playcounts and ratings from/to tags.
+    * Added support for setting rating using the edit tag dialog.
+    * Added setting to enable/disable playlist toolbar (#809).
+    * Added component type, content_rating type and releases to AppStream data file (#806).
+    * Removed unused "mark as listened" option in organize dialog.
+    * Fixed some clazy warnings and narrowing conversions in the source code.
+    * Replaced uses of macros in the source code.
+    * Added a more user-friendly error message when receiving encrypted streams from Tidal (#824).
+    * Added support for port-pattern entered in the device textbox when using Jack as output (#828).
+    * Added Spanish (Spain) translation.
+    * Added support for more CUE filenames (#835).
+    * (Windows) Add gstreamer dash plugin.
+
+Version 1.0.0 (2021.10.14)
 
   Bugfixes:
     * Fix updating temporary metadata when reloading songs outside of the collection.
@@ -56,12 +605,13 @@ ChangeLog
     * Add support for native global shortcuts on MATE.
     * Add radios view with channels from Radio Paradise and SomaFM.
 
-0.9.3:
+
+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.
@@ -79,7 +629,8 @@ ChangeLog
     * (macOS) Make macdeployqt work with Qt 5 too.
     * (macOS) Show keep running option in behaviour settings.
 
-0.9.2:
+
+Version 0.9.2 (2021.03.25)
 
   Bugfixes:
     * Fix marking songs available.
@@ -90,7 +641,8 @@ ChangeLog
     * (macOS) Fix crash when opening cover manager.
     * (macOS) Fix broken Qt plugins resulting in album covers not showing.
 
-0.9.1:
+
+Version 0.9.1 (2021.03.13)
 
   Bugfixes:
     * Fix duplicating songs in the DB when organizing songs between 2 different collection directories.
@@ -125,7 +677,8 @@ ChangeLog
   New features:
     * Add option and support for saving embedded covers for FLAC, Ogg Vorbis, MP3 and MP4/AAC.
 
-0.8.5:
+
+Version 0.8.5 (2020.12.19)
 
   Bugfixes:
     * Fix return type of SmartPlaylistQueryWizardPlugin::type().
@@ -144,7 +697,8 @@ ChangeLog
     * Add command line option to play a playlist based on name.
     * Change double-click behaviour in cover manager to open fullsize cover.
 
-0.8.4:
+
+Version 0.8.4 (2020.11.15)
 
   Bugfixes:
     * Fix preventing session logout when window is maxmimized.
@@ -170,7 +724,8 @@ ChangeLog
     * Remove remaining uses of QTextCodec.
     * Remove Core5Compat dependency.
 
-0.8.3:
+
+Version 0.8.3 (2020.10.24)
 
   Bugfixes:
     * Fixed updating playing widget song details in small cover mode.
@@ -185,7 +740,8 @@ ChangeLog
   Enhancements:
     * (Windows) Added WASAPI plugin.
 
-0.8.2:
+
+Version 0.8.2 (2020.10.13)
 
   Bugfixes:
     * Fixed broken transition to next song for CUE files with certain audio formats (regression since version 0.6.13).
@@ -197,7 +753,8 @@ ChangeLog
     * Removed use of HTML in system tray icon tooltip for all desktop environments instead of just KDE and Cinnamon.
     * (Windows) Ignore "IDirectSoundBuffer_GetStatus The operation completed successfully" false error when switching device while playing.
 
-0.8.1:
+
+Version 0.8.1 (2020.10.09)
 
   Bugfixes:
     * Fixed engine selection in backend settings with Qt 6.
@@ -244,14 +801,15 @@ ChangeLog
     * Added Subsonic server side scrobbling support.
     * Load thumbnails from iPods to show under device collection.
 
-0.7.2:
+Version 0.7.2 (2020.08.15)
 
   Bugfixes:
     * Fixed installation directory for translations.
     * Fixed collection sorting for non-ASCII characters.
     * Fixed closing connected devices on exit.
 
-0.7.1:
+
+Version 0.7.1 (2020.08.15)
 
   Bugfixes:
     * Fixed incorrectly mapped global shortcuts keys "2" and "3".
@@ -290,7 +848,8 @@ ChangeLog
     * Removed Xine engine support.
     * Removed broken imobiledevice (iPhone) support.
 
-0.6.13:
+
+Version 0.6.13 (2020.07.13)
 
   Bugfixes:
     * Fixed cut-off text in about dialog.
@@ -316,7 +875,8 @@ ChangeLog
     * Fixed unit test for testing playlist model.
     * Added new unit tests for tagreader.
 
-0.6.12:
+
+Version 0.6.12 (2020.06.07)
 
   Bugfixes:
     * Fixed height of about dialog.
@@ -329,7 +889,8 @@ ChangeLog
     * Sort folders added from file view.
     * Changed default collection grouping to album - disc.
 
-0.6.11:
+
+Version 0.6.11 (2020.05.16)
 
   Bugfixes:
     * Fixed MPRIS missing art url when playing albums with embedded cover.
@@ -355,7 +916,8 @@ ChangeLog
     * Added album covers from Musixmatch and Spotify.
     * Added lyrics from Genius, Musixmatch and ChartLyrics.
 
-0.6.10:
+
+Version 0.6.10 (2020.05.01)
 
   Bugfixes:
     * Fixed Subsonic album covers not working for albums with non ASCII characters.
@@ -386,7 +948,7 @@ ChangeLog
     * 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.
@@ -395,7 +957,8 @@ ChangeLog
   Removed features:
     * Removed Phonon engine support.
 
-Version 0.6.9:
+
+Version 0.6.9 (2020.03.09)
 
   BugFixes:
     * Fixed playlist metadata updating interfering with manual tag editing.
@@ -427,7 +990,8 @@ Version 0.6.9:
     * Tidal support (No agreement).
     * QObuz support (No agreement).
 
-Version 0.6.8:
+
+Version 0.6.8 (2020.01.05)
 
     * Fixed stuck tabbar and collection GUI with some themes.
     * Fixed possible crashes related to QProxyStyle.
@@ -444,14 +1008,15 @@ Version 0.6.8:
     * (macOS) Fixed filesystem watcher to correctly pick up changed collection directories.
     * (Windows) Fixed translations not being included.
 
-Version 0.6.7:
+
+Version 0.6.7 (2019.11.27)
 
     * Fixed crash when cancelling scrobbler authentication
     * Fixed "Double clicking a song in the playlist" behaviour setting
     * 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
@@ -461,7 +1026,8 @@ Version 0.6.7:
     * Removed left click on analyzer to popup menu
     * (Windows) Added killproc executable to terminate running process before uninstalling
 
-Version 0.6.6:
+
+Version 0.6.6 (2019.11.09)
 
     * Fixed lowercased album artist in playlist column
     * Fixed compiling with different optional features turned off
@@ -479,7 +1045,8 @@ Version 0.6.6:
     * Added option to automatically select current playing track
     * (Windows) Added support for WASAPI
 
-Version 0.6.5:
+
+Version 0.6.5 (2019.09.30)
 
     * Fixed scrobbler not to send scrobbles multiple times when metadata is updated
     * Fixed Listenbrainz scrobbler not don't send "various artists" as album artist
@@ -488,7 +1055,8 @@ Version 0.6.5:
     * Fixed OSD pretty positioning on Windows on screens with negative geometry
     * Fixed appdata file to pass full validation
 
-Version 0.6.4:
+
+Version 0.6.4 (2019.09.25)
 
     * Added setting for fancy tabbar background color
     * Added setting to make marking songs unavailable optional
@@ -515,18 +1083,21 @@ Version 0.6.4:
     * Fixed restoring to original window size when restoring from system tray
     * Updated 3rdparty taglib
 
-Version 0.6.3:
+
+Version 0.6.3 (2019.08.05)
 
     * Fixed crash when using internet services.
     * Fixed musicbrainz tagfetcher only showing 1 result per song.
     * Fixed collection watcher to unwatch deleted directories.
     * Added "album - disc" grouping.
 
-Version 0.6.2:
+
+Version 0.6.2 (2019.08.03)
 
     * Disabled fatal error for FTS5 cmake test.
 
-Version 0.6.1:
+
+Version 0.6.1 (2019.08.03)
 
     * Compare artist and album case-insensitive when generating score for album covers.
     * Fixed broken return value of sendMessage() in SingleApplication causing application to be started twice.
@@ -572,11 +1143,13 @@ Version 0.6.1:
     * Fixed certain cases where the playing widget gets stuck when switching fast between context and other widgets.
     * Removed ChartLyrics provider (service have been down for a long time).
 
-Version 0.5.5:
+
+Version 0.5.5 (2019.05.05)
 
     * Fixed Tidal API url
 
-Version 0.5.4:
+
+Version 0.5.4 (2019.05.05)
 
     * Changed description for offline mode scrobbling for less confusion
     * Fixed scrobbler to not send "playing now" when in offline mode
@@ -607,7 +1180,8 @@ Version 0.5.4:
     * Fixed and improved snap including upgrading to core18 and adding proper alsa support
     * Fixed resume playback on startup not working for other than the first playlist
 
-Version 0.5.3:
+
+Version 0.5.3 (2019.03.02)
 
     * Changed default tagging to albumartist in organise dialog
     * Removed support for older taglib in tagreader
@@ -647,7 +1221,8 @@ Version 0.5.3:
     * Added group by format
     * Fixed gstreamer leaks
 
-Version 0.5.2:
+
+Version 0.5.2 (2019.01.26)
 
     * Added error handling and message for URL handler
     * Added SingleCoreApplication secondary check
@@ -664,7 +1239,8 @@ Version 0.5.2:
     * Added option to copy album cover in organise dialog (filesystem and libgpod devices)
     * Added raise() to make sure window is on top when strawberry is started twice
 
-Version 0.5.1:
+
+Version 0.5.1 (2019.01.12)
 
     * Added scrobbler with support for Last.fm, Libre.fm and ListenBrainz
     * Fixed key up causing playback to reset
@@ -695,7 +1271,8 @@ Version 0.5.1:
     * Added debian copyright file
     * Fixed some compile errors
 
-Version 0.4.2:
+
+Version 0.4.2 (2018.11.28)
 
     * Updated AppStream data file to newer specifications
     * Fixed Deezer engine to use quality setting
@@ -709,7 +1286,8 @@ Version 0.4.2:
     * (Windows) Corrected uninstalled files on x64 installer
     * (macOS) Fixed poor performance
 
-Version 0.4.1:
+
+Version 0.4.1 (2018.11.01)
 
     * Fixed crash in analyzer
     * Fixed trying to use systray even if the desktop had no systray
@@ -727,11 +1305,13 @@ Version 0.4.1:
     * Added AppStream data file
     * Fixed compiling with Qt 5 versions of system QtSingleApplication and Qxt library
 
-Version 0.3.3:
+
+Version 0.3.3 (2018.09.24)
 
     * Fixed Tidal login
 
-Version 0.3.2:
+
+Version 0.3.2 (2018.09.24)
 
     * Fixed search error not shown in Tidal search
     * Added URL handler for Tidal, now retrieving URL's when playing instead of when searching
@@ -743,7 +1323,8 @@ Version 0.3.2:
     * Added encoding of Tidal token in the source code
     * Added encoding of Tidal password in the configuration
 
-Version 0.3.1:
+
+Version 0.3.1 (2018.09.15)
 
     * Added new lyrics provider with lyrics from AudD and API Seeds
     * New improved context widget with albums and lyrics
@@ -765,7 +1346,8 @@ Version 0.3.1:
     * Added support for reading/writing lyrics to tags
     * Fixed saving tags (APE) for WavPack files
 
-Version 0.2.1:
+
+Version 0.2.1 (2018.07.05)
 
     * Fixed crash with newer Qt
     * Fixed setting output/device for Xine and VLC backend
@@ -775,19 +1357,23 @@ Version 0.2.1:
     * Fixed device selection on macOS
     * Added xine on to windows build
 
-Version 0.1.6:
+
+Version 0.1.6 (2018.06.07)
     * Fixed crash on exit caused by NVIDIA driver
     * Fixed PulseAudio device selection
     * Improvements to device selection
 
-Version 0.1.5:
+
+Version 0.1.5 (2018.05.16)
     * Makefile fixes for building
 
-Version 0.1.4:
-    * Fixed compliation with clang compiler
+
+Version 0.1.4 (2018.05.14)
+    * Fixed compilation with clang compiler
     * This release is mainly to get it working on openbsd and freebsd.
 
-Version 0.1.3:
+
+Version 0.1.3 (2018.05.12)
     * Audio file detection by content
     * Added builtin taglib to 3rdparty to support detecting audio by content instead of just file extension
     * Removed unneeded qsqlite from 3rdparty
@@ -795,7 +1381,8 @@ Version 0.1.3:
     * Replaced incorrect DLL libgstdirectsoundsink.dll (from gst 1.12.4) instead of libgstdirectsound.dll (from gst 1.14.0) for windows build
     * Fixed git versioning
 
-Version 0.1.2:
+
+Version 0.1.2 (2018.05.02)
     * Fixed playback of WavPack files
     * Fixed musicbrainz tagfetcher
     * Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
@@ -805,5 +1392,6 @@ Version 0.1.2:
     * Fixed problems with windows build missing some DLL's, only supplying required gstreamer-plugins now
     * Removed redundant code
 
-Version 0.1.1:
+
+Version 0.1.1 (2018.04.07)
     * Initial release

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)
@@ -11,32 +11,36 @@ Strawberry is a music player and music collection organizer. It is a fork of Cle
 Resources:
 
   * Website: https://www.strawberrymusicplayer.org/
+  * Wiki: https://wiki.strawberrymusicplayer.org/
   * Forum: https://forum.strawberrymusicplayer.org/
   * Github: https://github.com/strawberrymusicplayer/strawberry
-  * Buildbot: https://buildbot.strawberrymusicplayer.org/
   * Latest builds: https://builds.strawberrymusicplayer.org/
   * openSUSE buildservice: https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
   * Ubuntu PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
   * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
-  * Translations: https://translate.zanata.org/iteration/view/strawberry/master
+  * Translations: https://crowdin.com/project/strawberrymusicplayer/
 
-### :bangbang: Opening an issue:
+### :bangbang: Opening an issue
 
+* Read the FAQ: https://wiki.strawberrymusicplayer.org/wiki/FAQ
 * Search for the issue to see if it is already solved, or if there is an open issue for it already. If there is an open issue already, you can comment on it if you have additional information that could be useful to us.
-* For technical problems, questions and feature requests please use our forum on https://forum.strawberrymusicplayer.org/ that is better suited for discussion. It also better allows answers from the community instead of just the developers on GitHub.
+* For technical problems, discussion, questions and feature suggestions use the forum (https://forum.strawberrymusicplayer.org/) instead. The forum is better suited for discussion.
+* We do not take feature requests from users on GitHub. Any issues related to feature requests will be closed. This does not necessarily mean that we won't add new features, but we don't have time to take feature requests or answer questions about new features from users. It is still possible to suggest or discuss new features on the forum (https://forum.strawberrymusicplayer.org/).
+* We do not maintain the Flatpak package. Do not report issues related to Flatpak unless the issue can be reproduced with a native package, use Flatpak support instead https://flatpak.org/about/
 
-### :moneybag:	Sponsoring:
+### :moneybag: Sponsoring
 
 The program is free software, released under GPL. If you like this program and can make use of it, consider sponsoring or donating to help fund the project.
-There are currently 3 options for sponsoring:
+There are currently 4 options for sponsoring:
 
-1. [GitHub Sponsors](https://github.com/sponsors/jonaski)
-2. [Patreon](https://www.patreon.com/jonaskvinge)
-3. [PayPal](https://paypal.me/jonaskvinge)
+1. [Patreon](https://www.patreon.com/jonaskvinge)
+2. [GitHub](https://github.com/sponsors/jonaski)
+3. [Ko-fi](https://ko-fi.com/jonaskvinge)
+4. [PayPal](https://paypal.me/jonaskvinge)
 
 Funding developers is a way to contribute to open source projects you appreciate, it helps developers get the resources they need, and recognize contributors working behind the scenes to make open source better for everyone.
 
-### :heavy_check_mark: Features:
+### :heavy_check_mark: Features
 
   * Play and organize music
   * Supports WAV, FLAC, WavPack, Ogg FLAC, Ogg Vorbis, Ogg Opus, Ogg Speex, MPC, TrueAudio, AIFF, MP4, MP3, ASF and Monkey's Audio.
@@ -45,39 +49,39 @@ Funding developers is a way to contribute to open source projects you appreciate
   * Playlist management
   * Smart and dynamic playlists
   * Advanced audio output and device configuration for bit-perfect playback on Linux
+  * In-player song loudness analysis and song playback loudness normalization, as per EBU R 128
   * 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 [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics.com](https://www.lololyrics.com/), [songlyrics.com](https://www.songlyrics.com/), [azlyrics.com](https://www.azlyrics.com/) and [elyrics.net](https://www.elyrics.net/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
   * Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
   * Scrobbler with support for [Last.fm](https://www.last.fm/), [Libre.fm](https://libre.fm/) and [ListenBrainz](https://listenbrainz.org/)
-  * Subsonic, Tidal and Qobuz streaming support
+  * Subsonic, Tidal, Spotify and Qobuz streaming support
 
 
 It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
 
-**There currently isn't any macOS developers actively working on this project, so we might not be able to help you with issues related to macOS.**
+**Access to macOS and Windows releases are currently restricted to sponsors, a 5 USD monthly sponsorship is required. You can sponsor strawberry through <a href="https://www.patreon.com/jonaskvinge">Patreon</a> for direct access to new releases. If you are sponsoring through GitHub, Ko-fi or PayPal, please e-mail support AT strawberrymusicplayer.org for access to downloads.**
 
 ### :heavy_exclamation_mark: Requirements
 
 To build Strawberry from source you need the following installed on your system with the additional development packages/headers:
 
 * [CMake](https://cmake.org/)
-* [GNU Make](https://www.gnu.org/software/make/)
-* [GCC](https://gcc.gnu.org/) or [clang](https://clang.llvm.org/) compiler
+* 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/)
-* [Protobuf](https://developers.google.com/protocol-buffers/)
-* [Qt 5.8 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/)
-* [SQLite 3.9 or newer with FTS5](https://www.sqlite.org)
-* [ALSA (Linux required)](https://www.alsa-project.org/)
-* [D-Bus (Linux required)](https://www.freedesktop.org/wiki/Software/dbus/)
-* [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org)
-* [GnuTLS](https://www.gnutls.org/)
-* [TagLib 1.11.1 or higher](https://www.taglib.org/) or [TagParser](https://github.com/Martchus/tagparser)
+* [Qt 6.4.0 or higher with components Core, Concurrent, Gui, Widgets, Network, Sql and D-Bus](https://www.qt.io/)
+* [SQLite 3.9 or newer](https://www.sqlite.org)
+* [ALSA (Required on Linux)](https://www.alsa-project.org/)
+* [GStreamer](https://gstreamer.freedesktop.org/)
+* [TagLib 1.12 or higher](https://www.taglib.org/)
+* [ICU](https://unicode-org.github.io/icu/)
+* [KDSingleApplication](https://github.com/KDAB/KDSingleApplication)
 
 Optional dependencies:
 
@@ -87,29 +91,27 @@ Optional dependencies:
 * Audio CD: [libcdio](https://www.gnu.org/software/libcdio/)
 * MTP devices: [libmtp](http://libmtp.sourceforge.net/)
 * iPod Classic devices: [libgpod](http://www.gtkpod.org/libgpod/)
+* EBU R 128 loudness normalization [libebur128](https://github.com/jiixyj/libebur128)
 
-Either GStreamer or VLC engine is required, but only GStreamer is fully implemented, and works best, it is therefore recommended to use GStreamer.
-You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav.
+You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav to support all audio formats.
 
-### :wrench:	Compiling from source
+### :wrench: Compiling from source
 
 ### Get the code:
 
-    git clone https://github.com/strawberrymusicplayer/strawberry
+    git clone --recursive https://github.com/strawberrymusicplayer/strawberry
 
 ### Compile and install:
 
     cd strawberry
-    mkdir build && cd build
+    mkdir build
+    cd build
     cmake ..
-    make -j$(nproc)
+    make -j $(nproc)
     sudo make install
-    
-To compile with Qt 6 use:
 
-    cmake .. -DBUILD_WITH_QT6=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)](https://repology.org/metapackage/strawberry/versions)
+### :penguin: Packaging status
 
+[![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?columns=3&header=Strawberry&exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)

cmake/Deb.cmake

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

cmake/Dmg.cmake

@@ -1,11 +1,17 @@
-#find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin /usr/local/bin REQUIRED)
-set(MACDEPLOYQT_EXECUTABLE "${CMAKE_BINARY_DIR}/3rdparty/macdeployqt/macdeployqt")
+find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/bin /usr/local/bin /opt/local/bin /usr/local/opt/qt6/bin REQUIRED)
 if(MACDEPLOYQT_EXECUTABLE)
   message(STATUS "Found macdeployqt: ${MACDEPLOYQT_EXECUTABLE}")
 else()
   message(WARNING "Missing macdeployqt executable.")
 endif()
 
+find_program(MACDEPLOYCHECK_EXECUTABLE NAMES macdeploycheck PATHS /usr/bin /usr/local/bin /opt/local/bin /usr/local/opt/qt6/bin REQUIRED)
+if(MACDEPLOYCHECK_EXECUTABLE)
+  message(STATUS "Found macdeploycheck: ${MACDEPLOYCHECK_EXECUTABLE}")
+else()
+  message(WARNING "Missing macdeploycheck executable.")
+endif()
+
 find_program(CREATEDMG_EXECUTABLE NAMES create-dmg REQUIRED)
 if(CREATEDMG_EXECUTABLE)
   message(STATUS "Found create-dmg: ${CREATEDMG_EXECUTABLE}")
@@ -14,29 +20,33 @@ else()
 endif()
 
 if(MACDEPLOYQT_EXECUTABLE)
-  add_custom_target(copy_gstreamer_plugins
-    #COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh strawberry.app
-  )
+
+  if(APPLE_DEVELOPER_ID)
+    set(MACDEPLOYQT_CODESIGN -codesign=${APPLE_DEVELOPER_ID})
+    set(CREATEDMG_CODESIGN --codesign ${APPLE_DEVELOPER_ID})
+  endif()
+  if(CREATEDMG_SKIP_JENKINS)
+    set(CREATEDMG_SKIP_JENKINS_ARG "--skip-jenkins")
+  endif()
+
   add_custom_target(deploy
     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/strawberry.app/Contents/{Frameworks,Resources}
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/strawberry.icns ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources/
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3
-      -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader
-      -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gio-modules/libgiognutls.so
-      #-executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner
+    COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh ${CMAKE_BINARY_DIR}/strawberry.app
+    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner ${MACDEPLOYQT_CODESIGN}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    DEPENDS strawberry strawberry-tagreader copy_gstreamer_plugins macdeployqt
-  )
-  add_custom_target(deploycheck
-    COMMAND ${CMAKE_BINARY_DIR}/ext/macdeploycheck/macdeploycheck strawberry.app
-    DEPENDS macdeploycheck
+    DEPENDS strawberry
   )
+  if(MACDEPLOYCHECK_EXECUTABLE)
+    add_custom_target(deploycheck
+      COMMAND ${MACDEPLOYCHECK_EXECUTABLE} strawberry.app
+    )
+  endif()
   if(CREATEDMG_EXECUTABLE)
     add_custom_target(dmg
-      COMMAND ${CREATEDMG_EXECUTABLE} --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
+      COMMAND ${CREATEDMG_EXECUTABLE} --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 ${CREATEDMG_CODESIGN} ${CREATEDMG_SKIP_JENKINS_ARG} strawberry-${STRAWBERRY_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      DEPENDS deploy deploycheck
     )
   endif()
 endif()

cmake/FindCppUnit.cmake

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

cmake/FindFFTW3.cmake

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

cmake/Rpm.cmake

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

cmake/Summary.cmake

@@ -24,7 +24,7 @@ macro(summary_show)
   list(SORT summary_willbuild)
   list(SORT summary_willnotbuild)
   message("")
-  message("Building strawberry version: ${STRAWBERRY_VERSION_DISPLAY}")
+  message("Building strawberry version: ${STRAWBERRY_VERSION_DISPLAY}, Qt version ${Qt${QT_VERSION_MAJOR}Core_VERSION}")
   summary_show_part(summary_willbuild "The following components will be built:")
   summary_show_part(summary_willnotbuild "The following components WILL NOT be built:")
   message("")

cmake/Translations.cmake

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

cmake/Version.cmake

@@ -1,35 +1,19 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
-set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 0)
-#set(STRAWBERRY_VERSION_PRERELEASE rc1)
+set(STRAWBERRY_VERSION_MINOR 2)
+set(STRAWBERRY_VERSION_PATCH 1)
+set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)
 
 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
 
-set(STRAWBERRY_VERSION_DISPLAY "${majorminorpatch}")
-set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}")
-set(STRAWBERRY_VERSION_RPM_V   "${majorminorpatch}")
-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}")
-  set(STRAWBERRY_VERSION_PACKAGE "${STRAWBERRY_VERSION_PACKAGE}${STRAWBERRY_VERSION_PRERELEASE}")
-endif(STRAWBERRY_VERSION_PRERELEASE)
-
-
-if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+if(FORCE_GIT_REVISION)
+  set(GIT_REVISION ${FORCE_GIT_REVISION})
+elseif(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
 
   find_program(GIT_EXECUTABLE git)
   if(NOT GIT_EXECUTABLE OR GIT_EXECUTABLE-NOTFOUND)
-    message(FATAL_ERROR "Missing GIT executable." )
+    message(FATAL_ERROR "Missing Git executable." )
   endif()
 
   # Get the current working branch
@@ -52,15 +36,11 @@ if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
   )
 
   if(NOT ${GIT_CMD_RESULT_REVISION} EQUAL 0)
-    message(FATAL_ERROR "GIT command failed to get revision string '${GIT_REVISION}'")
+    message(FATAL_ERROR "Git command failed to get revision string '${GIT_REVISION}'")
   endif()
 
 endif()
 
-if(FORCE_GIT_REVISION)
-  set(GIT_REVISION ${FORCE_GIT_REVISION})
-endif()
-
 if(GIT_REVISION)
 
   string(REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\1;\\2;\\3" GIT_PARTS ${GIT_REVISION})
@@ -71,7 +51,7 @@ if(GIT_REVISION)
 
   list(LENGTH GIT_PARTS GIT_PARTS_LENGTH)
   if(NOT GIT_PARTS_LENGTH EQUAL 3)
-    message(FATAL_ERROR "Failed to parse git revision string '${GIT_REVISION}'")
+    set(GIT_PARTS "${majorminorpatch};0;${GIT_REVISION}")
   endif()
 
   list(GET GIT_PARTS 0 GIT_TAGNAME)
@@ -82,15 +62,23 @@ if(GIT_REVISION)
 
   set(STRAWBERRY_VERSION_DISPLAY "${GIT_REVISION}")
   set(STRAWBERRY_VERSION_PACKAGE "${GIT_TAGNAME}.${GIT_COMMITCOUNT}.${GIT_SHA1}")
-  set(STRAWBERRY_VERSION_RPM_V   "${GIT_TAGNAME}")
+  string(REPLACE "-" "~" STRAWBERRY_VERSION_RPM_V "${GIT_TAGNAME}")
   set(STRAWBERRY_VERSION_RPM_R   "2.${GIT_COMMITCOUNT}.${GIT_SHA1}")
-  set(STRAWBERRY_VERSION_PAC_V   "${GIT_TAGNAME}.r${GIT_COMMITCOUNT}.${GIT_SHA1}")
-  set(STRAWBERRY_VERSION_PAC_R   "1")
 
+else()
+  if(STRAWBERRY_VERSION_PRERELEASE)
+    set(STRAWBERRY_VERSION_DISPLAY "${majorminorpatch}-${STRAWBERRY_VERSION_PRERELEASE}")
+    set(STRAWBERRY_VERSION_RPM_V   "${majorminorpatch}~${STRAWBERRY_VERSION_PRERELEASE}")
+    set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}${STRAWBERRY_VERSION_PRERELEASE}")
+  else()
+    set(STRAWBERRY_VERSION_DISPLAY "${majorminorpatch}")
+    set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}")
+    set(STRAWBERRY_VERSION_RPM_V   "${majorminorpatch}")
+  endif()
+  set(STRAWBERRY_VERSION_RPM_R   "1")
 endif()
 
 message(STATUS "Strawberry Version:")
 message(STATUS "Display:  ${STRAWBERRY_VERSION_DISPLAY}")
 message(STATUS "Package:  ${STRAWBERRY_VERSION_PACKAGE}")
 message(STATUS "RPM:      ${STRAWBERRY_VERSION_RPM_V}-${STRAWBERRY_VERSION_RPM_R}")
-message(STATUS "PAC:      ${STRAWBERRY_VERSION_PAC_V}-${STRAWBERRY_VERSION_PAC_R}")

crowdin.yml

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

data/data.qrc

@@ -1,21 +1,17 @@
 <RCC>
     <qresource prefix="/">
         <file>schema/schema.sql</file>
-        <file>schema/schema-1.sql</file>
-        <file>schema/schema-2.sql</file>
-        <file>schema/schema-3.sql</file>
-        <file>schema/schema-4.sql</file>
-        <file>schema/schema-5.sql</file>
-        <file>schema/schema-6.sql</file>
-        <file>schema/schema-7.sql</file>
-        <file>schema/schema-8.sql</file>
-        <file>schema/schema-9.sql</file>
         <file>schema/schema-10.sql</file>
         <file>schema/schema-11.sql</file>
         <file>schema/schema-12.sql</file>
         <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/schema-18.sql</file>
+        <file>schema/schema-19.sql</file>
+        <file>schema/schema-20.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>style/smartplaylistsearchterm.css</file>
@@ -46,8 +42,9 @@
         <file>pictures/rainbowdash.png</file>
         <file>pictures/star-on.png</file>
         <file>pictures/star-off.png</file>
-        <file>fonts/HumongousofEternitySt.ttf</file>
         <file>mood/sample.mood</file>
         <file>text/ghosts.txt</file>
+        <file>pictures/sidebar-background.png</file>
+        <file>style/dynamicplaylistcontrols.css</file>
     </qresource>
 </RCC>

data/icons.qrc

@@ -24,6 +24,7 @@
         <file>icons/128x128/document-open-folder.png</file>
         <file>icons/128x128/document-open.png</file>
         <file>icons/128x128/document-save.png</file>
+        <file>icons/128x128/document-save-all.png</file>
         <file>icons/128x128/document-search.png</file>
         <file>icons/128x128/download.png</file>
         <file>icons/128x128/edit-clear-list.png</file>
@@ -90,11 +91,13 @@
         <file>icons/128x128/love.png</file>
         <file>icons/128x128/subsonic.png</file>
         <file>icons/128x128/tidal.png</file>
+        <file>icons/128x128/spotify.png</file>
         <file>icons/128x128/qobuz.png</file>
         <file>icons/128x128/multimedia-player-ipod-standard-black.png</file>
         <file>icons/128x128/radio.png</file>
         <file>icons/128x128/somafm.png</file>
         <file>icons/128x128/radioparadise.png</file>
+        <file>icons/128x128/musicbrainz.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -119,6 +122,7 @@
         <file>icons/64x64/document-open-folder.png</file>
         <file>icons/64x64/document-open.png</file>
         <file>icons/64x64/document-save.png</file>
+        <file>icons/64x64/document-save-all.png</file>
         <file>icons/64x64/document-search.png</file>
         <file>icons/64x64/download.png</file>
         <file>icons/64x64/edit-clear-list.png</file>
@@ -186,11 +190,13 @@
         <file>icons/64x64/love.png</file>
         <file>icons/64x64/subsonic.png</file>
         <file>icons/64x64/tidal.png</file>
+        <file>icons/64x64/spotify.png</file>
         <file>icons/64x64/qobuz.png</file>
         <file>icons/64x64/multimedia-player-ipod-standard-black.png</file>
         <file>icons/64x64/radio.png</file>
         <file>icons/64x64/somafm.png</file>
         <file>icons/64x64/radioparadise.png</file>
+        <file>icons/64x64/musicbrainz.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -216,6 +222,7 @@
         <file>icons/48x48/document-open-remote.png</file>
         <file>icons/48x48/document-open.png</file>
         <file>icons/48x48/document-save.png</file>
+        <file>icons/48x48/document-save-all.png</file>
         <file>icons/48x48/document-search.png</file>
         <file>icons/48x48/download.png</file>
         <file>icons/48x48/edit-clear-list.png</file>
@@ -285,12 +292,14 @@
         <file>icons/48x48/moodbar.png</file>
         <file>icons/48x48/love.png</file>
         <file>icons/48x48/subsonic.png</file>
-	<file>icons/48x48/tidal.png</file>
-	<file>icons/48x48/qobuz.png</file>
+        <file>icons/48x48/tidal.png</file>
+        <file>icons/48x48/spotify.png</file>
+        <file>icons/48x48/qobuz.png</file>
         <file>icons/48x48/multimedia-player-ipod-standard-black.png</file>
         <file>icons/48x48/radio.png</file>
         <file>icons/48x48/somafm.png</file>
         <file>icons/48x48/radioparadise.png</file>
+        <file>icons/48x48/musicbrainz.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -316,6 +325,7 @@
         <file>icons/32x32/document-open-remote.png</file>
         <file>icons/32x32/document-open.png</file>
         <file>icons/32x32/document-save.png</file>
+        <file>icons/32x32/document-save-all.png</file>
         <file>icons/32x32/document-search.png</file>
         <file>icons/32x32/download.png</file>
         <file>icons/32x32/edit-clear-list.png</file>
@@ -386,11 +396,13 @@
         <file>icons/32x32/love.png</file>
         <file>icons/32x32/subsonic.png</file>
         <file>icons/32x32/tidal.png</file>
+        <file>icons/32x32/spotify.png</file>
         <file>icons/32x32/qobuz.png</file>
         <file>icons/32x32/multimedia-player-ipod-standard-black.png</file>
         <file>icons/32x32/radio.png</file>
         <file>icons/32x32/somafm.png</file>
         <file>icons/32x32/radioparadise.png</file>
+        <file>icons/32x32/musicbrainz.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -416,6 +428,7 @@
         <file>icons/22x22/document-open-remote.png</file>
         <file>icons/22x22/document-open.png</file>
         <file>icons/22x22/document-save.png</file>
+        <file>icons/22x22/document-save-all.png</file>
         <file>icons/22x22/document-search.png</file>
         <file>icons/22x22/download.png</file>
         <file>icons/22x22/edit-clear-list.png</file>
@@ -486,10 +499,12 @@
         <file>icons/22x22/love.png</file>
         <file>icons/22x22/subsonic.png</file>
         <file>icons/22x22/tidal.png</file>
+        <file>icons/22x22/spotify.png</file>
         <file>icons/22x22/qobuz.png</file>
         <file>icons/22x22/multimedia-player-ipod-standard-black.png</file>
         <file>icons/22x22/radio.png</file>
         <file>icons/22x22/somafm.png</file>
         <file>icons/22x22/radioparadise.png</file>
+        <file>icons/22x22/musicbrainz.png</file>
     </qresource>
 </RCC>

data/schema/device-schema.sql

@@ -1,35 +1,35 @@
 CREATE TABLE device_%deviceid_directories (
-  path TEXT NOT NULL DEFAULT '',
+  path TEXT NOT NULL,
   subdirs INTEGER NOT NULL
 );
 
 CREATE TABLE device_%deviceid_subdirectories (
   directory_id INTEGER NOT NULL,
-  path TEXT NOT NULL DEFAULT '',
+  path TEXT NOT NULL,
   mtime INTEGER NOT NULL
 );
 
 CREATE TABLE device_%deviceid_songs (
 
-  title TEXT DEFAULT '',
-  album TEXT DEFAULT '',
-  artist TEXT DEFAULT '',
-  albumartist TEXT DEFAULT '',
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
-  genre TEXT DEFAULT '',
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
-  composer TEXT DEFAULT '',
-  performer TEXT DEFAULT '',
-  grouping TEXT DEFAULT '',
-  comment TEXT DEFAULT '',
-  lyrics TEXT DEFAULT '',
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
 
-  artist_id TEXT DEFAULT '',
-  album_id TEXT DEFAULT '',
-  song_id TEXT DEFAULT '',
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -40,14 +40,14 @@ CREATE TABLE device_%deviceid_songs (
 
   source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL DEFAULT -1,
-  url TEXT NOT NULL DEFAULT '',
+  url TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
   filesize INTEGER NOT NULL DEFAULT -1,
   mtime INTEGER NOT NULL DEFAULT -1,
   ctime INTEGER NOT NULL DEFAULT -1,
   unavailable INTEGER DEFAULT 0,
 
-  fingerprint TEXT DEFAULT '',
+  fingerprint TEXT,
 
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
@@ -59,15 +59,34 @@ CREATE TABLE device_%deviceid_songs (
   compilation_off INTEGER NOT NULL DEFAULT 0,
   compilation_effective INTEGER NOT NULL DEFAULT 0,
 
-  art_automatic TEXT DEFAULT '',
-  art_manual TEXT DEFAULT '',
+  art_embedded INTEGER DEFAULT 0,
+  art_automatic TEXT,
+  art_manual TEXT,
+  art_unset INTEGER DEFAULT 0,
 
-  effective_albumartist TEXT DEFAULT '',
+  effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
 
-  cue_path TEXT DEFAULT '',
+  cue_path TEXT,
 
-  rating INTEGER DEFAULT -1
+  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,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -75,9 +94,4 @@ CREATE INDEX idx_device_%deviceid_songs_album ON device_%deviceid_songs (album);
 
 CREATE INDEX idx_device_%deviceid_songs_comp_artist ON device_%deviceid_songs (compilation_effective, artist);
 
-CREATE VIRTUAL TABLE device_%deviceid_fts USING fts5(
-  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment,
-  tokenize = "unicode61 remove_diacritics 1"
-);
-
-UPDATE devices SET schema_version=3 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=5 WHERE ROWID=%deviceid;

data/schema/schema-1.sql

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

data/schema/schema-14.sql

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

data/schema/schema-15.sql

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

data/schema/schema-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-18.sql

@@ -0,0 +1,37 @@
+ALTER TABLE songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE subsonic_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE subsonic_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE tidal_artists_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE tidal_albums_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE tidal_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE tidal_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE qobuz_artists_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE qobuz_albums_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE qobuz_songs ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE qobuz_songs ADD COLUMN ebur128_loudness_range_lu REAL;
+
+ALTER TABLE playlist_items ADD COLUMN ebur128_integrated_loudness_lufs REAL;
+
+ALTER TABLE playlist_items ADD COLUMN ebur128_loudness_range_lu REAL;
+
+UPDATE schema_version SET version=18;

data/schema/schema-19.sql

@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS %allsongstables_fts;
+
+DROP TABLE IF EXISTS songs_fts;
+
+DROP TABLE IF EXISTS subsonic_songs_fts;
+
+DROP TABLE IF EXISTS tidal_artists_songs_fts;
+
+DROP TABLE IF EXISTS tidal_albums_songs_fts;
+
+DROP TABLE IF EXISTS tidal_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_artists_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_albums_songs_fts;
+
+DROP TABLE IF EXISTS qobuz_songs_fts;
+
+UPDATE schema_version SET version=19;

data/schema/schema-2.sql

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

data/schema/schema-20.sql

@@ -0,0 +1,244 @@
+CREATE TABLE IF NOT EXISTS spotify_artists_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  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,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+CREATE TABLE IF NOT EXISTS spotify_albums_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  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,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+CREATE TABLE IF NOT EXISTS spotify_songs (
+
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT -1,
+  genre TEXT,
+  compilation INTEGER NOT NULL DEFAULT 0,
+  composer TEXT,
+  performer TEXT,
+  grouping TEXT,
+  comment TEXT,
+  lyrics TEXT,
+
+  artist_id TEXT,
+  album_id TEXT,
+  song_id TEXT,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT -1,
+  samplerate INTEGER NOT NULL DEFAULT -1,
+  bitdepth INTEGER NOT NULL DEFAULT -1,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER NOT NULL DEFAULT -1,
+  url TEXT NOT NULL,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER NOT NULL DEFAULT -1,
+  mtime INTEGER NOT NULL DEFAULT -1,
+  ctime INTEGER NOT NULL DEFAULT -1,
+  unavailable INTEGER DEFAULT 0,
+
+  fingerprint TEXT,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT -1,
+  lastseen INTEGER NOT NULL DEFAULT -1,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_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,
+
+  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,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
+
+);
+
+UPDATE schema_version SET version=20;

data/schema/schema-3.sql

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

data/schema/schema-4.sql

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

data/schema/schema-5.sql

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

data/schema/schema-6.sql

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

data/schema/schema-7.sql

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

data/schema/schema-8.sql

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

data/schema/schema-9.sql

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

data/style/dynamicplaylistcontrols.css

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

data/style/strawberry.css

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

debian/CMakeLists.txt

@@ -0,0 +1,10 @@
+if(LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
+
+  execute_process(COMMAND env LC_ALL=C date "+%a, %-d %b %Y %H:%M:%S %z" OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -cs" OUTPUT_VARIABLE DEB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if(DEB_CODENAME AND DEB_DATE)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in ${CMAKE_CURRENT_SOURCE_DIR}/changelog)
+  endif()
+
+endif()

debian/control

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

debian/copyright

@@ -1,46 +1,48 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: strawberry
 Upstream-Contact: Jonas Kvinge <jonas@jkvinge.net>
-Source: https://www.strawberrymusicplayer.org/
+Source: https://github.com/strawberrymusicplayer/strawberry
 
 Files: *
 Copyright: 2010-2015, David Sansome <me@davidsansome.com>
+           2012-2014, 2017-2024 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: src/core/timeconstants.h
-       ext/libstrawberry-common/core/logging.cpp
-       ext/libstrawberry-common/core/logging.h
-       ext/libstrawberry-common/core/messagehandler.cpp
-       ext/libstrawberry-common/core/messagehandler.h
+Files: src/utilities/timeconstants.h
+       src/core/logging.cpp
+       src/core/logging.h
 Copyright: 2011, 2012, David Sansome <me@davidsansome.com>
+           2018-2022, Jonas Kvinge <jonas@jkvinge.net>
 License: Apache-2.0
 
 Files: src/core/main.h
        src/core/iconloader.cpp
        src/core/iconloader.h
        src/core/iconmapper.h
-       src/config.h.in
-       src/version.h.in
        src/context/contextview.cpp
        src/context/contextview.h
        src/context/contextalbum.cpp
        src/context/contextalbum.h
-       src/engine/enginetype.cpp
-       src/engine/enginetype.h
        src/engine/alsadevicefinder.cpp
        src/engine/alsadevicefinder.h
+       src/engine/alsapcmdevicefinder.cpp
+       src/engine/alsapcmdevicefinder.h
        src/engine/mmdevicefinder.cpp
        src/engine/mmdevicefinder.h
+       src/engine/uwpdevicefinder.cpp
+       src/engine/uwpdevicefinder.h
        src/engine/devicefinder.cpp
        src/engine/devicefinder.h
        src/engine/enginedevice.cpp
        src/engine/enginedevice.h
-       src/internet/internetservice.cpp
-       src/internet/internetservice.h
-       src/internet/internettabsview.cpp
-       src/internet/internettabsview.h
-       src/internet/internetsongsview.cpp
-       src/internet/internetsongsview.h
+       src/engine/enginemetadata.cpp
+       src/engine/enginemetadata.h
+       src/streaming/streamingservice.cpp
+       src/streaming/streamingservice.h
+       src/streaming/streamingtabsview.cpp
+       src/streaming/streamingtabsview.h
+       src/streaming/streamingsongsview.cpp
+       src/streaming/streamingsongsview.h
        src/settings/backendsettingspage.cpp
        src/settings/backendsettingspage.h
        src/settings/coverssettingspage.cpp
@@ -53,6 +55,8 @@ Files: src/core/main.h
        src/settings/subsonicsettingspage.h
        src/settings/tidalsettingspage.cpp
        src/settings/tidalsettingspage.h
+       src/settings/spotifysettingspage.cpp
+       src/settings/spotifysettingspage.h
        src/covermanager/jsoncoverprovider.cpp
        src/covermanager/jsoncoverprovider.h
        src/covermanager/lastfmcoverprovider.cpp
@@ -63,17 +67,23 @@ Files: src/core/main.h
        src/covermanager/deezercoverprovider.h
        src/covermanager/tidalcoverprovider.cpp
        src/covermanager/tidalcoverprovider.h
+       src/covermanager/opentidalcoverprovider.cpp
+       src/covermanager/opentidalcoverprovider.h
        src/covermanager/qobuzcoverprovider.cpp
        src/covermanager/qobuzcoverprovider.h
        src/covermanager/spotifycoverprovider.cpp
        src/covermanager/spotifycoverprovider.h
        src/covermanager/musixmatchcoverprovider.cpp
        src/covermanager/musixmatchcoverprovider.h
-       src/globalshortcuts/globalshortcutsbackend-system.cpp
-       src/globalshortcuts/globalshortcutsbackend-system.h
+       src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp
+       src/globalshortcuts/globalshortcutsbackend-kglobalaccel.h
+       src/globalshortcuts/globalshortcutsbackend-x11.cpp
+       src/globalshortcuts/globalshortcutsbackend-x11.h
+       src/globalshortcuts/globalshortcutsbackend-win.cpp
+       src/globalshortcuts/globalshortcutsbackend-win.h
        src/globalshortcuts/globalshortcut.cpp
        src/globalshortcuts/globalshortcut.h
-       src/globalshortcuts/globalshortcut-X11.cpp
+       src/globalshortcuts/globalshortcut-x11.cpp
        src/globalshortcuts/globalshortcut-win.cpp
        src/globalshortcuts/keymapper_x11.h
        src/globalshortcuts/keymapper_win.h
@@ -81,132 +91,21 @@ Files: src/core/main.h
        src/scrobbler/*
        src/subsonic/*
        src/tidal/*
+       src/qobuz/*
+       src/radios/*
+       src/spotify/*
        src/transcoder/transcoderoptionswavpack.cpp
        src/transcoder/transcoderoptionswavpack.h
-Copyright: 2012-2014, 2017-2020, Jonas Kvinge <jonas@jkvinge.net>
-License: GPL-3+
-
-Files: src/core/main.cpp
-       src/core/mainwindow.cpp
-       src/core/mainwindow.h
-       src/core/player.cpp
-       src/core/player.h
-       src/core/song.cpp
-       src/core/song.h
-       src/core/songloader.cpp
-       src/core/songloader.h
-       src/core/urlhandler.cpp
-       src/core/urlhandler.h
-       src/core/utilities.cpp
-       src/core/utilities.h
-       src/core/networkaccessmanager.cpp
-       src/core/networkaccessmanager.h
-       src/core/threadsafenetworkdiskcache.cpp
-       src/core/threadsafenetworkdiskcache.h
-       src/core/filesystemmusicstorage.cpp
-       src/core/filesystemmusicstorage.h
-       src/core/stylesheetloader.cpp
-       src/core/stylesheetloader.h
-       src/engine/gstenginepipeline.cpp
-       src/engine/gstenginepipeline.h
-       src/engine/vlcengine.cpp
-       src/engine/vlcengine.h
-       src/collection/collectionwatcher.cpp
-       src/collection/collectionwatcher.h
-       src/collection/collectionbackend.cpp
-       src/collection/collectionbackend.h
-       src/collection/collectionmodel.cpp
-       src/collection/collectionmodel.h
-       src/context/contextalbumsmodel.cpp
-       src/context/contextalbumsview.cpp
-       src/context/contextalbumsmodel.h
-       src/context/contextalbumsview.h
-       src/widgets/playingwidget.cpp
-       src/widgets/playingwidget.h
-       src/osd/osdbase.cpp
-       src/osd/osdbase.h
-       src/osd/osdpretty.cpp
-       src/osd/osdpretty.h
-       src/osd/osddbus.cpp
-       src/osd/osddbus.h
-       src/osd/osdmac.cpp
-       src/osd/osdmac.h
-       src/dialogs/about.cpp
-       src/dialogs/about.h
-       src/playlist/playlist.cpp
-       src/playlist/playlist.h
-       src/playlist/playlistitem.cpp
-       src/playlist/playlistitem.h
-       src/playlist/playlistdelegates.cpp
-       src/playlist/playlistdelegates.h
-       src/playlist/playlistbackend.cpp
-       src/playlist/playlistbackend.h
-       src/playlist/playlistview.cpp
-       src/playlist/playlistview.h
-       src/playlist/songplaylistitem.cpp
-       src/playlist/songplaylistitem.h
-       src/internet/internetplaylistitem.cpp
-       src/internet/internetsearch.cpp
-       src/internet/internetsearch.h
-       src/internet/internetsearchview.cpp
-       src/internet/internetsearchview.h
-       src/internet/internetservices.cpp
-       src/internet/internetservices.h
-       src/internet/internetsongsview.cpp
-       src/internet/internetsongsview.h
-       src/internet/internetcollectionview.cpp
-       src/internet/internetcollectionview.h
-       ext/libstrawberry-tagreader/tagreader.cpp
-       ext/libstrawberry-tagreader/tagreader.h
-       src/device/devicemanager.cpp
-       src/device/devicemanager.h
-       src/device/deviceinfo.cpp
-       src/device/deviceinfo.h
-       src/device/deviceproperties.cpp
-       src/device/deviceproperties.h
-       src/device/deviceview.cpp
-       src/device/deviceview.h
-       src/device/connecteddevice.cpp
-       src/device/connecteddevice.h
-       src/device/mtpconnection.cpp
-       src/device/mtpconnection.h
-       src/device/mtpdevice.cpp
-       src/device/mtpdevice.h
-       src/globalshortcuts/globalshortcutsmanager.cpp
-       src/globalshortcuts/globalshortcutsmanager.h
-       src/settings/shortcutssettingspage.cpp
-       src/settings/shortcutssettingspage.h
-       src/settings/appearancesettingspage.cpp
-       src/settings/appearancesettingspage.h
-       src/organize/organize.cpp
-       src/organize/organize.h
-       src/organize/organizedialog.cpp
-       src/organize/organizedialog.h
-       src/organize/organizeerrordialog.cpp
-       src/organize/organizeerrordialog.h
-       src/transcoder/transcoder.cpp
-       src/transcoder/transcoder.h
-       src/musicbrainz/musicbrainzclient.cpp
-       src/musicbrainz/musicbrainzclient.h
-       src/covermanager/albumcoverloader.cpp
-       src/covermanager/albumcoverloader.h
-       src/covermanager/currentalbumcoverloader.cpp
-       src/covermanager/currentalbumcoverloader.h
-       src/covermanager/albumcoverchoicecontroller.cpp
-       src/covermanager/albumcoverchoicecontroller.h
-       src/covermanager/albumcoverfetchersearch.cpp
-       src/covermanager/albumcoverfetchersearch.h
-       src/covermanager/coverproviders.cpp
-       src/covermanager/coverproviders.h
-       src/covermanager/coverprovider.cpp
-       src/covermanager/coverprovider.h
-Copyright: 2010, 2012-2014 David Sansome <me@davidsansome.com>
-           2012-2014, 2017-2020 Jonas Kvinge <jonas@jkvinge.net>
+       src/widgets/resizabletextedit.cpp
+       src/widgets/resizabletextedit.h
+       src/widgets/fancytabdata.cpp
+       src/widgets/fancytabdata.h
+Copyright: 2012-2014, 2017-2024, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/engine/enginebase.cpp
        src/engine/enginebase.h
-Copyright: 2017, 2018, Jonas Kvinge <jonas@jkvinge.net>
+Copyright: 2017-2021, Jonas Kvinge <jonas@jkvinge.net>
            2010, David Sansome <me@davidsansome.com>
            2004, 2005, Max Howell, <max.howell@methylblue.com>
            2003, Mark Kretschmann <markey@web.de>
@@ -214,7 +113,7 @@ License: GPL-3+
 
 Files: src/engine/gstengine.cpp
        src/engine/gstengine.h
-Copyright: 2017, 2018, Jonas Kvinge <jonas@jkvinge.net>
+Copyright: 2017-2021, Jonas Kvinge <jonas@jkvinge.net>
            2006, Paul Cifarelli <paul@cifarelli.net>
            2005, Jakub Stachowski <qbast@go2.pl>
            2003-2005, Mark Kretschmann <markey@web.de>
@@ -222,6 +121,8 @@ License: GPL-2+
 
 Files: src/widgets/fancytabwidget.cpp
        src/widgets/fancytabwidget.h
+       src/widgets/fancytabbar.cpp
+       src/widgets/fancytabbar.h
 Copyright: 2018, Vikram Ambrose <ambroseworks@gmail.com>
            2018, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
@@ -230,12 +131,7 @@ Files: src/core/application.cpp
        src/core/application.h
 Copyright: 2012, David Sansome <me@davidsansome.com>
            2012, 2014, John Maguire <john.maguire@gmail.com>
-           2018, Jonas Kvinge <jonas@jkvinge.net>
-License: GPL-3+
-
-Files: src/core/appearance.cpp
-       src/core/appearance.h
-Copyright: 2012, Arnaud Bienner <arnaud.bienner@gmail.com>
+           2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/covermanager/discogscoverprovider.cpp
@@ -244,13 +140,7 @@ Copyright: 2012, Martin Björklund <mbj4668@gmail.com>
            2016, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: ext/libstrawberry-common/core/arraysize.h
-       ext/libstrawberry-common/core/scoped_nsautorelease_pool.h
-       ext/libstrawberry-common/core/scoped_nsautorelease_pool.mm
-Copyright: 2010, 2011, 2014, The Chromium Authors.
-License: BSD-style
-
-Files: ext/libstrawberry-common/core/lazy.h
+Files: src/core/lazy.h
 Copyright: 2016, John Maguire <john.maguire@gmail.com>
 License: GPL-3+
 
@@ -298,12 +188,16 @@ Copyright: 2011, Tyler Rhodes <tyler.s.rhodes@gmail.com>
            2015, Arun Narayanankutty <n.arun.lifescience@gmail.com>
 License: GPL-2+
 
-Files: src/collection/savedgroupingmanager.h
+Files: src/collection/savedgroupingmanager.*
 Copyright: 2015, Nick Lanham <nick@afternight.org>
+           2019-2021 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
-Files: src/core/scoped_cftyperef.h
+Files: src/core/arraysize.h
+       src/core/scoped_cftyperef.h
        src/core/scoped_nsobject.h
+       src/core/scoped_nsautorelease_pool.h
+       src/core/scoped_nsautorelease_pool.mm
 Copyright: 2010, 2011, 2014, The Chromium Authors.
 License: BSD-style
 
@@ -318,11 +212,11 @@ Files: src/device/udisks2lister.cpp
 Copyright: 2016, Valeriy Malov <jazzvoid@gmail.com>
 License: GPL-3+
 
-Files: src/internet/localredirectserver.cpp
-       src/internet/localredirectserver.h
+Files: src/core/localredirectserver.cpp
+       src/core/localredirectserver.h
 Copyright: 2012, 2014, John Maguire <john.maguire@gmail.com>
            2014, Krzysztof Sobiecki <sobkas@gmail.com>
-           2018-2019, Jonas Kvinge <jonas@jkvinge.net>
+           2018-2021, Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-3+
 
 Files: src/transcoder/transcoderoptionsopus.cpp
@@ -337,37 +231,47 @@ Files: src/widgets/clickablelabel.cpp
 Copyright: 2010, 2011, Andrea Decorte <adecorte@gmail.com>
 License: GPL-3+
 
-Files: src/widgets/sliderwidget.cpp
-       src/widgets/sliderwidget.h
-Copyright: 2005, Gábor Lehel
+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: 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
+           2005, Gábor Lehel
            2003, Mark Kretschmann <markey@web.de>
 License: GPL-2+
 
+Files: src/scrobbler/subsonicscrobbler.*
+Copyright: 2018-2021 Jonas Kvinge <jonas@jkvinge.net>
+           2020 Pascal Below <spezifisch@below.fr>
+License: GPL-3+
+
 Files: src/core/stylehelper.cpp
        src/core/stylehelper.h
 Copyright: 2016 The Qt Company Ltd.
 License: GPL-3+
 
-Files: ext/gstmoodbar/gstfastspectrum.cpp
-       ext/gstmoodbar/gstfastspectrum.h
+Files: 3rdparty/gstfastspectrum/gstfastspectrum.cpp
+       3rdparty/gstfastspectrum/gstfastspectrum.h
 Copyright: 1999 Erik Walthinsen <omega@cse.ogi.edu>
            2006,2011 Stefan Kost <ensonic@users.sf.net>
            2007-2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+           2018-2024 Jonas Kvinge <jonas@jkvinge.net>
 License: GPL-2+
 
-Files: src/widgets/qsearchfield_nonmac.cpp
+Files: src/widgets/qsearchfield_qt.cpp
        src/widgets/qsearchfield_mac.mm
        src/widgets/qsearchfield.h
+       src/widgets/qocoa_mac.h
+       src/widgets/searchfield_qt_private.cpp
+       src/widgets/searchfield_qt_private.h
 Copyright: 2011, Mike McQuaid <mike@mikemcquaid.com>
+           2018-2024, Jonas Kvinge <jonas@jkvinge.net>
 License: Expat
 
-Files: 3rdparty/SPMediaKeyTap/*
-Copyright: 2010, Spotify AB
-           2011, Joachim Bengtsson
-License: BSD-3-clause
-
-Files: 3rdparty/singleapplication/*
-Copyright: 2015-2018, Itay Grudev
+Files: 3rdparty/kdsingleapplication/*
+Copyright: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 License: MIT
 
 
@@ -475,7 +379,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.

debian/copyright-scan-patterns.yml

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

debian/rules

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

dist/CMakeLists.txt

@@ -2,17 +2,19 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CUR
 if(RPM_DISTRO AND RPM_DATE)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec @ONLY)
 endif(RPM_DISTRO AND RPM_DATE)
-if(DEB_CODENAME AND DEB_DATE)
-  configure_file(${CMAKE_SOURCE_DIR}/debian/changelog.in ${CMAKE_SOURCE_DIR}/debian/changelog)
-endif(DEB_CODENAME AND DEB_DATE)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD @ONLY)
 
 if(APPLE)
+  if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
+    set(LSMinimumSystemVersion $ENV{MACOSX_DEPLOYMENT_TARGET})
+  else()
+    set(LSMinimumSystemVersion 12.0)
+  endif()
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
 endif(APPLE)
 
 if(WIN32)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/windres.rc.in ${CMAKE_BINARY_DIR}/windres.rc)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_BINARY_DIR}/strawberry.nsi @ONLY)
 endif(WIN32)
 
 if(UNIX AND NOT APPLE)
@@ -21,7 +23,7 @@ if(UNIX AND NOT APPLE)
   install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
   install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
   install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
-  install(FILES unix/strawberry.1 unix/strawberry-tagreader.1 DESTINATION share/man/man1)
+  install(FILES unix/strawberry.1 DESTINATION share/man/man1)
 endif(UNIX AND NOT APPLE)
 
 if(APPLE)

dist/macos/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>@LSMinimumSystemVersion@</string>
   <key>SUFeedURL</key>
   <string>https://www.strawberrymusicplayer.org/sparkle-macos</string>
   <key>SUPublicEDKey</key>

dist/macos/macgstcopy.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Script to copy gstreamer plugins before macdeployqt is run.
+# Script to copy gio modules and gstreamer plugins before macdeployqt is run.
 
 if [ "$1" = "" ]; then
   echo "Usage: $0 <bundledir>"
@@ -8,100 +8,145 @@ if [ "$1" = "" ]; then
 fi
 bundledir=$1
 
-if [ "$GIO_EXTRA_MODULES" = "" ]; then
-  echo "Error: Set the GIO_EXTRA_MODULES environment variable to the path containing libgiognutls.so."
+if [ "${GIO_EXTRA_MODULES}" = "" ]; then
+  echo "Error: Set the GIO_EXTRA_MODULES environment variable to the path containing gio modules."
   exit 1
 fi
 
-if [ "$GST_PLUGIN_SCANNER" = "" ]; then
+if [ "${GST_PLUGIN_SCANNER}" = "" ]; then
   echo "Error: Set the GST_PLUGIN_SCANNER environment variable to the gst-plugin-scanner."
   exit 1
 fi
 
-if [ "$GST_PLUGIN_PATH" = "" ]; then
+if [ "${GST_PLUGIN_PATH}" = "" ]; then
   echo "Error: Set the GST_PLUGIN_PATH environment variable to the path containing gstreamer plugins."
   exit 1
 fi
 
+if ! [ -e "${GIO_EXTRA_MODULES}/libgiognutls.so" ] && ! [ -e "${GIO_EXTRA_MODULES}/libgioopenssl.so" ]; then
+  echo "Error: Missing ${GIO_EXTRA_MODULES}/libgiognutls.so or ${GIO_EXTRA_MODULES}/libgioopenssl.so."
+  exit 1
+fi
+
+if ! [ -e "${GST_PLUGIN_SCANNER}" ]; then
+  echo "Error: Missing ${GST_PLUGIN_SCANNER}"
+  exit 1
+fi
+
+if ! [ -d "${GST_PLUGIN_PATH}" ]; then
+  echo "Error: GStreamer plugins path ${GST_PLUGIN_PATH} does not exist."
+  exit 1
+fi
+
+if ! [ -e "${GST_PLUGIN_PATH}/libgstcoreelements.so" ] && ! [ -e "${GST_PLUGIN_PATH}/libgstcoreelements.dylib" ]; then
+  echo "Error: Missing libgstcoreelements.{so,dylib} in GStreamer plugins path ${GST_PLUGIN_PATH}."
+  exit 1
+fi
+
 mkdir -p "${bundledir}/Contents/PlugIns/gio-modules" || exit 1
 mkdir -p "${bundledir}/Contents/PlugIns/gstreamer" || exit 1
 
-if ! [ -f "${GIO_EXTRA_MODULES}/libgiognutls.so" ]; then
-  echo "Error: Missing ${GIO_EXTRA_MODULES}/libgiognutls.so."
-  exit 1
+if [ -e "${GIO_EXTRA_MODULES}/libgiognutls.so" ]; then
+  cp -v -f "${GIO_EXTRA_MODULES}/libgiognutls.so" "${bundledir}/Contents/PlugIns/gio-modules/" || exit 1
+else
+  echo "Warning: Missing ${GIO_EXTRA_MODULES}/libgiognutls.so."
 fi
-cp -v -f "${GIO_EXTRA_MODULES}/libgiognutls.so" "${bundledir}/Contents/PlugIns/gio-modules/" || exit 1
 
-if ! [ -f "${GST_PLUGIN_SCANNER}" ]; then
-  echo "Error: Missing ${GST_PLUGIN_SCANNER}"
-  exit 1
+if [ -e "${GIO_EXTRA_MODULES}/libgioopenssl.so" ]; then
+  cp -v -f "${GIO_EXTRA_MODULES}/libgioopenssl.so" "${bundledir}/Contents/PlugIns/gio-modules/" || exit 1
+else
+  echo "Warning: Missing ${GIO_EXTRA_MODULES}/libgioopenssl.so"
 fi
+
 cp -v -f "${GST_PLUGIN_SCANNER}" "${bundledir}/Contents/PlugIns/" || exit 1
+install_name_tool -add_rpath "@loader_path/../Frameworks" "${bundledir}/Contents/PlugIns/$(basename ${GST_PLUGIN_SCANNER})" || exit 1
 
 gst_plugins="
-libgstapetag.dylib
-libgstapp.dylib
-libgstaudioconvert.dylib
-libgstaudiofx.dylib
-libgstaudiomixer.dylib
-libgstaudioparsers.dylib
-libgstaudiorate.dylib
-libgstaudioresample.dylib
-libgstaudiotestsrc.dylib
-libgstaudiovisualizers.dylib
-libgstauparse.dylib
-libgstautoconvert.dylib
-libgstautodetect.dylib
-libgstcoreelements.dylib
-libgstequalizer.dylib
-libgstgio.dylib
-libgsticydemux.dylib
-libgstid3demux.dylib
-libgstlevel.dylib
-libgstosxaudio.dylib
-libgstplayback.dylib
-libgstrawparse.dylib
-libgstreplaygain.dylib
-libgstsoup.dylib
-libgstspectrum.dylib
-libgsttypefindfunctions.dylib
-libgstvolume.dylib
-libgstxingmux.dylib
-libgsttcp.dylib
-libgstudp.dylib
-libgstpbtypes.dylib
-libgstrtp.dylib
-libgstrtsp.dylib
-libgstflac.dylib
-libgstwavparse.dylib
-libgstfaad.dylib
-libgstogg.dylib
-libgstopus.dylib
-libgstasf.dylib
-libgstspeex.dylib
-libgsttaglib.dylib
-libgstvorbis.dylib
-libgstisomp4.dylib
-libgstlibav.dylib
-libgstaiff.dylib
-libgstlame.dylib
-libgstopusparse.dylib
-libgstfaac.dylib
-libgstmusepack.dylib
+libgstadaptivedemux2
+libgstaes
+libgstaiff
+libgstapetag
+libgstapp
+libgstasf
+libgstasfmux
+libgstaudioconvert
+libgstaudiofx
+libgstaudioparsers
+libgstaudioresample
+libgstautodetect
+libgstbs2b
+libgstcdio
+libgstcoreelements
+libgstdash
+libgstdsd
+libgstequalizer
+libgstfaac
+libgstfaad
+libgstfdkaac
+libgstflac
+libgstgio
+libgsthls
+libgsticydemux
+libgstid3demux
+libgstid3tag
+libgstisomp4
+libgstlame
+libgstmpegpsdemux
+libgstmpegpsmux
+libgstmpegtsdemux
+libgstmpegtsmux
+libgstlibav
+libgstmpg123
+libgstmusepack
+libgstogg
+libgstopenmpt
+libgstopus
+libgstopusparse
+libgstosxaudio
+libgstpbtypes
+libgstplayback
+libgstreplaygain
+libgstrtp
+libgstrtsp
+libgstsoup
+libgstspectrum
+libgstspeex
+libgstspotify
+libgsttaglib
+libgsttcp
+libgsttwolame
+libgsttypefindfunctions
+libgstudp
+libgstvolume
+libgstvorbis
+libgstwavenc
+libgstwavpack
+libgstwavparse
+libgstxingmux
 "
 
 gst_plugins=$(echo "$gst_plugins" | tr '\n' ' ' | sed -e 's/^ //g' | sed -e 's/  / /g')
-
-for gst_plugin in $gst_plugins
-do
-  if [ -f "${GST_PLUGIN_PATH}/${gst_plugin}" ]; then
-    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+for gst_plugin in $gst_plugins; do
+  if [ -e "${GST_PLUGIN_PATH}/${gst_plugin}.dylib" ]; then
+    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}.dylib" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+    install_name_tool -id "@rpath/${gst_plugin}.dylib" "${bundledir}/Contents/PlugIns/gstreamer/${gst_plugin}.dylib"
+  elif [ -e "${GST_PLUGIN_PATH}/${gst_plugin}.so" ]; then
+    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}.so" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+    install_name_tool -id "@rpath/${gst_plugin}.so" "${bundledir}/Contents/PlugIns/gstreamer/${gst_plugin}.so"
   else
-    echo "Warning: Missing gstreamer plugin ${GST_PLUGIN_PATH}/${gst_plugin}"
+    echo "Warning: Missing gstreamer plugin ${gst_plugin}."
   fi
 done
 
-if [ -f "/usr/local/lib/libbrotlicommon.1.dylib" ]; then
-  mkdir -p ${bundledir}/Contents/Frameworks
-  cp -v -f "/usr/local/lib/libbrotlicommon.1.dylib" "${bundledir}/Contents/Frameworks/"
+# libsoup is dynamically loaded by gstreamer, so it needs to be copied.
+if [ "${LIBSOUP_LIBRARY_PATH}" = "" ]; then
+  echo "Warning: Set the LIBSOUP_LIBRARY_PATH environment variable for copying libsoup."
+else
+  if [ -e "${LIBSOUP_LIBRARY_PATH}" ]; then
+    mkdir -p "${bundledir}/Contents/Frameworks" || exit 1
+    cp -v -f "${LIBSOUP_LIBRARY_PATH}" "${bundledir}/Contents/Frameworks/" || exit 1
+    install_name_tool -id "@rpath/$(basename ${LIBSOUP_LIBRARY_PATH})" "${bundledir}/Contents/Frameworks/$(basename ${LIBSOUP_LIBRARY_PATH})"
+  else
+    echo "Warning: Missing libsoup ${LIBSOUP_LIBRARY_PATH}."
+  fi
 fi

dist/scripts/import-from-clementine.sh

@@ -0,0 +1,179 @@
+#!/usr/bin/env bash
+
+# Strawberry Music Player
+# Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
+# 2021 Alexey Vazhnov
+#
+# 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/>.
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+# Based on https://github.com/strawberrymusicplayer/strawberry/wiki/Import-collection-library-and-playlists-data-from-Clementine
+
+set -o nounset
+set -o errexit
+set -o pipefail
+shopt -s dotglob
+
+# Use hardcoded path if no parameters. No need in quotes here! See `man bash`, "Parameter Expansion":
+FILE_SRC=${1:-~/.config/Clementine/clementine.db}
+FILE_DST=${2:-~/.local/share/strawberry/strawberry/strawberry.db}
+
+test -f "$FILE_SRC" || { echo "No such file: $FILE_SRC"; exit 1; }
+test -f "$FILE_DST" || { echo "No such file: $FILE_DST"; exit 1; }
+
+echo "Will try to copy information from $FILE_SRC to $FILE_DST."
+echo
+echo 'This script will **delete all information** from Strawberry database!'
+read -r -p 'Do you want to continue? (the only YES is accepted) ' answer
+if [ "$answer" != "YES" ]; then exit 1; fi
+
+# 'heredoc' with substitution of variables, see `man bash`, "Here Documents":
+sqlite3 -batch << EOF
+.echo on
+ATTACH '$FILE_DST' AS strawberry;
+ATTACH '$FILE_SRC' AS clementine;
+.bail on
+.databases
+
+/* This must be done when importing all data from Clementine because playlists are based on ROWIDs */
+
+DELETE FROM strawberry.directories;
+DELETE FROM strawberry.subdirectories;
+DELETE FROM strawberry.songs;
+DELETE FROM strawberry.playlists;
+DELETE FROM strawberry.playlist_items;
+
+/* Import all data from the collection library songs */
+
+INSERT INTO strawberry.directories (path, subdirs) SELECT path, subdirs FROM clementine.directories;
+INSERT INTO strawberry.subdirectories (directory_id, path, mtime) SELECT directory, path, mtime FROM clementine.subdirectories;
+INSERT INTO strawberry.songs (ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, beginning, length, bitrate, samplerate, directory_id, url, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, compilation_detected, compilation_on, compilation_off, compilation_effective, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path, rating)
+SELECT ROWID, title, album, artist, albumartist, track, disc, year, originalyear, genre, compilation, composer, performer, grouping, comment, lyrics, beginning, length, bitrate, samplerate, directory, filename, filetype, filesize, mtime, ctime, unavailable, playcount, skipcount, lastplayed, sampler, forced_compilation_on, forced_compilation_off, effective_compilation, art_automatic, art_manual, effective_albumartist, effective_originalyear, cue_path, rating FROM clementine.songs WHERE unavailable = 0;
+UPDATE strawberry.songs SET source = 2;
+UPDATE strawberry.songs SET artist_id = "";
+UPDATE strawberry.songs SET album_id = "";
+UPDATE strawberry.songs SET song_id = "";
+
+/* Import playlists */
+
+INSERT INTO strawberry.playlists (ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend)
+SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM clementine.playlists WHERE dynamic_playlist_type ISNULL;
+
+/* Import playlist items */
+
+INSERT INTO strawberry.playlist_items
+(ROWID,
+playlist,
+collection_id,
+title,
+album,
+artist,
+albumartist,
+track,
+disc,
+year,
+originalyear,
+genre,
+compilation,
+composer,
+performer,
+grouping,
+comment,
+lyrics,
+beginning,
+length,
+bitrate,
+samplerate,
+directory_id,
+url,
+filetype,
+filesize,
+mtime,
+ctime,
+unavailable,
+playcount,
+skipcount,
+lastplayed,
+compilation_detected,
+compilation_on,
+compilation_off,
+compilation_effective,
+art_automatic,
+art_manual,
+effective_albumartist,
+effective_originalyear,
+cue_path,
+rating
+)
+SELECT ROWID,
+   playlist,
+   library_id,
+   title,
+   album,
+   artist,
+   albumartist,
+   track,
+   disc,
+   year,
+   originalyear,
+   genre,
+   compilation,
+   composer,
+   performer,
+   grouping,
+   comment,
+   lyrics,
+   beginning,
+   length,
+   bitrate,
+   samplerate,
+   directory,
+   filename,
+   filetype,
+   filesize,
+   mtime,
+   ctime,
+   unavailable,
+   playcount,
+   skipcount,
+   lastplayed,
+   sampler,
+   forced_compilation_on,
+   forced_compilation_off,
+   effective_compilation,
+   art_automatic,
+   art_manual,
+   effective_albumartist,
+   effective_originalyear,
+   cue_path,
+   rating FROM clementine.playlist_items WHERE type = 'Library';
+
+UPDATE strawberry.playlist_items SET source = 2;
+UPDATE strawberry.playlist_items SET type = 2;
+UPDATE strawberry.playlist_items SET artist_id = "";
+UPDATE strawberry.playlist_items SET album_id = "";
+UPDATE strawberry.playlist_items SET song_id = "";
+
+/* Recreate the FTS tables */
+
+DELETE FROM strawberry.songs_fts;
+INSERT INTO strawberry.songs_fts (ROWID, ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsperformer, ftsgrouping, ftsgenre, ftscomment)
+SELECT ROWID, title, album, artist, albumartist, composer, performer, grouping, genre, comment
+FROM strawberry.songs;
+
+EOF
+
+# To be sure script didn't exit because of any error (because we use `set -o errexit`):
+echo "Script finished"

dist/scripts/maketarball.sh.in

@@ -11,10 +11,33 @@ if ! [ "$gitrev" = "ON" ]; then
   exclude_vcs="--exclude-vcs"
 fi
 
+cmds="gtar tar"
+for cmd in $cmds
+do
+  which $cmd >/dev/null 2>&1
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  result=$($cmd --version 2>&1 | head -n1)
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  echo "$result" | grep "^.* (GNU tar) .*$" >/dev/null 2>&1
+  if [ ! $? -eq 0 ]; then
+    continue
+  fi
+  TAR=$cmd
+done
+
+if [ "$TAR" = "" ]; then
+  echo "ERROR: Missing GNU Tar"
+  exit 1
+fi
+
 echo "Creating $name-$version.tar.xz..."
 
 rm -f "$name-$version.tar.xz"
-tar -cJf $name-$version.tar.xz \
+${TAR} -cJf $name-$version.tar.xz \
     --transform "s,^$rootnoslash,$name-$version," $exclude_vcs \
     --exclude=".directory" \
     --exclude="*.tar" \
@@ -26,6 +49,7 @@ tar -cJf $name-$version.tar.xz \
     --exclude="*.nsi" \
     --exclude="*.kdev4" \
     --exclude=".vscode" \
+    --exclude=".idea" \
     --exclude="$root/.github" \
     --exclude="$root/.travis.yml" \
     --exclude="$root/.circleci" \
@@ -33,11 +57,11 @@ tar -cJf $name-$version.tar.xz \
     --exclude="$root/CMakeLists.txt.user" \
     --exclude="$root/.clang-format" \
     --exclude="$root/build" \
+    --exclude="$root/cmake-build-debug" \
     --exclude="$root/zanata.xml" \
     --exclude="$root/.zanata-cache" \
     --exclude="$root/debian/changelog" \
     --exclude="$root/dist/scripts/maketarball.sh" \
-    --exclude="$root/dist/unix/PKGBUILD" \
     --exclude="$root/dist/macos/Info.plist" \
     --exclude="$root/dist/windows/windres.rc" \
     --exclude="$root/src/translations/translations.pot" \

dist/unix/PKGBUILD.in

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

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

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component>
+<component type="desktop-application">
   <id>org.strawberrymusicplayer.strawberry</id>
   <launchable type="desktop-id">org.strawberrymusicplayer.strawberry.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <provides>
     <binary>strawberry</binary>
-    <binary>strawberry-tagreader</binary>
   </provides>
   <name>Strawberry Music Player</name>
   <summary>A music player and collection organizer</summary>
   <url type="homepage">https://www.strawberrymusicplayer.org/</url>
   <url type="bugtracker">https://github.com/strawberrymusicplayer/strawberry/</url>
+  <developer id="net.jkvinge.jonas">
+    <name>Jonas Kvinge</name>
+  </developer>
   ​<translation type="qt">strawberry</translation>
+  <content_rating type="oars-1.1" />
   <description>
     <p>
-      Strawberry is a music player and music collection organizer. It is aimed at music collectors and audiophiles. With Strawberry you can play and manage your digital music collection, or stream your favorite radios. It also has unofficial streaming support for Tidal and Qobuz. Strawberry is free software released under GPL. The source code is available on GitHub. It's written in C++ using the Qt toolkit and GStreamer. Strawberry is compatible with both Qt version 5 and 6.
+      Strawberry is a music player and music collection organizer. It is aimed at music collectors and audiophiles. Strawberry is free software released under GPL. It's written in C++ using the Qt framework and GStreamer.
     </p>
     <p>Features:</p>
     <ul>
@@ -28,13 +31,12 @@
       <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>Support for multiple backends</li>
+      <li>Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net</li>
       <li>Audio analyzer and equalizer</li>
       <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
       <li>Scrobbler with support for Last.fm, Libre.fm and ListenBrainz</li>
       <li>Streaming support for Subsonic-compatible servers</li>
-      <li>Unofficial streaming support for Tidal and Qobuz</li>
+      <li>Unofficial streaming support for Tidal, Spotify and Qobuz</li>
     </ul>
   </description>
   <screenshots>
@@ -48,4 +50,16 @@
     </screenshot>
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
+    <releases>
+        <release version="1.1.3" date="2024-09-21"/>
+        <release version="1.1.2" date="2024-09-12"/>
+        <release version="1.1.1" date="2024-07-22"/>
+        <release version="1.1.0" date="2024-07-14"/>
+        <release version="1.0.23" date="2024-01-11"/>
+        <release version="1.0.22" date="2023-12-09"/>
+        <release version="1.0.21" date="2023-10-21"/>
+        <release version="1.0.20" date="2023-09-24"/>
+        <release version="1.0.19" date="2023-09-24"/>
+        <release version="1.0.18" date="2023-07-02"/>
+    </releases>
 </component>

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -3,37 +3,43 @@ Version=1.0
 Type=Application
 Name=Strawberry
 GenericName=Strawberry Music Player
+GenericName[fr]=Lecteur de musique Strawberry
+GenericName[ru]=Музыкальный проигрыватель Strawberry
 Comment=Plays music
+Comment[fr]=Joue de la musique
+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
-Actions=Play;Pause;Stop;StopAfterCurrent;Previous;Next;
+Actions=Play-Pause;Stop;StopAfterCurrent;Previous;Next;
 
-[Desktop Action Play]
-Name=Play
-Exec=strawberry --play
-
-[Desktop Action Pause]
-Name=Pause
-Exec=strawberry --pause
+[Desktop Action Play-Pause]
+Name=Play/Pause
+Exec=strawberry --play-pause
+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-tagreader.1

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