Add Dropbox

CMakeLists.txt

@@ -218,7 +218,7 @@ set(QT_VERSION_MAJOR 6)
 set(QT_MIN_VERSION 6.4.0)
 set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
 set(QT_COMPONENTS Core Concurrent Gui Widgets Network Sql)
-set(QT_OPTIONAL_COMPONENTS GuiPrivate LinguistTools Test Protobuf)
+set(QT_OPTIONAL_COMPONENTS GuiPrivate LinguistTools Test)
 if(UNIX AND NOT APPLE)
   list(APPEND QT_OPTIONAL_COMPONENTS DBus)
 endif()
@@ -278,7 +278,6 @@ if(APPLE OR WIN32)
   if(TARGET "qtsparkle-qt${QT_VERSION_MAJOR}::qtsparkle")
     set(QTSPARKLE_FOUND ON)
   endif()
-  pkg_check_modules(TINYSVCMDNS IMPORTED_TARGET tinysvcmdns)
 endif()
 
 if(UNIX AND NOT APPLE)
@@ -380,19 +379,14 @@ optional_component(STREAMTAGREADER ON "Stream tagreader"
 
 optional_component(DISCORD_RPC ON "Discord Rich Presence"
   DEPENDS "RapidJSON" RapidJSON_FOUND
+
+optional_component(DROPBOX ON "Streaming: Dropbox"
+  DEPENDS "Stream tagreader" HAVE_STREAMTAGREADER
 )
 
-if(WIN32)
+optional_component(ONEDRIVE ON "Streaming: OneDrive"
-  optional_component(NETWORKREMOTE ON "Network remote"
+  DEPENDS "Stream tagreader" HAVE_STREAMTAGREADER
-    DEPENDS "Qt Protobuf" Qt${QT_VERSION_MAJOR}Protobuf_FOUND
+)
-    DEPENDS "tinysvcmdns" TINYSVCMDNS_FOUND
-  )
-else()
-  optional_component(NETWORKREMOTE ON "Network remote"
-    DEPENDS "Qt Protobuf" Qt${QT_VERSION_MAJOR}Protobuf_FOUND
-  )
-endif()
-
 
 if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
   set(HAVE_CHROMAPRINT ON)
@@ -772,7 +766,6 @@ set(SOURCES
   src/widgets/loginstatewidget.cpp
   src/widgets/ratingwidget.cpp
   src/widgets/resizabletextedit.cpp
-  src/widgets/filechooserwidget.cpp
 
   src/osd/osdbase.cpp
   src/osd/osdpretty.cpp
@@ -790,6 +783,7 @@ set(SOURCES
   src/streaming/streamingcollectionviewcontainer.cpp
   src/streaming/streamingsearchview.cpp
   src/streaming/streamsongmimedata.cpp
+  src/streaming/cloudstoragestreamingservice.cpp
 
   src/radios/radioservices.cpp
   src/radios/radiobackend.cpp
@@ -1071,7 +1065,6 @@ set(HEADERS
   src/widgets/ratingwidget.h
   src/widgets/forcescrollperpixel.h
   src/widgets/resizabletextedit.h
-  src/widgets/filechooserwidget.h
 
   src/osd/osdbase.h
   src/osd/osdpretty.h
@@ -1087,6 +1080,7 @@ set(HEADERS
   src/streaming/streamingtabsview.h
   src/streaming/streamingcollectionview.h
   src/streaming/streamingcollectionviewcontainer.h
+  src/streaming/cloudstoragestreamingservice.h
 
   src/radios/radioservices.h
   src/radios/radiobackend.h
@@ -1495,56 +1489,24 @@ optional_source(HAVE_QOBUZ
     src/settings/qobuzsettingspage.ui
 )
 
-if(HAVE_NETWORKREMOTE)
+optional_source(HAVE_DROPBOX
-  optional_source(HAVE_NETWORKREMOTE
+  SOURCES
-    SOURCES
+    src/dropbox/dropboxservice.cpp
-      src/core/zeroconf.cpp
+    src/dropbox/dropboxurlhandler.cpp
-      src/networkremote/incomingdataparser.cpp
+    src/dropbox/dropboxbaserequest.cpp
-      src/networkremote/networkremote.cpp
+    src/dropbox/dropboxsongsrequest.cpp
-      src/networkremote/outgoingdatacreator.cpp
+    src/dropbox/dropboxstreamurlrequest.cpp
-      src/networkremote/networkremoteclient.cpp
+    src/settings/dropboxsettingspage.cpp
-      src/networkremote/songsender.cpp
+  HEADERS
-      src/settings/networkremotesettingspage.cpp
+    src/dropbox/dropboxservice.h
-    HEADERS
+    src/dropbox/dropboxurlhandler.h
-      src/networkremote/networkremote.h
+    src/dropbox/dropboxbaserequest.h
-      src/networkremote/incomingdataparser.h
+    src/dropbox/dropboxsongsrequest.h
-      src/networkremote/outgoingdatacreator.h
+    src/dropbox/dropboxstreamurlrequest.h
-      src/networkremote/networkremoteclient.h
+    src/settings/dropboxsettingspage.h
-      src/networkremote/songsender.h
+  UI
-      src/settings/networkremotesettingspage.h
+    src/settings/dropboxsettingspage.ui
-    UI
+)
-      src/settings/networkremotesettingspage.ui
-  )
-  if(UNIX AND NOT APPLE)
-    get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION)
-    add_custom_command(
-        OUTPUT
-        ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahiserver.cpp
-        ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahiserver.h
-        COMMAND ${QT_DBUSXML2CPP_EXECUTABLE}
-        ${CMAKE_SOURCE_DIR}/src/avahi/org.freedesktop.Avahi.Server.xml
-        -p ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahiserver
-        -i includes/dbus_metatypes.h
-        DEPENDS src/avahi/org.freedesktop.Avahi.Server.xml
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-    add_custom_command(
-        OUTPUT
-        ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahientrygroup.cpp
-        ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahientrygroup.h
-        COMMAND ${QT_DBUSXML2CPP_EXECUTABLE}
-        ${CMAKE_SOURCE_DIR}/src/avahi/org.freedesktop.Avahi.EntryGroup.xml
-        -p ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahientrygroup
-        -i includes/dbus_metatypes.h
-        DEPENDS src/avahi/org.freedesktop.Avahi.EntryGroup.xml
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-    list(APPEND SOURCES src/avahi/avahi.cpp ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahientrygroup.cpp ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahiserver.cpp)
-    list(APPEND HEADERS src/avahi/avahi.h ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahientrygroup.h ${CMAKE_CURRENT_BINARY_DIR}/avahi/avahiserver.h)
-  endif()
-  optional_source(APPLE SOURCES src/core/bonjour.mm HEADERS src/core/bonjour.h)
-  optional_source(WIN32 SOURCES src/core/tinysvcmdns.cpp HEADERS src/core/tinysvcmdns.h)
-endif()
 
 qt_wrap_cpp(SOURCES ${HEADERS})
 qt_wrap_ui(SOURCES ${UI})
@@ -1584,12 +1546,6 @@ if(HAVE_TRANSLATIONS)
   endif()
 endif()
 
-if(HAVE_NETWORKREMOTE)
-  qt_add_protobuf(NetworkRemoteMessages
-    PROTO_FILES src/networkremote/networkremotemessages.proto
-  )
-endif()
-
 target_include_directories(strawberry_lib PUBLIC
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
@@ -1622,7 +1578,6 @@ target_link_libraries(strawberry_lib PUBLIC
   Qt${QT_VERSION_MAJOR}::Sql
   $<$<BOOL:${HAVE_DBUS}>:Qt${QT_VERSION_MAJOR}::DBus>
   $<$<BOOL:${HAVE_QPA_QPLATFORMNATIVEINTERFACE}>:Qt${QT_VERSION_MAJOR}::GuiPrivate>
-  $<$<BOOL:${HAVE_NETWORKREMOTE}>:Qt${QT_VERSION_MAJOR}::Protobuf>
   ICU::uc
   ICU::i18n
   $<$<BOOL:${HAVE_STREAMTAGREADER}>:PkgConfig::LIBSPARSEHASH>
@@ -1642,7 +1597,6 @@ target_link_libraries(strawberry_lib PUBLIC
   $<$<BOOL:${MSVC}>:WindowsApp>
   KDAB::kdsingleapplication
   $<$<BOOL:${HAVE_DISCORD_RPC}>:discord-rpc>
-  $<$<BOOL:${HAVE_NETWORKREMOTE}>:NetworkRemoteMessages>
 )
 
 if(APPLE)
@@ -1661,10 +1615,6 @@ if(APPLE)
   endif()
 endif()
 
-if(WIN32 AND HAVE_NETWORKREMOTE)
-  target_link_libraries(strawberry_lib PUBLIC PkgConfig::TINYSVCMDNS)
-endif()
-
 target_link_libraries(strawberry PUBLIC strawberry_lib)
 
 if(NOT APPLE)

data/icons.qrc

@@ -98,6 +98,7 @@
         <file>icons/128x128/somafm.png</file>
         <file>icons/128x128/radioparadise.png</file>
         <file>icons/128x128/musicbrainz.png</file>
+        <file>icons/128x128/dropbox.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -197,6 +198,7 @@
         <file>icons/64x64/somafm.png</file>
         <file>icons/64x64/radioparadise.png</file>
         <file>icons/64x64/musicbrainz.png</file>
+        <file>icons/64x64/dropbox.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -300,6 +302,7 @@
         <file>icons/48x48/somafm.png</file>
         <file>icons/48x48/radioparadise.png</file>
         <file>icons/48x48/musicbrainz.png</file>
+        <file>icons/48x48/dropbox.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -403,6 +406,7 @@
         <file>icons/32x32/somafm.png</file>
         <file>icons/32x32/radioparadise.png</file>
         <file>icons/32x32/musicbrainz.png</file>
+        <file>icons/32x32/dropbox.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -506,5 +510,6 @@
         <file>icons/22x22/somafm.png</file>
         <file>icons/22x22/radioparadise.png</file>
         <file>icons/22x22/musicbrainz.png</file>
+        <file>icons/22x22/dropbox.png</file>
     </qresource>
 </RCC>

data/schema/schema-22.sql

@@ -0,0 +1,82 @@
+CREATE TABLE IF NOT EXISTS dropbox_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=22;

data/schema/schema.sql

@@ -1018,6 +1018,87 @@ CREATE TABLE IF NOT EXISTS qobuz_songs (
 
 );
 
+CREATE TABLE IF NOT EXISTS dropbox_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 playlists (
 
   name TEXT NOT NULL,

org.freedesktop.Avahi.EntryGroup.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="data" type="s" direction="out"/>
-    </method>
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.EntryGroup">
-    <method name="Free"/>
-    <method name="Commit"/>
-    <method name="Reset"/>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="IsEmpty">
-      <arg name="empty" type="b" direction="out"/>
-    </method>
-
-    <method name="AddService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="host" type="s" direction="in"/>
-      <arg name="port" type="q" direction="in"/>
-      <arg name="txt" type="aay" direction="in"/>
-    </method>
-
-    <method name="AddServiceSubtype">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="subtype" type="s" direction="in"/>
-    </method>
-
-    <method name="UpdateServiceTxt">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="txt" type="aay" direction="in"/>
-    </method>
-
-    <method name="AddAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-    </method>
-
-    <method name="AddRecord">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="ttl" type="u" direction="in"/>
-      <arg name="rdata" type="ay" direction="in"/>
-    </method>
-  </interface>
-</node>

org.freedesktop.Avahi.Server.xml

@@ -1,405 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
- <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="data" type="s" direction="out"/>
-    </method>
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.Server">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="txt" type="aay" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.Server2">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="txt" type="aay" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-</node>

src/avahi/avahi.cpp

@@ -1,114 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QByteArray>
-#include <QString>
-#include <QDBusConnection>
-#include <QDBusPendingReply>
-#include <QDBusPendingCallWatcher>
-
-#include "core/logging.h"
-
-#include "avahi.h"
-#include "avahi/avahiserver.h"
-#include "avahi/avahientrygroup.h"
-
-using namespace Qt::StringLiterals;
-
-Avahi::Avahi(QObject *parent) : Zeroconf(parent), port_(0), entry_group_interface_(nullptr) {}
-
-void Avahi::PublishInternal(const QString &domain, const QString &type, const QByteArray &name, quint16 port) {
-
-  domain_ = domain;
-  type_ = type;
-  name_ = name;
-  port_ = port;
-
-  OrgFreedesktopAvahiServerInterface server_interface(u"org.freedesktop.Avahi"_s, u"/"_s, QDBusConnection::systemBus());
-  QDBusPendingReply<QDBusObjectPath> reply = server_interface.EntryGroupNew();
-  QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
-  QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &Avahi::PublishInternalFinished);
-
-}
-
-void Avahi::PublishInternalFinished(QDBusPendingCallWatcher *watcher) {
-
-  const QDBusPendingReply<QDBusObjectPath> path_reply = watcher->reply();
-
-  watcher->deleteLater();
-
-  if (path_reply.isError()) {
-    qLog(Error) << "Failed to create Avahi entry group:" << path_reply.error();
-    qLog(Info) << "This might be because 'disable-user-service-publishing'" << "is set to 'yes' in avahi-daemon.conf";
-    return;
-  }
-
-  AddService(path_reply.reply().path());
-
-}
-
-void Avahi::AddService(const QString &path) {
-
-  entry_group_interface_ = new OrgFreedesktopAvahiEntryGroupInterface(u"org.freedesktop.Avahi"_s, path, QDBusConnection::systemBus());
-  QDBusPendingReply<> reply = entry_group_interface_->AddService(-1, -1, 0, QString::fromUtf8(name_.constData(), name_.size()), type_, domain_, QString(), port_);
-  QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
-  QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &Avahi::AddServiceFinished);
-
-}
-
-void Avahi::AddServiceFinished(QDBusPendingCallWatcher *watcher) {
-
-  const QDBusPendingReply<QDBusObjectPath> path_reply = watcher->reply();
-
-  watcher->deleteLater();
-
-  if (path_reply.isError()) {
-    qLog(Error) << "Failed to add Avahi service:" << path_reply.error();
-    return;
-  }
-
-  Commit();
-
-}
-
-void Avahi::Commit() {
-
-  QDBusPendingReply<> reply = entry_group_interface_->Commit();
-  QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
-  QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &Avahi::CommitFinished);
-
-}
-
-void Avahi::CommitFinished(QDBusPendingCallWatcher *watcher) {
-
-  const QDBusPendingReply<QDBusObjectPath> path_reply = watcher->reply();
-
-  watcher->deleteLater();
-
-  entry_group_interface_->deleteLater();
-  entry_group_interface_ = nullptr;
-
-  if (path_reply.isError()) {
-    qLog(Debug) << "Commit error:" << path_reply.error();
-  }
-  else {
-    qLog(Debug) << "Remote interface published on Avahi";
-  }
-
-}

src/avahi/avahi.h

@@ -1,58 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef AVAHI_H
-#define AVAHI_H
-
-#include <QObject>
-#include <QByteArray>
-#include <QString>
-
-#include "core/zeroconf.h"
-
-class QDBusPendingCallWatcher;
-class OrgFreedesktopAvahiEntryGroupInterface;
-
-class Avahi : public Zeroconf {
-  Q_OBJECT
-
-public:
-  explicit Avahi(QObject *parent = nullptr);
-
- private:
-  void AddService(const QString &path);
-  void Commit();
-
- private Q_SLOTS:
-  void PublishInternalFinished(QDBusPendingCallWatcher *watcher);
-  void AddServiceFinished(QDBusPendingCallWatcher *watcher);
-  void CommitFinished(QDBusPendingCallWatcher *watcher);
-
- protected:
-  virtual void PublishInternal(const QString &domain, const QString &type, const QByteArray &name, quint16 port) override;
-
- private:
-  QString domain_;
-  QString type_;
-  QByteArray name_;
-  quint16 port_;
-  OrgFreedesktopAvahiEntryGroupInterface *entry_group_interface_;
-};
-
-#endif  // AVAHI_H

src/avahi/org.freedesktop.Avahi.EntryGroup.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="data" type="s" direction="out"/>
-    </method>
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.EntryGroup">
-    <method name="Free"/>
-    <method name="Commit"/>
-    <method name="Reset"/>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="IsEmpty">
-      <arg name="empty" type="b" direction="out"/>
-    </method>
-
-    <method name="AddService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="host" type="s" direction="in"/>
-      <arg name="port" type="q" direction="in"/>
-    </method>
-
-    <method name="AddServiceSubtype">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="subtype" type="s" direction="in"/>
-    </method>
-
-    <method name="UpdateServiceTxt">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-    </method>
-
-    <method name="AddAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-    </method>
-
-    <method name="AddRecord">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="ttl" type="u" direction="in"/>
-      <arg name="rdata" type="ay" direction="in"/>
-    </method>
-  </interface>
-</node>

src/avahi/org.freedesktop.Avahi.Server.xml

@@ -1,396 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!--
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi 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 Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<node>
-
-  <interface name="org.freedesktop.Avahi.Server">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserNew">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-
-  <interface name="org.freedesktop.Avahi.Server2">
-
-    <method name="GetVersionString">
-      <arg name="version" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAPIVersion">
-      <arg name="version" type="u" direction="out"/>
-    </method>
-
-    <method name="GetHostName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="SetHostName">
-      <arg name="name" type="s" direction="in"/>
-    </method>
-    <method name="GetHostNameFqdn">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetDomainName">
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="IsNSSSupportAvailable">
-      <arg name="yes" type="b" direction="out"/>
-    </method>
-
-    <method name="GetState">
-      <arg name="state" type="i" direction="out"/>
-    </method>
-
-    <signal name="StateChanged">
-      <arg name="state" type="i"/>
-      <arg name="error" type="s"/>
-    </signal>
-
-    <method name="GetLocalServiceCookie">
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeHostName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetAlternativeServiceName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-
-    <method name="GetNetworkInterfaceNameByIndex">
-      <arg name="index" type="i" direction="in"/>
-      <arg name="name" type="s" direction="out"/>
-    </method>
-    <method name="GetNetworkInterfaceIndexByName">
-      <arg name="name" type="s" direction="in"/>
-      <arg name="index" type="i" direction="out"/>
-    </method>
-
-    <method name="ResolveHostName">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveAddress">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="ResolveService">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="interface" type="i" direction="out"/>
-      <arg name="protocol" type="i" direction="out"/>
-      <arg name="name" type="s" direction="out"/>
-      <arg name="type" type="s" direction="out"/>
-      <arg name="domain" type="s" direction="out"/>
-      <arg name="host" type="s" direction="out"/>
-      <arg name="aprotocol" type="i" direction="out"/>
-      <arg name="address" type="s" direction="out"/>
-      <arg name="port" type="q" direction="out"/>
-      <arg name="flags" type="u" direction="out"/>
-    </method>
-
-    <method name="EntryGroupNew">
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="DomainBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="btype" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceTypeBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="ServiceResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-      <arg name="domain" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="HostNameResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="aprotocol" type="i" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="AddressResolverPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="address" type="s" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-    <method name="RecordBrowserPrepare">
-      <arg name="interface" type="i" direction="in"/>
-      <arg name="protocol" type="i" direction="in"/>
-      <arg name="name" type="s" direction="in"/>
-      <arg name="clazz" type="q" direction="in"/>
-      <arg name="type" type="q" direction="in"/>
-      <arg name="flags" type="u" direction="in"/>
-
-      <arg name="path" type="o" direction="out"/>
-    </method>
-
-  </interface>
-</node>

src/collection/collectionplaylistitem.cpp

@@ -41,9 +41,12 @@ bool CollectionPlaylistItem::InitFromQuery(const SqlRow &query) {
     case Song::Source::Collection:
       col = 0;
       break;
-    default:
+    case Song::Source::Dropbox:
       col = static_cast<int>(Song::kRowIdColumns.count());
       break;
+    default:
+      col = static_cast<int>(Song::kRowIdColumns.count() * 2);
+      break;
   }
 
   song_.InitFromQuery(query, true, col);

src/config.h.in

@@ -33,7 +33,8 @@
 #cmakedefine HAVE_SPOTIFY
 #cmakedefine HAVE_QOBUZ
 #cmakedefine HAVE_DISCORD_RPC
-#cmakedefine HAVE_NETWORKREMOTE
+#cmakedefine HAVE_DROPBOX
+#cmakedefine HAVE_ONEDRIVE
 
 #cmakedefine HAVE_TAGLIB_DSFFILE
 #cmakedefine HAVE_TAGLIB_DSDIFFFILE

src/constants/dropboxconstants.h

@@ -1,6 +1,6 @@
 /*
 * Strawberry Music Player
-* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
+* Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
 *
 * Strawberry is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,19 +17,14 @@
 *
 */
 
-#ifndef NETWORKREMOTESETTINGSCONSTANTS_H
+#ifndef DROPBOXCONSTANTS_H
-#define NETWORKREMOTESETTINGSCONSTANTS_H
+#define DROPBOXCONSTANTS_H
 
-namespace NetworkRemoteSettingsConstants {
+namespace DropboxConstants {
 
-constexpr char kSettingsGroup[] = "NetworkRemote";
+constexpr char kApiUrl[] = "https://api.dropboxapi.com";
-constexpr char kEnabled[] = "enabled";
+constexpr char kNotifyApiUrl[] = "https://notify.dropboxapi.com";
-constexpr char kPort[] = "port";
-constexpr char kAllowPublicAccess[] = "allow_public_access";
-constexpr char kUseAuthCode[] = "use_authcode";
-constexpr char kAuthCode[] = "authcode";
-constexpr char kFilesRootFolder[] = "files_root_folder";
 
-}  // namespace NetworkRemoteSettingsConstants
+}  // namespace
 
-#endif // NETWORKREMOTESETTINGSCONSTANTS_H
+#endif  // DROPBOXCONSTANTS_H

src/constants/dropboxsettings.h

@@ -0,0 +1,46 @@
+/*
+* Strawberry Music Player
+* Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+*
+* Strawberry is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Strawberry is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#ifndef DROPBOXSETTINGS_H
+#define DROPBOXSETTINGS_H
+
+namespace DropboxSettings {
+
+constexpr char kSettingsGroup[] = "Dropbox";
+
+constexpr char kEnabled[] = "enabled";
+constexpr char kSearchDelay[] = "searchdelay";
+constexpr char kArtistsSearchLimit[] = "artistssearchlimit";
+constexpr char kAlbumsSearchLimit[] = "albumssearchlimit";
+constexpr char kSongsSearchLimit[] = "songssearchlimit";
+constexpr char kFetchAlbums[] = "fetchalbums";
+constexpr char kDownloadAlbumCovers[] = "downloadalbumcovers";
+
+constexpr char kTokenType[] = "token_type";
+constexpr char kAccessToken[] = "access_token";
+constexpr char kRefreshToken[] = "refresh_token";
+constexpr char kExpiresIn[] = "expires_in";
+constexpr char kLoginTime[] = "login_time";
+
+constexpr char kApiUrl[] = "https://api.dropboxapi.com";
+constexpr char kNotifyApiUrl[] = "https://notify.dropboxapi.com";
+
+}  // namespace
+
+#endif  // DROPBOXSETTINGS_H

src/constants/networkremoteconstants.h

@@ -1,36 +0,0 @@
-/*
-* Strawberry Music Player
-* Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
-*
-* Strawberry is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Strawberry is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-#ifndef NETWORKREMOTECONSTANTS_H
-#define NETWORKREMOTECONSTANTS_H
-
-#include <QStringList>
-
-using namespace Qt::Literals::StringLiterals;
-
-namespace NetworkRemoteConstants {
-
-const QStringList kDefaultMusicExtensionsAllowedRemotely = { u"aac"_s, u"alac"_s, u"flac"_s, u"m3u"_s, u"m4a"_s, u"mp3"_s, u"ogg"_s, u"wav"_s, u"wmv"_s };
-constexpr quint16 kDefaultServerPort = 5500;
-constexpr char kTranscoderSettingPostfix[] = "/NetworkRemote";
-constexpr quint32 kFileChunkSize = 100000;
-
-}  // namespace NetworkRemoteConstants
-
-#endif // NETWORKREMOTECONSTANTS_H

src/core/application.cpp

@@ -105,15 +105,15 @@
 #  include "covermanager/qobuzcoverprovider.h"
 #endif
 
+#ifdef HAVE_DROPBOX
+#  include "dropbox/dropboxservice.h"
+#endif
+
 #ifdef HAVE_MOODBAR
 #  include "moodbar/moodbarcontroller.h"
 #  include "moodbar/moodbarloader.h"
 #endif
 
-#ifdef HAVE_NETWORKREMOTE
-#  include "networkremote/networkremote.h"
-#endif
-
 #include "radios/radioservices.h"
 #include "radios/radiobackend.h"
 
@@ -204,6 +204,9 @@ class ApplicationImpl {
 #endif
 #ifdef HAVE_QOBUZ
           streaming_services->AddService(make_shared<QobuzService>(app->task_manager(), app->database(), app->network(), app->url_handlers(), app->albumcover_loader()));
+#endif
+#ifdef HAVE_DROPBOX
+          streaming_services->AddService(make_shared<DropboxService>(app->task_manager(), app->database(), app->network(), app->url_handlers(), app->tagreader_client(), app->albumcover_loader()));
 #endif
           return streaming_services;
         }),
@@ -220,13 +223,6 @@ class ApplicationImpl {
 #ifdef HAVE_MOODBAR
         moodbar_loader_([app]() { return new MoodbarLoader(app); }),
         moodbar_controller_([app]() { return new MoodbarController(app->player(), app->moodbar_loader()); }),
-#endif
-#ifdef HAVE_NETWORKREMOTE
-        network_remote_([app]() {
-          NetworkRemote *networkremote = new NetworkRemote(app->database(), app->player(), app->collection_backend(), app->playlist_manager(), app->playlist_backend(), app->current_albumcover_loader(), app->scrobbler());
-          app->MoveToNewThread(networkremote);
-          return networkremote;
-        }),
 #endif
         lastfm_import_([app]() { return new LastFMImport(app->network()); })
   {}
@@ -252,9 +248,6 @@ class ApplicationImpl {
 #ifdef HAVE_MOODBAR
   Lazy<MoodbarLoader> moodbar_loader_;
   Lazy<MoodbarController> moodbar_controller_;
-#endif
-#ifdef HAVE_NETWORKREMOTE
-  Lazy<NetworkRemote> network_remote_;
 #endif
   Lazy<LastFMImport> lastfm_import_;
 
@@ -404,6 +397,3 @@ SharedPtr<LastFMImport> Application::lastfm_import() const { return p_->lastfm_i
 SharedPtr<MoodbarController> Application::moodbar_controller() const { return p_->moodbar_controller_.ptr(); }
 SharedPtr<MoodbarLoader> Application::moodbar_loader() const { return p_->moodbar_loader_.ptr(); }
 #endif
-#ifdef HAVE_NETWORKREMOTE
-SharedPtr<NetworkRemote> Application::network_remote() const { return p_->network_remote_.ptr(); }
-#endif

src/core/application.h

@@ -63,9 +63,6 @@ class RadioServices;
 class MoodbarController;
 class MoodbarLoader;
 #endif
-#ifdef HAVE_NETWORKREMOTE
-class NetworkRemote;
-#endif
 
 class Application : public QObject {
   Q_OBJECT
@@ -106,10 +103,6 @@ class Application : public QObject {
   SharedPtr<MoodbarLoader> moodbar_loader() const;
 #endif
 
-#ifdef HAVE_NETWORKREMOTE
-  SharedPtr<NetworkRemote> network_remote() const;
-#endif
-
   SharedPtr<LastFMImport> lastfm_import() const;
 
   void Exit();

src/core/bonjour.h

@@ -1,24 +0,0 @@
-#ifndef BONJOUR_H
-#define BONJOUR_H
-
-#include "zeroconf.h"
-
-#ifdef __OBJC__
-@class NetServicePublicationDelegate;
-#else
-class NetServicePublicationDelegate;
-#endif  // __OBJC__
-
-class Bonjour : public Zeroconf {
- public:
-  explicit Bonjour();
-  virtual ~Bonjour();
-
- protected:
-  virtual void PublishInternal(const QString &domain, const QString &type, const QByteArray &name, const quint16 port);
-
- private:
-  NetServicePublicationDelegate *delegate_;
-};
-
-#endif  // BONJOUR_H

src/core/bonjour.mm

@@ -1,57 +0,0 @@
-#include "bonjour.h"
-
-#import <Foundation/NSNetServices.h>
-#import <Foundation/NSString.h>
-
-#include "core/logging.h"
-#include "core/scoped_nsautorelease_pool.h"
-
-@interface NetServicePublicationDelegate : NSObject <NSNetServiceDelegate> {}
-
-- (void)netServiceWillPublish:(NSNetService*)netService;
-- (void)netService:(NSNetService*)netService didNotPublish:(NSDictionary*)errorDict;
-- (void)netServiceDidStop:(NSNetService*)netService;
-
-@end
-
-@implementation NetServicePublicationDelegate
-
-- (void)netServiceWillPublish:(NSNetService*)netService {
-  qLog(Debug) << "Publishing:" << [[netService name] UTF8String];
-}
-
-- (void)netService:(NSNetService*)netServie didNotPublish:(NSDictionary*)errorDict {
-  qLog(Debug) << "Failed to publish remote service with Bonjour";
-  NSLog(@"%@", errorDict);
-}
-
-- (void)netServiceDidStop:(NSNetService*)netService {
-  qLog(Debug) << "Unpublished:" << [[netService name] UTF8String];
-}
-
-@end
-
-namespace {
-
-NSString* NSStringFromQString(const QString& s) {
-  return [[NSString alloc] initWithUTF8String:s.toUtf8().constData()];
-}
-}
-
-Bonjour::Bonjour() : delegate_([[NetServicePublicationDelegate alloc] init]) {}
-
-Bonjour::~Bonjour() { [delegate_ release]; }
-
-void Bonjour::PublishInternal(const QString& domain, const QString& type, const QByteArray& name, const quint16 port) {
-  ScopedNSAutoreleasePool pool;
-  NSNetService* service =
-      [[NSNetService alloc] initWithDomain:NSStringFromQString(domain)
-                                      type:NSStringFromQString(type)
-                                      name:[NSString stringWithUTF8String:name.constData()]
-                                      port:port];
-  if (service) {
-    [service setDelegate:delegate_];
-    [service publish];
-  }
-
-}

src/core/mainwindow.cpp

@@ -178,6 +178,9 @@
 #ifdef HAVE_QOBUZ
 #  include "constants/qobuzsettings.h"
 #endif
+#ifdef HAVE_DROPBOX
+#  include "constants/dropboxsettings.h"
+#endif
 
 #include "streaming/streamingservices.h"
 #include "streaming/streamingservice.h"
@@ -355,6 +358,9 @@ MainWindow::MainWindow(Application *app,
 #endif
 #ifdef HAVE_QOBUZ
       qobuz_view_(new StreamingTabsView(app->streaming_services()->ServiceBySource(Song::Source::Qobuz), app->albumcover_loader(), QLatin1String(QobuzSettings::kSettingsGroup), this)),
+#endif
+#ifdef HAVE_DROPBOX
+      dropbox_view_(new StreamingSongsView(app->streaming_services()->ServiceBySource(Song::Source::Dropbox), QLatin1String(DropboxSettings::kSettingsGroup), this)),
 #endif
       radio_view_(new RadioViewContainer(this)),
       lastfm_import_dialog_(new LastFMImportDialog(app_->lastfm_import(), this)),
@@ -441,6 +447,9 @@ MainWindow::MainWindow(Application *app,
 #ifdef HAVE_QOBUZ
   ui_->tabs->AddTab(qobuz_view_, u"qobuz"_s, IconLoader::Load(u"qobuz"_s, true, 0, 32), tr("Qobuz"));
 #endif
+#ifdef HAVE_DROPBOX
+  ui_->tabs->AddTab(dropbox_view_, u"dropbox"_s, IconLoader::Load(u"dropbox"_s, true, 0, 32), tr("Dropbox"));
+#endif
 
   // Add the playing widget to the fancy tab widget
   ui_->tabs->AddBottomWidget(ui_->widget_playing);
@@ -782,6 +791,12 @@ MainWindow::MainWindow(Application *app,
   }
 #endif
 
+#ifdef HAVE_DROPBOX
+  QObject::connect(dropbox_view_, &StreamingSongsView::ShowErrorDialog, this, &MainWindow::ShowErrorDialog);
+  QObject::connect(dropbox_view_, &StreamingSongsView::OpenSettingsDialog, this, &MainWindow::OpenServiceSettingsDialog);
+  QObject::connect(dropbox_view_->view(), &StreamingCollectionView::AddToPlaylistSignal, this, &MainWindow::AddToPlaylist);
+#endif
+
   QObject::connect(radio_view_, &RadioViewContainer::Refresh, &*app_->radio_services(), &RadioServices::RefreshChannels);
   QObject::connect(radio_view_->view(), &RadioView::GetChannels, &*app_->radio_services(), &RadioServices::GetChannels);
   QObject::connect(radio_view_->view(), &RadioView::AddToPlaylistSignal, this, &MainWindow::AddToPlaylist);
@@ -977,10 +992,6 @@ MainWindow::MainWindow(Application *app,
   ui_->action_open_cd->setVisible(false);
 #endif
 
-#ifdef HAVE_NETWORKREMOTE
-  app_->network_remote();
-#endif
-
   // Load settings
   qLog(Debug) << "Loading settings";
   Settings settings;
@@ -1284,6 +1295,18 @@ void MainWindow::ReloadSettings() {
   }
 #endif
 
+#ifdef HAVE_DROPBOX
+  s.beginGroup(DropboxSettings::kSettingsGroup);
+  const bool enable_dropbox = s.value(DropboxSettings::kEnabled, false).toBool();
+  s.endGroup();
+  if (enable_dropbox) {
+    ui_->tabs->EnableTab(dropbox_view_);
+  }
+  else {
+    ui_->tabs->DisableTab(dropbox_view_);
+  }
+#endif
+
   ui_->tabs->ReloadSettings();
 
 }
@@ -1330,10 +1353,12 @@ void MainWindow::ReloadAllSettings() {
   qobuz_view_->ReloadSettings();
   qobuz_view_->search_view()->ReloadSettings();
 #endif
+#ifdef HAVE_DROPBOX
+  dropbox_view_->ReloadSettings();
+#endif
 #ifdef HAVE_DISCORD_RPC
   discord_rich_presence_->ReloadSettings();
 #endif
-
 }
 
 void MainWindow::RefreshStyleSheet() {
@@ -2721,6 +2746,9 @@ void MainWindow::OpenServiceSettingsDialog(const Song::Source source) {
     case Song::Source::Spotify:
       settings_dialog_->OpenAtPage(SettingsDialog::Page::Spotify);
       break;
+    case Song::Source::Dropbox:
+      settings_dialog_->OpenAtPage(SettingsDialog::Page::Dropbox);
+      break;
     default:
       break;
   }
@@ -3402,6 +3430,11 @@ void MainWindow::FocusSearchField() {
   else if (ui_->tabs->currentIndex() == ui_->tabs->IndexOfTab(qobuz_view_) && !qobuz_view_->SearchFieldHasFocus()) {
     qobuz_view_->FocusSearchField();
   }
+#endif
+#ifdef HAVE_DROPBOX
+  else if (ui_->tabs->currentIndex() == ui_->tabs->IndexOfTab(dropbox_view_) && !dropbox_view_->SearchFieldHasFocus()) {
+    dropbox_view_->FocusSearchField();
+  }
 #endif
   else if (!ui_->playlist->SearchFieldHasFocus()) {
     ui_->playlist->FocusSearchField();

src/core/mainwindow.h

@@ -355,6 +355,9 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 #ifdef HAVE_QOBUZ
   StreamingTabsView *qobuz_view_;
 #endif
+#ifdef HAVE_DROPBOX
+  StreamingSongsView *dropbox_view_;
+#endif
 
   RadioViewContainer *radio_view_;
 

src/core/mimedata.cpp

@@ -25,15 +25,14 @@
 
 #include "mimedata.h"
 
-MimeData::MimeData(const bool clear, const bool play_now, const bool enqueue, const bool enqueue_next_now, const bool open_in_new_playlist, const int playlist_id, QObject *parent)
+MimeData::MimeData(const bool clear, const bool play_now, const bool enqueue, const bool enqueue_next_now, const bool open_in_new_playlist, QObject *parent)
     : override_user_settings_(false),
       clear_first_(clear),
       play_now_(play_now),
       enqueue_now_(enqueue),
       enqueue_next_now_(enqueue_next_now),
       open_in_new_playlist_(open_in_new_playlist),
-      from_doubleclick_(false),
+      from_doubleclick_(false) {
-      playlist_id_(playlist_id) {
 
   Q_UNUSED(parent);
 

src/core/mimedata.h

@@ -29,7 +29,7 @@ class MimeData : public QMimeData {
   Q_OBJECT
 
  public:
-  explicit MimeData(const bool clear = false, const bool play_now = false, const bool enqueue = false, const bool enqueue_next_now = false, const bool open_in_new_playlist = false, const int playlist_id = -1, QObject *parent = nullptr);
+  explicit MimeData(const bool clear = false, const bool play_now = false, const bool enqueue = false, const bool enqueue_next_now = false, const bool open_in_new_playlist = false, QObject *parent = nullptr);
 
   // If this is set then MainWindow will not touch any of the other flags.
   bool override_user_settings_;
@@ -57,9 +57,6 @@ class MimeData : public QMimeData {
   // The MainWindow will set the above flags to the defaults set by the user.
   bool from_doubleclick_;
 
-  // The Network Remote can use this MimeData to drop songs on another playlist than the one currently opened on the server
-  int playlist_id_;
-
   // Returns a pretty name for a playlist containing songs described by this MimeData object.
   // By pretty name we mean the value of 'name_for_new_playlist_' or generic "Playlist" string if the 'name_for_new_playlist_' attribute is empty.
   QString get_name_for_new_playlist() const;

src/core/song.cpp

@@ -1163,6 +1163,8 @@ QString Song::TextForSource(const Source source) {
     case Source::Qobuz:         return u"qobuz"_s;
     case Source::SomaFM:        return u"somafm"_s;
     case Source::RadioParadise: return u"radioparadise"_s;
+    case Source::Dropbox:       return u"dropbox"_s;
+    case Source::OneDrive:      return u"onedrive"_s;
     case Source::Unknown:       return u"unknown"_s;
   }
   return u"unknown"_s;
@@ -1183,6 +1185,8 @@ QString Song::DescriptionForSource(const Source source) {
     case Source::Qobuz:         return u"Qobuz"_s;
     case Source::SomaFM:        return u"SomaFM"_s;
     case Source::RadioParadise: return u"Radio Paradise"_s;
+    case Source::Dropbox:       return u"Dropbox"_s;
+    case Source::OneDrive:      return u"OneDrive"_s;
     case Source::Unknown:       return u"Unknown"_s;
   }
   return u"unknown"_s;
@@ -1202,6 +1206,8 @@ Song::Source Song::SourceFromText(const QString &source) {
   if (source.compare("qobuz"_L1, Qt::CaseInsensitive) == 0) return Source::Qobuz;
   if (source.compare("somafm"_L1, Qt::CaseInsensitive) == 0) return Source::SomaFM;
   if (source.compare("radioparadise"_L1, Qt::CaseInsensitive) == 0) return Source::RadioParadise;
+  if (source.compare("dropbox"_L1, Qt::CaseInsensitive) == 0) return Source::Dropbox;
+  if (source.compare("onedrive"_L1, Qt::CaseInsensitive) == 0) return Source::OneDrive;
 
   return Source::Unknown;
 
@@ -1221,6 +1227,8 @@ QIcon Song::IconForSource(const Source source) {
     case Source::Qobuz:         return IconLoader::Load(u"qobuz"_s);
     case Source::SomaFM:        return IconLoader::Load(u"somafm"_s);
     case Source::RadioParadise: return IconLoader::Load(u"radioparadise"_s);
+    case Source::Dropbox:       return IconLoader::Load(u"dropbox"_s);
+    case Source::OneDrive:      return IconLoader::Load(u"onedrive"_s);
     case Source::Unknown:       return IconLoader::Load(u"edit-delete"_s);
   }
   return IconLoader::Load(u"edit-delete"_s);
@@ -1470,7 +1478,7 @@ Song::FileType Song::FiletypeByExtension(const QString &ext) {
 
 bool Song::IsLinkedCollectionSource(const Source source) {
 
-  return source == Source::Collection;
+  return source == Source::Collection || source == Source::Dropbox;
 
 }
 
@@ -1489,11 +1497,14 @@ QString Song::ImageCacheDir(const Source source) {
       return StandardPaths::WritableLocation(StandardPaths::StandardLocation::AppLocalDataLocation) + u"/qobuzalbumcovers"_s;
     case Source::Device:
       return StandardPaths::WritableLocation(StandardPaths::StandardLocation::AppLocalDataLocation) + u"/devicealbumcovers"_s;
+    case Source::Dropbox:
+      return StandardPaths::WritableLocation(StandardPaths::StandardLocation::AppLocalDataLocation) + u"/dropboxalbumcovers"_s;
     case Source::LocalFile:
     case Source::CDDA:
     case Source::Stream:
     case Source::SomaFM:
     case Source::RadioParadise:
+    case Source::OneDrive:
     case Source::Unknown:
       return StandardPaths::WritableLocation(StandardPaths::StandardLocation::AppLocalDataLocation) + u"/albumcovers"_s;
   }

src/core/song.h

@@ -76,7 +76,9 @@ class Song {
     Qobuz = 8,
     SomaFM = 9,
     RadioParadise = 10,
-    Spotify = 11
+    Spotify = 11,
+    Dropbox = 12,
+    OneDrive = 13,
   };
   static const int kSourceCount = 16;
 

src/core/tinysvcmdns.cpp

@@ -1,86 +0,0 @@
-extern "C" {
-#include "mdnsd.h"
-}
-
-#include <QObject>
-#include <QList>
-#include <QString>
-#include <QHostInfo>
-#include <QNetworkInterface>
-#include <QtEndian>
-
-#include "tinysvcmdns.h"
-#include "core/logging.h"
-
-using namespace Qt::Literals::StringLiterals;
-
-TinySVCMDNS::TinySVCMDNS(QObject *parent) : Zeroconf(parent) {
-
-  // Get all network interfaces
-  const QList<QNetworkInterface> network_interfaces = QNetworkInterface::allInterfaces();
-  for (const QNetworkInterface &network_interface : network_interfaces) {
-    // Only use up and non loopback interfaces
-    if (network_interface.flags().testFlag(network_interface.IsUp) && !network_interface.flags().testFlag(network_interface.IsLoopBack)) {
-
-      qLog(Debug) << "Interface" << network_interface.humanReadableName();
-
-      uint32_t ipv4 = 0;
-      QString ipv6;
-
-      // Now check all network addresses for this device
-      QList<QNetworkAddressEntry> network_address_entries = network_interface.addressEntries();
-
-      for (QNetworkAddressEntry network_address_entry : network_address_entries) {
-        QHostAddress host_address = network_address_entry.ip();
-        if (host_address.protocol() == QAbstractSocket::IPv4Protocol) {
-          ipv4 = qToBigEndian(host_address.toIPv4Address());
-          qLog(Debug) << "  ipv4:" << host_address.toString();
-        }
-        else if (host_address.protocol() == QAbstractSocket::IPv6Protocol) {
-          ipv6 = host_address.toString();
-          qLog(Debug) << "  ipv6:" << host_address.toString();
-        }
-      }
-
-      // Now start the service
-      CreateMdnsd(ipv4, ipv6);
-    }
-  }
-
-}
-
-TinySVCMDNS::~TinySVCMDNS() {
-
-  for (mdnsd *mdnsd : std::as_const(mdnsd_)) {
-    mdnsd_stop(mdnsd);
-  }
-
-}
-
-void TinySVCMDNS::CreateMdnsd(const uint32_t ipv4, const QString &ipv6) {
-
-  const QString host = QHostInfo::localHostName();
-
-  // Start the service
-  mdnsd *mdnsd = mdnsd_start();
-
-  // Set our hostname
-  const QString fullhostname = host + ".local"_L1;
-  mdnsd_set_hostname(mdnsd, fullhostname.toUtf8().constData(), ipv4);
-
-  // Add to the list
-  mdnsd_.append(mdnsd);
-
-}
-
-void TinySVCMDNS::PublishInternal(const QString &domain, const QString &type, const QByteArray &name, const quint16 port) {
-
-  // Some pointless text, so tinymDNS publishes the service correctly.
-  const char *txt[] = { "cat=nyan", nullptr };
-
-  for (mdnsd *mdnsd : mdnsd_) {
-    const QString fulltype = type + ".local"_L1;
-    mdnsd_register_svc(mdnsd, name.constData(), fulltype.toUtf8().constData(), port, nullptr, txt);
-  }
-
-}

src/core/tinysvcmdns.h

@@ -1,26 +0,0 @@
-#ifndef TINYSVCMDNS_H
-#define TINYSVCMDNS_H
-
-#include <QList>
-#include <QByteArray>
-#include <QString>
-
-#include "zeroconf.h"
-
-struct mdnsd;
-
-class TinySVCMDNS : public Zeroconf {
-
- public:
-  explicit TinySVCMDNS(QObject *parent = nullptr);
-  virtual ~TinySVCMDNS();
-
- protected:
-  virtual void PublishInternal(const QString &domain, const QString &type, const QByteArray &name, const quint16 port) override;
-
- private:
-  void CreateMdnsd(const uint32_t ipv4, const QString &ipv6);
-  QList<mdnsd*> mdnsd_;
-};
-
-#endif  // TINYSVCMDNS_H

src/core/zeroconf.cpp

@@ -1,69 +0,0 @@
-#include "config.h"
-
-#include <QObject>
-#include <QByteArray>
-#include <QString>
-
-#ifdef HAVE_DBUS
-#  include "avahi/avahi.h"
-#endif
-
-#ifdef Q_OS_DARWIN
-#  include "bonjour.h"
-#endif
-
-#ifdef Q_OS_WIN32
-#  include "tinysvcmdns.h"
-#endif
-
-#include "zeroconf.h"
-
-Zeroconf *Zeroconf::sInstance = nullptr;
-
-Zeroconf::Zeroconf(QObject *parent) : QObject(parent) {}
-
-Zeroconf::~Zeroconf() = default;
-
-Zeroconf *Zeroconf::GetZeroconf() {
-
-  if (!sInstance) {
-#ifdef HAVE_DBUS
-    sInstance = new Avahi;
-#endif  // HAVE_DBUS
-
-#ifdef Q_OS_DARWIN
-    sInstance = new Bonjour;
-#endif
-
-#ifdef Q_OS_WIN32
-    sInstance = new TinySVCMDNS;
-#endif
-  }
-
-  return sInstance;
-
-}
-
-QByteArray Zeroconf::TruncateName(const QString &name) {
-
-  QByteArray truncated_utf8;
-  for (const QChar c : name) {
-    if (truncated_utf8.size() + 1 >= 63) {
-      break;
-    }
-    truncated_utf8 += c.toLatin1();
-  }
-
-  // NULL-terminate the string.
-  truncated_utf8.append('\0');
-
-  return truncated_utf8;
-
-}
-
-void Zeroconf::Publish(const QString &domain, const QString &type, const QString &name, quint16 port) {
-
-  const QByteArray truncated_name = TruncateName(name);
-  PublishInternal(domain, type, truncated_name, port);
-
-}

src/core/zeroconf.h

@@ -1,28 +0,0 @@
-#ifndef ZEROCONF_H
-#define ZEROCONF_H
-
-#include <QObject>
-#include <QByteArray>
-#include <QString>
-
-class Zeroconf : public QObject {
-
- public:
-  explicit Zeroconf(QObject *parent);
-  virtual ~Zeroconf();
-
-  void Publish(const QString &domain, const QString &type, const QString &name, quint16 port);
-
-  static Zeroconf *GetZeroconf();
-
-  // Truncate a QString to 63 bytes of UTF-8.
-  static QByteArray TruncateName(const QString &name);
-
- protected:
-  virtual void PublishInternal(const QString &domain, const QString &type, const QByteArray &name, quint16 port) = 0;
-
- private:
-  static Zeroconf *sInstance;
-};
-
-#endif  // ZEROCONF_H

src/covermanager/albumcoverchoicecontroller.cpp

@@ -589,6 +589,8 @@ void AlbumCoverChoiceController::SaveArtManualToSong(Song *song, const QUrl &art
     case Song::Source::Tidal:
     case Song::Source::Spotify:
     case Song::Source::Qobuz:
+    case Song::Source::Dropbox:
+    case Song::Source::OneDrive:
       StreamingServicePtr service = streaming_services_->ServiceBySource(song->source());
       if (!service) break;
       if (service->artists_collection_backend()) {

src/dropbox/dropboxbaserequest.cpp

@@ -0,0 +1,132 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QByteArray>
+#include <QString>
+#include <QUrl>
+#include <QNetworkReply>
+#include <QJsonObject>
+
+#include "constants/dropboxconstants.h"
+#include "core/networkaccessmanager.h"
+#include "dropboxservice.h"
+#include "dropboxbaserequest.h"
+
+using namespace Qt::Literals::StringLiterals;
+using namespace DropboxConstants;
+
+DropboxBaseRequest::DropboxBaseRequest(const SharedPtr<NetworkAccessManager> network, DropboxService *service, QObject *parent)
+    : JsonBaseRequest(network, parent),
+      service_(service) {}
+
+QString DropboxBaseRequest::service_name() const {
+
+  return service_->name();
+
+}
+
+bool DropboxBaseRequest::authentication_required() const {
+
+  return true;
+
+}
+
+bool DropboxBaseRequest::authenticated() const {
+
+  return service_->authenticated();
+
+}
+
+bool DropboxBaseRequest::use_authorization_header() const {
+
+  return true;
+
+}
+
+QByteArray DropboxBaseRequest::authorization_header() const {
+
+  return service_->authorization_header();
+
+}
+
+QNetworkReply *DropboxBaseRequest::GetTemporaryLink(const QUrl &url) {
+
+  QJsonObject json_object;
+  json_object.insert("path"_L1, url.path());
+  return CreatePostRequest(QUrl(QLatin1String(kApiUrl) + "/2/files/get_temporary_link"_L1), json_object);
+
+}
+
+JsonBaseRequest::JsonObjectResult DropboxBaseRequest::ParseJsonObject(QNetworkReply *reply) {
+
+  if (reply->error() != QNetworkReply::NoError && reply->error() < 200) {
+    return ReplyDataResult(ErrorCode::NetworkError, QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
+  }
+
+  JsonObjectResult result(ErrorCode::Success);
+  result.network_error = reply->error();
+  if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).isValid()) {
+    result.http_status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+  }
+
+  const QByteArray data = reply->readAll();
+  if (!data.isEmpty()) {
+    QJsonParseError json_parse_error;
+    const QJsonDocument json_document = QJsonDocument::fromJson(data, &json_parse_error);
+    if (json_parse_error.error == QJsonParseError::NoError) {
+      const QJsonObject json_object = json_document.object();
+      if (json_object.contains("error"_L1) && json_object["error"_L1].isObject()) {
+        const QJsonObject object_error = json_object["error"_L1].toObject();
+        if (object_error.contains("status"_L1) && object_error.contains("message"_L1)) {
+          const int status = object_error["status"_L1].toInt();
+          const QString message = object_error["message"_L1].toString();
+          result.error_code = ErrorCode::APIError;
+          result.error_message = QStringLiteral("%1 (%2)").arg(message).arg(status);
+        }
+      }
+      else {
+        result.json_object = json_document.object();
+      }
+    }
+    else {
+      result.error_code = ErrorCode::ParseError;
+      result.error_message = json_parse_error.errorString();
+    }
+  }
+
+  if (result.error_code != ErrorCode::APIError) {
+    if (reply->error() != QNetworkReply::NoError) {
+      result.error_code = ErrorCode::NetworkError;
+      result.error_message = QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error());
+    }
+    else if (result.http_status_code != 200) {
+      result.error_code = ErrorCode::HttpError;
+      result.error_message = QStringLiteral("Received HTTP code %1").arg(result.http_status_code);
+    }
+  }
+
+  if (reply->error() == QNetworkReply::AuthenticationRequiredError) {
+    service_->ClearSession();
+  }
+
+  return result;
+
+}

src/dropbox/dropboxbaserequest.h

@@ -0,0 +1,59 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef DROPBOXBASEREQUEST_H
+#define DROPBOXBASEREQUEST_H
+
+#include "config.h"
+
+#include <QByteArray>
+#include <QString>
+#include <QUrl>
+
+#include "includes/shared_ptr.h"
+#include "core/jsonbaserequest.h"
+
+class QNetworkReply;
+class NetworkAccessManager;
+class DropboxService;
+
+class DropboxBaseRequest : public JsonBaseRequest {
+  Q_OBJECT
+
+ public:
+  explicit DropboxBaseRequest(const SharedPtr<NetworkAccessManager> network, DropboxService *service, QObject *parent = nullptr);
+
+  QString service_name() const override;
+  bool authentication_required() const override;
+  bool authenticated() const override;
+  bool use_authorization_header() const override;
+  QByteArray authorization_header() const override;
+
+ protected:
+  QNetworkReply *GetTemporaryLink(const QUrl &url);
+  JsonObjectResult ParseJsonObject(QNetworkReply *reply);
+
+ Q_SIGNALS:
+  void ShowErrorDialog(const QString &error);
+
+ private:
+  DropboxService *service_;
+};
+
+#endif  // DROPBOXBASEREQUEST_H

src/dropbox/dropboxservice.cpp

@@ -0,0 +1,190 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QString>
+#include <QUrl>
+#include <QTimer>
+
+#include "constants/dropboxsettings.h"
+#include "core/logging.h"
+#include "core/settings.h"
+#include "core/database.h"
+#include "core/urlhandlers.h"
+#include "core/networkaccessmanager.h"
+#include "core/oauthenticator.h"
+#include "collection/collectionbackend.h"
+#include "collection/collectionmodel.h"
+#include "streaming/cloudstoragestreamingservice.h"
+#include "dropboxservice.h"
+#include "dropboxurlhandler.h"
+#include "dropboxsongsrequest.h"
+#include "dropboxstreamurlrequest.h"
+
+using namespace Qt::Literals::StringLiterals;
+using namespace DropboxSettings;
+
+const Song::Source DropboxService::kSource = Song::Source::Dropbox;
+
+namespace {
+constexpr char kClientIDB64[] = "Zmx0b2EyYzRwaGo2eHlw";
+constexpr char kClientSecretB64[] = "emo3em5jNnNpM3Ftd2s3";
+constexpr char kOAuthRedirectUrl[] = "http://localhost/";
+constexpr char kOAuthAuthorizeUrl[] = "https://www.dropbox.com/1/oauth2/authorize";
+constexpr char kOAuthAccessTokenUrl[] = "https://api.dropboxapi.com/1/oauth2/token";
+}  // namespace
+
+DropboxService::DropboxService(const SharedPtr<TaskManager> task_manager,
+                               const SharedPtr<Database> database,
+                               const SharedPtr<NetworkAccessManager> network,
+                               const SharedPtr<UrlHandlers> url_handlers,
+                               const SharedPtr<TagReaderClient> tagreader_client,
+                               const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                               QObject *parent)
+    : CloudStorageStreamingService(task_manager, database, tagreader_client, albumcover_loader, Song::Source::Dropbox, u"Dropbox"_s, u"dropbox"_s, QLatin1String(kSettingsGroup), parent),
+      network_(network),
+      oauth_(new OAuthenticator(network, this)),
+      songs_request_(new DropboxSongsRequest(network, collection_backend_, this, this)),
+      enabled_(false),
+      next_stream_url_request_id_(0) {
+
+  url_handlers->Register(new DropboxUrlHandler(task_manager, this, this));
+
+  oauth_->set_settings_group(QLatin1String(kSettingsGroup));
+  oauth_->set_type(OAuthenticator::Type::Authorization_Code);
+  oauth_->set_authorize_url(QUrl(QLatin1String(kOAuthAuthorizeUrl)));
+  oauth_->set_redirect_url(QUrl(QLatin1String(kOAuthRedirectUrl)));
+  oauth_->set_access_token_url(QUrl(QLatin1String(kOAuthAccessTokenUrl)));
+  oauth_->set_client_id(QString::fromLatin1(QByteArray::fromBase64(kClientIDB64)));
+  oauth_->set_client_secret(QString::fromLatin1(QByteArray::fromBase64(kClientSecretB64)));
+  oauth_->set_use_local_redirect_server(true);
+  oauth_->set_random_port(true);
+
+  QObject::connect(oauth_, &OAuthenticator::AuthenticationFinished, this, &DropboxService::OAuthFinished);
+
+  DropboxService::ReloadSettings();
+  oauth_->LoadSession();
+
+}
+
+bool DropboxService::authenticated() const {
+
+  return oauth_->authenticated();
+
+}
+
+void DropboxService::Exit() {
+
+  wait_for_exit_ << &*collection_backend_;
+  QObject::connect(&*collection_backend_, &CollectionBackend::ExitFinished, this, &DropboxService::ExitReceived);
+  collection_backend_->ExitAsync();
+
+}
+
+void DropboxService::ExitReceived() {
+
+  QObject *obj = sender();
+  QObject::disconnect(obj, nullptr, this, nullptr);
+  qLog(Debug) << obj << "successfully exited.";
+  wait_for_exit_.removeAll(obj);
+  if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished();
+
+}
+
+void DropboxService::ReloadSettings() {
+
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  enabled_ = s.value(kEnabled, false).toBool();
+  s.endGroup();
+
+}
+
+void DropboxService::Authenticate() {
+
+  oauth_->Authenticate();
+
+}
+
+void DropboxService::ClearSession() {
+
+  oauth_->ClearSession();
+}
+
+void DropboxService::OAuthFinished(const bool success, const QString &error) {
+
+  if (success) {
+    Q_EMIT LoginFinished(true);
+    Q_EMIT LoginSuccess();
+  }
+  else {
+    Q_EMIT LoginFailure(error);
+    Q_EMIT LoginFinished(false);
+  }
+
+}
+
+QByteArray DropboxService::authorization_header() const {
+  return oauth_->authorization_header();
+}
+
+void DropboxService::Start() {
+  songs_request_->GetFolderList();
+}
+
+void DropboxService::Reset() {
+
+  collection_backend_->DeleteAll();
+
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  s.remove("cursor");
+  s.endGroup();
+
+  if (authenticated()) {
+    Start();
+  }
+
+}
+
+uint DropboxService::GetStreamURL(const QUrl &url, QString &error) {
+
+  if (!authenticated()) {
+    error = tr("Not authenticated with Dropbox.");
+    return 0;
+  }
+
+  uint id = 0;
+  while (id == 0) id = ++next_stream_url_request_id_;
+  DropboxStreamURLRequestPtr stream_url_request = DropboxStreamURLRequestPtr(new DropboxStreamURLRequest(network_, this, id, url));
+  stream_url_requests_.insert(id, stream_url_request);
+  QObject::connect(&*stream_url_request, &DropboxStreamURLRequest::StreamURLRequestFinished, this, &DropboxService::StreamURLRequestFinishedSlot);
+  stream_url_request->Process();
+
+  return id;
+
+}
+
+void DropboxService::StreamURLRequestFinishedSlot(const uint id, const QUrl &media_url, const bool success, const QUrl &stream_url, const QString &error) {
+
+  if (!stream_url_requests_.contains(id)) return;
+  DropboxStreamURLRequestPtr stream_url_request = stream_url_requests_.take(id);
+
+  Q_EMIT StreamURLRequestFinished(id, media_url, success, stream_url, error);
+
+}

src/dropbox/dropboxservice.h

@@ -0,0 +1,93 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef DROPBOXSERVICE_H
+#define DROPBOXSERVICE_H
+
+#include <QList>
+#include <QString>
+#include <QUrl>
+#include <QSharedPointer>
+
+#include "core/song.h"
+#include "streaming/cloudstoragestreamingservice.h"
+
+class QNetworkReply;
+
+class TaskManager;
+class Database;
+class NetworkAccessManager;
+class UrlHandlers;
+class TagReaderClient;
+class AlbumCoverLoader;
+class OAuthenticator;
+class DropboxSongsRequest;
+class DropboxStreamURLRequest;
+
+class DropboxService : public CloudStorageStreamingService {
+  Q_OBJECT
+
+ public:
+  explicit DropboxService(const SharedPtr<TaskManager> task_manager,
+                          const SharedPtr<Database> database,
+                          const SharedPtr<NetworkAccessManager> network,
+                          const SharedPtr<UrlHandlers> url_handlers,
+                          const SharedPtr<TagReaderClient> tagreader_client,
+                          const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                          QObject *parent = nullptr);
+
+  static const Song::Source kSource;
+
+  bool oauth() const override { return true; }
+  bool authenticated() const override;
+  bool show_progress() const override { return false; }
+  bool enable_refresh_button() const override { return false; }
+
+  void Exit() override;
+  void ReloadSettings() override;
+
+  void Authenticate();
+  void ClearSession();
+
+  void Start();
+  void Reset();
+  uint GetStreamURL(const QUrl &url, QString &error);
+
+  QByteArray authorization_header() const;
+
+ Q_SIGNALS:
+  void StreamURLRequestFinished(const uint id, const QUrl &media_url, const bool success, const QUrl &stream_url, const QString &error = QString());
+
+ private Q_SLOTS:
+  void ExitReceived();
+  void OAuthFinished(const bool success, const QString &error = QString());
+  void StreamURLRequestFinishedSlot(const uint id, const QUrl &media_url, const bool success, const QUrl &stream_url, const QString &error = QString());
+
+ private:
+  const SharedPtr<NetworkAccessManager> network_;
+  OAuthenticator *oauth_;
+  DropboxSongsRequest *songs_request_;
+  bool enabled_;
+  QList<QObject*> wait_for_exit_;
+  bool finished_;
+  uint next_stream_url_request_id_;
+  QMap<uint, QSharedPointer<DropboxStreamURLRequest>> stream_url_requests_;
+};
+
+#endif  // DROPBOXSERVICE_H

src/dropbox/dropboxsongsrequest.cpp

@@ -0,0 +1,244 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QByteArray>
+#include <QString>
+#include <QUrl>
+#include <QDateTime>
+#include <QTimer>
+#include <QNetworkReply>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonValue>
+
+#include "constants/dropboxsettings.h"
+#include "core/logging.h"
+#include "core/settings.h"
+#include "core/networkaccessmanager.h"
+#include "collection/collectionbackend.h"
+#include "dropboxservice.h"
+#include "dropboxbaserequest.h"
+#include "dropboxsongsrequest.h"
+
+using namespace Qt::Literals::StringLiterals;
+using namespace DropboxSettings;
+
+DropboxSongsRequest::DropboxSongsRequest(const SharedPtr<NetworkAccessManager> network, const SharedPtr<CollectionBackend> collection_backend, DropboxService *service, QObject *parent)
+    : DropboxBaseRequest(network, service, parent),
+      network_(network),
+      collection_backend_(collection_backend),
+      service_(service) {}
+
+void DropboxSongsRequest::GetFolderList() {
+
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  QString cursor = s.value("cursor").toString();
+  s.endGroup();
+
+  QUrl url(QLatin1String(kApiUrl) + "/2/files/list_folder"_L1);
+  QJsonObject json_object;
+
+  if (cursor.isEmpty()) {
+    json_object.insert("path"_L1, ""_L1);
+    json_object.insert("recursive"_L1, true);
+    json_object.insert("include_deleted"_L1, true);
+  }
+  else {
+    url.setUrl(QLatin1String(kApiUrl) + "/2/files/list_folder/continue"_L1);
+    json_object.insert("cursor"_L1, cursor);
+  }
+
+  QNetworkReply *reply = CreatePostRequest(url, json_object);
+  QObject::connect(reply, &QNetworkReply::finished, this, [this, reply] { GetFolderListFinished(reply); });
+
+}
+
+void DropboxSongsRequest::GetFolderListFinished(QNetworkReply *reply) {
+
+  reply->deleteLater();
+
+  const JsonObjectResult json_object_result = ParseJsonObject(reply);
+  if (json_object_result.success()) {
+    Error(json_object_result.error_message);
+    return;
+  }
+
+  const QJsonObject &json_object = json_object_result.json_object;
+  if (json_object.isEmpty()) {
+    return;
+  }
+
+  if (json_object.contains("reset"_L1) && json_object["reset"_L1].toBool()) {
+    qLog(Debug) << "Resetting Dropbox database";
+    collection_backend_->DeleteAll();
+  }
+
+  {
+    Settings s;
+    s.beginGroup(kSettingsGroup);
+    s.setValue("cursor", json_object["cursor"_L1].toString());
+    s.endGroup();
+  }
+
+  const QJsonArray entires = json_object["entries"_L1].toArray();
+  qLog(Debug) << "File list found:" << entires.size();
+
+  QList<QUrl> urls_deleted;
+  for (const QJsonValue &value_entry : entires) {
+    if (!value_entry.isObject()) {
+      continue;
+    }
+    const QJsonObject object_entry = value_entry.toObject();
+    const QString tag = object_entry[".tag"_L1].toString();
+    const QString path = object_entry["path_lower"_L1].toString();
+    const qint64 size = object_entry["size"_L1].toInt();
+    const QString server_modified = object_entry["server_modified"_L1].toString();
+
+    QUrl url;
+    url.setScheme(service_->url_scheme());
+    url.setPath(path);
+
+    if (tag == "deleted"_L1) {
+      qLog(Debug) << "Deleting song with URL" << url;
+      urls_deleted << url;
+      continue;
+    }
+
+    if (tag == "folder"_L1) {
+      continue;
+    }
+
+    if (DropboxService::IsSupportedFiletype(path)) {
+      GetStreamURL(url, path, size, QDateTime::fromString(server_modified, Qt::ISODate).toSecsSinceEpoch());
+    }
+
+  }
+
+  if (!urls_deleted.isEmpty()) {
+    collection_backend_->DeleteSongsByUrlsAsync(urls_deleted);
+  }
+
+  if (json_object.contains("has_more"_L1) && json_object["has_more"_L1].isBool() && json_object["has_more"_L1].toBool()) {
+    Settings s;
+    s.beginGroup(kSettingsGroup);
+    s.setValue("cursor", json_object["cursor"_L1].toVariant());
+    s.endGroup();
+    GetFolderList();
+  }
+  else {
+    // Long-poll wait for changes.
+    LongPollDelta();
+  }
+
+}
+
+void DropboxSongsRequest::LongPollDelta() {
+
+  if (!service_->authenticated()) {
+    return;
+  }
+
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  const QString cursor = s.value("cursor").toString();
+  s.endGroup();
+
+  QJsonObject json_object;
+  json_object.insert("cursor"_L1, cursor);
+  json_object.insert("timeout"_L1, 30);
+
+  QNetworkReply *reply = CreatePostRequest(QUrl(QLatin1String(kNotifyApiUrl) + "/2/files/list_folder/longpoll"_L1), json_object);
+  QObject::connect(reply, &QNetworkReply::finished, this, [this, reply] { LongPollDeltaFinished(reply); });
+
+}
+
+void DropboxSongsRequest::LongPollDeltaFinished(QNetworkReply *reply) {
+
+  reply->deleteLater();
+
+  const JsonObjectResult json_object_result = ParseJsonObject(reply);
+  if (json_object_result.success()) {
+    Error(json_object_result.error_message);
+    return;
+  }
+
+  const QJsonObject &json_object = json_object_result.json_object;
+  if (json_object["changes"_L1].toBool()) {
+    qLog(Debug) << "Dropbox: Received changes...";
+    GetFolderList();
+  }
+  else {
+    bool ok = false;
+    int backoff = json_object["backoff"_L1].toString().toInt(&ok);
+    if (!ok) {
+      backoff = 10;
+    }
+    QTimer::singleShot(backoff * 1000, this, &DropboxSongsRequest::LongPollDelta);
+  }
+
+}
+
+void DropboxSongsRequest::GetStreamURL(const QUrl &url, const QString &path, const qint64 size, const qint64 mtime) {
+
+  QNetworkReply *reply = GetTemporaryLink(url);
+  QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, path, size, mtime]() {
+    GetStreamUrlFinished(reply, path, size, mtime);
+  });
+
+}
+
+void DropboxSongsRequest::GetStreamUrlFinished(QNetworkReply *reply, const QString &filename, const qint64 size, const qint64 mtime) {
+
+  reply->deleteLater();
+
+  const JsonObjectResult json_object_result = ParseJsonObject(reply);
+  if (!json_object_result.success()) {
+    Error(json_object_result.error_message);
+    return;
+  }
+
+  const QJsonObject &json_object = json_object_result.json_object;
+  if (json_object.isEmpty()) {
+    return;
+  }
+
+  if (!json_object.contains("link"_L1)) {
+    Error(u"Missing link"_s);
+    return;
+  }
+
+  const QUrl url = QUrl::fromEncoded(json_object["link"_L1].toVariant().toByteArray());
+
+  service_->MaybeAddFileToDatabase(url, filename, size, mtime);
+
+}
+
+void DropboxSongsRequest::Error(const QString &error_message, const QVariant &debug_output) {
+
+  qLog(Error) << service_name() << error_message;
+  if (debug_output.isValid()) {
+    qLog(Debug) << debug_output;
+  }
+
+  Q_EMIT ShowErrorDialog(error_message);
+
+}

src/dropbox/dropboxsongsrequest.h

@@ -0,0 +1,67 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef DROPBOXSONGSREQUEST_H
+#define DROPBOXSONGSREQUEST_H
+
+#include "config.h"
+
+#include <QList>
+#include <QString>
+#include <QUrl>
+
+#include "dropboxbaserequest.h"
+
+class NetworkAccessManager;
+class CollectionBackend;
+class QNetworkReply;
+class DropboxService;
+
+class DropboxSongsRequest : public DropboxBaseRequest {
+  Q_OBJECT
+
+ public:
+  explicit DropboxSongsRequest(const SharedPtr<NetworkAccessManager> network, const SharedPtr<CollectionBackend> collection_backend, DropboxService *service, QObject *parent = nullptr);
+
+  void ReloadSettings();
+
+  void GetFolderList();
+
+ Q_SIGNALS:
+  void ShowErrorDialog(const QString &error);
+
+ private:
+  void LongPollDelta();
+  void GetStreamURL(const QUrl &url, const QString &path, const qint64 size, const qint64 mtime);
+
+ protected:
+  void Error(const QString &error_message, const QVariant &debug_output = QVariant()) override;
+
+ private Q_SLOTS:
+  void GetFolderListFinished(QNetworkReply *reply);
+  void LongPollDeltaFinished(QNetworkReply *reply);
+  void GetStreamUrlFinished(QNetworkReply *reply, const QString &filename, const qint64 size, const qint64 mtime);
+
+ private:
+  const SharedPtr<NetworkAccessManager> network_;
+  const SharedPtr<CollectionBackend> collection_backend_;
+  DropboxService *service_;
+};
+
+#endif  // DROPBOXSONGSREQUEST_H

src/dropbox/dropboxstreamurlrequest.cpp

@@ -0,0 +1,129 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QByteArray>
+#include <QString>
+#include <QUrl>
+#include <QNetworkReply>
+#include <QJsonObject>
+
+#include "includes/shared_ptr.h"
+#include "core/logging.h"
+#include "core/networkaccessmanager.h"
+#include "dropboxservice.h"
+#include "dropboxbaserequest.h"
+#include "dropboxstreamurlrequest.h"
+
+using namespace Qt::Literals::StringLiterals;
+
+DropboxStreamURLRequest::DropboxStreamURLRequest(const SharedPtr<NetworkAccessManager> network, DropboxService *service, const uint id, const QUrl &media_url, QObject *parent)
+    : DropboxBaseRequest(network, service, parent),
+      network_(network),
+      service_(service),
+      id_(id),
+      media_url_(media_url),
+      reply_(nullptr) {}
+
+DropboxStreamURLRequest::~DropboxStreamURLRequest() {
+
+  if (reply_) {
+    QObject::disconnect(reply_, nullptr, this, nullptr);
+    if (reply_->isRunning()) reply_->abort();
+    reply_->deleteLater();
+    reply_ = nullptr;
+  }
+
+}
+
+void DropboxStreamURLRequest::Cancel() {
+
+  if (reply_ && reply_->isRunning()) {
+    reply_->abort();
+  }
+
+}
+
+void DropboxStreamURLRequest::Process() {
+
+  GetStreamURL();
+
+}
+
+void DropboxStreamURLRequest::GetStreamURL() {
+
+  if (reply_) {
+    QObject::disconnect(reply_, nullptr, this, nullptr);
+    if (reply_->isRunning()) reply_->abort();
+    reply_->deleteLater();
+  }
+
+  reply_ = GetTemporaryLink(media_url_);
+  QObject::connect(reply_, &QNetworkReply::finished, this, &DropboxStreamURLRequest::StreamURLReceived);
+
+}
+
+void DropboxStreamURLRequest::StreamURLReceived() {
+
+  const QScopeGuard finish = qScopeGuard([this]() { Finish(); });
+
+  if (!reply_) return;
+
+  Q_ASSERT(replies_.contains(reply_));
+  replies_.removeAll(reply_);
+
+  const JsonObjectResult json_object_result = ParseJsonObject(reply_).json_object;
+
+  QObject::disconnect(reply_, nullptr, this, nullptr);
+  reply_->deleteLater();
+  reply_ = nullptr;
+
+  if (!json_object_result.success()) {
+    Error(json_object_result.error_message);
+    return;
+  }
+
+  const QJsonObject &json_object = json_object_result.json_object;
+  if (json_object.isEmpty() || !json_object.contains("link"_L1)) {
+    Error(u"Could not parse stream URL"_s);
+    return;
+  }
+
+  stream_url_ = QUrl::fromEncoded(json_object["link"_L1].toVariant().toByteArray());
+  success_ = stream_url_.isValid();
+
+}
+
+void DropboxStreamURLRequest::Error(const QString &error_message, const QVariant &debug_output) {
+
+  qLog(Error) << service_name() << error_message;
+  if (debug_output.isValid()) {
+    qLog(Debug) << debug_output;
+  }
+
+  error_ = error_message;
+
+}
+
+void DropboxStreamURLRequest::Finish() {
+
+  Q_EMIT StreamURLRequestFinished(id_, media_url_, success_, stream_url_, error_);
+
+}

src/dropbox/dropboxstreamurlrequest.h

@@ -0,0 +1,71 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef DROPBOXSTREAMURLREQUEST_H
+#define DROPBOXSTREAMURLREQUEST_H
+
+#include "config.h"
+
+#include <QVariant>
+#include <QString>
+#include <QUrl>
+#include <QSharedPointer>
+
+#include "includes/shared_ptr.h"
+#include "dropboxservice.h"
+#include "dropboxbaserequest.h"
+
+class QNetworkReply;
+class NetworkAccessManager;
+
+class DropboxStreamURLRequest : public DropboxBaseRequest {
+  Q_OBJECT
+
+ public:
+  explicit DropboxStreamURLRequest(const SharedPtr<NetworkAccessManager> network, DropboxService *service, const uint id, const QUrl &media_url, QObject *parent = nullptr);
+  ~DropboxStreamURLRequest() override;
+
+  void Process();
+  void Cancel();
+
+ Q_SIGNALS:
+  void StreamURLRequestFinished(const uint id, const QUrl &media_url, const bool success, const QUrl &stream_url, const QString &error = QString());
+
+ private Q_SLOTS:
+  void StreamURLReceived();
+
+ private:
+  void GetStreamURL();
+  void Error(const QString &error_message, const QVariant &debug_output = QVariant()) override;
+  void Finish();
+
+ private:
+  const SharedPtr<NetworkAccessManager> network_;
+  DropboxService *service_;
+  uint id_;
+  QUrl media_url_;
+  QUrl stream_url_;
+  QNetworkReply *reply_;
+  bool success_;
+  QString error_;
+};
+
+using DropboxStreamURLRequestPtr = QSharedPointer<DropboxStreamURLRequest>;
+
+#endif  // DROPBOXSTREAMURLREQUEST_H

src/dropbox/dropboxurlhandler.cpp

@@ -0,0 +1,76 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QString>
+#include <QUrl>
+
+#include "includes/shared_ptr.h"
+#include "core/taskmanager.h"
+#include "dropboxurlhandler.h"
+#include "dropboxservice.h"
+
+DropboxUrlHandler::DropboxUrlHandler(const SharedPtr<TaskManager> task_manager, DropboxService *service, QObject *parent)
+    : UrlHandler(parent),
+      task_manager_(task_manager),
+      service_(service) {
+
+  QObject::connect(service, &DropboxService::StreamURLRequestFinished, this, &DropboxUrlHandler::StreamURLRequestFinished);
+
+}
+
+QString DropboxUrlHandler::scheme() const { return service_->url_scheme(); }
+
+UrlHandler::LoadResult DropboxUrlHandler::StartLoading(const QUrl &url) {
+
+  Request request;
+  request.task_id = task_manager_->StartTask(QStringLiteral("Loading %1 stream...").arg(url.scheme()));
+  QString error;
+  request.id = service_->GetStreamURL(url, error);
+  if (request.id == 0) {
+    CancelTask(request.task_id);
+    return LoadResult(url, LoadResult::Type::Error, error);
+  }
+
+  requests_.insert(request.id, request);
+
+  LoadResult load_result(url);
+  load_result.type_ = LoadResult::Type::WillLoadAsynchronously;
+
+  return load_result;
+
+}
+
+void DropboxUrlHandler::StreamURLRequestFinished(const uint id, const QUrl &media_url, const bool success, const QUrl &stream_url, const QString &error) {
+
+  if (!requests_.contains(id)) return;
+  const Request request = requests_.take(id);
+  CancelTask(request.task_id);
+
+  if (success) {
+    Q_EMIT AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::TrackAvailable, stream_url));
+  }
+  else {
+    Q_EMIT AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::Error, error));
+  }
+
+}
+
+void DropboxUrlHandler::CancelTask(const int task_id) {
+  task_manager_->SetTaskFinished(task_id);
+}

src/dropbox/dropboxurlhandler.h

@@ -0,0 +1,56 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef DROPBOXURLHANDLER_H
+#define DROPBOXURLHANDLER_H
+
+#include "includes/shared_ptr.h"
+#include "core/urlhandler.h"
+
+class TaskManager;
+class DropboxService;
+
+class DropboxUrlHandler : public UrlHandler {
+  Q_OBJECT
+
+ public:
+  explicit DropboxUrlHandler(const SharedPtr<TaskManager> task_manager, DropboxService *service, QObject *parent = nullptr);
+
+  QString scheme() const override;
+  LoadResult StartLoading(const QUrl &url) override;
+
+ private:
+  void CancelTask(const int task_id);
+
+ private Q_SLOTS:
+  void StreamURLRequestFinished(const uint id, const QUrl &media_url, const bool success, const QUrl &stream_url, const QString &error = QString());
+
+ private:
+  class Request {
+   public:
+    explicit Request() : id(0), task_id(-1) {}
+    uint id;
+    int task_id;
+  };
+  const SharedPtr<TaskManager> task_manager_;
+  DropboxService *service_;
+  QMap<uint, Request> requests_;
+};
+
+#endif  // DROPBOXURLHANDLER_H

src/networkremote/incomingdataparser.cpp

@@ -1,478 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <algorithm>
-
-#include <QString>
-#include <QUrl>
-#include <QDir>
-#include <QSettings>
-
-#include "core/logging.h"
-#include "core/mimedata.h"
-#include "constants/timeconstants.h"
-#include "engine/enginebase.h"
-#include "playlist/playlist.h"
-#include "playlist/playlistmanager.h"
-#include "playlist/playlistsequence.h"
-#include "incomingdataparser.h"
-#include "scrobbler/audioscrobbler.h"
-#include "constants/mainwindowsettings.h"
-
-using namespace Qt::Literals::StringLiterals;
-
-IncomingDataParser::IncomingDataParser(const SharedPtr<Player> player,
-                                       const SharedPtr<PlaylistManager> playlist_manager,
-                                       const SharedPtr<AudioScrobbler> scrobbler,
-                                       QObject *parent)
-    : QObject(parent),
-      player_(player),
-      playlist_manager_(playlist_manager),
-      scrobbler_(scrobbler),
-      close_connection_(false),
-      doubleclick_playlist_addmode_(BehaviourSettings::PlaylistAddBehaviour::Enqueue) {
-
-  ReloadSettings();
-
-  QObject::connect(this, &IncomingDataParser::Play, &*player_, &Player::PlayHelper);
-  QObject::connect(this, &IncomingDataParser::PlayPause, &*player_, &Player::PlayPauseHelper);
-  QObject::connect(this, &IncomingDataParser::Pause, &*player_, &Player::Pause);
-  QObject::connect(this, &IncomingDataParser::Stop, &*player_, &Player::Stop);
-  QObject::connect(this, &IncomingDataParser::StopAfterCurrent, &*player_, &Player::StopAfterCurrent);
-  QObject::connect(this, &IncomingDataParser::Next, &*player_, &Player::Next);
-  QObject::connect(this, &IncomingDataParser::Previous, &*player_, &Player::Previous);
-  QObject::connect(this, &IncomingDataParser::SetVolume, &*player_, &Player::SetVolume);
-  QObject::connect(this, &IncomingDataParser::PlayAt, &*player_, &Player::PlayAt);
-  QObject::connect(this, &IncomingDataParser::SeekTo, &*player_, &Player::SeekTo);
-
-  QObject::connect(this, &IncomingDataParser::Enqueue, &*playlist_manager_, &PlaylistManager::Enqueue);
-  QObject::connect(this, &IncomingDataParser::SetActivePlaylist, &*playlist_manager_, &PlaylistManager::SetActivePlaylist);
-  QObject::connect(this, &IncomingDataParser::ShuffleCurrent, &*playlist_manager_, &PlaylistManager::ShuffleCurrent);
-  QObject::connect(this, &IncomingDataParser::InsertUrls, &*playlist_manager_, &PlaylistManager::InsertUrls);
-  QObject::connect(this, &IncomingDataParser::InsertSongs, &*playlist_manager_, &PlaylistManager::InsertSongs);
-  QObject::connect(this, &IncomingDataParser::RemoveSongs, &*playlist_manager_, &PlaylistManager::RemoveItemsWithoutUndo);
-  QObject::connect(this, &IncomingDataParser::New, &*playlist_manager_, &PlaylistManager::New);
-  QObject::connect(this, &IncomingDataParser::Open, &*playlist_manager_, &PlaylistManager::Open);
-  QObject::connect(this, &IncomingDataParser::Close, &*playlist_manager_, &PlaylistManager::Close);
-  QObject::connect(this, &IncomingDataParser::Clear, &*playlist_manager_, &PlaylistManager::Clear);
-  QObject::connect(this, &IncomingDataParser::Rename, &*playlist_manager_, &PlaylistManager::Rename);
-  QObject::connect(this, &IncomingDataParser::Favorite, &*playlist_manager_, &PlaylistManager::Favorite);
-
-  QObject::connect(this, &IncomingDataParser::SetRepeatMode, &*playlist_manager_->sequence(), &PlaylistSequence::SetRepeatMode);
-  QObject::connect(this, &IncomingDataParser::SetShuffleMode, &*playlist_manager_->sequence(), &PlaylistSequence::SetShuffleMode);
-
-  QObject::connect(this, &IncomingDataParser::RateCurrentSong, &*playlist_manager_, &PlaylistManager::RateCurrentSong);
-
-  QObject::connect(this, &IncomingDataParser::Love, &*scrobbler_, &AudioScrobbler::Love);
-
-}
-
-IncomingDataParser::~IncomingDataParser() = default;
-
-void IncomingDataParser::ReloadSettings() {
-
-  QSettings s;
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
-  doubleclick_playlist_addmode_ = static_cast<BehaviourSettings::PlaylistAddBehaviour>(s.value(BehaviourSettings::kDoubleClickPlaylistAddMode, static_cast<int>(BehaviourSettings::PlaylistAddBehaviour::Enqueue)).toInt());
-  s.endGroup();
-
-}
-
-bool IncomingDataParser::close_connection() const { return close_connection_; }
-
-void IncomingDataParser::SetRemoteRootFiles(const QString &files_root_folder) {
-  files_root_folder_ = files_root_folder;
-}
-
-Song IncomingDataParser::SongFromPbSongMetadata(const networkremote::SongMetadata &pb_song_metadata) const {
-
-  Song song;
-  song.Init(pb_song_metadata.title(), pb_song_metadata.artist(), pb_song_metadata.album(), pb_song_metadata.length() * kNsecPerSec);
-  song.set_albumartist(pb_song_metadata.albumartist());
-  song.set_genre(pb_song_metadata.genre());
-  song.set_year(pb_song_metadata.prettyYear().toInt());
-  song.set_track(pb_song_metadata.track());
-  song.set_disc(pb_song_metadata.disc());
-  song.set_url(QUrl(pb_song_metadata.url()));
-  song.set_filesize(pb_song_metadata.fileSize());
-  song.set_rating(pb_song_metadata.rating());
-  song.set_basefilename(pb_song_metadata.filename());
-  song.set_art_automatic(QUrl(pb_song_metadata.artAutomatic()));
-  song.set_art_manual(QUrl(pb_song_metadata.artManual()));
-  song.set_filetype(static_cast<Song::FileType>(pb_song_metadata.filetype()));
-
-  return song;
-
-}
-
-void IncomingDataParser::Parse(const networkremote::Message &msg) {
-
-  close_connection_ = false;
-  NetworkRemoteClient *client = qobject_cast<NetworkRemoteClient*>(sender());
-
-  switch (msg.type()) {
-    case networkremote::MsgTypeGadget::MsgType::CONNECT:
-      ClientConnect(msg, client);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::DISCONNECT:
-      close_connection_ = true;
-      break;
-    case networkremote::MsgTypeGadget::MsgType::GET_COLLECTION:
-      Q_EMIT SendCollection(client);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::GET_PLAYLISTS:
-      ParseSendPlaylists(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::GET_PLAYLIST_SONGS:
-      ParseGetPlaylistSongs(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::SET_VOLUME:
-      Q_EMIT SetVolume(msg.requestSetVolume().volume());
-      break;
-    case networkremote::MsgTypeGadget::MsgType::PLAY:
-      Q_EMIT Play();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::PLAYPAUSE:
-      Q_EMIT PlayPause();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::PAUSE:
-      Q_EMIT Pause();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::STOP:
-      Q_EMIT Stop();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::STOP_AFTER:
-      Q_EMIT StopAfterCurrent();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::NEXT:
-      Q_EMIT Next();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::PREVIOUS:
-      Q_EMIT Previous();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::CHANGE_SONG:
-      ParseChangeSong(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::SHUFFLE_PLAYLIST:
-      Q_EMIT ShuffleCurrent();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::REPEAT:
-      ParseSetRepeatMode(msg.repeat());
-      break;
-    case networkremote::MsgTypeGadget::MsgType::SHUFFLE:
-      ParseSetShuffleMode(msg.shuffle());
-      break;
-    case networkremote::MsgTypeGadget::MsgType::SET_TRACK_POSITION:
-      Q_EMIT SeekTo(msg.requestSetTrackPosition().position());
-      break;
-    case networkremote::MsgTypeGadget::MsgType::PLAYLIST_INSERT_URLS:
-      ParseInsertUrls(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::REMOVE_PLAYLIST_SONGS:
-      ParseRemoveSongs(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::OPEN_PLAYLIST:
-      ParseOpenPlaylist(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::CLOSE_PLAYLIST:
-      ParseClosePlaylist(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::UPDATE_PLAYLIST:
-      ParseUpdatePlaylist(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::LOVE:
-      Q_EMIT Love();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::GET_LYRICS:
-      Q_EMIT GetLyrics();
-      break;
-    case networkremote::MsgTypeGadget::MsgType::DOWNLOAD_SONGS:
-      client->song_sender()->SendSongs(msg.requestDownloadSongs());
-      break;
-    case networkremote::MsgTypeGadget::MsgType::SONG_OFFER_RESPONSE:
-      client->song_sender()->ResponseSongOffer(msg.responseSongOffer().accepted());
-      break;
-    case networkremote::MsgTypeGadget::MsgType::RATE_SONG:
-      ParseRateSong(msg);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::REQUEST_FILES:
-      Q_EMIT SendListFiles(msg.requestListFiles().relativePath(), client);
-      break;
-    case networkremote::MsgTypeGadget::MsgType::APPEND_FILES:
-      ParseAppendFilesToPlaylist(msg);
-      break;
-
-    default:
-      break;
-  }
-
-}
-
-void IncomingDataParser::ClientConnect(const networkremote::Message &msg, NetworkRemoteClient *client) {
-
-  Q_EMIT SendInfo();
-
-  if (!client->isDownloader()) {
-    if (!msg.requestConnect().hasSendPlaylistSongs() || msg.requestConnect().sendPlaylistSongs()) {
-      Q_EMIT SendFirstData(true);
-    }
-    else {
-      Q_EMIT SendFirstData(false);
-    }
-  }
-
-}
-
-void IncomingDataParser::ParseGetPlaylistSongs(const networkremote::Message &msg) {
-  Q_EMIT SendPlaylistSongs(msg.requestPlaylistSongs().playlistId());
-}
-
-void IncomingDataParser::ParseChangeSong(const networkremote::Message &msg) {
-
-  // Get the first entry and check if there is a song
-  const networkremote::RequestChangeSong &request = msg.requestChangeSong();
-
-  // Check if we need to change the playlist
-  if (request.playlistId() != playlist_manager_->active_id()) {
-    Q_EMIT SetActivePlaylist(request.playlistId());
-  }
-
-  switch (doubleclick_playlist_addmode_) {
-    case BehaviourSettings::PlaylistAddBehaviour::Play:{
-      Q_EMIT PlayAt(request.songIndex(), false, 0, EngineBase::TrackChangeType::Manual, Playlist::AutoScroll::Maybe, false, false);
-      break;
-    }
-    case BehaviourSettings::PlaylistAddBehaviour::Enqueue:{
-      Q_EMIT Enqueue(request.playlistId(), request.songIndex());
-      if (player_->GetState() != EngineBase::State::Playing) {
-        Q_EMIT PlayAt(request.songIndex(), false, 0, EngineBase::TrackChangeType::Manual, Playlist::AutoScroll::Maybe, false, false);
-      }
-      break;
-    }
-  }
-
-}
-
-void IncomingDataParser::ParseSetRepeatMode(const networkremote::Repeat &repeat) {
-
-  switch (repeat.repeatMode()) {
-    case networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Off:
-      Q_EMIT SetRepeatMode(PlaylistSequence::RepeatMode::Off);
-      break;
-    case networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Track:
-      Q_EMIT SetRepeatMode(PlaylistSequence::RepeatMode::Track);
-      break;
-    case networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Album:
-      Q_EMIT SetRepeatMode(PlaylistSequence::RepeatMode::Album);
-      break;
-    case networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Playlist:
-      Q_EMIT SetRepeatMode(PlaylistSequence::RepeatMode::Playlist);
-      break;
-    default:
-      break;
-  }
-
-}
-
-void IncomingDataParser::ParseSetShuffleMode(const networkremote::Shuffle &shuffle) {
-
-  switch (shuffle.shuffleMode()) {
-    case networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_Off:
-      Q_EMIT SetShuffleMode(PlaylistSequence::ShuffleMode::Off);
-      break;
-    case networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_All:
-      Q_EMIT SetShuffleMode(PlaylistSequence::ShuffleMode::All);
-      break;
-    case networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_InsideAlbum:
-      Q_EMIT SetShuffleMode(PlaylistSequence::ShuffleMode::InsideAlbum);
-      break;
-    case networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_Albums:
-      Q_EMIT SetShuffleMode(PlaylistSequence::ShuffleMode::Albums);
-      break;
-    default:
-      break;
-  }
-
-}
-
-void IncomingDataParser::ParseInsertUrls(const networkremote::Message &msg) {
-
-  const networkremote::RequestInsertUrls &request = msg.requestInsertUrls();
-  int playlist_id = request.playlistId();
-
-  // Insert plain urls without metadata
-  if (!request.urls().empty()) {
-    QList<QUrl> urls;
-    for (auto it = request.urls().begin(); it != request.urls().end(); ++it) {
-      const QString s = *it;
-      urls << QUrl(s);
-    }
-
-    if (request.hasNewPlaylistName()) {
-      playlist_id = playlist_manager_->New(request.newPlaylistName());
-    }
-
-    // Insert the urls
-    Q_EMIT InsertUrls(playlist_id, urls, request.position(), request.playNow(), request.enqueue());
-  }
-
-  // Add songs with metadata if present
-  if (!request.songs().empty()) {
-    SongList songs;
-    for (int i = 0; i < request.songs().size(); i++) {
-      songs << SongFromPbSongMetadata(request.songs().at(i));
-    }
-
-    // Create a new playlist if required and not already done above by InsertUrls
-    if (request.hasNewPlaylistName() && playlist_id == request.playlistId()) {
-      playlist_id = playlist_manager_->New(request.newPlaylistName());
-    }
-
-    Q_EMIT InsertSongs(request.playlistId(), songs, request.position(), request.playNow(), request.enqueue());
-  }
-
-}
-
-void IncomingDataParser::ParseRemoveSongs(const networkremote::Message &msg) {
-
-  const networkremote::RequestRemoveSongs &request = msg.requestRemoveSongs();
-
-  QList<int> songs;
-  songs.reserve(request.songs().size());
-  for (int i = 0; i < request.songs().size(); i++) {
-    songs.append(request.songs().at(i));
-  }
-
-  Q_EMIT RemoveSongs(request.playlistId(), songs);
-
-}
-
-void IncomingDataParser::ParseSendPlaylists(const networkremote::Message &msg) {
-
-  if (!msg.hasRequestPlaylistSongs() || !msg.requestPlaylists().includeClosed()) {
-    Q_EMIT SendAllActivePlaylists();
-  }
-  else {
-    Q_EMIT SendAllPlaylists();
-  }
-
-}
-
-void IncomingDataParser::ParseOpenPlaylist(const networkremote::Message &msg) {
-  Q_EMIT Open(msg.requestOpenPlaylist().playlistId());
-}
-
-void IncomingDataParser::ParseClosePlaylist(const networkremote::Message &msg) {
-  Q_EMIT Close(msg.requestClosePlaylist().playlistId());
-}
-
-void IncomingDataParser::ParseUpdatePlaylist(const networkremote::Message &msg) {
-
-  const networkremote::RequestUpdatePlaylist &req_update = msg.requestUpdatePlaylist();
-  if (req_update.hasCreateNewPlaylist() && req_update.createNewPlaylist()) {
-    Q_EMIT New(req_update.hasNewPlaylistName() ? req_update.newPlaylistName() : u"New Playlist"_s);
-    return;
-  }
-  if (req_update.hasClearPlaylist() && req_update.clearPlaylist()) {
-    Q_EMIT Clear(req_update.playlistId());
-    return;
-  }
-  if (req_update.hasNewPlaylistName() && !req_update.newPlaylistName().isEmpty()) {
-    Q_EMIT Rename(req_update.playlistId(), req_update.newPlaylistName());
-  }
-  if (req_update.hasFavorite()) {
-    Q_EMIT Favorite(req_update.playlistId(), req_update.favorite());
-  }
-
-}
-
-void IncomingDataParser::ParseRateSong(const networkremote::Message &msg) {
-
-  Q_EMIT RateCurrentSong(msg.requestRateSong().rating());
-
-}
-
-void IncomingDataParser::ParseAppendFilesToPlaylist(const networkremote::Message &msg) {
-
-  if (files_root_folder_.isEmpty()) {
-    qLog(Warning) << "Remote root dir is not set although receiving APPEND_FILES request...";
-    return;
-  }
-  QDir root_dir(files_root_folder_);
-  if (!root_dir.exists()) {
-    qLog(Warning) << "Remote root dir doesn't exist...";
-    return;
-  }
-
-  const networkremote::RequestAppendFiles &req_append = msg.requestAppendFiles();
-  QString relative_path = req_append.relativePath();
-  if (relative_path.startsWith("/"_L1)) relative_path.remove(0, 1);
-
-  QFileInfo fi_folder(root_dir, relative_path);
-  if (!fi_folder.exists()) {
-    qLog(Warning) << "Remote relative path " << relative_path << " doesn't exist...";
-    return;
-  }
-  else if (!fi_folder.isDir()) {
-    qLog(Warning) << "Remote relative path " << relative_path << " is not a directory...";
-    return;
-  }
-  else if (root_dir.relativeFilePath(fi_folder.absoluteFilePath()).startsWith("../"_L1)) {
-    qLog(Warning) << "Remote relative path " << relative_path << " should not be accessed...";
-    return;
-  }
-
-  QList<QUrl> urls;
-  QDir dir(fi_folder.absoluteFilePath());
-  for (const auto &file : req_append.files()) {
-    QFileInfo fi(dir, file);
-    if (fi.exists()) urls << QUrl::fromLocalFile(fi.canonicalFilePath());
-  }
-  if (!urls.isEmpty()) {
-    MimeData *data = new MimeData;
-    data->setUrls(urls);
-    if (req_append.hasPlayNow()) {
-      data->play_now_ = req_append.playNow();
-    }
-    if (req_append.hasClearFirst()) {
-      data->clear_first_ = req_append.clearFirst();
-    }
-    if (req_append.hasNewPlaylistName()) {
-      QString playlist_name = req_append.newPlaylistName();
-      if (!playlist_name.isEmpty()) {
-        data->open_in_new_playlist_ = true;
-        data->name_for_new_playlist_ = playlist_name;
-      }
-    }
-    else if (req_append.hasPlaylistId()) {
-      // If playing we will drop the files in another playlist
-      if (player_->GetState() == EngineBase::State::Playing) {
-        data->playlist_id_ = req_append.playlistId();
-      }
-      else {
-        // As we may play the song, we change the current playlist
-        Q_EMIT SetCurrentPlaylist(req_append.playlistId());
-      }
-    }
-    Q_EMIT AddToPlaylistSignal(data);
-  }
-
-}

src/networkremote/incomingdataparser.h

@@ -1,123 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef INCOMINGDATAPARSER_H
-#define INCOMINGDATAPARSER_H
-
-#include <QObject>
-#include <QString>
-#include <QStringList>
-
-#include "constants/behavioursettings.h"
-#include "core/player.h"
-#include "networkremoteclient.h"
-#include "networkremotemessages.qpb.h"
-#include "playlist/playlistsequence.h"
-
-class PlaylistManager;
-class AudioScrobbler;
-
-class IncomingDataParser : public QObject {
-  Q_OBJECT
-
- public:
-  explicit IncomingDataParser(const SharedPtr<Player> player,
-                              const SharedPtr<PlaylistManager> playlist_manager,
-                              const SharedPtr<AudioScrobbler> scrobbler,
-                              QObject *parent = nullptr);
-
-  ~IncomingDataParser();
-
-  bool close_connection() const;
-
-  void SetRemoteRootFiles(const QString &files_root_folder);
-
- public Q_SLOTS:
-  void Parse(const networkremote::Message &msg);
-  void ReloadSettings();
-
- Q_SIGNALS:
-  void SendInfo();
-  void SendFirstData(const bool send_playlist_songs);
-  void SendAllPlaylists();
-  void SendAllActivePlaylists();
-  void SendPlaylistSongs(const int id);
-  void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString());
-  void Open(const int id);
-  void Clear(const int id);
-  void Close(const int id);
-  void Rename(const int id, const QString &new_playlist_name);
-  void Favorite(const int id, const bool favorite);
-  void GetLyrics();
-  void Love();
-
-  void Play();
-  void PlayPause();
-  void Pause();
-  void Stop(const bool stop_after = false);
-  void StopAfterCurrent();
-  void Next();
-  void Previous();
-  void SetVolume(const uint volume);
-  void PlayAt(const int index, const bool pause, const quint64 offset_nanosec, EngineBase::TrackChangeFlags change, const Playlist::AutoScroll autoscroll, const bool reshuffle, const bool force_inform);
-  void Enqueue(const int id, const int i);
-  void SetActivePlaylist(const int id);
-  void ShuffleCurrent();
-  void SetRepeatMode(const PlaylistSequence::RepeatMode repeat_mode);
-  void SetShuffleMode(const PlaylistSequence::ShuffleMode shuffle_mode);
-  void InsertUrls(const int id, const QList<QUrl> &urls, const int pos = -1, const bool play_now = false, const bool enqueue = false);
-  void InsertSongs(const int id, const SongList &songs, const int pos, const bool play_now, const bool enqueue);
-  void RemoveSongs(const int id, const QList<int> &indices);
-  void SeekTo(const quint64 seconds);
-  void SendCollection(NetworkRemoteClient *client);
-  void RateCurrentSong(const float rating);
-
-  void SendListFiles(const QString &path, NetworkRemoteClient *client);
-  void AddToPlaylistSignal(QMimeData *data);
-  void SetCurrentPlaylist(const int id);
-
- private:
-  const SharedPtr<Player> player_;
-  const SharedPtr<PlaylistManager> playlist_manager_;
-  const SharedPtr<AudioScrobbler> scrobbler_;
-
-  bool close_connection_;
-  BehaviourSettings::PlaylistAddBehaviour doubleclick_playlist_addmode_;
-  QString files_root_folder_;
-
-  void ClientConnect(const networkremote::Message &msg, NetworkRemoteClient *client);
-  Song SongFromPbSongMetadata(const networkremote::SongMetadata &pb_song_metadata) const;
-
-  void ParseGetPlaylistSongs(const networkremote::Message &msg);
-  void ParseChangeSong(const networkremote::Message &msg);
-  void ParseSetRepeatMode(const networkremote::Repeat &repeat);
-  void ParseSetShuffleMode(const networkremote::Shuffle &shuffle);
-  void ParseInsertUrls(const networkremote::Message &msg);
-  void ParseRemoveSongs(const networkremote::Message &msg);
-  void ParseSendPlaylists(const networkremote::Message &msg);
-  void ParseOpenPlaylist(const networkremote::Message &msg);
-  void ParseClosePlaylist(const networkremote::Message &msg);
-  void ParseUpdatePlaylist(const networkremote::Message &msg);
-  void ParseRateSong(const networkremote::Message &msg);
-  void ParseAppendFilesToPlaylist(const networkremote::Message &msg);
-};
-
-#endif  // INCOMINGDATAPARSER_H

src/networkremote/networkremote.cpp

@@ -1,231 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <memory>
-
-#include <QDataStream>
-#include <QHostInfo>
-#include <QNetworkProxy>
-#include <QTcpSocket>
-#include <QTcpServer>
-#include <QSettings>
-
-#include "constants/networkremotesettingsconstants.h"
-#include "constants/networkremoteconstants.h"
-#include "core/logging.h"
-#include "core/zeroconf.h"
-#include "playlist/playlistmanager.h"
-#include "covermanager/currentalbumcoverloader.h"
-#include "networkremote.h"
-#include "incomingdataparser.h"
-#include "outgoingdatacreator.h"
-
-using namespace Qt::Literals::StringLiterals;
-using namespace NetworkRemoteSettingsConstants;
-using namespace NetworkRemoteConstants;
-using std::make_unique;
-
-NetworkRemote::NetworkRemote(const SharedPtr<Database> database,
-                             const SharedPtr<Player> player,
-                             const SharedPtr<CollectionBackend> collection_backend,
-                             const SharedPtr<PlaylistManager> playlist_manager,
-                             const SharedPtr<PlaylistBackend> playlist_backend,
-                             const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader,
-                             const SharedPtr<AudioScrobbler> scrobbler,
-                             QObject *parent)
-    : QObject(parent),
-      database_(database),
-      player_(player),
-      collection_backend_(collection_backend),
-      playlist_manager_(playlist_manager),
-      playlist_backend_(playlist_backend),
-      current_albumcover_loader_(current_albumcover_loader),
-      scrobbler_(scrobbler),
-      enabled_(false),
-      port_(0),
-      allow_public_access_(true),
-      signals_connected_(false) {
-
-  setObjectName("NetworkRemote");
-
-  ReloadSettings();
-
-}
-
-NetworkRemote::~NetworkRemote() { StopServer(); }
-
-void NetworkRemote::ReloadSettings() {
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-  enabled_ = s.value(kEnabled, false).toBool();
-  port_ = s.value("port", kDefaultServerPort).toInt();
-  allow_public_access_ = s.value(kAllowPublicAccess, false).toBool();
-  s.endGroup();
-
-  SetupServer();
-  StopServer();
-  StartServer();
-
-}
-
-void NetworkRemote::SetupServer() {
-
-  server_ = make_unique<QTcpServer>();
-  server_ipv6_ = make_unique<QTcpServer>();
-  incoming_data_parser_ = make_unique<IncomingDataParser>(player_, playlist_manager_, scrobbler_);
-  outgoing_data_creator_ = make_unique<OutgoingDataCreator>(database_, player_, playlist_manager_, playlist_backend_);
-
-  outgoing_data_creator_->SetClients(&clients_);
-
-  QObject::connect(&*current_albumcover_loader_, &CurrentAlbumCoverLoader::AlbumCoverLoaded, &*outgoing_data_creator_, &OutgoingDataCreator::CurrentSongChanged);
-
-  QObject::connect(&*server_, &QTcpServer::newConnection, this, &NetworkRemote::AcceptConnection);
-  QObject::connect(&*server_ipv6_, &QTcpServer::newConnection, this, &NetworkRemote::AcceptConnection);
-
-  QObject::connect(&*incoming_data_parser_, &IncomingDataParser::AddToPlaylistSignal, this, &NetworkRemote::AddToPlaylistSignal);
-  QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SetCurrentPlaylist, this, &NetworkRemote::SetCurrentPlaylist);
-
-}
-
-void NetworkRemote::StartServer() {
-
-  if (!enabled_) {
-    qLog(Info) << "Network Remote deactivated";
-    return;
-  }
-
-  qLog(Info) << "Starting network remote";
-
-  server_->setProxy(QNetworkProxy::NoProxy);
-  server_ipv6_->setProxy(QNetworkProxy::NoProxy);
-
-  server_->listen(QHostAddress::Any, port_);
-  server_ipv6_->listen(QHostAddress::AnyIPv6, port_);
-
-  qLog(Info) << "Listening on port " << port_;
-
-  if (Zeroconf::GetZeroconf()) {
-    QString name = QLatin1String("Strawberry on %1").arg(QHostInfo::localHostName());
-    Zeroconf::GetZeroconf()->Publish(u"local"_s, u"_strawberry._tcp"_s, name, port_);
-  }
-
-}
-
-void NetworkRemote::StopServer() {
-
-  if (server_->isListening()) {
-    outgoing_data_creator_->DisconnectAllClients();
-    server_->close();
-    server_ipv6_->close();
-    qDeleteAll(clients_);
-    clients_.clear();
-  }
-
-}
-
-void NetworkRemote::AcceptConnection() {
-
-  if (!signals_connected_) {
-    signals_connected_ = true;
-
-    QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SendInfo, &*outgoing_data_creator_, &OutgoingDataCreator::SendInfo);
-    QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SendFirstData, &*outgoing_data_creator_, &OutgoingDataCreator::SendFirstData);
-    QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SendAllPlaylists, &*outgoing_data_creator_, &OutgoingDataCreator::SendAllPlaylists);
-    QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SendAllActivePlaylists, &*outgoing_data_creator_, &OutgoingDataCreator::SendAllActivePlaylists);
-    QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SendPlaylistSongs, &*outgoing_data_creator_, &OutgoingDataCreator::SendPlaylistSongs);
-
-    QObject::connect(&*playlist_manager_, &PlaylistManager::ActiveChanged, &*outgoing_data_creator_, &OutgoingDataCreator::ActiveChanged);
-    QObject::connect(&*playlist_manager_, &PlaylistManager::PlaylistChanged, &*outgoing_data_creator_, &OutgoingDataCreator::PlaylistChanged);
-    QObject::connect(&*playlist_manager_, &PlaylistManager::PlaylistAdded, &*outgoing_data_creator_, &OutgoingDataCreator::PlaylistAdded);
-    QObject::connect(&*playlist_manager_, &PlaylistManager::PlaylistRenamed, &*outgoing_data_creator_, &OutgoingDataCreator::PlaylistRenamed);
-    QObject::connect(&*playlist_manager_, &PlaylistManager::PlaylistClosed, &*outgoing_data_creator_, &OutgoingDataCreator::PlaylistClosed);
-    QObject::connect(&*playlist_manager_, &PlaylistManager::PlaylistDeleted, &*outgoing_data_creator_, &OutgoingDataCreator::PlaylistDeleted);
-
-    QObject::connect(&*player_, &Player::VolumeChanged, &*outgoing_data_creator_, &OutgoingDataCreator::VolumeChanged);
-    QObject::connect(&*player_->engine(), &EngineBase::StateChanged, &*outgoing_data_creator_, &OutgoingDataCreator::StateChanged);
-
-    QObject::connect(&*playlist_manager_->sequence(), &PlaylistSequence::RepeatModeChanged, &*outgoing_data_creator_, &OutgoingDataCreator::SendRepeatMode);
-    QObject::connect(&*playlist_manager_->sequence(), &PlaylistSequence::ShuffleModeChanged, &*outgoing_data_creator_, &OutgoingDataCreator::SendShuffleMode);
-
-    QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SendCollection, &*outgoing_data_creator_, &OutgoingDataCreator::SendCollection);
-    QObject::connect(&*incoming_data_parser_, &IncomingDataParser::SendListFiles, &*outgoing_data_creator_, &OutgoingDataCreator::SendListFiles);
-  }
-
-  QTcpServer *server = qobject_cast<QTcpServer*>(sender());
-  QTcpSocket *client_socket = server->nextPendingConnection();
-
-  if (!allow_public_access_ && !IpIsPrivate(client_socket->peerAddress())) {
-    qLog(Warning) << "Got connection from public IP address" << client_socket->peerAddress().toString();
-    client_socket->close();
-    client_socket->deleteLater();
-  }
-  else {
-    CreateRemoteClient(client_socket);
-  }
-
-}
-
-bool NetworkRemote::IpIsPrivate(const QHostAddress &address) {
-
-  return
-    // Localhost v4
-    address.isInSubnet(QHostAddress::parseSubnet(u"127.0.0.0/8"_s)) ||
-    // Link Local v4
-    address.isInSubnet(QHostAddress::parseSubnet(u"169.254.1.0/16"_s)) ||
-    // Link Local v6
-    address.isInSubnet(QHostAddress::parseSubnet(u"::1/128"_s)) ||
-    address.isInSubnet(QHostAddress::parseSubnet(u"fe80::/10"_s)) ||
-    // Private v4 range
-    address.isInSubnet(QHostAddress::parseSubnet(u"192.168.0.0/16"_s)) ||
-    address.isInSubnet(QHostAddress::parseSubnet(u"172.16.0.0/12"_s)) ||
-    address.isInSubnet(QHostAddress::parseSubnet(u"10.0.0.0/8"_s)) ||
-    // Private v4 range translated to v6
-    address.isInSubnet(QHostAddress::parseSubnet(u"::ffff:192.168.0.0/112"_s)) ||
-    address.isInSubnet(QHostAddress::parseSubnet(u"::ffff:172.16.0.0/108"_s)) ||
-    address.isInSubnet(QHostAddress::parseSubnet(u"::ffff:10.0.0.0/104"_s)) ||
-    // Private v6 range
-    address.isInSubnet(QHostAddress::parseSubnet(u"fc00::/7"_s));
-
-}
-
-void NetworkRemote::CreateRemoteClient(QTcpSocket *client_socket) {
-
-  if (client_socket) {
-
-    NetworkRemoteClient *client = new NetworkRemoteClient(player_, collection_backend_, playlist_manager_, client_socket);
-    clients_.push_back(client);
-
-    // Update the Remote Root Files for the latest Client
-    outgoing_data_creator_->SetMusicExtensions(client->files_music_extensions());
-    outgoing_data_creator_->SetRemoteRootFiles(client->files_root_folder());
-    incoming_data_parser_->SetRemoteRootFiles(client->files_root_folder());
-    // Update OutgoingDataCreator with latest allow_downloads setting
-    outgoing_data_creator_->SetAllowDownloads(client->allow_downloads());
-
-    // Connect the signal to parse data
-    QObject::connect(client, &NetworkRemoteClient::Parse, &*incoming_data_parser_, &IncomingDataParser::Parse);
-
-    client->IncomingData();
-
-  }
-
-}

src/networkremote/networkremote.h

@@ -1,98 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef NETWORKREMOTE_H
-#define NETWORKREMOTE_H
-
-#include <QObject>
-#include <QList>
-
-#include "includes/shared_ptr.h"
-#include "includes/scoped_ptr.h"
-
-class QMimeData;
-class QHostAddress;
-class QTcpServer;
-class QTcpSocket;
-
-class Database;
-class Player;
-class CollectionBackend;
-class PlaylistManager;
-class PlaylistBackend;
-class CurrentAlbumCoverLoader;
-class AudioScrobbler;
-class IncomingDataParser;
-class OutgoingDataCreator;
-class NetworkRemoteClient;
-
-class NetworkRemote : public QObject {
-  Q_OBJECT
-
- public:
-  explicit NetworkRemote(const SharedPtr<Database> database,
-                         const SharedPtr<Player> player,
-                         const SharedPtr<CollectionBackend> collection_backend,
-                         const SharedPtr<PlaylistManager> playlist_manager,
-                         const SharedPtr<PlaylistBackend> playlist_backend,
-                         const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader,
-                         const SharedPtr<AudioScrobbler> scrobbler,
-                         QObject *parent = nullptr);
-
-  ~NetworkRemote();
-
- Q_SIGNALS:
-  void AddToPlaylistSignal(QMimeData *data);
-  void SetCurrentPlaylist(const int id);
-
- public Q_SLOTS:
-  void SetupServer();
-  void StartServer();
-  void ReloadSettings();
-  void AcceptConnection();
-
- private:
-  const SharedPtr<Database> database_;
-  const SharedPtr<Player> player_;
-  const SharedPtr<CollectionBackend> collection_backend_;
-  const SharedPtr<PlaylistManager> playlist_manager_;
-  const SharedPtr<PlaylistBackend> playlist_backend_;
-  const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader_;
-  const SharedPtr<AudioScrobbler> scrobbler_;
-
-  ScopedPtr<QTcpServer> server_;
-  ScopedPtr<QTcpServer> server_ipv6_;
-  ScopedPtr<IncomingDataParser> incoming_data_parser_;
-  ScopedPtr<OutgoingDataCreator> outgoing_data_creator_;
-
-  bool enabled_;
-  quint16 port_;
-  bool allow_public_access_;
-  bool signals_connected_;
-
-  QList<NetworkRemoteClient*> clients_;
-
-  void StopServer();
-  void CreateRemoteClient(QTcpSocket *client_socket);
-  bool IpIsPrivate(const QHostAddress &address);
-};
-
-#endif  // NETWORKREMOTE_H

src/networkremote/networkremoteclient.cpp

@@ -1,223 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2013, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QDataStream>
-#include <QTcpSocket>
-#include <QProtobufSerializer>
-#include <QSettings>
-
-#include "constants/networkremotesettingsconstants.h"
-#include "core/logging.h"
-#include "networkremote.h"
-#include "networkremoteclient.h"
-#include "networkremotemessages.qpb.h"
-
-using namespace Qt::Literals::StringLiterals;
-using namespace NetworkRemoteSettingsConstants;
-
-NetworkRemoteClient::NetworkRemoteClient(const SharedPtr<Player> player,
-                                         const SharedPtr<CollectionBackend> collection_backend,
-                                         const SharedPtr<PlaylistManager> playlist_manager,
-                                         QTcpSocket *socket,
-                                         QObject *parent)
-    : QObject(parent),
-      player_(player),
-      socket_(socket),
-      downloader_(false),
-      reading_protobuf_(false),
-      expected_length_(0),
-      song_sender_(new SongSender(player, collection_backend, playlist_manager, this)) {
-
-  QObject::connect(socket, &QTcpSocket::readyRead, this, &NetworkRemoteClient::ReadyRead);
-  QObject::connect(socket, &QTcpSocket::channelReadyRead, this, &NetworkRemoteClient::ReadyRead);
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-  use_auth_code_ = s.value(kUseAuthCode, false).toBool();
-  auth_code_ = s.value(kAuthCode, 0).toInt();
-  files_root_folder_ = s.value(kFilesRootFolder, ""_L1).toString();
-  s.endGroup();
-
-  authenticated_ = !use_auth_code_;
-
-}
-
-NetworkRemoteClient::~NetworkRemoteClient() {
-
-  socket_->close();
-  if (socket_->state() == QAbstractSocket::ConnectedState) {
-    socket_->waitForDisconnected(2000);
-  }
-
-  song_sender_->deleteLater();
-  socket_->deleteLater();
-
-}
-
-void NetworkRemoteClient::setDownloader(const bool downloader) { downloader_ = downloader; }
-
-void NetworkRemoteClient::ReadyRead() {
-
-  IncomingData();
-
-}
-
-void NetworkRemoteClient::IncomingData() {
-
-  while (socket_->bytesAvailable()) {
-    if (!reading_protobuf_) {
-      // If we have less than 4 byte, we cannot read the length. Wait for more data
-      if (socket_->bytesAvailable() < 4) {
-        break;
-      }
-      // Read the length of the next message
-      QDataStream s(socket_);
-      s >> expected_length_;
-
-      // Receiving more than 128 MB is very unlikely
-      // Flush the data and disconnect the client
-      if (expected_length_ > 134217728) {
-        qLog(Debug) << "Received invalid data, disconnect client";
-        qLog(Debug) << "expected_length_ =" << expected_length_;
-        socket_->close();
-        return;
-      }
-
-      reading_protobuf_ = true;
-    }
-
-    // Read some of the message
-    buffer_.append(socket_->read(static_cast<qint32>(expected_length_) - buffer_.size()));
-
-    // Did we get everything?
-    if (buffer_.size() == static_cast<qint32>(expected_length_)) {
-
-      ParseMessage(buffer_);
-
-      // Clear the buffer
-      buffer_.clear();
-      reading_protobuf_ = false;
-    }
-  }
-
-}
-
-void NetworkRemoteClient::ParseMessage(const QByteArray &data) {
-
-  QProtobufSerializer serializer;
-  networkremote::Message msg;
-  if (!serializer.deserialize(&msg, data)) {
-    qLog(Info) << "Couldn't parse data:" << serializer.lastErrorString();
-    return;
-  }
-
-  if (msg.type() == networkremote::MsgTypeGadget::MsgType::CONNECT && use_auth_code_) {
-    if (msg.requestConnect().authCode() != auth_code_) {
-      DisconnectClient(networkremote::ReasonDisconnectGadget::ReasonDisconnect::Wrong_Auth_Code);
-      return;
-    }
-    else {
-      authenticated_ = true;
-    }
-  }
-
-  if (msg.type() == networkremote::MsgTypeGadget::MsgType::CONNECT) {
-    setDownloader(msg.requestConnect().hasDownloader() && msg.requestConnect().downloader());
-    qLog(Debug) << "Downloader" << downloader_;
-  }
-
-  // Check if downloads are allowed
-  if (msg.type() == networkremote::MsgTypeGadget::MsgType::DOWNLOAD_SONGS && !allow_downloads_) {
-    DisconnectClient(networkremote::ReasonDisconnectGadget::ReasonDisconnect::Download_Forbidden);
-    return;
-  }
-
-  if (msg.type() == networkremote::MsgTypeGadget::MsgType::DISCONNECT) {
-    socket_->abort();
-    qLog(Debug) << "Client disconnected";
-    return;
-  }
-
-  // Check if the client has sent the correct auth code
-  if (!authenticated_) {
-    DisconnectClient(networkremote::ReasonDisconnectGadget::ReasonDisconnect::Not_Authenticated);
-    return;
-  }
-
-  // Now parse the other data
-  Q_EMIT Parse(msg);
-
-}
-
-void NetworkRemoteClient::DisconnectClient(const networkremote::ReasonDisconnectGadget::ReasonDisconnect reason) {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::DISCONNECT);
-
-  networkremote::ResponseDisconnect response_disconnect;
-  response_disconnect.setReasonDisconnect(reason);
-  msg.setResponseDisconnect(response_disconnect);
-  SendDataToClient(&msg);
-
-  // Just close the connection. The next time the outgoing data creator sends a keep alive, the client will be deleted
-  socket_->close();
-
-}
-
-// Sends data to client without check if authenticated
-void NetworkRemoteClient::SendDataToClient(networkremote::Message *msg) {
-
-  //msg->setVersion(msg);
-
-  if (socket_->state() == QTcpSocket::ConnectedState) {
-    // Serialize the message
-    QProtobufSerializer serializer;
-    const QByteArray data = serializer.serialize(msg);
-
-    // Write the length of the data first
-    QDataStream s(socket_);
-    s << static_cast<qint32>(data.length());
-    if (downloader_) {
-      // Don't use QDataSteam for large files
-      socket_->write(data.data(), data.length());
-    }
-    else {
-      s.writeRawData(data.data(), data.length());
-    }
-
-    // Do NOT flush data here! If the client is already disconnected, it causes a SIGPIPE termination!!!
-  }
-  else {
-    qDebug() << "Closed";
-    socket_->close();
-  }
-
-}
-
-void NetworkRemoteClient::SendData(networkremote::Message *msg) {
-
-  if (authenticated_) {
-    SendDataToClient(msg);
-  }
-
-}
-
-QAbstractSocket::SocketState NetworkRemoteClient::State() const { return socket_->state(); }

src/networkremote/networkremoteclient.h

@@ -1,89 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2013, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef NETWORKREMOTECLIENT_H
-#define NETWORKREMOTECLIENT_H
-
-#include <QObject>
-#include <QByteArray>
-#include <QString>
-#include <QStringList>
-#include <QAbstractSocket>
-
-#include "networkremotemessages.qpb.h"
-#include "songsender.h"
-
-class QTcpSocket;
-
-class NetworkRemoteClient : public QObject {
-  Q_OBJECT
-
- public:
-  explicit NetworkRemoteClient(const SharedPtr<Player> player,
-                               const SharedPtr<CollectionBackend> collection_backend,
-                               const SharedPtr<PlaylistManager> playlist_manager,
-                               QTcpSocket *client,
-                               QObject *parent = nullptr);
-
-  ~NetworkRemoteClient();
-
-  void SendData(networkremote::Message *msg);
-  QAbstractSocket::SocketState State() const;
-  void setDownloader(const bool downloader);
-  bool isDownloader() const { return downloader_; }
-  void DisconnectClient(const networkremote::ReasonDisconnectGadget::ReasonDisconnect reason);
-
-  SongSender *song_sender() const { return song_sender_; }
-  const QString &files_root_folder() const { return files_root_folder_; }
-  const QStringList &files_music_extensions() const { return files_music_extensions_; }
-  bool allow_downloads() const { return allow_downloads_; }
-
- public Q_SLOTS:
-  void ReadyRead();
-  void IncomingData();
-
- Q_SIGNALS:
-  void Parse(const networkremote::Message &msg);
-
- private:
-  void ParseMessage(const QByteArray &data);
-  void SendDataToClient(networkremote::Message *msg);
-
- private:
-  const SharedPtr<Player> player_;
-  QTcpSocket *socket_;
-
-  bool use_auth_code_;
-  int auth_code_;
-  bool authenticated_;
-  bool allow_downloads_;
-  bool downloader_;
-
-  bool reading_protobuf_;
-  quint32 expected_length_;
-  QByteArray buffer_;
-  SongSender *song_sender_;
-
-  QString files_root_folder_;
-  QStringList files_music_extensions_;
-};
-
-#endif  // NETWORKREMOTECLIENT_H

src/networkremote/networkremotemessages.proto

@@ -1,422 +0,0 @@
-syntax = "proto2";
-
-package networkremote;
-
-enum MsgType {
-
-  UNKNOWN = 0;
-
-  CONNECT = 1;
-  DISCONNECT = 2;
-
-  INFO = 3;
-  KEEP_ALIVE = 4;
-
-  GET_COLLECTION = 5;
-
-  GET_PLAYLISTS = 6;
-  GET_PLAYLIST_SONGS = 7;
-  SEND_PLAYLISTS = 8;
-  SEND_PLAYLIST_SONGS = 10;
-
-  OPEN_PLAYLIST = 11;
-  CLOSE_PLAYLIST = 12;
-  UPDATE_PLAYLIST = 13;
-  REMOVE_PLAYLIST_SONGS = 14;
-  PLAYLIST_INSERT_URLS = 15;
-
-  CHANGE_SONG = 21;
-  SET_VOLUME = 22;
-  SET_TRACK_POSITION = 23;
-  GET_LYRICS = 24;
-  DOWNLOAD_SONGS = 25;
-  SONG_OFFER_RESPONSE = 26;
-  SONG_OFFER_FILE_CHUNK = 27;
-  CURRENT_METAINFO = 28;
-  ENGINE_STATE_CHANGED = 29;
-  UPDATE_TRACK_POSITION = 30;
-  ACTIVE_PLAYLIST_CHANGED = 31;
-  FIRST_DATA_SENT_COMPLETE = 32;
-  LYRICS = 33;
-  DOWNLOAD_QUEUE_EMPTY = 34;
-  COLLECTION_CHUNK = 35;
-  DOWNLOAD_TOTAL_SIZE = 36;
-  TRANSCODING_FILES = 37;
-
-  PLAYPAUSE = 101;
-  PLAY = 102;
-  PAUSE = 103;
-  STOP = 104;
-  STOP_AFTER = 105;
-  NEXT = 106;
-  PREVIOUS = 107;
-  SHUFFLE_PLAYLIST = 108;
-
-  REPEAT = 111;
-  SHUFFLE = 112;
-
-  LIST_FILES = 121;
-  REQUEST_FILES = 122;
-  APPEND_FILES = 123;
-
-  LOVE = 131;
-  RATE_SONG = 132;
-
-}
-
-enum EngineState {
-  EngineState_Empty = 0;
-  EngineState_Idle = 1;
-  EngineState_Playing = 2;
-  EngineState_Paused = 3;
-}
-
-message SongMetadata {
-
-  enum Source {
-    Source_Unknown = 0;
-    Source_LocalFile = 1;
-    Source_Collection = 2;
-    Source_CDDA = 3;
-    Source_Device = 4;
-    Source_Stream = 5;
-    Source_Tidal = 6;
-    Source_Subsonic = 7;
-    Source_Qobuz = 8;
-    Source_SomaFM = 9;
-    Source_RadioParadise = 10;
-    Source_Spotify = 11;
-  }
-
-  enum FileType {
-    FileType_Unknown = 0;
-    FileType_WAV = 1;
-    FileType_FLAC = 2;
-    FileType_WavPack = 3;
-    FileType_OggFlac = 4;
-    FileType_OggVorbis = 5;
-    FileType_OggOpus = 6;
-    FileType_OggSpeex = 7;
-    FileType_MPEG = 8;
-    FileType_MP4 = 9;
-    FileType_ASF = 10;
-    FileType_AIFF = 11;
-    FileType_MPC = 12;
-    FileType_TrueAudio = 13;
-    FileType_DSF = 14;
-    FileType_DSDIFF = 15;
-    FileType_PCM = 16;
-    FileType_APE = 17;
-    FileType_MOD = 18;
-    FileType_S3M = 19;
-    FileType_XM = 20;
-    FileType_IT = 21;
-    FileType_SPC = 22;
-    FileType_VGM = 23;
-    FileType_CDDA = 90;
-    FileType_Stream = 91;
-  }
-
-  optional int32 song_id = 1;
-  optional int32 index = 2;
-  optional string title = 3;
-  optional string album = 4;
-  optional string artist = 5;
-  optional string albumartist = 6;
-  optional int32 track = 7;
-  optional int32 disc = 8;
-  optional string pretty_year = 9;
-  optional string genre = 10;
-  optional uint32 playcount = 11;
-  optional string pretty_length = 12;
-  optional bytes art = 13;
-  optional int64 length = 14;
-  optional bool is_local = 15;
-  optional Source source = 22;
-  optional FileType filetype = 23;
-  optional string filename = 16;
-  optional int64 file_size = 17;
-  optional float rating = 18;
-  optional string url = 19;
-  optional string art_automatic = 20;
-  optional string art_manual = 21;
-
-}
-
-message Playlist {
-  optional int32 playlist_id = 1;
-  optional string name = 2;
-  optional int32 item_count = 3;
-  optional bool active = 4;
-  optional bool closed = 5;
-  optional bool favorite = 6;
-}
-
-enum RepeatMode {
-  RepeatMode_Off = 0;
-  RepeatMode_Track = 1;
-  RepeatMode_Album = 2;
-  RepeatMode_Playlist = 3;
-  RepeatMode_OneByOne = 4;
-  RepeatMode_Intro = 5;
-}
-
-enum ShuffleMode {
-  ShuffleMode_Off = 0;
-  ShuffleMode_All = 1;
-  ShuffleMode_InsideAlbum = 2;
-  ShuffleMode_Albums = 3;
-}
-
-message RequestPlaylists {
-  optional bool include_closed = 1;
-}
-
-message RequestPlaylistSongs {
-  optional int32 playlist_id = 1;
-}
-
-message RequestChangeSong {
-  optional int32 playlist_id = 1;
-  optional int32 song_index = 2;
-}
-
-message RequestSetVolume {
-  optional uint32 volume = 1;
-}
-
-message Repeat {
-  optional RepeatMode repeat_mode = 1;
-}
-
-message Shuffle {
-  optional ShuffleMode shuffle_mode = 1;
-}
-
-message ResponseInfo {
-  optional string version = 1;
-  optional EngineState state = 2;
-  optional bool allow_downloads = 3;
-  repeated string files_music_extensions = 4;
-}
-
-message ResponseCurrentMetadata {
-  optional SongMetadata song_metadata = 1;
-}
-
-message ResponsePlaylists {
-  repeated Playlist playlist = 1;
-  optional bool include_closed = 2;
-}
-
-message ResponsePlaylistSongs {
-  optional Playlist requested_playlist = 1;
-  repeated SongMetadata songs = 2;
-}
-
-message ResponseEngineStateChanged {
-  optional EngineState state = 1;
-}
-
-message ResponseUpdateTrackPosition {
-  optional int32 position = 1;
-}
-
-message RequestConnect {
-  optional int32 auth_code = 1;
-  optional bool send_playlist_songs = 2;
-  optional bool downloader = 3;
-}
-
-enum ReasonDisconnect {
-  Server_Shutdown = 1;
-  Wrong_Auth_Code = 2;
-  Not_Authenticated = 3;
-  Download_Forbidden = 4;
-}
-
-message ResponseDisconnect {
-  optional ReasonDisconnect reason_disconnect = 1;
-}
-
-message ResponseActiveChanged {
-  optional int32 playlist_id = 1;
-}
-
-message RequestSetTrackPosition {
-  optional int32 position = 1;
-}
-
-message RequestInsertUrls {
-
-  optional int32 playlist_id = 1;
-  repeated string urls = 2;
-  optional int32 position = 3 [default = -1];
-  optional bool play_now = 4 [default = false];
-  optional bool enqueue = 5 [default = false];
-  repeated SongMetadata songs = 6;
-  optional string new_playlist_name = 7;
-
-}
-
-message RequestRemoveSongs {
-  optional int32 playlist_id = 1;
-  repeated int32 songs = 2;
-}
-
-message RequestOpenPlaylist {
-  optional int32 playlist_id = 1;
-}
-
-message RequestClosePlaylist {
-  optional int32 playlist_id = 1;
-}
-
-message RequestUpdatePlaylist {
-  optional int32 playlist_id = 1;
-  optional string new_playlist_name = 2;
-  optional bool favorite = 3;
-  optional bool create_new_playlist = 4;
-  optional bool clear_playlist = 5;
-}
-
-message ResponseLyrics {
-  repeated Lyric lyrics = 1;
-}
-message Lyric {
-  optional string song_id = 1;
-  optional string title = 2;
-  optional string content = 3;
-}
-
-enum DownloadItem {
-  CurrentItem = 1;
-  ItemAlbum = 2;
-  APlaylist = 3;
-  Urls = 4;
-}
-
-message RequestDownloadSongs {
-  optional DownloadItem download_item = 1;
-  optional int32 playlist_id = 2;
-  repeated string urls = 3;
-  repeated int32 songs_ids = 4;
-  optional string relative_path = 5;
-}
-
-message ResponseSongFileChunk {
-  optional int32 chunk_number = 1;
-  optional int32 chunk_count = 2;
-  optional int32 file_number = 3;
-  optional int32 file_count = 4;
-  optional SongMetadata song_metadata = 6;
-  optional bytes data = 7;
-  optional int64 size = 8;
-  optional bytes file_hash = 9;
-}
-
-message ResponseCollectionChunk {
-  optional int32 chunk_number = 1;
-  optional int32 chunk_count = 2;
-  optional bytes data = 3;
-  optional int64 size = 4;
-  optional bytes file_hash = 5;
-}
-
-message ResponseSongOffer {
-  optional bool accepted = 1;
-}
-
-message RequestRateSong {
-  optional float rating = 1;
-}
-
-message ResponseDownloadTotalSize {
-  optional int64 total_size = 1;
-  optional int64 file_count = 2;
-}
-
-message ResponseTranscoderStatus {
-  optional int32 processed = 1;
-  optional int32 total = 2;
-}
-
-message RequestListFiles {
-  optional string relative_path = 1;
-}
-
-message FileMetadata {
-  optional string filename = 1;
-  optional bool is_dir = 2;
-}
-
-message ResponseListFiles {
-  enum Error {
-    NONE = 0;
-    ROOT_DIR_NOT_SET = 1;
-    DIR_NOT_ACCESSIBLE = 2;
-    DIR_NOT_EXIST = 3;
-    UNKNOWN = 4;
-  }
-  optional string relative_path = 1;
-  repeated FileMetadata files = 2;
-  optional Error error = 3;
-}
-
-message RequestAppendFiles {
-  optional int32 playlist_id = 1;
-  optional string new_playlist_name = 2;
-  optional string relative_path = 3;
-  repeated string files = 4;
-  optional bool play_now = 5;
-  optional bool clear_first = 6;
-}
-
-message Stream {
-  optional string name = 1;
-  optional string url = 2;
-  optional string url_logo = 3;
-}
-
-message Message {
-
-  optional int32 version = 1 [default = 21];
-  optional MsgType type = 2
-      [default = UNKNOWN];
-
-  optional RequestConnect request_connect = 21;
-  optional RequestPlaylists request_playlists = 27;
-  optional RequestPlaylistSongs request_playlist_songs = 10;
-  optional RequestChangeSong request_change_song = 11;
-  optional RequestSetVolume request_set_volume = 12;
-  optional RequestSetTrackPosition request_set_track_position = 23;
-  optional RequestInsertUrls request_insert_urls = 25;
-  optional RequestRemoveSongs request_remove_songs = 26;
-  optional RequestOpenPlaylist request_open_playlist = 28;
-  optional RequestClosePlaylist request_close_playlist = 29;
-  optional RequestUpdatePlaylist request_update_playlist = 53;
-  optional RequestDownloadSongs request_download_songs = 31;
-  optional RequestRateSong request_rate_song = 35;
-  optional RequestListFiles request_list_files = 50;
-  optional RequestAppendFiles request_append_files = 51;
-
-  optional Repeat repeat = 13;
-  optional Shuffle shuffle = 14;
-
-  optional ResponseInfo response_info = 15;
-  optional ResponseCurrentMetadata response_current_metadata = 16;
-  optional ResponsePlaylists response_playlists = 17;
-  optional ResponsePlaylistSongs response_playlist_songs = 18;
-  optional ResponseEngineStateChanged response_engine_state_changed = 19;
-  optional ResponseUpdateTrackPosition response_update_track_position = 20;
-  optional ResponseDisconnect response_disconnect = 22;
-  optional ResponseActiveChanged response_active_changed = 24;
-  optional ResponseLyrics response_lyrics = 30;
-  optional ResponseSongFileChunk response_song_file_chunk = 32;
-  optional ResponseSongOffer response_song_offer = 33;
-  optional ResponseCollectionChunk response_collection_chunk = 34;
-  optional ResponseDownloadTotalSize response_download_total_size = 36;
-  optional ResponseTranscoderStatus response_transcoder_status = 39;
-  optional ResponseListFiles response_list_files = 52;
-
-}

src/networkremote/outgoingdatacreator.cpp

@@ -1,638 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <cmath>
-
-#include <QCoreApplication>
-#include <QDir>
-#include <QSqlDatabase>
-#include <QSqlQuery>
-#include <QBuffer>
-#include <QTimer>
-#include <QStandardPaths>
-
-#include "includes/shared_ptr.h"
-#include "constants/timeconstants.h"
-#include "utilities/randutils.h"
-#include "core/player.h"
-#include "core/database.h"
-#include "core/sqlquery.h"
-#include "core/logging.h"
-#include "utilities/cryptutils.h"
-#include "collection/collectionbackend.h"
-#include "playlist/playlistmanager.h"
-#include "playlist/playlistbackend.h"
-#include "networkremote.h"
-#include "networkremoteclient.h"
-#include "outgoingdatacreator.h"
-
-using namespace std::chrono_literals;
-using namespace Qt::Literals::StringLiterals;
-
-namespace {
-constexpr quint32 kFileChunkSize = 100000;
-}
-
-OutgoingDataCreator::OutgoingDataCreator(const SharedPtr<Database> database,
-                                         const SharedPtr<Player> player,
-                                         const SharedPtr<PlaylistManager> playlist_manager,
-                                         const SharedPtr<PlaylistBackend> playlist_backend,
-                                         QObject *parent)
-    : QObject(parent),
-      database_(database),
-      player_(player),
-      playlist_manager_(playlist_manager),
-      playlist_backend_(playlist_backend),
-      keep_alive_timer_(new QTimer(this)),
-      keep_alive_timeout_(10000) {
-
-  QObject::connect(keep_alive_timer_, &QTimer::timeout, this, &OutgoingDataCreator::SendKeepAlive);
-
-}
-
-OutgoingDataCreator::~OutgoingDataCreator() = default;
-
-void OutgoingDataCreator::SetClients(QList<NetworkRemoteClient*> *clients) {
-
-  clients_ = clients;
-  // After we got some clients, start the keep alive timer
-  // Default: every 10 seconds
-  keep_alive_timer_->start(keep_alive_timeout_);
-
-  // Create the song position timer
-  track_position_timer_ = new QTimer(this);
-  QObject::connect(track_position_timer_, &QTimer::timeout, this, &OutgoingDataCreator::UpdateTrackPosition);
-
-}
-
-void OutgoingDataCreator::SendDataToClients(networkremote::Message *msg) {
-
-  if (clients_->empty()) {
-    return;
-  }
-
-  for (NetworkRemoteClient *client : std::as_const(*clients_)) {
-    // Do not send data to downloaders
-    if (client->isDownloader()) {
-      if (client->State() != QTcpSocket::ConnectedState) {
-        clients_->removeAt(clients_->indexOf(client));
-        delete client;
-      }
-      continue;
-    }
-
-    // Check if the client is still active
-    if (client->State() == QTcpSocket::ConnectedState) {
-      client->SendData(msg);
-    }
-    else {
-      clients_->removeAt(clients_->indexOf(client));
-      delete client;
-    }
-  }
-
-}
-
-void OutgoingDataCreator::SendInfo() {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::INFO);
-  networkremote::ResponseInfo info;
-  info.setVersion(QLatin1String("%1 %2").arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion()));
-  info.setFilesMusicExtensions(files_music_extensions_);
-  info.setAllowDownloads(allow_downloads_);
-  info.setState(GetEngineState());
-  msg.setResponseInfo(info);
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::SendKeepAlive() {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::KEEP_ALIVE);
-  SendDataToClients(&msg);
-
-}
-
-networkremote::EngineStateGadget::EngineState OutgoingDataCreator::GetEngineState() {
-
-  switch (player_->GetState()) {
-    case EngineBase::State::Idle:
-      return networkremote::EngineStateGadget::EngineState::EngineState_Idle;
-      break;
-    case EngineBase::State::Error:
-    case EngineBase::State::Empty:
-      return networkremote::EngineStateGadget::EngineState::EngineState_Empty;
-      break;
-    case EngineBase::State::Playing:
-      return networkremote::EngineStateGadget::EngineState::EngineState_Playing;
-      break;
-    case EngineBase::State::Paused:
-      return networkremote::EngineStateGadget::EngineState::EngineState_Paused;
-      break;
-  }
-
-  return networkremote::EngineStateGadget::EngineState::EngineState_Empty;
-
-}
-
-void OutgoingDataCreator::SendAllPlaylists() {
-
-  // Get all Playlists
-  const int active_playlist = playlist_manager_->active_id();
-
-  // Create message
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::SEND_PLAYLISTS);
-
-  networkremote::ResponsePlaylists playlists = msg.responsePlaylists();
-  playlists.setIncludeClosed(true);
-
-  // Get all playlists, even ones that are hidden in the UI.
-  const QList<PlaylistBackend::Playlist> all_playlists = playlist_backend_->GetAllPlaylists();
-  for (const PlaylistBackend::Playlist &p : all_playlists) {
-    const bool playlist_open = playlist_manager_->IsPlaylistOpen(p.id);
-    const int item_count = playlist_open ? playlist_manager_->playlist(p.id)->rowCount() : 0;
-
-    // Create a new playlist
-    networkremote::Playlist playlist;// = playlists.playlist();
-    playlist.setPlaylistId(p.id);
-    playlist.setName(p.name);
-    playlist.setActive((p.id == active_playlist));
-    playlist.setItemCount(item_count);
-    playlist.setClosed(!playlist_open);
-    playlist.setFavorite(p.favorite);
-  }
-
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::SendAllActivePlaylists() {
-
-  const int active_playlist = playlist_manager_->active_id();
-
-  const QList<Playlist*> playlists = playlist_manager_->GetAllPlaylists();
-  QList<networkremote::Playlist> pb_playlists;
-  pb_playlists.reserve(playlists.count());
-  for (Playlist *p : playlists) {
-    networkremote::Playlist pb_playlist;
-    pb_playlist.setPlaylistId(p->id());
-    pb_playlist.setName(playlist_manager_->GetPlaylistName(p->id()));
-    pb_playlist.setActive(p->id() == active_playlist);
-    pb_playlist.setItemCount(p->rowCount());
-    pb_playlist.setClosed(false);
-    pb_playlist.setFavorite(p->is_favorite());
-    pb_playlists << pb_playlist;
-  }
-
-  networkremote::ResponsePlaylists response_playlists;
-  response_playlists.setPlaylist(pb_playlists);
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::SEND_PLAYLISTS);
-  msg.setResponsePlaylists(response_playlists);
-
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::ActiveChanged(Playlist *playlist) {
-
-  SendPlaylistSongs(playlist->id());
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::ACTIVE_PLAYLIST_CHANGED);
-  networkremote::ResponseActiveChanged response_active_changed;
-  response_active_changed.setPlaylistId(playlist->id());
-  msg.setResponseActiveChanged(response_active_changed);
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::PlaylistAdded(const int id, const QString &name, const bool favorite) {
-
-  Q_UNUSED(id)
-  Q_UNUSED(name)
-  Q_UNUSED(favorite)
-
-  SendAllActivePlaylists();
-
-}
-
-void OutgoingDataCreator::PlaylistDeleted(const int id) {
-
-  Q_UNUSED(id)
-
-  SendAllActivePlaylists();
-
-}
-
-void OutgoingDataCreator::PlaylistClosed(const int id) {
-
-  Q_UNUSED(id)
-
-  SendAllActivePlaylists();
-
-}
-
-void OutgoingDataCreator::PlaylistRenamed(const int id, const QString &new_name) {
-
-  Q_UNUSED(id)
-  Q_UNUSED(new_name)
-
-  SendAllActivePlaylists();
-
-}
-
-void OutgoingDataCreator::SendFirstData(const bool send_playlist_songs) {
-
-  CurrentSongChanged(current_song_, albumcoverloader_result_);
-
-  VolumeChanged(player_->GetVolume());
-
-  if (!track_position_timer_->isActive() && player_->engine()->state() == EngineBase::State::Playing) {
-    track_position_timer_->start(1s);
-  }
-
-  UpdateTrackPosition();
-
-  SendAllActivePlaylists();
-
-  if (send_playlist_songs) {
-    SendPlaylistSongs(playlist_manager_->active_id());
-  }
-
-  SendShuffleMode(playlist_manager_->sequence()->shuffle_mode());
-  SendRepeatMode(playlist_manager_->sequence()->repeat_mode());
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::FIRST_DATA_SENT_COMPLETE);
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::CurrentSongChanged(const Song &song, const AlbumCoverLoaderResult &result) {
-
-  albumcoverloader_result_ = result;
-  current_song_ = song;
-  current_image_ = result.album_cover.image;
-
-  SendSongMetadata();
-
-}
-
-void OutgoingDataCreator::SendSongMetadata() {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::CURRENT_METAINFO);
-  const networkremote::SongMetadata pb_song_metadata = PbSongMetadataFromSong(playlist_manager_->active()->current_row(), current_song_, current_image_);
-  networkremote::ResponseCurrentMetadata response_current_metadata;
-  response_current_metadata.setSongMetadata(pb_song_metadata);
-  msg.setResponseCurrentMetadata(response_current_metadata);
-  SendDataToClients(&msg);
-
-}
-
-networkremote::SongMetadata OutgoingDataCreator::PbSongMetadataFromSong(const int index, const Song &song, const QImage &image_cover_art) {
-
-  if (!song.is_valid()) {
-    return networkremote::SongMetadata();
-  }
-
-  networkremote::SongMetadata pb_song_metadata;
-  pb_song_metadata.setSongId(song.id());
-  pb_song_metadata.setIndex(index);
-  pb_song_metadata.setTitle(song.PrettyTitle());
-  pb_song_metadata.setArtist(song.artist());
-  pb_song_metadata.setAlbum(song.album());
-  pb_song_metadata.setAlbumartist(song.albumartist());
-  pb_song_metadata.setLength(song.length_nanosec() / kNsecPerSec);
-  pb_song_metadata.setPrettyLength(song.PrettyLength());
-  pb_song_metadata.setGenre(song.genre());
-  pb_song_metadata.setPrettyYear(song.PrettyYear());
-  pb_song_metadata.setTrack(song.track());
-  pb_song_metadata.setDisc(song.disc());
-  pb_song_metadata.setPlaycount(song.playcount());
-  pb_song_metadata.setIsLocal(song.url().isLocalFile());
-  pb_song_metadata.setFilename(song.basefilename());
-  pb_song_metadata.setFileSize(song.filesize());
-  pb_song_metadata.setRating(song.rating());
-  pb_song_metadata.setUrl(song.url().toString());
-  pb_song_metadata.setArtAutomatic(song.art_automatic().toString());
-  pb_song_metadata.setArtManual(song.art_manual().toString());
-  pb_song_metadata.setFiletype(static_cast<networkremote::SongMetadata::FileType>(song.filetype()));
-
-  if (!image_cover_art.isNull()) {
-    QImage image_cover_art_small;
-    if (image_cover_art.width() > 1000 || image_cover_art.height() > 1000) {
-      image_cover_art_small = image_cover_art.scaled(1000, 1000, Qt::KeepAspectRatio);
-    }
-    else {
-      image_cover_art_small = image_cover_art;
-    }
-
-    QByteArray data;
-    QBuffer buffer(&data);
-    if (buffer.open(QIODevice::WriteOnly)) {
-      image_cover_art_small.save(&buffer, "JPG");
-      buffer.close();
-    }
-
-    pb_song_metadata.setArt(data);
-  }
-
-  return pb_song_metadata;
-
-}
-
-void OutgoingDataCreator::VolumeChanged(const uint volume) {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::SET_VOLUME);
-  networkremote::RequestSetVolume request_set_volume;
-  request_set_volume.setVolume(volume);
-  msg.setRequestSetVolume(request_set_volume);
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::SendPlaylistSongs(const int playlist_id) {
-
-  Playlist *playlist = playlist_manager_->playlist(playlist_id);
-  if (!playlist) {
-    qLog(Error) << "Could not find playlist with ID" << playlist_id;
-    return;
-  }
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::SEND_PLAYLIST_SONGS);
-
-  networkremote::Playlist pb_playlist;
-  pb_playlist.setPlaylistId(playlist_id);
-  networkremote::ResponsePlaylistSongs pb_response_playlist_songs;
-  pb_response_playlist_songs.setRequestedPlaylist(pb_playlist);
-
-  const SongList songs = playlist->GetAllSongs();
-  QList<networkremote::SongMetadata> pb_song_metadatas;
-  pb_song_metadatas.reserve(songs.count());
-  for (const Song &song : songs) {
-    pb_song_metadatas << PbSongMetadataFromSong(songs.indexOf(song), song);
-  }
-
-  pb_response_playlist_songs.setSongs(pb_song_metadatas);
-  msg.setResponsePlaylistSongs(pb_response_playlist_songs);
-
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::PlaylistChanged(Playlist *playlist) {
-  SendPlaylistSongs(playlist->id());
-}
-
-void OutgoingDataCreator::StateChanged(const EngineBase::State state) {
-
-  if (state == last_state_) {
-    return;
-  }
-  last_state_ = state;
-
-  networkremote::Message msg;
-
-  switch (state) {
-    case EngineBase::State::Playing:
-      msg.setType(networkremote::MsgTypeGadget::MsgType::PLAY);
-      track_position_timer_->start(1s);
-      break;
-    case EngineBase::State::Paused:
-      msg.setType(networkremote::MsgTypeGadget::MsgType::PAUSE);
-      track_position_timer_->stop();
-      break;
-    case EngineBase::State::Empty:
-      msg.setType(networkremote::MsgTypeGadget::MsgType::STOP);  // Empty is called when player stopped
-      track_position_timer_->stop();
-      break;
-    default:
-      msg.setType(networkremote::MsgTypeGadget::MsgType::STOP);
-      track_position_timer_->stop();
-      break;
-  };
-
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::SendRepeatMode(const PlaylistSequence::RepeatMode mode) {
-
-  networkremote::Repeat repeat;
-
-  switch (mode) {
-    case PlaylistSequence::RepeatMode::Off:
-      repeat.setRepeatMode(networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Off);
-      break;
-    case PlaylistSequence::RepeatMode::Track:
-      repeat.setRepeatMode(networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Track);
-      break;
-    case PlaylistSequence::RepeatMode::Album:
-      repeat.setRepeatMode(networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Album);
-      break;
-    case PlaylistSequence::RepeatMode::Playlist:
-      repeat.setRepeatMode(networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Playlist);
-      break;
-    case PlaylistSequence::RepeatMode::OneByOne:
-      repeat.setRepeatMode(networkremote::RepeatModeGadget::RepeatMode::RepeatMode_OneByOne);
-      break;
-    case PlaylistSequence::RepeatMode::Intro:
-      repeat.setRepeatMode(networkremote::RepeatModeGadget::RepeatMode::RepeatMode_Intro);
-      break;
-  }
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::REPEAT);
-  msg.setRepeat(repeat);
-
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::SendShuffleMode(const PlaylistSequence::ShuffleMode mode) {
-
-  networkremote::Shuffle shuffle;
-
-  switch (mode) {
-    case PlaylistSequence::ShuffleMode::Off:
-      shuffle.setShuffleMode(networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_Off);
-      break;
-    case PlaylistSequence::ShuffleMode::All:
-      shuffle.setShuffleMode(networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_All);
-      break;
-    case PlaylistSequence::ShuffleMode::InsideAlbum:
-      shuffle.setShuffleMode(networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_InsideAlbum);
-      break;
-    case PlaylistSequence::ShuffleMode::Albums:
-      shuffle.setShuffleMode(networkremote::ShuffleModeGadget::ShuffleMode::ShuffleMode_Albums);
-      break;
-  }
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::SHUFFLE);
-  msg.setShuffle(shuffle);
-
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::UpdateTrackPosition() {
-
-  const qint64 position_nanosec = player_->engine()->position_nanosec();
-  int position = static_cast<int>(std::floor(static_cast<double>(position_nanosec) / kNsecPerSec + 0.5));
-
-  if (position_nanosec > current_song_.length_nanosec()) {
-    position = last_track_position_;
-  }
-
-  last_track_position_ = position;
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::UPDATE_TRACK_POSITION);
-  networkremote::ResponseUpdateTrackPosition reponse_update_track_position;
-  reponse_update_track_position.setPosition(position);
-  msg.setResponseUpdateTrackPosition(reponse_update_track_position);
-
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::DisconnectAllClients() {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::DISCONNECT);
-  networkremote::ResponseDisconnect reponse_disconnect;
-  reponse_disconnect.setReasonDisconnect(networkremote::ReasonDisconnectGadget::ReasonDisconnect::Server_Shutdown);
-  msg.setResponseDisconnect(reponse_disconnect);
-  SendDataToClients(&msg);
-
-}
-
-void OutgoingDataCreator::SendCollection(NetworkRemoteClient *client) {
-
-  const QString temp_database_filename = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + u'/' + Utilities::GetRandomStringWithChars(20);
-
-  Database::AttachedDatabase adb(temp_database_filename, ""_L1, true);
-  QSqlDatabase db(database_->Connect());
-
-  database_->AttachDatabaseOnDbConnection(u"songs_export"_s, adb, db);
-
-  SqlQuery q(db);
-  q.prepare(u"CREATE TABLE songs_export.songs AS SELECT * FROM songs WHERE unavailable = 0"_s);
-
-  if (!q.exec()) {
-    database_->ReportErrors(q);
-    return;
-  }
-
-  database_->DetachDatabase(u"songs_export"_s);
-
-  QFile file(temp_database_filename);
-  const QByteArray sha1 = Utilities::Sha1File(file).toHex();
-  qLog(Debug) << "Collection SHA1" << sha1;
-
-  if (!file.open(QIODevice::ReadOnly)) {
-    qLog(Error) << "Could not open file" << temp_database_filename;
-  }
-
-  const int chunk_count = qRound((file.size() / kFileChunkSize) + 0.5);
-  int chunk_number = 0;
-  while (!file.atEnd()) {
-    ++chunk_number;
-    const QByteArray data = file.read(kFileChunkSize);
-    networkremote::ResponseCollectionChunk chunk;
-    chunk.setChunkNumber(chunk_number);
-    chunk.setChunkCount(chunk_count);
-    chunk.setSize(file.size());
-    chunk.setData(data);
-    chunk.setFileHash(sha1);
-    networkremote::Message msg;
-    msg.setType(networkremote::MsgTypeGadget::MsgType::COLLECTION_CHUNK);
-    msg.setResponseCollectionChunk(chunk);
-    client->SendData(&msg);
-  }
-
-  file.remove();
-  file.close();
-
-}
-
-void OutgoingDataCreator::SendListFiles(QString relative_path, NetworkRemoteClient *client) {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::LIST_FILES);
-  networkremote::ResponseListFiles files;
-
-  if (files_root_folder_.isEmpty()) {
-    files.setError(networkremote::ResponseListFiles::Error::ROOT_DIR_NOT_SET);
-    SendDataToClients(&msg);
-    return;
-  }
-
-  QDir root_dir(files_root_folder_);
-  if (!root_dir.exists()) {
-    files.setError(networkremote::ResponseListFiles::Error::ROOT_DIR_NOT_SET);
-  }
-  else if (relative_path.startsWith(".."_L1) || relative_path.startsWith("./.."_L1)) {
-    files.setError(networkremote::ResponseListFiles::Error::DIR_NOT_ACCESSIBLE);
-  }
-  else {
-    if (relative_path.startsWith("/"_L1)) relative_path.remove(0, 1);
-
-    QFileInfo fi_folder(root_dir, relative_path);
-    if (!fi_folder.exists()) {
-      files.setError(networkremote::ResponseListFiles::Error::DIR_NOT_EXIST);
-    }
-    else if (!fi_folder.isDir()) {
-      files.setError(networkremote::ResponseListFiles::Error::DIR_NOT_EXIST);
-    }
-    else if (root_dir.relativeFilePath(fi_folder.absoluteFilePath()).startsWith("../"_L1)) {
-      files.setError(networkremote::ResponseListFiles::Error::DIR_NOT_ACCESSIBLE);
-    }
-    else {
-      files.setRelativePath(root_dir.relativeFilePath(fi_folder.absoluteFilePath()));
-      QDir dir(fi_folder.absoluteFilePath());
-      dir.setFilter(QDir::NoDotAndDotDot | QDir::AllEntries);
-      dir.setSorting(QDir::Name | QDir::DirsFirst);
-
-      const QList<QFileInfo> fis = dir.entryInfoList();
-      for (const QFileInfo &fi : fis) {
-        if (fi.isDir() || files_music_extensions_.contains(fi.suffix())) {
-          networkremote::FileMetadata pb_file;// = files->addFiles();
-          pb_file.setIsDir(fi.isDir());
-          pb_file.setFilename(fi.fileName());
-        }
-      }
-    }
-  }
-
-  msg.setResponseListFiles(files);
-
-  client->SendData(&msg);
-
-}

src/networkremote/outgoingdatacreator.h

@@ -1,120 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef OUTGOINGDATACREATOR_H
-#define OUTGOINGDATACREATOR_H
-
-#include <QObject>
-#include <QList>
-#include <QMap>
-#include <QQueue>
-#include <QString>
-#include <QStringList>
-#include <QImage>
-#include <QTcpSocket>
-#include <QTimer>
-
-#include "includes/shared_ptr.h"
-#include "engine/enginebase.h"
-#include "playlist/playlistsequence.h"
-#include "networkremotemessages.qpb.h"
-#include "covermanager/albumcoverloaderresult.h"
-
-class Database;
-class Player;
-class PlaylistManager;
-class PlaylistBackend;
-class Playlist;
-class NetworkRemoteClient;
-
-class OutgoingDataCreator : public QObject {
-  Q_OBJECT
-
- public:
-  explicit OutgoingDataCreator(const SharedPtr<Database> database,
-                               const SharedPtr<Player> player,
-                               const SharedPtr<PlaylistManager> playlist_manager,
-                               const SharedPtr<PlaylistBackend> playlist_backend,
-                               QObject *parent = nullptr);
-
-  ~OutgoingDataCreator();
-
-  void SetClients(QList<NetworkRemoteClient*> *clients);
-  void SetRemoteRootFiles(const QString &files_root_folder) {
-    files_root_folder_ = files_root_folder;
-  }
-  void SetMusicExtensions(const QStringList &files_music_extensions) {
-    files_music_extensions_ = files_music_extensions;
-  }
-  void SetAllowDownloads(bool allow_downloads) {
-    allow_downloads_ = allow_downloads;
-  }
-
-  static networkremote::SongMetadata PbSongMetadataFromSong(const int index, const Song &song, const QImage &image_cover_art = QImage());
-
- public Q_SLOTS:
-  void SendInfo();
-  void SendKeepAlive();
-  void SendAllPlaylists();
-  void SendAllActivePlaylists();
-  void SendFirstData(const bool send_playlist_songs);
-  void SendPlaylistSongs(const int id);
-  void PlaylistChanged(Playlist *playlist);
-  void VolumeChanged(const uint volume);
-  void PlaylistAdded(const int id, const QString &name, bool favorite);
-  void PlaylistDeleted(const int id);
-  void PlaylistClosed(const int id);
-  void PlaylistRenamed(const int id, const QString &new_name);
-  void ActiveChanged(Playlist *playlist);
-  void CurrentSongChanged(const Song &song, const AlbumCoverLoaderResult &result);
-  void SendSongMetadata();
-  void StateChanged(const EngineBase::State state);
-  void SendRepeatMode(const PlaylistSequence::RepeatMode mode);
-  void SendShuffleMode(const PlaylistSequence::ShuffleMode mode);
-  void UpdateTrackPosition();
-  void DisconnectAllClients();
-  void SendCollection(NetworkRemoteClient *client);
-  void SendListFiles(QString relative_path, NetworkRemoteClient *client);
-
- private:
-  void SendDataToClients(networkremote::Message *msg);
-  networkremote::EngineStateGadget::EngineState GetEngineState();
-
- private:
-  const SharedPtr<Database> database_;
-  const SharedPtr<Player> player_;
-  const SharedPtr<PlaylistManager> playlist_manager_;
-  const SharedPtr<PlaylistBackend> playlist_backend_;
-  QList<NetworkRemoteClient*> *clients_;
-  Song current_song_;
-  AlbumCoverLoaderResult albumcoverloader_result_;
-  QImage current_image_;
-  EngineBase::State last_state_;
-  QTimer *keep_alive_timer_;
-  QTimer *track_position_timer_;
-  int keep_alive_timeout_;
-  int last_track_position_;
-  QString files_root_folder_;
-  QStringList files_music_extensions_;
-  bool allow_downloads_;
-};
-
-#endif  // OUTGOINGDATACREATOR_H

src/networkremote/songsender.cpp

@@ -1,442 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "songsender.h"
-
-#include <QImage>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QSettings>
-
-#include "includes/shared_ptr.h"
-#include "constants/networkremotesettingsconstants.h"
-#include "constants/networkremoteconstants.h"
-#include "core/logging.h"
-#include "core/player.h"
-#include "collection/collectionbackend.h"
-#include "playlist/playlistmanager.h"
-#include "playlist/playlist.h"
-#include "networkremote.h"
-#include "outgoingdatacreator.h"
-#include "networkremoteclient.h"
-#include "utilities/randutils.h"
-#include "utilities/cryptutils.h"
-
-using namespace Qt::Literals::StringLiterals;
-using namespace NetworkRemoteSettingsConstants;
-using namespace NetworkRemoteConstants;
-
-SongSender::SongSender(const SharedPtr<Player> player,
-                       const SharedPtr<CollectionBackend> collection_backend,
-                       const SharedPtr<PlaylistManager> playlist_manager,
-                       NetworkRemoteClient *client,
-                       QObject *parent)
-    : QObject(parent),
-      player_(player),
-      collection_backend_(collection_backend),
-      playlist_manager_(playlist_manager),
-      client_(client),
-      transcoder_(new Transcoder(this, QLatin1String(kTranscoderSettingPostfix))) {
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-
-  transcode_lossless_files_ = s.value("convert_lossless", false).toBool();
-
-  // Load preset
-  QString last_output_format = s.value("last_output_format", u"audio/x-vorbis"_s).toString();
-  QList<TranscoderPreset> presets = transcoder_->GetAllPresets();
-  for (int i = 0; i < presets.count(); ++i) {
-    if (last_output_format == presets.at(i).codec_mimetype_) {
-      transcoder_preset_ = presets.at(i);
-      break;
-    }
-  }
-
-  qLog(Debug) << "Transcoder preset" << transcoder_preset_.codec_mimetype_;
-
-  QObject::connect(transcoder_, &Transcoder::JobComplete, this, &SongSender::TranscodeJobComplete);
-  QObject::connect(transcoder_, &Transcoder::AllJobsComplete, this, &SongSender::StartTransfer);
-
-  total_transcode_ = 0;
-
-}
-
-SongSender::~SongSender() {
-
-  QObject::disconnect(transcoder_, &Transcoder::JobComplete, this, &SongSender::TranscodeJobComplete);
-  QObject::disconnect(transcoder_, &Transcoder::AllJobsComplete, this, &SongSender::StartTransfer);
-
-  transcoder_->Cancel();
-
-}
-
-void SongSender::SendSongs(const networkremote::RequestDownloadSongs &request) {
-
-  Song current_song;
-  if (player_->GetCurrentItem()) {
-    current_song = player_->GetCurrentItem()->Metadata();
-  }
-
-  switch (request.downloadItem()) {
-    case networkremote::DownloadItemGadget::DownloadItem::CurrentItem:{
-      if (current_song.is_valid()) {
-        const DownloadItem item(current_song, 1, 1);
-        download_queue_.append(item);
-      }
-      break;
-    }
-    case networkremote::DownloadItemGadget::DownloadItem::ItemAlbum:
-      if (current_song.is_valid()) {
-        SendAlbum(current_song);
-      }
-      break;
-    case networkremote::DownloadItemGadget::DownloadItem::APlaylist:
-      SendPlaylist(request);
-      break;
-    case networkremote::DownloadItemGadget::DownloadItem::Urls:
-      SendUrls(request);
-      break;
-    default:
-      break;
-  }
-
-  if (transcode_lossless_files_) {
-    TranscodeLosslessFiles();
-  }
-  else {
-    StartTransfer();
-  }
-
-}
-
-void SongSender::TranscodeLosslessFiles() {
-
-  for (const DownloadItem &item : std::as_const(download_queue_)) {
-    // Check only lossless files
-    if (!item.song_.IsFileLossless()) continue;
-
-    // Add the file to the transcoder
-    const QString local_file = item.song_.url().toLocalFile();
-
-    qLog(Debug) << "Transcoding" << local_file;
-
-    transcoder_->AddJob(local_file, transcoder_preset_, Utilities::GetRandomStringWithCharsAndNumbers(20));
-
-    total_transcode_++;
-  }
-
-  if (total_transcode_ > 0) {
-    transcoder_->Start();
-    SendTranscoderStatus();
-  }
-  else {
-    StartTransfer();
-  }
-
-}
-
-void SongSender::TranscodeJobComplete(const QString &input, const QString &output, const bool success) {
-
-  qLog(Debug) << input << "transcoded to" << output << success;
-
-  // If it wasn't successful send original file
-  if (success) {
-    transcoder_map_.insert(input, output);
-  }
-
-  SendTranscoderStatus();
-
-}
-
-void SongSender::SendTranscoderStatus() {
-
-  // Send a message to the remote that we are converting files
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::TRANSCODING_FILES);
-
-  networkremote::ResponseTranscoderStatus status = msg.responseTranscoderStatus();
-  status.setProcessed(static_cast<int>(transcoder_map_.count()));
-  status.setTotal(total_transcode_);
-
-  client_->SendData(&msg);
-
-}
-
-void SongSender::StartTransfer() {
-
-  total_transcode_ = 0;
-
-  // Send total file size & file count
-  SendTotalFileSize();
-
-  // Send first file
-  OfferNextSong();
-
-}
-
-void SongSender::SendTotalFileSize() {
-
-  networkremote::Message msg;
-  msg.setType(networkremote::MsgTypeGadget::MsgType::DOWNLOAD_TOTAL_SIZE);
-
-  networkremote::ResponseDownloadTotalSize response = msg.responseDownloadTotalSize();
-
-  response.setFileCount(download_queue_.size());
-
-  qint64 total = 0;
-  for (const DownloadItem &item : std::as_const(download_queue_)) {
-    QString local_file = item.song_.url().toLocalFile();
-    const bool is_transcoded = transcoder_map_.contains(local_file);
-
-    if (is_transcoded) {
-      local_file = transcoder_map_.value(local_file);
-    }
-
-    total += QFileInfo(local_file).size();
-
-  }
-
-  response.setTotalSize(total);
-
-  client_->SendData(&msg);
-
-}
-
-void SongSender::OfferNextSong() {
-
-  networkremote::Message msg;
-
-  if (download_queue_.isEmpty()) {
-    msg.setType(networkremote::MsgTypeGadget::MsgType::DOWNLOAD_QUEUE_EMPTY);
-  }
-  else {
-    // Get the item and send the single song
-    const DownloadItem item = download_queue_.head();
-
-    msg.setType(networkremote::MsgTypeGadget::MsgType::SONG_OFFER_FILE_CHUNK);
-    networkremote::ResponseSongFileChunk chunk = msg.responseSongFileChunk();
-
-    // Open the file
-    QFile file(item.song_.url().toLocalFile());
-
-    // Song offer is chunk no 0
-    chunk.setChunkCount(0);
-    chunk.setChunkNumber(0);
-    chunk.setFileCount(item.song_count_);
-    chunk.setFileNumber(item.song_number_);
-    chunk.setSize(file.size());
-    chunk.setSongMetadata(OutgoingDataCreator::PbSongMetadataFromSong(-1, item.song_));
-    msg.setResponseSongFileChunk(chunk);
-  }
-
-  client_->SendData(&msg);
-
-}
-
-void SongSender::ResponseSongOffer(const bool accepted) {
-
-  if (download_queue_.isEmpty()) return;
-
-  // Get the item and send the single song
-  DownloadItem item = download_queue_.dequeue();
-  if (accepted) SendSingleSong(item);
-
-  // And offer the next song
-  OfferNextSong();
-
-}
-
-void SongSender::SendSingleSong(const DownloadItem &download_item) {
-
-  if (!download_item.song_.url().isLocalFile()) return;
-
-  QString local_file = download_item.song_.url().toLocalFile();
-  bool is_transcoded = transcoder_map_.contains(local_file);
-
-  if (is_transcoded) {
-    local_file = transcoder_map_.take(local_file);
-  }
-
-  // Open the file
-  QFile file(local_file);
-
-  // Get sha1 for file
-  QByteArray sha1 = Utilities::Sha1File(file).toHex();
-  qLog(Debug) << "sha1 for file" << local_file << "=" << sha1;
-
-  file.open(QIODevice::ReadOnly);
-
-  QByteArray data;
-  networkremote::Message msg;
-  networkremote::ResponseSongFileChunk chunk = msg.responseSongFileChunk();
-  msg.setType(networkremote::MsgTypeGadget::MsgType::SONG_OFFER_FILE_CHUNK);
-
-  // Calculate the number of chunks
-  int chunk_count = qRound((static_cast<quint32>(file.size()) / kFileChunkSize) + 0.5);
-  int chunk_number = 1;
-
-  while (!file.atEnd()) {
-    // Read file chunk
-    data = file.read(kFileChunkSize);
-
-    // Set chunk data
-    chunk.setChunkCount(chunk_count);
-    chunk.setChunkNumber(chunk_number);
-    chunk.setFileCount(download_item.song_count_);
-    chunk.setFileNumber(download_item.song_number_);
-    chunk.setSize(file.size());
-    chunk.setData(data);
-    chunk.setFileHash(sha1);
-
-    // On the first chunk send the metadata, so the client knows what file it receives.
-    if (chunk_number == 1) {
-      const int i = playlist_manager_->active()->current_row();
-      networkremote::SongMetadata song_metadata = OutgoingDataCreator::PbSongMetadataFromSong(i, download_item.song_);
-
-      // If the file was transcoded, we have to change the filename and filesize
-      if (is_transcoded) {
-        song_metadata.setFileSize(file.size());
-        QString basefilename = download_item.song_.basefilename();
-        QFileInfo info(basefilename);
-        basefilename.replace(u'.' + info.suffix(), u'.' + transcoder_preset_.extension_);
-        song_metadata.setFilename(basefilename);
-      }
-    }
-
-    // Send data directly to the client
-    client_->SendData(&msg);
-
-    // Clear working data
-    chunk = networkremote::ResponseSongFileChunk();
-    data.clear();
-
-    chunk_number++;
-  }
-
-  // If the file was transcoded, delete the temporary one
-  if (is_transcoded) {
-    file.remove();
-  }
-  else {
-    file.close();
-  }
-
-}
-
-void SongSender::SendAlbum(const Song &album_song) {
-
-  if (!album_song.url().isLocalFile()) return;
-
-  const SongList songs = collection_backend_->GetSongsByAlbum(album_song.album());
-
-  for (const Song &song : songs) {
-    const DownloadItem item(song, static_cast<int>(songs.indexOf(song)) + 1, static_cast<int>(songs.size()));
-    download_queue_.append(item);
-  }
-
-}
-
-void SongSender::SendPlaylist(const networkremote::RequestDownloadSongs &request) {
-
-  const int playlist_id = request.playlistId();
-  Playlist *playlist = playlist_manager_->playlist(playlist_id);
-  if (!playlist) {
-    qLog(Info) << "Could not find playlist with id = " << playlist_id;
-    return;
-  }
-  const SongList song_list = playlist->GetAllSongs();
-
-  QList<int> requested_ids;
-  requested_ids.reserve(request.songsIds().count());
-  for (auto song_id : request.songsIds()) {
-    requested_ids << song_id;
-  }
-
-  // Count the local songs
-  int count = 0;
-  for (const Song &song : song_list) {
-    if (song.url().isLocalFile() && (requested_ids.isEmpty() || requested_ids.contains(song.id()))) {
-      ++count;
-    }
-  }
-
-  for (const Song &song : song_list) {
-    if (song.url().isLocalFile() && (requested_ids.isEmpty() || requested_ids.contains(song.id()))) {
-      DownloadItem item(song, static_cast<int>(song_list.indexOf(song)) + 1, count);
-      download_queue_.append(item);
-    }
-  }
-
-}
-
-void SongSender::SendUrls(const networkremote::RequestDownloadSongs &request) {
-
-  SongList songs;
-
-  // First gather all valid songs
-  if (!request.relativePath().isEmpty()) {
-    // Security checks, cf OutgoingDataCreator::SendListFiles
-    const QString &files_root_folder = client_->files_root_folder();
-    if (files_root_folder.isEmpty()) return;
-    QDir root_dir(files_root_folder);
-    QString relative_path = request.relativePath();
-    if (!root_dir.exists() || relative_path.startsWith(".."_L1) || relative_path.startsWith("./.."_L1))
-      return;
-
-    if (relative_path.startsWith(u'/')) relative_path.remove(0, 1);
-
-    QFileInfo fi_folder(root_dir, relative_path);
-    if (!fi_folder.exists() || !fi_folder.isDir() || root_dir.relativeFilePath(fi_folder.absoluteFilePath()).startsWith(u"../"_s)) {
-      return;
-    }
-
-    QDir dir(fi_folder.absoluteFilePath());
-    const QStringList &files_music_extensions = client_->files_music_extensions();
-    for (const QString &s : request.urls()) {
-      QFileInfo fi(dir, s);
-      if (fi.exists() && fi.isFile() && files_music_extensions.contains(fi.suffix())) {
-        Song song;
-        song.set_basefilename(fi.fileName());
-        song.set_filesize(fi.size());
-        song.set_url(QUrl::fromLocalFile(fi.absoluteFilePath()));
-        song.set_valid(true);
-        songs.append(song);
-      }
-    }
-  }
-  else {
-    for (const QString &url_str : request.urls()) {
-      const QUrl url(url_str);
-      Song song = collection_backend_->GetSongByUrl(url);
-      if (song.is_valid() && song.url().isLocalFile()) {
-        songs.append(song);
-      }
-    }
-  }
-
-  for (const Song &song : songs) {
-    DownloadItem item(song, static_cast<int>(songs.indexOf(song)) + 1, static_cast<int>(songs.count()));
-    download_queue_.append(item);
-  }
-
-}

src/networkremote/songsender.h

@@ -1,96 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2012, Andreas Muttscheller <asfa194@gmail.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef SONGSENDER_H
-#define SONGSENDER_H
-
-#include <QObject>
-#include <QMap>
-#include <QQueue>
-#include <QString>
-#include <QUrl>
-
-#include "includes/shared_ptr.h"
-#include "core/song.h"
-#include "networkremotemessages.qpb.h"
-#include "transcoder/transcoder.h"
-
-class Player;
-class CollectionBackend;
-class PlaylistManager;
-class NetworkRemoteClient;
-class Transcoder;
-
-class DownloadItem {
- public:
-  explicit DownloadItem(const Song &song, const int song_number, const int song_count)
-      : song_(song), song_number_(song_number), song_count_(song_count) {}
-
-  Song song_;
-  int song_number_;
-  int song_count_;
-};
-
-class SongSender : public QObject {
-  Q_OBJECT
-
- public:
-  explicit SongSender(const SharedPtr<Player> player,
-                      const SharedPtr<CollectionBackend> collection_backend,
-                      const SharedPtr<PlaylistManager> playlist_manager,
-                      NetworkRemoteClient *client,
-                      QObject *parent = nullptr);
-
-  ~SongSender();
-
- public Q_SLOTS:
-  void SendSongs(const networkremote::RequestDownloadSongs &request);
-  void ResponseSongOffer(bool accepted);
-
- private Q_SLOTS:
-  void TranscodeJobComplete(const QString &input, const QString &output, const bool success);
-  void StartTransfer();
-
- private:
-  const SharedPtr<Player> player_;
-  const SharedPtr<CollectionBackend> collection_backend_;
-  const SharedPtr<PlaylistManager> playlist_manager_;
-  NetworkRemoteClient *client_;
-
-  TranscoderPreset transcoder_preset_;
-  Transcoder *transcoder_;
-  bool transcode_lossless_files_;
-
-  QQueue<DownloadItem> download_queue_;
-  QMap<QString, QString> transcoder_map_;
-  int total_transcode_;
-
-  void SendSingleSong(const DownloadItem &download_item);
-  void SendAlbum(const Song &song);
-  void SendPlaylist(const networkremote::RequestDownloadSongs &request);
-  void SendUrls(const networkremote::RequestDownloadSongs &request);
-  void OfferNextSong();
-  void SendTotalFileSize();
-  void TranscodeLosslessFiles();
-  void SendTranscoderStatus();
-};
-
-#endif  // SONGSENDER_H

src/playlist/playlistbackend.cpp

@@ -56,7 +56,7 @@ using namespace Qt::Literals::StringLiterals;
 using std::make_shared;
 
 namespace {
-constexpr int kSongTableJoins = 2;
+constexpr int kSongTableJoins = 3;
 }
 
 PlaylistBackend::PlaylistBackend(const SharedPtr<Database> database,
@@ -186,10 +186,12 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(const int id) {
 
 QString PlaylistBackend::PlaylistItemsQuery() {
 
-  return QStringLiteral("SELECT %1, %2, p.type FROM playlist_items AS p "
+  return QStringLiteral("SELECT %1, %2, %3, p.type FROM playlist_items AS p "
                         "LEFT JOIN songs ON p.type = songs.source AND p.collection_id = songs.ROWID "
+                        "LEFT JOIN dropbox_songs ON p.type = dropbox_songs.source AND p.collection_id = dropbox_songs.ROWID "
                         "WHERE p.playlist = :playlist"
                         ).arg(Song::JoinSpec(u"songs"_s),
+                              Song::JoinSpec(u"dropbox_songs"_s),
                               Song::JoinSpec(u"p"_s));
 
 }

src/playlist/playlistitem.cpp

@@ -47,6 +47,8 @@ PlaylistItemPtr PlaylistItem::NewFromSource(const Song::Source source) {
 
   switch (source) {
     case Song::Source::Collection:
+    case Song::Source::Dropbox:
+    case Song::Source::OneDrive:
       return make_shared<CollectionPlaylistItem>(source);
     case Song::Source::Subsonic:
     case Song::Source::Tidal:
@@ -72,6 +74,8 @@ PlaylistItemPtr PlaylistItem::NewFromSong(const Song &song) {
 
   switch (song.source()) {
     case Song::Source::Collection:
+    case Song::Source::Dropbox:
+    case Song::Source::OneDrive:
       return make_shared<CollectionPlaylistItem>(song);
     case Song::Source::Subsonic:
     case Song::Source::Tidal:

src/playlist/playlistmanager.cpp

@@ -57,7 +57,6 @@
 #include "playlistview.h"
 #include "playlistsaveoptionsdialog.h"
 #include "playlistparsers/playlistparser.h"
-#include "queue/queue.h"
 #include "dialogs/saveplaylistsdialog.h"
 
 using namespace Qt::Literals::StringLiterals;
@@ -186,9 +185,9 @@ Playlist *PlaylistManager::AddPlaylist(const int id, const QString &name, const
 
 }
 
-int PlaylistManager::New(const QString &name, const SongList &songs, const QString &special_type) {
+void PlaylistManager::New(const QString &name, const SongList &songs, const QString &special_type) {
 
-  if (name.isNull()) return -1;
+  if (name.isNull()) return;
 
   int id = playlist_backend_->CreatePlaylist(name, special_type);
 
@@ -204,8 +203,6 @@ int PlaylistManager::New(const QString &name, const SongList &songs, const QStri
     Rename(id, QStringLiteral("%1 %2").arg(name).arg(id));
   }
 
-  return id;
-
 }
 
 void PlaylistManager::Load(const QString &filename) {
@@ -617,22 +614,3 @@ void PlaylistManager::SaveAllPlaylists() {
   }
 
 }
-
-void PlaylistManager::Clear(const int id) {
-
-  if (playlists_.count() <= 1 || !playlists_.contains(id)) return;
-  playlists_[id].p->Clear();
-
-}
-
-void PlaylistManager::Enqueue(const int id, const int i) {
-
-  QModelIndexList dummyIndexList;
-
-  Q_ASSERT(playlists_.contains(id));
-
-  dummyIndexList.append(playlist(id)->index(i, 0));
-  playlist(id)->queue()->ToggleTracks(dummyIndexList);
-
-}
-

src/playlist/playlistmanager.h

@@ -95,7 +95,7 @@ class PlaylistManager : public PlaylistManagerInterface {
   PlaylistContainer *playlist_container() const override { return playlist_container_; }
 
  public Q_SLOTS:
-  int New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString()) override;
+  void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString()) override;
   void Load(const QString &filename) override;
   void Save(const int id, const QString &playlist_name, const QString &filename, const PlaylistSettings::PathType path_type) override;
   // Display a file dialog to let user choose a file before saving the file
@@ -144,9 +144,6 @@ class PlaylistManager : public PlaylistManagerInterface {
   void SetActivePaused() override;
   void SetActiveStopped() override;
 
-  void Clear(const int id);
-  void Enqueue(const int id, const int i);
-
  private Q_SLOTS:
   void OneOfPlaylistsChanged();
   void UpdateSummaryText();

src/playlist/playlistmanagerinterface.h

@@ -77,7 +77,7 @@ class PlaylistManagerInterface : public QObject {
   virtual void PlaySmartPlaylist(PlaylistGeneratorPtr generator, const bool as_new, const bool clear) = 0;
 
  public Q_SLOTS:
-  virtual int New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString()) = 0;
+  virtual void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString()) = 0;
   virtual void Load(const QString &filename) = 0;
   virtual void Save(const int id, const QString &playlist_name, const QString &filename, const PlaylistSettings::PathType path_type) = 0;
   virtual void Rename(const int id, const QString &new_name) = 0;

src/playlist/songplaylistitem.cpp

@@ -34,7 +34,7 @@ SongPlaylistItem::SongPlaylistItem(const Song::Source source) : PlaylistItem(sou
 SongPlaylistItem::SongPlaylistItem(const Song &song) : PlaylistItem(song.source()), song_(song) {}
 
 bool SongPlaylistItem::InitFromQuery(const SqlRow &query) {
-  song_.InitFromQuery(query, false, static_cast<int>(Song::kRowIdColumns.count()));
+  song_.InitFromQuery(query, false, static_cast<int>(Song::kRowIdColumns.count() * 2));
   return true;
 }
 

src/playlist/streamplaylistitem.cpp

@@ -47,7 +47,7 @@ void StreamPlaylistItem::InitMetadata() {
 
 bool StreamPlaylistItem::InitFromQuery(const SqlRow &query) {
 
-  song_.InitFromQuery(query, false, static_cast<int>(Song::kRowIdColumns.count()));
+  song_.InitFromQuery(query, false, static_cast<int>(Song::kRowIdColumns.count() * 2));
   InitMetadata();
   return true;
 

src/queue/queue.h

@@ -51,6 +51,7 @@ class Queue : public QAbstractProxyModel {
 
   // Modify the queue
   int TakeNext();
+  void ToggleTracks(const QModelIndexList &source_indexes);
   void InsertFirst(const QModelIndexList &source_indexes);
   void Clear();
   void Move(const QList<int> &proxy_rows, int pos);
@@ -78,7 +79,6 @@ class Queue : public QAbstractProxyModel {
 
  public Q_SLOTS:
   void UpdateSummaryText();
-  void ToggleTracks(const QModelIndexList &source_indexes);
 
  Q_SIGNALS:
   void TotalLengthChanged(const quint64 length);

src/settings/dropboxsettingspage.cpp

@@ -0,0 +1,144 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QObject>
+#include <QVariant>
+#include <QByteArray>
+#include <QString>
+#include <QSettings>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QMessageBox>
+#include <QEvent>
+
+#include "constants/dropboxsettings.h"
+#include "core/settings.h"
+#include "core/iconloader.h"
+#include "widgets/loginstatewidget.h"
+#include "dropbox/dropboxservice.h"
+#include "settingsdialog.h"
+#include "dropboxsettingspage.h"
+#include "ui_dropboxsettingspage.h"
+
+using namespace Qt::Literals::StringLiterals;
+using namespace DropboxSettings;
+
+DropboxSettingsPage::DropboxSettingsPage(SettingsDialog *dialog, const SharedPtr<DropboxService> service, QWidget *parent)
+    : SettingsPage(dialog, parent),
+      ui_(new Ui_DropboxSettingsPage),
+      service_(service) {
+
+  Q_ASSERT(service);
+
+  ui_->setupUi(this);
+
+  setWindowIcon(IconLoader::Load(u"dropbox"_s));
+
+  ui_->login_state->AddCredentialGroup(ui_->widget_authorization);
+
+  QObject::connect(ui_->button_login, &QPushButton::clicked, this, &DropboxSettingsPage::LoginClicked);
+  QObject::connect(ui_->button_reset, &QPushButton::clicked, this, &DropboxSettingsPage::ResetClicked);
+  QObject::connect(ui_->login_state, &LoginStateWidget::LogoutClicked, this, &DropboxSettingsPage::LogoutClicked);
+
+  QObject::connect(this, &DropboxSettingsPage::Authorize, &*service_, &DropboxService::Authenticate);
+  QObject::connect(&*service_, &StreamingService::LoginFailure, this, &DropboxSettingsPage::LoginFailure);
+  QObject::connect(&*service_, &StreamingService::LoginSuccess, this, &DropboxSettingsPage::LoginSuccess);
+
+  dialog->installEventFilter(this);
+
+}
+
+DropboxSettingsPage::~DropboxSettingsPage() {
+  delete ui_;
+}
+
+void DropboxSettingsPage::Load() {
+
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  ui_->enable->setChecked(s.value(kEnabled, false).toBool());
+  s.endGroup();
+
+  if (service_->authenticated()) ui_->login_state->SetLoggedIn(LoginStateWidget::State::LoggedIn);
+
+  Init(ui_->layout_dropboxsettingspage->parentWidget());
+
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
+
+}
+
+void DropboxSettingsPage::Save() {
+
+  Settings s;
+  s.beginGroup(kSettingsGroup);
+  s.setValue(kEnabled, ui_->enable->isChecked());
+  s.endGroup();
+
+}
+
+void DropboxSettingsPage::LoginClicked() {
+
+  Q_EMIT Authorize();
+
+  ui_->button_login->setEnabled(false);
+
+}
+
+bool DropboxSettingsPage::eventFilter(QObject *object, QEvent *event) {
+
+  if (object == dialog() && event->type() == QEvent::Enter) {
+    ui_->button_login->setEnabled(true);
+  }
+
+  return SettingsPage::eventFilter(object, event);
+
+}
+
+void DropboxSettingsPage::LogoutClicked() {
+
+  service_->ClearSession();
+  ui_->button_login->setEnabled(true);
+  ui_->login_state->SetLoggedIn(LoginStateWidget::State::LoggedOut);
+
+}
+
+void DropboxSettingsPage::LoginSuccess() {
+
+  if (!isVisible()) return;
+  ui_->login_state->SetLoggedIn(LoginStateWidget::State::LoggedIn);
+  ui_->button_login->setEnabled(true);
+
+}
+
+void DropboxSettingsPage::LoginFailure(const QString &failure_reason) {
+
+  if (!isVisible()) return;
+  QMessageBox::warning(this, tr("Authentication failed"), failure_reason);
+  ui_->button_login->setEnabled(true);
+
+}
+
+void DropboxSettingsPage::ResetClicked() {
+
+  service_->Reset();
+
+}

src/settings/dropboxsettingspage.h

@@ -0,0 +1,58 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef DROPBOXSETTINGSPAGE_H
+#define DROPBOXSETTINGSPAGE_H
+
+#include <QObject>
+
+#include "includes/shared_ptr.h"
+#include "settingspage.h"
+
+class DropboxService;
+class Ui_DropboxSettingsPage;
+
+class DropboxSettingsPage : public SettingsPage {
+  Q_OBJECT
+
+ public:
+  explicit DropboxSettingsPage(SettingsDialog *dialog, const SharedPtr<DropboxService> service, QWidget *parent);
+  ~DropboxSettingsPage();
+
+  void Load() override;
+  void Save() override;
+
+  bool eventFilter(QObject *object, QEvent *event) override;
+
+ Q_SIGNALS:
+  void Authorize();
+
+ private Q_SLOTS:
+  void LoginClicked();
+  void LogoutClicked();
+  void LoginSuccess();
+  void LoginFailure(const QString &failure_reason);
+  void ResetClicked();
+
+ private:
+  Ui_DropboxSettingsPage *ui_;
+  const SharedPtr<DropboxService> service_;
+};
+
+#endif  // DROPBOXSETTINGSPAGE_H

src/settings/dropboxsettingspage.ui

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DropboxSettingsPage</class>
+ <widget class="QWidget" name="DropboxSettingsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>569</width>
+    <height>491</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dropbox</string>
+  </property>
+  <layout class="QVBoxLayout" name="layout_dropboxsettingspage">
+   <item>
+    <widget class="QLabel" name="label_info">
+     <property name="text">
+      <string>Strawberry can play music that you have uploaded to Dropbox</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="enable">
+     <property name="text">
+      <string>Enable</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="LoginStateWidget" name="login_state" native="true"/>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget_authorization" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>28</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPushButton" name="button_login">
+          <property name="text">
+           <string>Login</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="spacer_login">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="layout_buttons">
+     <item>
+      <widget class="QPushButton" name="button_reset">
+       <property name="text">
+        <string>Reset cursor and songs</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer_buttons">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="spacer_bottom">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>357</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LoginStateWidget</class>
+   <extends>QWidget</extends>
+   <header>widgets/loginstatewidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

src/settings/networkremotesettingspage.cpp

@@ -1,157 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "networkremotesettingspage.h"
-
-#include <algorithm>
-
-#include <QString>
-#include <QUrl>
-#include <QFile>
-#include <QHostInfo>
-#include <QNetworkInterface>
-#include <QDesktopServices>
-#include <QSettings>
-#include <QRandomGenerator>
-
-#include "constants/networkremotesettingsconstants.h"
-#include "constants/networkremoteconstants.h"
-#include "core/iconloader.h"
-#include "networkremote/networkremote.h"
-#include "transcoder/transcoder.h"
-#include "transcoder/transcoderoptionsdialog.h"
-#include "settingsdialog.h"
-#include "ui_networkremotesettingspage.h"
-
-using namespace Qt::Literals::StringLiterals;
-using namespace NetworkRemoteSettingsConstants;
-using namespace NetworkRemoteConstants;
-
-namespace {
-
-static bool ComparePresetsByName(const TranscoderPreset &left, const TranscoderPreset &right) {
-  return left.name_ < right.name_;
-}
-
-}  // namespace
-
-NetworkRemoteSettingsPage::NetworkRemoteSettingsPage(SettingsDialog *dialog)
-    : SettingsPage(dialog),
-      ui_(new Ui_NetworkRemoteSettingsPage) {
-
-  ui_->setupUi(this);
-
-  setWindowIcon(IconLoader::Load(u"ipodtouchicon"_s));
-
-  QObject::connect(ui_->options, &QPushButton::clicked, this, &NetworkRemoteSettingsPage::Options);
-
-  QList<TranscoderPreset> presets = Transcoder::GetAllPresets();
-  std::sort(presets.begin(), presets.end(), ComparePresetsByName);
-  for (const TranscoderPreset &preset : std::as_const(presets)) {
-    ui_->format->addItem(QStringLiteral("%1 (.%2)").arg(preset.name_, preset.extension_), QVariant::fromValue(preset));
-  }
-
-}
-
-NetworkRemoteSettingsPage::~NetworkRemoteSettingsPage() { delete ui_; }
-
-void NetworkRemoteSettingsPage::Load() {
-
-  QSettings s;
-
-  s.beginGroup(kSettingsGroup);
-
-  ui_->enabled->setChecked(s.value(kEnabled).toBool());
-  ui_->spinbox_port->setValue(s.value(kPort, kDefaultServerPort).toInt());
-  ui_->checkbox_allow_public_access->setChecked(s.value(kAllowPublicAccess, false).toBool());
-
-  ui_->checkbox_use_auth_code->setChecked(s.value(kUseAuthCode, false).toBool());
-  ui_->spinbox_auth_code->setValue(s.value(kAuthCode, QRandomGenerator::global()->bounded(100000)).toInt());
-
-  ui_->allow_downloads->setChecked(s.value("allow_downloads", false).toBool());
-  ui_->convert_lossless->setChecked(s.value("convert_lossless", false).toBool());
-
-  QString last_output_format = s.value("last_output_format", u"audio/x-vorbis"_s).toString();
-  for (int i = 0; i < ui_->format->count(); ++i) {
-    if (last_output_format == ui_->format->itemData(i).value<TranscoderPreset>().codec_mimetype_) {
-      ui_->format->setCurrentIndex(i);
-      break;
-    }
-  }
-
-  ui_->files_root_folder->SetPath(s.value("files_root_folder").toString());
-  ui_->files_music_extensions->setText(s.value("files_music_extensions", kDefaultMusicExtensionsAllowedRemotely).toStringList().join(u','));
-
-  s.endGroup();
-
-  // Get local IP addresses
-  QString ip_addresses;
-  QList<QHostAddress> addresses = QNetworkInterface::allAddresses();
-  for (const QHostAddress &address : addresses) {
-    // TODO: Add IPv6 support to tinysvcmdns
-    if (address.protocol() == QAbstractSocket::IPv4Protocol && !address.isInSubnet(QHostAddress::parseSubnet(u"127.0.0.1/8"_s))) {
-      if (!ip_addresses.isEmpty()) {
-        ip_addresses.append(u", "_s);
-      }
-      ip_addresses.append(address.toString());
-    }
-  }
-  ui_->label_ip_address->setText(ip_addresses);
-
-}
-
-void NetworkRemoteSettingsPage::Save() {
-
-  QSettings s;
-
-  s.beginGroup(kSettingsGroup);
-  s.setValue(kEnabled, ui_->enabled->isChecked());
-  s.setValue(kPort, ui_->spinbox_port->value());
-  s.setValue(kAllowPublicAccess, ui_->checkbox_allow_public_access->isChecked());
-  s.setValue(kUseAuthCode, ui_->checkbox_use_auth_code->isChecked());
-  s.setValue(kAuthCode, ui_->spinbox_auth_code->value());
-
-  TranscoderPreset preset = ui_->format->itemData(ui_->format->currentIndex()).value<TranscoderPreset>();
-  s.setValue("last_output_format", preset.codec_mimetype_);
-
-  s.setValue(kFilesRootFolder, ui_->files_root_folder->Path());
-
-  QStringList files_music_extensions;
-  for (const QString &extension : ui_->files_music_extensions->text().split(u',')) {
-    QString ext = extension.trimmed();
-    if (ext.size() > 0 && ext.size() < 8)  // no empty string, less than 8 char
-      files_music_extensions << ext;
-  }
-  s.setValue("files_music_extensions", files_music_extensions);
-
-  s.endGroup();
-
-}
-
-void NetworkRemoteSettingsPage::Options() {
-
-  TranscoderPreset preset = ui_->format->itemData(ui_->format->currentIndex()).value<TranscoderPreset>();
-
-  TranscoderOptionsDialog dialog(preset.filetype_, this);
-  dialog.set_settings_postfix(QLatin1String(kTranscoderSettingPostfix));
-  dialog.exec();
-
-}

src/settings/networkremotesettingspage.h

@@ -1,46 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2024, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef NETWORKREMOTESETTINGSPAGE_H
-#define NETWORKREMOTESETTINGSPAGE_H
-
-#include "settingspage.h"
-
-class Ui_NetworkRemoteSettingsPage;
-
-class NetworkRemoteSettingsPage : public SettingsPage {
-  Q_OBJECT
-
- public:
-  explicit NetworkRemoteSettingsPage(SettingsDialog *dialog);
-  ~NetworkRemoteSettingsPage();
-
-  void Load();
-  void Save();
-
- private Q_SLOTS:
-  void Options();
-
- private:
-  Ui_NetworkRemoteSettingsPage *ui_;
-};
-
-#endif  // NETWORKREMOTESETTINGSPAGE_H

src/settings/networkremotesettingspage.ui

@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NetworkRemoteSettingsPage</class>
- <widget class="QWidget" name="NetworkRemoteSettingsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>421</width>
-    <height>664</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Network Remote</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QCheckBox" name="enabled">
-     <property name="text">
-      <string>Enabled</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupbox_use_remote_container">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="title">
-      <string>Settings</string>
-     </property>
-     <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_port">
-        <property name="minimumSize">
-         <size>
-          <width>171</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="text">
-         <string>Port</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="spinbox_port">
-        <property name="maximum">
-         <number>65535</number>
-        </property>
-        <property name="value">
-         <number>8080</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QCheckBox" name="checkbox_allow_public_access">
-        <property name="toolTip">
-         <string>Only accept connections from clients within the ip ranges:
-10.x.x.x
-172.16.0.0 - 172.31.255.255
-192.168.x.x</string>
-        </property>
-        <property name="text">
-         <string>Allow public access</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="checkbox_use_auth_code">
-        <property name="toolTip">
-         <string>A client can connect only, if the correct code was entered.</string>
-        </property>
-        <property name="text">
-         <string>Require authentication code</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QSpinBox" name="spinbox_auth_code">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="suffix">
-         <string/>
-        </property>
-        <property name="maximum">
-         <number>99999</number>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="0">
-       <widget class="QLabel" name="label_ip_address_description">
-        <property name="toolTip">
-         <string>Enter this IP in the App to connect to Clementine.</string>
-        </property>
-        <property name="text">
-         <string>Your IP address:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="1">
-       <widget class="QLabel" name="label_ip_address">
-        <property name="text">
-         <string notr="true">127.0.0.1</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="allow_downloads">
-        <property name="toolTip">
-         <string>Allow a client to download music from this computer.</string>
-        </property>
-        <property name="text">
-         <string>Allow downloads</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="2">
-       <widget class="QGroupBox" name="download_settings_container">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="title">
-         <string>Download settings</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <item>
-          <widget class="QCheckBox" name="convert_lossless">
-           <property name="toolTip">
-            <string>Convert lossless audiofiles before sending them to the remote.</string>
-           </property>
-           <property name="text">
-            <string>Convert lossless files</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="format_container">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="title">
-            <string>Audio format</string>
-           </property>
-           <layout class="QGridLayout" name="gridLayout">
-            <item row="0" column="1">
-             <widget class="QPushButton" name="options">
-              <property name="text">
-               <string>Options...</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QComboBox" name="format"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_files_root_folder">
-        <property name="toolTip">
-         <string>Root folder that will be browsable from the network remote</string>
-        </property>
-        <property name="text">
-         <string>Files root folder</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="FileChooserWidget" name="files_root_folder" native="true">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="QLineEdit" name="files_music_extensions"/>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_music_extensions">
-        <property name="toolTip">
-         <string>comma-separated list of the allowed extensions that will be visible from the network remote (ex: m3u,mp3,flac,ogg,wav)</string>
-        </property>
-        <property name="text">
-         <string>Music extensions remotely visible</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="spacer_bottom">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>98</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>FileChooserWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">widgets/filechooserwidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>checkbox_use_auth_code</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>spinbox_auth_code</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>137</x>
-     <y>124</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>351</x>
-     <y>125</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>enabled</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupbox_use_remote_container</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>59</x>
-     <y>22</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>57</x>
-     <y>43</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>allow_downloads</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>download_settings_container</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>196</x>
-     <y>160</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>117</x>
-     <y>205</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>convert_lossless</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>format_container</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>218</x>
-     <y>212</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>218</x>
-     <y>262</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

src/settings/settingsdialog.cpp

@@ -90,8 +90,9 @@
 #  include "qobuz/qobuzservice.h"
 #  include "qobuzsettingspage.h"
 #endif
-#ifdef HAVE_NETWORKREMOTE
+#ifdef HAVE_DROPBOX
-#  include "networkremotesettingspage.h"
+#  include "dropbox/dropboxservice.h"
+#  include "dropboxsettingspage.h"
 #endif
 
 #include "ui_settingsdialog.h"
@@ -147,7 +148,7 @@ SettingsDialog::SettingsDialog(const SharedPtr<Player> player,
   AddPage(Page::Moodbar, new MoodbarSettingsPage(this, this), iface);
 #endif
 
-#if defined(HAVE_SUBSONIC) || defined(HAVE_TIDAL) || defined(HAVE_SPOTIFY) || defined(HAVE_QOBUZ)
+#if defined(HAVE_SUBSONIC) || defined(HAVE_TIDAL) || defined(HAVE_SPOTIFY) || defined(HAVE_QOBUZ) || defined(HAVE_DROPBOX)
   QTreeWidgetItem *streaming = AddCategory(tr("Streaming"));
 #endif
 
@@ -163,9 +164,8 @@ SettingsDialog::SettingsDialog(const SharedPtr<Player> player,
 #ifdef HAVE_QOBUZ
   AddPage(Page::Qobuz, new QobuzSettingsPage(this, streaming_services->Service<QobuzService>(), this), streaming);
 #endif
-
+#ifdef HAVE_DROPBOX
-#ifdef HAVE_NETWORKREMOTE
+  AddPage(Page::Dropbox, new DropboxSettingsPage(this, streaming_services->Service<DropboxService>(), this), streaming);
-  AddPage(Page::NetworkRemote, new NetworkRemoteSettingsPage(this));
 #endif
 
   // List box

src/settings/settingsdialog.h

@@ -93,7 +93,8 @@ class SettingsDialog : public QDialog {
     Tidal,
     Qobuz,
     Spotify,
-    NetworkRemote
+    Dropbox,
+    OneDrive,
   };
 
   enum Role {

src/streaming/cloudstoragestreamingservice.cpp

@@ -0,0 +1,134 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <memory>
+
+#include <QString>
+#include <QUrl>
+#include <QFileInfo>
+
+#include "core/logging.h"
+#include "core/database.h"
+#include "core/taskmanager.h"
+#include "core/song.h"
+#include "collection/collectionbackend.h"
+#include "collection/collectionmodel.h"
+#include "playlist/playlist.h"
+#include "cloudstoragestreamingservice.h"
+
+using namespace Qt::Literals::StringLiterals;
+using std::make_shared;
+
+CloudStorageStreamingService::CloudStorageStreamingService(const SharedPtr<TaskManager> task_manager,
+                                                           const SharedPtr<Database> database,
+                                                           const SharedPtr<TagReaderClient> tagreader_client,
+                                                           const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                                                           const Song::Source source,
+                                                           const QString &name,
+                                                           const QString &url_scheme,
+                                                           const QString &settings_group,
+                                                           QObject *parent)
+    : StreamingService(source, name, url_scheme, settings_group, parent),
+      task_manager_(task_manager),
+      tagreader_client_(tagreader_client),
+      source_(source),
+      indexing_task_id_(-1),
+      indexing_task_progress_(0),
+      indexing_task_max_(0) {
+
+  collection_backend_ = make_shared<CollectionBackend>();
+  collection_backend_->moveToThread(database->thread());
+  collection_backend_->Init(database, task_manager, source, name + "_songs"_L1);
+  collection_model_ = new CollectionModel(collection_backend_, albumcover_loader, this);
+
+}
+
+void CloudStorageStreamingService::MaybeAddFileToDatabase(const QUrl &url, const QString &filename, const size_t size, const quint64 mtime, const QString &token_type, const QString &access_token) {
+
+  if (!IsSupportedFiletype(filename)) {
+    return;
+  }
+
+  if (indexing_task_id_ == -1) {
+    indexing_task_id_ = task_manager_->StartTask(tr("Indexing %1").arg(name()));
+    indexing_task_progress_ = 0;
+    indexing_task_max_ = 0;
+  }
+  indexing_task_max_++;
+  task_manager_->SetTaskProgress(indexing_task_id_, indexing_task_progress_, indexing_task_max_);
+
+  TagReaderReadStreamReplyPtr reply = tagreader_client_->ReadStreamAsync(url, filename, size, mtime, token_type, access_token);
+  pending_tagreader_replies_.append(reply);
+
+  SharedPtr<QMetaObject::Connection> connection = make_shared<QMetaObject::Connection>();
+  *connection = QObject::connect(&*reply, &TagReaderReadStreamReply::Finished, this, [this, reply, url, filename, connection]() {
+    ReadStreamFinished(reply, url, filename);
+    QObject::disconnect(*connection);
+  }, Qt::QueuedConnection);
+
+}
+
+void CloudStorageStreamingService::ReadStreamFinished(TagReaderReadStreamReplyPtr reply, const QUrl url, const QString filename) {
+
+  ++indexing_task_progress_;
+  if (indexing_task_progress_ >= indexing_task_max_) {
+    task_manager_->SetTaskFinished(indexing_task_id_);
+    indexing_task_id_ = -1;
+    Q_EMIT AllIndexingTasksFinished();
+  }
+  else {
+    task_manager_->SetTaskProgress(indexing_task_id_, indexing_task_progress_, indexing_task_max_);
+  }
+
+  if (!reply->result().success()) {
+    qLog(Error) << "Failed to read tags from stream, URL" << url << reply->result().error_string();
+    return;
+  }
+
+  Song song = reply->song();
+  song.set_source(source_);
+  song.set_directory_id(0);
+  QUrl song_url;
+  song_url.setScheme(url_scheme());
+  song_url.setPath(filename);
+  song.set_url(song_url);
+
+  collection_backend_->AddOrUpdateSongs(SongList() << song);
+
+}
+
+bool CloudStorageStreamingService::IsSupportedFiletype(const QString &filename) {
+
+  const QFileInfo fileinfo(filename);
+  return Song::kAcceptedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive) && !Song::kRejectedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive);
+
+}
+
+void CloudStorageStreamingService::AbortReadTagsReplies() {
+
+  qLog(Debug) << "Aborting the read tags replies";
+
+  pending_tagreader_replies_.clear();
+
+  task_manager_->SetTaskFinished(indexing_task_id_);
+  indexing_task_id_ = -1;
+
+  Q_EMIT AllIndexingTasksFinished();
+
+}

src/streaming/cloudstoragestreamingservice.h

@@ -0,0 +1,89 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef CLOUDSTORAGESTREAMINGSERVICE_H
+#define CLOUDSTORAGESTREAMINGSERVICE_H
+
+#include <QList>
+
+#include "includes/shared_ptr.h"
+#include "tagreader/tagreaderclient.h"
+#include "streamingservice.h"
+#include "covermanager/albumcovermanager.h"
+#include "collection/collectionmodel.h"
+
+class TaskManager;
+class Database;
+class TagReaderClient;
+class AlbumCoverLoader;
+class CollectionBackend;
+class CollectionModel;
+class NetworkAccessManager;
+
+class CloudStorageStreamingService : public StreamingService {
+  Q_OBJECT
+
+ public:
+  explicit CloudStorageStreamingService(const SharedPtr<TaskManager> task_manager,
+                                        const SharedPtr<Database> database,
+                                        const SharedPtr<TagReaderClient> tagreader_client,
+                                        const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                                        const Song::Source source,
+                                        const QString &name,
+                                        const QString &url_scheme,
+                                        const QString &settings_group,
+                                        QObject *parent = nullptr);
+
+  bool is_indexing() const { return indexing_task_id_ != -1; }
+
+  SharedPtr<CollectionBackend> collection_backend() const { return collection_backend_; }
+  CollectionModel *collection_model() const { return collection_model_; }
+  CollectionFilter *collection_filter_model() const { return collection_model_->filter(); }
+
+  SharedPtr<CollectionBackend> songs_collection_backend() override { return collection_backend_; }
+  CollectionModel *songs_collection_model() override { return collection_model_; }
+  CollectionFilter *songs_collection_filter_model() override { return collection_model_->filter(); }
+
+  virtual void MaybeAddFileToDatabase(const QUrl &url, const QString &filename, const size_t size, const quint64 mtime, const QString &token_type = QString(), const QString &access_token = QString());
+  static bool IsSupportedFiletype(const QString &filename);
+
+ Q_SIGNALS:
+  void AllIndexingTasksFinished();
+
+ protected:
+  void AbortReadTagsReplies();
+
+ protected Q_SLOTS:
+  void ReadStreamFinished(TagReaderReadStreamReplyPtr reply, const QUrl url, const QString filename);
+
+ protected:
+  const SharedPtr<TaskManager> task_manager_;
+  const SharedPtr<TagReaderClient> tagreader_client_;
+  SharedPtr<CollectionBackend> collection_backend_;
+  CollectionModel *collection_model_;
+  QList<TagReaderReplyPtr> pending_tagreader_replies_;
+
+ private:
+  Song::Source source_;
+  int indexing_task_id_;
+  int indexing_task_progress_;
+  int indexing_task_max_;
+};
+
+#endif  // CLOUDSTORAGESTREAMINGSERVICE_H

src/utilities/coverutils.cpp

@@ -142,6 +142,8 @@ QString CoverUtils::CoverFilenameFromSource(const Song::Source source, const QUr
     case Song::Source::Stream:
     case Song::Source::SomaFM:
     case Song::Source::RadioParadise:
+    case Song::Source::Dropbox:
+    case Song::Source::OneDrive:
     case Song::Source::Unknown:
       filename = QString::fromLatin1(Sha1CoverHash(artist, album).toHex());
       break;

src/utilities/cryptutils.cpp

@@ -20,8 +20,6 @@
 #include <QByteArray>
 #include <QString>
 #include <QCryptographicHash>
-#include <QFile>
-#include <QIODevice>
 
 #include "cryptutils.h"
 
@@ -64,17 +62,4 @@ QByteArray HmacSha1(const QByteArray &key, const QByteArray &data) {
   return Hmac(key, data, QCryptographicHash::Sha1);
 }
 
-QByteArray Sha1File(QFile &file) {
-
-  file.open(QIODevice::ReadOnly);
-  QCryptographicHash hash(QCryptographicHash::Sha1);
-  while (!file.atEnd()) {
-    hash.addData(file.read(1000000));
-  }
-  file.close();
-
-  return hash.result();
-
-}
-
 }  // namespace Utilities

src/utilities/cryptutils.h

@@ -23,7 +23,6 @@
 #include <QByteArray>
 #include <QString>
 #include <QCryptographicHash>
-#include <QFile>
 
 namespace Utilities {
 
@@ -31,7 +30,6 @@ QByteArray Hmac(const QByteArray &key, const QByteArray &data, const QCryptograp
 QByteArray HmacMd5(const QByteArray &key, const QByteArray &data);
 QByteArray HmacSha256(const QByteArray &key, const QByteArray &data);
 QByteArray HmacSha1(const QByteArray &key, const QByteArray &data);
-QByteArray Sha1File(QFile &file);
 
 }  // namespace Utilities
 

src/widgets/filechooserwidget.cpp

@@ -1,116 +0,0 @@
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-
-#include "filechooserwidget.h"
-
-using namespace Qt::Literals::StringLiterals;
-
-FileChooserWidget::FileChooserWidget(QWidget *parent)
-    : QWidget(parent),
-      layout_(new QHBoxLayout(this)),
-      path_edit_(new QLineEdit(this)),
-      mode_(Mode::Directory) {
-
-  Init();
-
-}
-
-FileChooserWidget::FileChooserWidget(const Mode mode, const QString &initial_path, QWidget* parent)
-    : QWidget(parent),
-      layout_(new QHBoxLayout(this)),
-      path_edit_(new QLineEdit(this)),
-      mode_(mode) {
-
-  Init(initial_path);
-
-}
-
-FileChooserWidget::FileChooserWidget(const Mode mode, const QString &label, const QString &initial_path, QWidget* parent)
-    : QWidget(parent),
-      layout_(new QHBoxLayout(this)),
-      path_edit_(new QLineEdit(this)),
-      mode_(mode) {
-
-  layout_->addWidget(new QLabel(label, this));
-
-  Init(initial_path);
-
-}
-
-void FileChooserWidget::SetFileFilter(const QString &file_filter) {
-  file_filter_ = file_filter;
-}
-
-void FileChooserWidget::SetPath(const QString &path) {
-
-  QFileInfo fi(path);
-  if (fi.exists()) {
-    path_edit_->setText(path);
-    open_dir_path_ = fi.absolutePath();
-  }
-
-}
-
-QString FileChooserWidget::Path() const {
-
-  QString path(path_edit_->text());
-  QFileInfo fi(path);
-  if (!fi.exists()) return QString();
-  if (mode_ == Mode::File) {
-    if (!fi.isFile()) return QString();
-  }
-  else {
-    if (!fi.isDir()) return QString();
-  }
-
-  return path;
-
-}
-
-void FileChooserWidget::Init(const QString &initial_path) {
-
-  QFileInfo fi(initial_path);
-  if (fi.exists()) {
-    path_edit_->setText(initial_path);
-    open_dir_path_ = fi.absolutePath();
-  }
-  layout_->addWidget(path_edit_);
-
-  QPushButton* changePath = new QPushButton(QLatin1String("..."), this);
-  connect(changePath, &QAbstractButton::clicked, this, &FileChooserWidget::ChooseFile);
-  changePath->setFixedWidth(2 * changePath->fontMetrics().horizontalAdvance(" ... "_L1));
-
-  layout_->addWidget(changePath);
-  layout_->setContentsMargins(2, 0, 2, 0);
-
-  setFocusProxy(path_edit_);
-
-}
-
-void FileChooserWidget::ChooseFile() {
-
-  QString new_path;
-
-  if (mode_ == Mode::File) {
-    new_path = QFileDialog::getOpenFileName(this, tr("Select a file"), open_dir_path_, file_filter_);
-  }
-  else {
-    new_path = QFileDialog::getExistingDirectory(this, tr("Select a directory"), open_dir_path_);
-  }
-
-  if (!new_path.isEmpty()) {
-    QFileInfo fi(new_path);
-    open_dir_path_ = fi.absolutePath();
-    if (mode_ == Mode::File) {
-      path_edit_->setText(fi.absoluteFilePath());
-    }
-    else {
-      path_edit_->setText(fi.absoluteFilePath() + u"/"_s);
-    }
-  }
-
-}

src/widgets/filechooserwidget.h

@@ -1,40 +0,0 @@
-#ifndef FILECHOOSERWIDGET_H
-#define FILECHOOSERWIDGET_H
-
-#include <QWidget>
-
-class QLineEdit;
-class QHBoxLayout;
-
-class FileChooserWidget : public QWidget {
-  Q_OBJECT
-
- public:
-  enum class Mode { File, Directory };
-
- public:
-  explicit FileChooserWidget(QWidget *parent = nullptr);
-  explicit FileChooserWidget(const Mode mode, const QString& initial_path = QString(), QWidget *parent = nullptr);
-  explicit FileChooserWidget(const Mode mode, const QString& label, const QString &initial_path = QString(), QWidget *parent = nullptr);
-  ~FileChooserWidget() = default;
-
-  void SetFileFilter(const QString &file_filter);
-
-  void SetPath(const QString &path);
-  QString Path() const;
-
- public Q_SLOTS:
-  void ChooseFile();
-
- private:
-  void Init(const QString &initial_path = QString());
-
- private:
-  QHBoxLayout *layout_;
-  QLineEdit *path_edit_;
-  const Mode mode_;
-  QString file_filter_;
-  QString open_dir_path_;
-};
-
-#endif  // FILECHOOSERWIDGET_H