feat: migrate early ini to early json

Author: Charliechen114514

cmake/generate_desktop_settings.cmake

@@ -3,11 +3,11 @@
 # ============================================================
 # This module generates:
 #   1. desktop_settings.h - compile-time header with default paths
-#   2. settings/early.ini - pre-configured settings for overlay
+#   2. settings/early.json - pre-configured settings for overlay
 #
 # Output directories:
 #   ${CMAKE_BINARY_DIR}/autogen/desktop_settings/  (header)
-#   ${CMAKE_BINARY_DIR}/bin/settings/              (early.ini)
+#   ${CMAKE_BINARY_DIR}/bin/settings/              (early.json)
 #
 # Cross-compilation:
 #   Set -DCFDESKTOP_DEFAULT_ROOT=<path> to override the default
@@ -42,7 +42,9 @@ function(cf_generate_desktop_settings)
     else()
         # Native build: use host environment variables
         if(WIN32)
-            set(CFDESKTOP_DEFAULT_ROOT "$ENV{USERPROFILE}/cfdesktop/")
+            # Normalize to forward slashes to avoid Qt6 QSettings treating
+            # backslashes as escape sequences in the INI file
+            file(TO_CMAKE_PATH "$ENV{USERPROFILE}/cfdesktop/" CFDESKTOP_DEFAULT_ROOT)
         else()
             set(CFDESKTOP_DEFAULT_ROOT "$ENV{HOME}/desktop")
         endif()
@@ -67,23 +69,23 @@ function(cf_generate_desktop_settings)
     log_info("DesktopSettings" "Desktop root default: ${CFDESKTOP_DEFAULT_ROOT}")
 
     # ----------------------------------------------------------
-    # 2. Generate settings/early.ini (pre-configured for overlay)
+    # 2. Generate settings/early.json (pre-configured for overlay)
     # ----------------------------------------------------------
-    set(EARLY_INI_OUTPUT_DIR ${CMAKE_BINARY_DIR}/bin/settings)
-    file(MAKE_DIRECTORY ${EARLY_INI_OUTPUT_DIR})
+    set(EARLY_JSON_OUTPUT_DIR ${CMAKE_BINARY_DIR}/bin/settings)
+    file(MAKE_DIRECTORY ${EARLY_JSON_OUTPUT_DIR})
 
     # Only generate if not already present (preserve developer customizations)
-    set(EARLY_INI_PATH ${EARLY_INI_OUTPUT_DIR}/early.ini)
+    set(EARLY_JSON_PATH ${EARLY_JSON_OUTPUT_DIR}/early.json)
 
-    if(NOT EXISTS "${EARLY_INI_PATH}" OR CFDESKTOP_OVERLAY_FORCE)
+    if(NOT EXISTS "${EARLY_JSON_PATH}" OR CFDESKTOP_OVERLAY_FORCE)
         configure_file(
-            ${CMAKE_SOURCE_DIR}/cmake/meta_info/early_settings.template.ini.in
-            ${EARLY_INI_PATH}
+            ${CMAKE_SOURCE_DIR}/cmake/meta_info/early_settings.template.json.in
+            ${EARLY_JSON_PATH}
             @ONLY
         )
-        log_info("DesktopSettings" "Generated settings/early.ini in: ${EARLY_INI_OUTPUT_DIR}")
+        log_info("DesktopSettings" "Generated settings/early.json in: ${EARLY_JSON_OUTPUT_DIR}")
     else()
-        log_info("DesktopSettings" "settings/early.ini already exists, skipping generation")
+        log_info("DesktopSettings" "settings/early.json already exists, skipping generation")
     endif()
 
     # ----------------------------------------------------------

cmake/meta_info/desktop_settings.template.h.in

@@ -12,16 +12,16 @@
 
 namespace cf::desktop::early_stage {
 /// @brief Default relative path to the early settings configuration file.
-static constexpr const char* EARLY_SETTINGS = "settings/early.ini";
+static constexpr const char* EARLY_SETTINGS = "settings/early.json";
 
-/// @brief Template content for generating the early settings INI file.
-static constexpr const char* EARLY_SETTINGS_TEMPLATE = R"([logger]
-# Dirent Should be relatives at CFDesktop Itself
-dirent="logger/"
-
-[desktop]
-# Desktop Root Places, that place will be the place where desktop
-# Scan and, maybe created the subdirectories
-root="@CFDESKTOP_DEFAULT_ROOT@"
+/// @brief Template content for generating the early settings JSON file.
+static constexpr const char* EARLY_SETTINGS_TEMPLATE = R"({
+    "logger": {
+        "dirent": "logger/"
+    },
+    "desktop": {
+        "root": "@CFDESKTOP_DEFAULT_ROOT@"
+    }
+}
 )";
 } // namespace cf::desktop::early_stage

cmake/meta_info/early_settings.template.ini.in

@@ -0,0 +1,8 @@
+{
+    "logger": {
+        "dirent": "logger/"
+    },
+    "desktop": {
+        "root": "@CFDESKTOP_DEFAULT_ROOT@"
+    }
+}

cmake/meta_info/early_settings.template.json.in

@@ -1,27 +1,46 @@
 #include "settings/early_settings.h"
 #include "file_op.h"
 #include "log/log_helper.h"
-#include <memory>
+#include <QFile>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 namespace cf::desktop::early_settings {
 
-EarlySettings::EarlySettings(const QString& early_config_path)
-    : early_settings(std::make_unique<QSettings>(early_config_path, QSettings::IniFormat)) {}
+EarlySettings::~EarlySettings() {}
+
+EarlySettings::EarlySettings(const QString& early_config_path) : filepath_(early_config_path) {
+    QFile file(early_config_path);
+    if (!file.open(QIODevice::ReadOnly)) {
+        valid_ = false;
+        return;
+    }
+
+    QByteArray data = file.readAll();
+    file.close();
+
+    QJsonParseError parseError;
+    QJsonDocument doc = QJsonDocument::fromJson(data, &parseError);
+
+    if (parseError.error != QJsonParseError::NoError || !doc.isObject()) {
+        valid_ = false;
+        return;
+    }
+
+    early_settings_obj_ = std::make_unique<QJsonObject>(doc.object());
+    valid_ = true;
+}
 
 bool EarlySettings::valid() const {
-    if (!early_settings)
-        return false;
-    return early_settings->status() == QSettings::NoError;
+    return valid_;
 }
 
 QString EarlySettings::loadFrom() const {
-    if (!early_settings)
-        return "invalid settings";
-    return early_settings->fileName();
+    return filepath_;
 }
 
 QString EarlySettings::get_boot_logger_path() const {
-    if (!valid()) {
+    if (!valid() || !early_settings_obj_) {
         return {};
     }
 
@@ -30,7 +49,8 @@ QString EarlySettings::get_boot_logger_path() const {
     }
 
     const auto log_file_rev = base::filesystem::concat_filepath(
-        early_settings->value("logger/dirent", "").value<QString>(), logger_helper::log_filename());
+        (*early_settings_obj_)["logger"].toObject()["dirent"].toString(),
+        logger_helper::log_filename());
     const auto log_file =
         base::filesystem::concat_filepath(base::filesystem::app_runtime_dir(), log_file_rev);
 
@@ -39,20 +59,20 @@ QString EarlySettings::get_boot_logger_path() const {
 }
 
 QString EarlySettings::get_desktop_root() const {
-    if (!valid()) {
+    if (!valid() || !early_settings_obj_) {
         return {};
     }
 
     if (!desktop_root.isEmpty()) {
         return desktop_root;
     }
 
-    desktop_root = early_settings->value("desktop/root", "").value<QString>();
+    desktop_root = (*early_settings_obj_)["desktop"].toObject()["root"].toString();
     return desktop_root;
 }
 
-std::unique_ptr<QSettings> EarlySettings::unlock_early_settings() {
-    return std::move(early_settings);
+std::unique_ptr<QJsonObject> EarlySettings::unlock_early_settings() {
+    return std::move(early_settings_obj_);
 }
 
 } // namespace cf::desktop::early_settings

desktop/main/early_session/settings/early_settings.cpp

@@ -3,32 +3,33 @@
  * @brief Early settings configuration loader and manager.
  *
  * Handles loading and accessing early desktop initialization configuration
- * from INI files using Qt's QSettings mechanism.
+ * from JSON files using Qt's JSON parsing.
  *
  * @author CFDesktop Team
  * @date 2026-03-16
- * @version 0.13.1
+ * @version 0.14.0
  * @since 0.13.0
  * @ingroup early_session
  */
 #pragma once
 
-#include <QSettings>
 #include <QString>
 #include <memory>
 
+class QJsonObject;
+
 namespace cf::desktop::early_settings {
 /**
  * @brief Manages early desktop configuration settings.
  *
- * Loads and provides access to early initialization configuration from an
- * INI-format configuration file. Uses Qt's QSettings for parsing.
+ * Loads and provides access to early initialization configuration from a
+ * JSON-format configuration file.
  *
  * @note Not thread-safe unless externally synchronized.
  * @ingroup early_session
  *
  * @code
- * EarlySettings settings("settings/early.ini");
+ * EarlySettings settings("settings/early.json");
  * if (settings.valid()) {
  *     QString logPath = settings.get_boot_logger_path();
  * }
@@ -39,52 +40,31 @@ class EarlySettings {
     /**
      * @brief Constructs EarlySettings and loads from the specified config path.
      *
-     * @param[in] early_config_path Path to the early configuration INI file.
-     * @throws None
-     * @note None
-     * @warning None
-     * @since 0.13.0
-     * @ingroup early_session
+     * @param[in] early_config_path Path to the early configuration JSON file.
      */
     EarlySettings(const QString& early_config_path);
 
-    ~EarlySettings() = default;
+    ~EarlySettings();
 
     /**
      * @brief Checks if the settings were loaded successfully.
      *
      * @return True if settings are valid and loaded without error, false otherwise.
-     * @throws None
-     * @note None
-     * @warning None
-     * @since 0.13.0
-     * @ingroup early_session
      */
     bool valid() const;
 
     /**
      * @brief Gets the file path from which settings were loaded.
      *
      * @return Absolute path to the configuration file.
-     * @throws None
-     * @note None
-     * @warning None
-     * @since 0.13.0
-     * @ingroup early_session
      */
     QString loadFrom() const;
 
     /**
      * @brief Gets the boot logger directory path from settings.
      *
-     * Reads the logger directory configuration from the early settings file.
-     *
      * @return Path to the boot logger directory.
-     * @throws None
      * @note The result is cached after the first call.
-     * @warning None
-     * @since 0.13.0
-     * @ingroup early_session
      */
     QString get_boot_logger_path() const;
 
@@ -96,20 +76,27 @@ class EarlySettings {
     QString get_desktop_root() const;
 
     /**
-     * @brief Unlock the Early Settings, using in release the sessions
+     * @brief Unlock the Early Settings, used in releasing the sessions.
      *
-     * @return std::unique_ptr<QSettings>
+     * @return std::unique_ptr<QJsonObject> containing the early settings data.
+     *         Returns nullptr if settings are invalid.
      */
-    std::unique_ptr<QSettings> unlock_early_settings();
+    std::unique_ptr<QJsonObject> unlock_early_settings();
 
   private:
-    /// @brief Cached path to the log file for the current session. Ownership: owner.
+    /// @brief Cached path to the log file for the current session.
     mutable QString this_session_logfile_path{};
 
-    /// @brief Cached Desktop Root; only changes when the desktop path is switched
+    /// @brief Cached Desktop Root; only changes when the desktop path is switched.
     mutable QString desktop_root{};
 
-    /// @brief Qt settings object for reading the INI configuration. Ownership: owner.
-    std::unique_ptr<QSettings> early_settings;
+    /// @brief Parsed JSON object containing the configuration data. Ownership: owner.
+    std::unique_ptr<QJsonObject> early_settings_obj_;
+
+    /// @brief Whether the JSON file was loaded successfully.
+    bool valid_ = false;
+
+    /// @brief Path to the configuration file.
+    QString filepath_{};
 };
 } // namespace cf::desktop::early_settings

desktop/main/early_session/settings/early_settings.h

@@ -1,11 +1,17 @@
 #include "init_settings.h"
 #include "early_handle/early_handle.h"
+#include <QJsonObject>
 
 namespace cf::desktop::init_session {
 
+InitInfoHandle::~InitInfoHandle() {
+    delete early_settings_;
+    early_settings_ = nullptr;
+}
+
 void InitInfoHandle::passedEarlyBootInfo(early_stage::EarlyHandle& early_handle) {
     auto earlies = early_handle.unlockEarlySettings();
-    early_settings_ = earlies->unlock_early_settings();
+    early_settings_ = earlies->unlock_early_settings().release();
     /* Releases the Early settings... */
 }
 
@@ -20,7 +26,10 @@ QWidget* InitInfoHandle::unlockBootWidget() {
 }
 
 QString InitInfoHandle::root_position() const {
-    return early_settings_->value("desktop/root").value<QString>();
+    if (!early_settings_) {
+        return {};
+    }
+    return (*early_settings_)["desktop"].toObject()["root"].toString();
 }
 
-} // namespace cf::desktop::init_session
+} // namespace cf::desktop::init_session

desktop/main/init/init_settings.cpp

@@ -14,9 +14,11 @@
  */
 #pragma once
 #include "base/singleton/simple_singleton.hpp"
-#include <QSettings>
+#include <QString>
 #include <memory>
 
+class QJsonObject;
+
 class QWidget;
 namespace cf::desktop::early_stage {
 class EarlyHandle;
@@ -41,6 +43,7 @@ namespace cf::desktop::init_session {
  */
 class InitInfoHandle : public SimpleSingleton<InitInfoHandle> {
   public:
+    ~InitInfoHandle();
     /**
      * @brief Transfers early boot information from the early stage.
      *
@@ -100,8 +103,8 @@ class InitInfoHandle : public SimpleSingleton<InitInfoHandle> {
     QWidget* boot_widget_{nullptr};
     /// @brief Path to load early settings from. Ownership: owner.
     QString load_early_settings_from;
-    /// @brief Qt settings object for early configuration. Ownership: owner.
-    std::unique_ptr<QSettings> early_settings_;
+    /// @brief JSON object containing early configuration. Ownership: owner.
+    QJsonObject* early_settings_ = nullptr;
 };
 
 } // namespace cf::desktop::init_session