Made some UI states persistent across sessions, ref #484

src/libs/core/include/core/String.hpp

@@ -67,14 +67,25 @@ namespace lms::core::stringUtils
     template<typename T>
     [[nodiscard]] std::optional<T> readAs(std::string_view str)
     {
-        T res;
+        if constexpr (std::is_enum_v<T>)
+        {
+            using UnderlyingType = std::underlying_type_t<T>;
+            std::optional<UnderlyingType> underlyingValue{ readAs<UnderlyingType>(str) };
+            if (!underlyingValue)
+                return std::nullopt;
 
-        std::istringstream iss{ std::string{ str } };
-        iss >> res;
-        if (iss.fail())
-            return std::nullopt;
+            return static_cast<T>(*underlyingValue);
+        }
+        else
+        {
+            T res;
+            std::istringstream iss{ std::string{ str } };
+            iss >> res;
+            if (iss.fail())
+                return std::nullopt;
 
-        return res;
+            return res;
+        }
     }
 
     template<>

src/libs/database/CMakeLists.txt

@@ -24,6 +24,7 @@ add_library(lmsdatabase SHARED
 	impl/Track.cpp
 	impl/TrackBookmark.cpp
 	impl/Types.cpp
+	impl/UIState.cpp
 	impl/User.cpp
 	impl/Utils.cpp
 	)

src/libs/database/impl/Migration.cpp

@@ -35,7 +35,7 @@ namespace lms::db
 {
     namespace
     {
-        static constexpr Version LMS_DATABASE_VERSION{ 66 };
+        static constexpr Version LMS_DATABASE_VERSION{ 67 };
     }
 
     VersionInfo::VersionInfo()
@@ -744,6 +744,22 @@ SELECT
         session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
     }
 
+    void migrateFromV66(Session& session)
+    {
+        // New way of handling UI settings
+        session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "ui_state" (
+  "id" integer primary key autoincrement,
+  "version" integer not null,
+  "item" text not null,
+  "value" text not null,
+  "user_id" bigint,
+  constraint "fk_ui_state_user" foreign key ("user_id") references "user" ("id") on delete cascade deferrable initially deferred
+))");
+
+        session.getDboSession()->execute("ALTER TABLE user DROP COLUMN repeat_all");
+        session.getDboSession()->execute("ALTER TABLE user DROP COLUMN radio");
+    }
+
     bool doDbMigration(Session& session)
     {
         static const std::string outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
@@ -786,6 +802,7 @@ SELECT
             { 63, migrateFromV63 },
             { 64, migrateFromV64 },
             { 65, migrateFromV65 },
+            { 66, migrateFromV66 },
         };
 
         bool migrationPerformed{};

src/libs/database/impl/Session.cpp

@@ -44,6 +44,7 @@
 #include "database/TrackFeatures.hpp"
 #include "database/TrackList.hpp"
 #include "database/TransactionChecker.hpp"
+#include "database/UIState.hpp"
 #include "database/User.hpp"
 
 #include "EnumSetTraits.hpp"
@@ -117,6 +118,7 @@ namespace lms::db
         _session.mapClass<TrackFeatures>("track_features");
         _session.mapClass<TrackList>("tracklist");
         _session.mapClass<TrackListEntry>("tracklist_entry");
+        _session.mapClass<UIState>("ui_state");
         _session.mapClass<User>("user");
     }
 

src/libs/database/impl/UIState.cpp

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "database/UIState.hpp"
+
+#include "core/ILogger.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
+
+#include "IdTypeTraits.hpp"
+#include "StringViewTraits.hpp"
+#include "Utils.hpp"
+
+namespace lms::db
+{
+    UIState::UIState(std::string_view item, ObjectPtr<User> user)
+        : _item{ item }
+        , _user{ getDboPtr(user) }
+    {
+    }
+
+    UIState::pointer UIState::create(Session& session, std::string_view item, ObjectPtr<User> user)
+    {
+        return session.getDboSession()->add(std::unique_ptr<UIState>{ new UIState{ item, user } });
+    }
+
+    std::size_t UIState::getCount(Session& session)
+    {
+        session.checkReadTransaction();
+
+        return utils::fetchQuerySingleResult(session.getDboSession()->query<int>("SELECT COUNT(*) FROM ui_state"));
+    }
+
+    UIState::pointer UIState::find(Session& session, UIStateId settingId)
+    {
+        auto query{ session.getDboSession()->query<Wt::Dbo::ptr<UIState>>("SELECT ui_s from ui_state ui_s").where("ui_s.id = ?").bind(settingId) };
+        return utils::fetchQuerySingleResult(query);
+    }
+
+    UIState::pointer UIState::find(Session& session, std::string_view item, UserId userId)
+    {
+        auto query{ session.getDboSession()->query<Wt::Dbo::ptr<UIState>>("SELECT ui_s from ui_state ui_s").where("ui_s.item = ?").bind(item).where("ui_s.user_id = ?").bind(userId) };
+        return utils::fetchQuerySingleResult(query);
+    }
+} // namespace lms::db

src/libs/database/impl/User.cpp

@@ -24,6 +24,7 @@
 #include "database/Release.hpp"
 #include "database/Session.hpp"
 #include "database/Track.hpp"
+#include "database/UIState.hpp"
 
 #include "IdTypeTraits.hpp"
 #include "StringViewTraits.hpp"

src/libs/database/include/database/UIState.hpp

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <Wt/Dbo/Dbo.h>
+
+#include "core/String.hpp"
+#include "database/Object.hpp"
+#include "database/Types.hpp"
+#include "database/UIStateId.hpp"
+#include "database/UserId.hpp"
+
+namespace lms::db
+{
+    class User;
+    class Session;
+
+    class UIState final : public Object<UIState, UIStateId>
+    {
+    public:
+        UIState() = default;
+
+        static std::size_t getCount(Session& session);
+        static pointer find(Session& session, UIStateId settingId);
+        static pointer find(Session& session, std::string_view item, UserId userId);
+
+        // Getters
+        std::string_view getValue() const { return _value; };
+
+        // Setters
+        void setValue(std::string_view value) { _value = value; };
+
+        template<class Action>
+        void persist(Action& a)
+        {
+            Wt::Dbo::field(a, _item, "item");
+            Wt::Dbo::field(a, _value, "value");
+
+            Wt::Dbo::belongsTo(a, _user, "user", Wt::Dbo::OnDeleteCascade);
+        }
+
+    private:
+        friend class Session;
+        UIState(std::string_view item, ObjectPtr<User> user);
+        static pointer create(Session& session, std::string_view item, ObjectPtr<User> user);
+
+        std::string _item;
+        std::string _value;
+        Wt::Dbo::ptr<User> _user;
+    };
+} // namespace lms::db

src/libs/database/include/database/UIStateId.hpp

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "database/IdType.hpp"
+
+LMS_DECLARE_IDTYPE(UIStateId)

src/libs/database/include/database/User.hpp

@@ -35,6 +35,7 @@ namespace lms::db
 {
     class AuthToken;
     class Session;
+    class UIState;
 
     class User final : public Object<User, UserId>
     {
@@ -105,8 +106,6 @@ namespace lms::db
         void setSubsonicDefaultTranscodintOutputFormat(TranscodingOutputFormat encoding) { _subsonicDefaultTranscodingOutputFormat = encoding; }
         void setSubsonicDefaultTranscodingOutputBitrate(Bitrate bitrate);
         void setCurPlayingTrackPos(std::size_t pos) { _curPlayingTrackPos = pos; }
-        void setRadio(bool val) { _radio = val; }
-        void setRepeatAll(bool val) { _repeatAll = val; }
         void setUITheme(UITheme uiTheme) { _uiTheme = uiTheme; }
         void clearAuthTokens();
         void setSubsonicArtistListMode(SubsonicArtistListMode mode) { _subsonicArtistListMode = mode; }
@@ -122,8 +121,6 @@ namespace lms::db
         TranscodingOutputFormat getSubsonicDefaultTranscodingOutputFormat() const { return _subsonicDefaultTranscodingOutputFormat; }
         Bitrate getSubsonicDefaultTranscodingOutputBitrate() const { return _subsonicDefaultTranscodingOutputBitrate; }
         std::size_t getCurPlayingTrackPos() const { return _curPlayingTrackPos; }
-        bool isRepeatAllSet() const { return _repeatAll; }
-        bool isRadioSet() const { return _radio; }
         UITheme getUITheme() const { return _uiTheme; }
         SubsonicArtistListMode getSubsonicArtistListMode() const { return _subsonicArtistListMode; }
         FeedbackBackend getFeedbackBackend() const { return _feedbackBackend; }
@@ -149,10 +146,9 @@ namespace lms::db
 
             // UI player settings
             Wt::Dbo::field(a, _curPlayingTrackPos, "cur_playing_track_pos");
-            Wt::Dbo::field(a, _repeatAll, "repeat_all");
-            Wt::Dbo::field(a, _radio, "radio");
 
             Wt::Dbo::hasMany(a, _authTokens, Wt::Dbo::ManyToOne, "user");
+            Wt::Dbo::hasMany(a, _uiSettings, Wt::Dbo::ManyToOne, "user");
         }
 
     private:
@@ -180,10 +176,9 @@ namespace lms::db
 
         // User's dynamic data (UI)
         int _curPlayingTrackPos{}; // Current track position in queue
-        bool _repeatAll{};
-        bool _radio{};
 
         Wt::Dbo::collection<Wt::Dbo::ptr<AuthToken>> _authTokens;
+        Wt::Dbo::collection<Wt::Dbo::ptr<UIState>> _uiSettings;
     };
 
 } // namespace lms::db

src/libs/database/test/Migration.cpp

@@ -29,6 +29,8 @@
 #include "database/StarredArtist.hpp"
 #include "database/StarredRelease.hpp"
 #include "database/StarredTrack.hpp"
+#include "database/UIState.hpp"
+#include "database/User.hpp"
 
 namespace lms::db::tests
 {
@@ -349,6 +351,7 @@ VALUES
             EXPECT_FALSE(StarredTrack::find(session, StarredTrackId{}));
             EXPECT_FALSE(Track::find(session, TrackId{}));
             EXPECT_FALSE(TrackList::find(session, TrackListId{}));
+            EXPECT_FALSE(UIState::find(session, UIStateId{}));
             EXPECT_FALSE(User::find(session, UserId{}));
         }
     }

src/lms/CMakeLists.txt

@@ -11,6 +11,7 @@ add_executable(lms
 	ui/NotificationContainer.cpp
 	ui/PlayQueue.cpp
 	ui/SettingsView.cpp
+	ui/State.cpp
 	ui/Utils.cpp
 	ui/admin/InitWizardView.cpp
 	ui/admin/MediaLibrariesView.cpp

src/lms/ui/LmsApplication.cpp

@@ -207,34 +207,34 @@ namespace lms::ui
 
     db::User::pointer LmsApplication::getUser()
     {
-        if (!_authenticatedUser)
+        if (!_user)
             return {};
 
-        return db::User::find(getDbSession(), _authenticatedUser->userId);
+        return db::User::find(getDbSession(), _user->userId);
     }
 
-    db::UserId LmsApplication::getUserId()
+    db::UserId LmsApplication::getUserId() const
     {
-        return _authenticatedUser->userId;
+        assert(_user);
+        return _user->userId;
     }
 
     bool LmsApplication::isUserAuthStrong() const
     {
-        return _authenticatedUser->strongAuth;
+        assert(_user);
+        return _user->strongAuth;
     }
 
-    db::UserType LmsApplication::getUserType()
+    db::UserType LmsApplication::getUserType() const
     {
-        auto transaction{ getDbSession().createReadTransaction() };
-
-        return getUser()->getType();
+        assert(_user);
+        return _user->userType;
     }
 
-    std::string LmsApplication::getUserLoginName()
+    std::string_view LmsApplication::getUserLoginName() const
     {
-        auto transaction{ getDbSession().createReadTransaction() };
-
-        return getUser()->getLoginName();
+        assert(_user);
+        return _user->userLoginName;
     }
 
     LmsApplication::LmsApplication(const Wt::WEnvironment& env,
@@ -244,11 +244,10 @@ namespace lms::ui
         : Wt::WApplication{ env }
         , _db{ db }
         , _appManager{ appManager }
-        , _authenticatedUser{ userId ? std::make_optional<UserAuthInfo>(UserAuthInfo{ *userId, false }) : std::nullopt }
     {
         try
         {
-            init();
+            init(userId);
         }
         catch (LmsApplicationException& e)
         {
@@ -264,7 +263,7 @@ namespace lms::ui
 
     LmsApplication::~LmsApplication() = default;
 
-    void LmsApplication::init()
+    void LmsApplication::init(std::optional<db::UserId> userId)
     {
         LMS_SCOPED_TRACE_OVERVIEW("UI", "ApplicationInit");
 
@@ -279,8 +278,8 @@ namespace lms::ui
         // Handle Media Scanner events and other session events
         enableUpdates(true);
 
-        if (_authenticatedUser)
-            onUserLoggedIn();
+        if (userId)
+            onUserLoggedIn(*userId, false /* strongAuth */);
         else if (core::Service<auth::IPasswordService>::exists())
             processPasswordAuth();
     }
@@ -292,8 +291,7 @@ namespace lms::ui
             if (userId)
             {
                 LMS_LOG(UI, DEBUG, "User authenticated using Auth token!");
-                _authenticatedUser = { *userId, false };
-                onUserLoggedIn();
+                onUserLoggedIn(*userId, false /* strongAuth */);
                 return;
             }
         }
@@ -315,15 +313,14 @@ namespace lms::ui
         {
             Auth* auth{ root()->addNew<Auth>() };
             auth->userLoggedIn.connect(this, [this](db::UserId userId) {
-                _authenticatedUser = { userId, true };
-                onUserLoggedIn();
+                onUserLoggedIn(userId, true /* strongAuth */);
             });
         }
     }
 
     void LmsApplication::finalize()
     {
-        if (_authenticatedUser)
+        if (_user)
             _appManager.unregisterApplication(*this);
 
         preQuit().emit();
@@ -359,10 +356,12 @@ namespace lms::ui
         goHomeAndQuit();
     }
 
-    void LmsApplication::onUserLoggedIn()
+    void LmsApplication::onUserLoggedIn(db::UserId userId, bool strongAuth)
     {
         root()->clear();
 
+        setUserInfo(userId, strongAuth);
+
         LMS_LOG(UI, INFO, "User '" << getUserLoginName() << "' logged in from '" << environment().clientAddress() << "', user agent = " << environment().userAgent());
 
         _appManager.registerApplication(*this);
@@ -380,6 +379,23 @@ namespace lms::ui
         createHome();
     }
 
+    void LmsApplication::setUserInfo(db::UserId userId, bool strongAuth)
+    {
+        auto transaction{ getDbSession().createReadTransaction() };
+
+        const db::User::pointer user{ db::User::find(getDbSession(), userId) };
+        if (!user)
+            throw core::LmsException{ "Internal error" }; // Do not put details here at it may appear on the user rendered html
+
+        assert(!_user);
+        _user = UserAuthInfo{
+            .userId = userId,
+            .userType = user->getType(),
+            .userLoginName = user->getLoginName(),
+            .strongAuth = strongAuth
+        };
+    }
+
     void LmsApplication::createHome()
     {
         LMS_SCOPED_TRACE_OVERVIEW("UI", "ApplicationCreateHome");
@@ -420,7 +436,7 @@ namespace lms::ui
         navbar->bindNew<Wt::WAnchor>("tracklists", Wt::WLink{ Wt::LinkType::InternalPath, "/tracklists" }, Wt::WString::tr("Lms.Explore.tracklists"));
 
         Filters* filters{ navbar->bindNew<Filters>("filters") };
-        navbar->bindString("username", getUserLoginName(), Wt::TextFormat::Plain);
+        navbar->bindString("username", std::string{ getUserLoginName() }, Wt::TextFormat::Plain);
         navbar->bindNew<Wt::WAnchor>("settings", Wt::WLink{ Wt::LinkType::InternalPath, "/settings" }, Wt::WString::tr("Lms.Settings.menu-settings"));
 
         {

src/lms/ui/LmsApplication.hpp

@@ -20,6 +20,8 @@
 #pragma once
 
 #include <optional>
+#include <string>
+#include <string_view>
 
 #include <Wt/WApplication.h>
 
@@ -63,10 +65,10 @@ namespace lms::ui
         db::Session& getDbSession(); // always thread safe
 
         db::ObjectPtr<db::User> getUser();
-        db::UserId getUserId();
+        db::UserId getUserId() const;
         bool isUserAuthStrong() const;  // user must be logged in prior this call
-        db::UserType getUserType();     // user must be logged in prior this call
-        std::string getUserLoginName(); // user must be logged in prior this call
+        db::UserType getUserType() const;     // user must be logged in prior this call
+        std::string_view getUserLoginName() const; // user must be logged in prior this call
 
         // Proxified scanner events
         scanner::Events& getScannerEvents() { return _scannerEvents; }
@@ -86,18 +88,19 @@ namespace lms::ui
         Wt::Signal<>& preQuit() { return _preQuit; }
 
     private:
-        void init();
+        void init(std::optional<db::UserId> userId);
         void processPasswordAuth();
         void handleException(LmsApplicationException& e);
         void goHomeAndQuit();
 
         // Signal slots
         void logoutUser();
-        void onUserLoggedIn();
+        void onUserLoggedIn(db::UserId userId, bool strongAuth);
 
         void notify(const Wt::WEvent& event) override;
         void finalize() override;
 
+        void setUserInfo(db::UserId userId, bool strongAuth);
         void createHome();
 
         db::Db& _db;
@@ -107,9 +110,11 @@ namespace lms::ui
         struct UserAuthInfo
         {
             db::UserId userId;
+            db::UserType userType{ db::UserType::REGULAR };
+            std::string userLoginName;
             bool strongAuth{};
         };
-        std::optional<UserAuthInfo> _authenticatedUser;
+        std::optional<UserAuthInfo> _user;
         std::shared_ptr<CoverResource> _coverResource;
         MediaPlayer* _mediaPlayer{};
         PlayQueue* _playQueue{};

src/lms/ui/PlayQueue.cpp

@@ -45,6 +45,7 @@
 #include "LmsApplication.hpp"
 #include "MediaPlayer.hpp"
 #include "ModalManager.hpp"
+#include "State.hpp"
 #include "Utils.hpp"
 #include "common/InfiniteScrollingContainer.hpp"
 #include "common/MandatoryValidator.hpp"
@@ -156,35 +157,21 @@ namespace lms::ui
 
         _repeatBtn = bindNew<Wt::WCheckBox>("repeat-btn");
         _repeatBtn->clicked().connect([this] {
-            auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
-
-            if (!LmsApp->getUser()->isDemo())
-                LmsApp->getUser().modify()->setRepeatAll(isRepeatAllSet());
+            state::writeValue<bool>("player_repeat_all", isRepeatAllSet());
         });
-        {
-            auto transaction{ LmsApp->getDbSession().createReadTransaction() };
-            if (LmsApp->getUser()->isRepeatAllSet())
-                _repeatBtn->setCheckState(Wt::CheckState::Checked);
-        }
+        if (state::readValue<bool>("player_repeat_all").value_or(false))
+            _repeatBtn->setCheckState(Wt::CheckState::Checked);
 
         _radioBtn = bindNew<Wt::WCheckBox>("radio-btn");
         _radioBtn->clicked().connect([this] {
             {
-                auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
-
-                if (!LmsApp->getUser()->isDemo())
-                    LmsApp->getUser().modify()->setRadio(isRadioModeSet());
+                state::writeValue<bool>("player_radio_mode", isRadioModeSet());
             }
             if (isRadioModeSet())
                 enqueueRadioTracksIfNeeded();
         });
 
-        bool isRadioModeSet{};
-        {
-            auto transaction{ LmsApp->getDbSession().createReadTransaction() };
-            isRadioModeSet = LmsApp->getUser()->isRadioSet();
-        }
-        if (isRadioModeSet)
+        if (state::readValue<bool>("player_radio_mode").value_or(false))
         {
             _radioBtn->setCheckState(Wt::CheckState::Checked);
             enqueueRadioTracksIfNeeded();

src/lms/ui/SettingsView.cpp

@@ -102,7 +102,7 @@ namespace lms::ui
                 }
 
                 addField(PasswordField);
-                setValidator(PasswordField, createPasswordStrengthValidator([] { return auth::PasswordValidationContext{ LmsApp->getUserLoginName(), LmsApp->getUserType() }; }));
+                setValidator(PasswordField, createPasswordStrengthValidator([] { return auth::PasswordValidationContext{ .loginName = std::string{ LmsApp->getUserLoginName() }, .userType = LmsApp->getUserType() }; }));
                 addField(PasswordConfirmField);
             }
 

src/lms/ui/State.cpp

@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "State.hpp"
+
+#include "core/ILogger.hpp"
+#include "database/Session.hpp"
+#include "database/UIState.hpp"
+#include "database/User.hpp"
+
+#include "LmsApplication.hpp"
+
+namespace lms::ui::state::details
+{
+    void writeValue(std::string_view item, std::string_view value)
+    {
+        // No UI state stored for demo user
+        if (LmsApp->getUserType() == db::UserType::DEMO)
+            return;
+
+        LMS_LOG(UI, DEBUG, "Write state '" << item << "': '" << value << "'");
+
+        {
+            auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
+
+            db::UIState::pointer state{ db::UIState::find(LmsApp->getDbSession(), item, LmsApp->getUserId()) };
+            if (!state)
+            {
+                if (db::User::pointer user{ LmsApp->getUser() })
+                    state = LmsApp->getDbSession().create<db::UIState>(item, user);
+            }
+
+            if (state)
+                state.modify()->setValue(value);
+        }
+    }
+
+    std::optional<std::string> readValue(std::string_view item)
+    {
+        std::optional<std::string> res;
+
+        // No UI state stored for demo user
+        if (LmsApp->getUserType() == db::UserType::DEMO)
+            return res;
+
+        {
+            auto transaction{ LmsApp->getDbSession().createReadTransaction() };
+
+            const db::UIState::pointer state{ db::UIState::find(LmsApp->getDbSession(), item, LmsApp->getUserId()) };
+            if (state)
+                res = state->getValue();
+        }
+
+        LMS_LOG(UI, DEBUG, "Read state '" << item << "': '" << (res ? *res : "<no value>") << "'";);
+
+        return res;
+    }
+
+    void eraseValue(std::string_view item)
+    {
+        // No UI state stored for demo user
+        if (LmsApp->getUserType() == db::UserType::DEMO)
+            return;
+
+        LMS_LOG(UI, DEBUG, "Removing state '" << item << "'");
+
+        {
+            auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
+
+            db::UIState::pointer state{ db::UIState::find(LmsApp->getDbSession(), item, LmsApp->getUserId()) };
+            if (state)
+                state.remove();
+        }
+    }
+
+} // namespace lms::ui::state::details

src/lms/ui/State.hpp

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <optional>
+#include <string>
+#include <string_view>
+
+#include "core/String.hpp"
+
+namespace lms::ui::state
+{
+    namespace details
+    {
+        std::optional<std::string> readValue(std::string_view item);
+        void writeValue(std::string_view item, std::string_view value);
+        void eraseValue(std::string_view item);
+    } // namespace details
+
+    template<typename T>
+    void writeValue(std::string_view item, std::optional<T> value)
+    {
+        if (value.has_value())
+        {
+            if constexpr (std::is_enum_v<T>)
+                details::writeValue(item, std::to_string(static_cast<std::underlying_type_t<T>>(*value)));
+            else
+                details::writeValue(item, std::to_string(*value));
+        }
+        else
+            details::eraseValue(item);
+    }
+
+    template<typename T>
+    std::optional<T> readValue(std::string_view item)
+    {
+        if (std::optional<std::string> res{ details::readValue(item) })
+            return core::stringUtils::readAs<T>(*res);
+
+        return std::nullopt;
+    }
+
+} // namespace lms::ui::state

src/lms/ui/explore/ArtistsView.cpp

@@ -30,6 +30,7 @@
 #include "Filters.hpp"
 #include "LmsApplication.hpp"
 #include "SortModeSelector.hpp"
+#include "State.hpp"
 #include "TrackArtistLinkTypeSelector.hpp"
 #include "common/InfiniteScrollingContainer.hpp"
 
@@ -50,15 +51,27 @@ namespace lms::ui
             refreshView(searEdit->text());
         });
 
-        SortModeSelector* sortModeSelector{ bindNew<SortModeSelector>("sort-mode", _defaultSortMode) };
-        sortModeSelector->itemSelected.connect([this](ArtistCollector::Mode sortMode) {
-            refreshView(sortMode);
-        });
+        {
+            const ArtistCollector::Mode sortMode{ state::readValue<ArtistCollector::Mode>("artists_sort_mode").value_or(_defaultSortMode) };
+            _artistCollector.setMode(sortMode);
 
-        TrackArtistLinkTypeSelector* linkTypeSelector{ bindNew<TrackArtistLinkTypeSelector>("link-type", _defaultLinkType) };
-        linkTypeSelector->itemSelected.connect([this](std::optional<TrackArtistLinkType> linkType) {
-            refreshView(linkType);
-        });
+            SortModeSelector* sortModeSelector{ bindNew<SortModeSelector>("sort-mode", sortMode) };
+            sortModeSelector->itemSelected.connect([this](ArtistCollector::Mode newSortMode) {
+                state::writeValue<ArtistCollector::Mode>("artists_sort_mode", newSortMode);
+                refreshView(newSortMode);
+            });
+        }
+
+        {
+            const std::optional<TrackArtistLinkType> linkType{ state::readValue<TrackArtistLinkType>("artists_link_type") };
+            _artistCollector.setArtistLinkType(linkType);
+
+            TrackArtistLinkTypeSelector* linkTypeSelector{ bindNew<TrackArtistLinkTypeSelector>("link-type", linkType) };
+            linkTypeSelector->itemSelected.connect([this](std::optional<TrackArtistLinkType> newLinkType) {
+                state::writeValue<TrackArtistLinkType>("artists_link_type", newLinkType);
+                refreshView(newLinkType);
+            });
+        }
 
         _container = bindNew<InfiniteScrollingContainer>("artists", Wt::WString::tr("Lms.Explore.Artists.template.container"));
         _container->onRequestElements.connect([this] {

src/lms/ui/explore/ArtistsView.hpp

@@ -54,6 +54,5 @@ namespace lms::ui
         InfiniteScrollingContainer* _container{};
         ArtistCollector _artistCollector;
         static constexpr ArtistCollector::Mode _defaultSortMode{ ArtistCollector::Mode::Random };
-        static constexpr std::optional<db::TrackArtistLinkType> _defaultLinkType{ std::nullopt };
     };
 } // namespace lms::ui

src/lms/ui/explore/DropDownMenuSelector.hpp

@@ -45,7 +45,9 @@ namespace lms::ui
         {
             auto* menuItem{ bindNew<Wt::WPushButton>(var, title) };
             menuItem->clicked().connect([this, menuItem, title, item] {
-                _currentActiveItem->removeStyleClass("active");
+                if (_currentActiveItem)
+                    _currentActiveItem->removeStyleClass("active");
+
                 menuItem->addStyleClass("active");
                 _currentActiveItem = menuItem;
                 _selectedItem->setText(title);

src/lms/ui/explore/Filters.cpp

@@ -32,6 +32,7 @@
 
 #include "LmsApplication.hpp"
 #include "ModalManager.hpp"
+#include "State.hpp"
 #include "Utils.hpp"
 #include "common/ValueStringModel.hpp"
 
@@ -54,7 +55,7 @@ namespace lms::ui
                 auto transaction{ LmsApp->getDbSession().createReadTransaction() };
                 db::ClusterType::find(LmsApp->getDbSession(), [&](const db::ClusterType::pointer& clusterType) {
                     typeModel->add(Wt::WString::fromUTF8(std::string{ clusterType->getName() }), clusterType->getId());
-                });
+                    });
             }
 
             typeModel->add(Wt::WString::tr("Lms.Explore.media-library"), MediaLibraryTag{});
@@ -77,7 +78,7 @@ namespace lms::ui
             {
                 db::MediaLibrary::find(session, [&](const db::MediaLibrary::pointer& library) {
                     valueModel->add(Wt::WString::fromUTF8(std::string{ library->getName() }), library->getId());
-                });
+                    });
             }
             else if (const db::ClusterTypeId * clusterTypeId{ std::get_if<db::ClusterTypeId>(&type) })
             {
@@ -87,7 +88,7 @@ namespace lms::ui
 
                 db::Cluster::find(session, params, [&](const db::Cluster::pointer& cluster) {
                     valueModel->add(Wt::WString::fromUTF8(std::string{ cluster->getName() }), cluster->getId());
-                });
+                    });
             }
 
             return valueModel;
@@ -115,6 +116,7 @@ namespace lms::ui
             if (const db::MediaLibraryId * mediaLibraryId{ std::get_if<db::MediaLibraryId>(&value) })
             {
                 set(*mediaLibraryId);
+                state::writeValue<db::MediaLibraryId::ValueType>("filters_media_library_id", mediaLibraryId->getValue());
             }
             else if (const db::ClusterId * clusterId{ std::get_if<db::ClusterId>(&value) })
             {
@@ -123,12 +125,12 @@ namespace lms::ui
 
             // TODO
             LmsApp->getModalManager().dispose(dialogPtr);
-        });
+            });
 
         Wt::WPushButton* cancelBtn{ dialog->bindNew<Wt::WPushButton>("cancel-btn", Wt::WString::tr("Lms.cancel")) };
         cancelBtn->clicked().connect([=] {
             LmsApp->getModalManager().dispose(dialogPtr);
-        });
+            });
 
         typeCombo->activated().connect([valueCombo, typeModel](int row) {
             const TypeVariant type{ typeModel->getValue(row) };
@@ -136,7 +138,7 @@ namespace lms::ui
             const std::shared_ptr<ValueModel> valueModel{ createValueModel(type) };
             valueCombo->clear();
             valueCombo->setModel(valueModel);
-        });
+            });
 
         typeCombo->activated().emit(0); // force emit to refresh the type combo model
 
@@ -153,6 +155,9 @@ namespace lms::ui
         addFilterBtn->clicked().connect(this, &Filters::showDialog);
 
         _filters = bindNew<Wt::WContainerWidget>("clusters");
+
+        if (const std::optional<db::MediaLibraryId::ValueType> mediaLibraryId{ state::readValue<db::MediaLibraryId::ValueType>("filters_media_library_id") })
+            set(*mediaLibraryId);
     }
 
     void Filters::add(db::ClusterId clusterId)
@@ -176,7 +181,7 @@ namespace lms::ui
             _filters->removeWidget(filter);
             _clusterIds.erase(std::remove_if(std::begin(_clusterIds), std::end(_clusterIds), [clusterId](db::ClusterId id) { return id == clusterId; }), std::end(_clusterIds));
             _sigUpdated.emit();
-        });
+            });
 
         emitFilterAddedNotification();
     }
@@ -208,7 +213,8 @@ namespace lms::ui
             _mediaLibraryId = db::MediaLibraryId{};
             _mediaLibraryFilter = nullptr;
             _sigUpdated.emit();
-        });
+            state::writeValue<db::MediaLibraryId::ValueType>("filters_media_library_id", std::nullopt);
+            });
 
         emitFilterAddedNotification();
     }

src/lms/ui/explore/ReleasesView.cpp

@@ -27,6 +27,7 @@
 
 #include "LmsApplication.hpp"
 #include "SortModeSelector.hpp"
+#include "State.hpp"
 #include "common/InfiniteScrollingContainer.hpp"
 #include "common/Template.hpp"
 #include "explore/Filters.hpp"
@@ -51,10 +52,16 @@ namespace lms::ui
             refreshView(searEdit->text());
         });
 
-        SortModeSelector* sortMode{ bindNew<SortModeSelector>("sort-mode", _defaultMode) };
-        sortMode->itemSelected.connect([this](ReleaseCollector::Mode sortMode) {
-            refreshView(sortMode);
-        });
+        {
+            const ReleaseCollector::Mode sortMode{ state::readValue<ReleaseCollector::Mode>("releases_sort_mode").value_or(_defaultMode) };
+            _releaseCollector.setMode(sortMode);
+
+            SortModeSelector* sortModeSelector{ bindNew<SortModeSelector>("sort-mode", sortMode) };
+            sortModeSelector->itemSelected.connect([this](ReleaseCollector::Mode newSortMode) {
+                state::writeValue<ReleaseCollector::Mode>("releases_sort_mode", newSortMode);
+                refreshView(newSortMode);
+            });
+        }
 
         Wt::WPushButton* playBtn{ bindNew<Wt::WPushButton>("play-btn", Wt::WString::tr("Lms.Explore.play"), Wt::TextFormat::XHTML) };
         playBtn->clicked().connect([this] {

src/lms/ui/explore/TrackListsView.cpp

@@ -27,6 +27,7 @@
 #include "DropDownMenuSelector.hpp"
 #include "Filters.hpp"
 #include "LmsApplication.hpp"
+#include "State.hpp"
 #include "Utils.hpp"
 #include "common/InfiniteScrollingContainer.hpp"
 #include "common/Template.hpp"
@@ -42,15 +43,20 @@ namespace lms::ui
         addFunction("tr", &Wt::WTemplate::Functions::tr);
         addFunction("id", &Wt::WTemplate::Functions::id);
 
-        using SortModeSelector = DropDownMenuSelector<TrackLists::Mode>;
-        SortModeSelector* sortModeSelector{ bindNew<SortModeSelector>("sort-mode", Wt::WString::tr("Lms.Explore.TrackLists.template.sort-mode"), _mode) };
-        sortModeSelector->bindItem("recently-modified", Wt::WString::tr("Lms.Explore.recently-modified"), Mode::RecentlyModified);
-        sortModeSelector->bindItem("all", Wt::WString::tr("Lms.Explore.all"), Mode::All);
+        {
+            _mode = state::readValue<Mode>("tracklists_sort_mode").value_or(_defaultMode);
 
-        sortModeSelector->itemSelected.connect(this, [this](TrackLists::Mode mode) {
-            _mode = mode;
-            refreshView();
-        });
+            using SortModeSelector = DropDownMenuSelector<TrackLists::Mode>;
+            SortModeSelector* sortModeSelector{ bindNew<SortModeSelector>("sort-mode", Wt::WString::tr("Lms.Explore.TrackLists.template.sort-mode"), _mode) };
+            sortModeSelector->bindItem("recently-modified", Wt::WString::tr("Lms.Explore.recently-modified"), Mode::RecentlyModified);
+            sortModeSelector->bindItem("all", Wt::WString::tr("Lms.Explore.all"), Mode::All);
+
+            sortModeSelector->itemSelected.connect(this, [this](TrackLists::Mode mode) {
+                state::writeValue<Mode>("tracklists_sort_mode", mode);
+                _mode = mode;
+                refreshView();
+            });
+        }
 
         _container = bindNew<InfiniteScrollingContainer>("tracklists", Wt::WString::tr("Lms.Explore.TrackLists.template.container"));
         _container->onRequestElements.connect([this] {

src/lms/ui/explore/TrackListsView.hpp

@@ -57,10 +57,11 @@ namespace lms::ui
         void addSome();
         void addTracklist(const db::ObjectPtr<db::TrackList>& trackList);
 
+        static constexpr Mode _defaultMode{ Mode::RecentlyModified };
         static constexpr std::size_t _batchSize{ 30 };
         static constexpr std::size_t _maxCount{ 500 };
 
-        Mode _mode{ Mode::RecentlyModified };
+        Mode _mode;
         Filters& _filters;
         Wt::WWidget* _currentActiveItem{};
         InfiniteScrollingContainer* _container{};

src/lms/ui/explore/TracksView.cpp

@@ -28,6 +28,7 @@
 
 #include "LmsApplication.hpp"
 #include "SortModeSelector.hpp"
+#include "State.hpp"
 #include "common/InfiniteScrollingContainer.hpp"
 #include "explore/Filters.hpp"
 #include "explore/PlayQueueController.hpp"
@@ -52,10 +53,16 @@ namespace lms::ui
             refreshView(searEdit->text());
         });
 
-        SortModeSelector* sortMode{ bindNew<SortModeSelector>("sort-mode", _defaultMode) };
-        sortMode->itemSelected.connect([this](TrackCollector::Mode mode) {
-            refreshView(mode);
-        });
+        {
+            const TrackCollector::Mode sortMode{ state::readValue<TrackCollector::Mode>("tracks_sort_mode").value_or(_defaultMode) };
+            _trackCollector.setMode(sortMode);
+
+            SortModeSelector* sortModeSelector{ bindNew<SortModeSelector>("sort-mode", sortMode) };
+            sortModeSelector->itemSelected.connect([this](TrackCollector::Mode newSortMode) {
+                state::writeValue<TrackCollector::Mode>("tracks_sort_mode", newSortMode);
+                refreshView(newSortMode);
+            });
+        }
 
         bindNew<Wt::WPushButton>("play-btn", Wt::WString::tr("Lms.Explore.play"), Wt::TextFormat::XHTML)
             ->clicked()