refactor: Part of Remove Qt dependencies from utils

apps/ll-package-manager/src/main.cpp

@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
 #include "configure.h"
 #include "linglong/adaptors/package_manager/package_manager1.h"
+#include "linglong/common/dbus/register.h"
 #include "linglong/package_manager/package_manager.h"
 #include "linglong/repo/config.h"
 #include "linglong/repo/migrate.h"
 #include "linglong/repo/ostree_repo.h"
-#include "linglong/utils/dbus/register.h"
 #include "linglong/utils/global/initialize.h"
 #include "ocppi/cli/CLI.hpp"
 #include "ocppi/cli/crun/Crun.hpp"
 
 #include <QCoreApplication>
 
 #include <filesystem>
 
+using namespace linglong::common::dbus;
 using namespace linglong::utils::global;
-using namespace linglong::utils::dbus;
 
 namespace {
 void withDBusDaemon(ocppi::cli::CLI &cli)

libs/linglong/CMakeLists.txt

@@ -35,6 +35,15 @@ pfl_add_library(
   src/linglong/cli/printer.h
   src/linglong/cli/terminal_notifier.cpp
   src/linglong/cli/terminal_notifier.h
+  src/linglong/common/dbus/properties_forwarder.cpp
+  src/linglong/common/dbus/properties_forwarder.h
+  src/linglong/common/dbus/register.cpp
+  src/linglong/common/dbus/register.h
+  src/linglong/common/formatter.cpp
+  src/linglong/common/formatter.h
+  src/linglong/common/gkeyfile_wrapper.h
+  src/linglong/common/serialize/json.cpp
+  src/linglong/common/serialize/json.h
   src/linglong/extension/extension.cpp
   src/linglong/extension/extension.h
   src/linglong/package/architecture.cpp

libs/linglong/src/linglong/builder/source_fetcher.cpp

@@ -7,6 +7,7 @@
 #include "source_fetcher.h"
 
 #include "configure.h"
+#include "linglong/common/formatter.h"
 #include "linglong/utils/error/error.h"
 #include "linglong/utils/global/initialize.h"
 #include "linglong/utils/log/log.h"

libs/linglong/src/linglong/cli/cli.cpp

@@ -298,7 +298,7 @@ void Cli::interaction(const QDBusObjectPath &object_path,
     }
 
     auto messageType = static_cast<api::types::v1::InteractionMessageType>(messageID);
-    auto msg = utils::serialize::fromQVariantMap<
+    auto msg = common::serialize::fromQVariantMap<
       api::types::v1::PackageManager1RequestInteractionAdditionalMessage>(additionalMessage);
 
     std::vector<std::string> actions{ "yes", "Yes", "no", "No" };
@@ -348,7 +348,7 @@ void Cli::interaction(const QDBusObjectPath &object_path,
     auto reply = api::types::v1::InteractionReply{ .action = action };
 
     QDBusPendingReply<void> dbusReply =
-      this->pkgMan.ReplyInteraction(object_path, utils::serialize::toQVariantMap(reply));
+      this->pkgMan.ReplyInteraction(object_path, common::serialize::toQVariantMap(reply));
     dbusReply.waitForFinished();
     if (dbusReply.isError()) {
         this->printer.printErr(
@@ -964,7 +964,7 @@ int Cli::installFromFile(const QFileInfo &fileInfo,
     auto pendingReply =
       this->pkgMan.InstallFromFile(dbusFileDescriptor,
                                    fileInfo.suffix(),
-                                   utils::serialize::toQVariantMap(commonOptions));
+                                   common::serialize::toQVariantMap(commonOptions));
     res = waitTaskCreated(pendingReply, TaskType::InstallFromFile);
     if (!res) {
         this->handleCommonError(res.error());
@@ -1030,7 +1030,7 @@ int Cli::install(const InstallOptions &options)
 
     LogD("install module: {}", common::strings::join(*params.package.modules));
 
-    auto pendingReply = this->pkgMan.Install(utils::serialize::toQVariantMap(params));
+    auto pendingReply = this->pkgMan.Install(common::serialize::toQVariantMap(params));
     auto res = waitTaskCreated(pendingReply, TaskType::Install);
     if (!res) {
         handleInstallError(res.error(), params);
@@ -1094,7 +1094,7 @@ int Cli::upgrade(const UpgradeOptions &options)
         params.packages.emplace_back(std::move(package));
     }
 
-    auto pendingReply = this->pkgMan.Update(utils::serialize::toQVariantMap(params));
+    auto pendingReply = this->pkgMan.Update(common::serialize::toQVariantMap(params));
     auto res = waitTaskCreated(pendingReply, TaskType::Upgrade);
     if (!res) {
         handleUpgradeError(res.error());
@@ -1155,7 +1155,7 @@ int Cli::search(const SearchOptions &options)
               return;
           }
           auto result =
-            utils::serialize::fromQVariantMap<api::types::v1::PackageManager1SearchResult>(data);
+            common::serialize::fromQVariantMap<api::types::v1::PackageManager1SearchResult>(data);
           if (!result) {
               this->printer.printErr(result.error());
               loop.exit(-1);
@@ -1222,7 +1222,7 @@ int Cli::search(const SearchOptions &options)
           loop.exit(0);
       });
 
-    auto pendingReply = this->pkgMan.Search(utils::serialize::toQVariantMap(params));
+    auto pendingReply = this->pkgMan.Search(common::serialize::toQVariantMap(params));
     auto result = waitDBusReply<api::types::v1::PackageManager1JobInfo>(pendingReply);
     if (!result) {
         this->printer.printErr(result.error());
@@ -1254,7 +1254,7 @@ int Cli::prune()
                     return;
                 }
                 auto ret =
-                  utils::serialize::fromQVariantMap<api::types::v1::PackageManager1PruneResult>(
+                  common::serialize::fromQVariantMap<api::types::v1::PackageManager1PruneResult>(
                     data);
                 if (!ret) {
                     this->printer.printErr(ret.error());
@@ -1315,7 +1315,7 @@ int Cli::uninstall(const UninstallOptions &options)
         params.package.packageManager1PackageModule = options.module;
     }
 
-    auto pendingReply = this->pkgMan.Uninstall(utils::serialize::toQVariantMap(params));
+    auto pendingReply = this->pkgMan.Uninstall(common::serialize::toQVariantMap(params));
     auto res = waitTaskCreated(pendingReply, TaskType::Uninstall);
     if (!res) {
         this->handleUninstallError(res.error());
@@ -1399,7 +1399,7 @@ int Cli::repo(CLI::App *app, const RepoOptions &options)
         return -1;
     }
 
-    auto cfg = utils::serialize::fromQVariantMap<api::types::v1::RepoConfigV2>(propCfg);
+    auto cfg = common::serialize::fromQVariantMap<api::types::v1::RepoConfigV2>(propCfg);
     if (!cfg) {
         qCritical() << cfg.error();
         qCritical() << "linglong bug detected.";
@@ -1462,7 +1462,7 @@ int Cli::repo(CLI::App *app, const RepoOptions &options)
           .priority = 0,
           .url = url,
         });
-        return this->setRepoConfig(utils::serialize::toQVariantMap(cfgRef));
+        return this->setRepoConfig(common::serialize::toQVariantMap(cfgRef));
     }
 
     auto existingRepo =
@@ -1496,7 +1496,7 @@ int Cli::repo(CLI::App *app, const RepoOptions &options)
             }
         }
 
-        return this->setRepoConfig(utils::serialize::toQVariantMap(cfgRef));
+        return this->setRepoConfig(common::serialize::toQVariantMap(cfgRef));
     }
 
     if (argsParsed("update")) {
@@ -1506,17 +1506,17 @@ int Cli::repo(CLI::App *app, const RepoOptions &options)
         }
 
         existingRepo->url = url;
-        return this->setRepoConfig(utils::serialize::toQVariantMap(cfgRef));
+        return this->setRepoConfig(common::serialize::toQVariantMap(cfgRef));
     }
 
     if (argsParsed("enable-mirror")) {
         existingRepo->mirrorEnabled = true;
-        return this->setRepoConfig(utils::serialize::toQVariantMap(cfgRef));
+        return this->setRepoConfig(common::serialize::toQVariantMap(cfgRef));
     }
 
     if (argsParsed("disable-mirror")) {
         existingRepo->mirrorEnabled = false;
-        return this->setRepoConfig(utils::serialize::toQVariantMap(cfgRef));
+        return this->setRepoConfig(common::serialize::toQVariantMap(cfgRef));
     }
 
     if (argsParsed("set-default")) {
@@ -1530,15 +1530,15 @@ int Cli::repo(CLI::App *app, const RepoOptions &options)
                     break;
                 }
             }
-            return this->setRepoConfig(utils::serialize::toQVariantMap(cfgRef));
+            return this->setRepoConfig(common::serialize::toQVariantMap(cfgRef));
         }
 
         return 0;
     }
 
     if (argsParsed("set-priority")) {
         existingRepo->priority = options.repoPriority;
-        return this->setRepoConfig(utils::serialize::toQVariantMap(cfgRef));
+        return this->setRepoConfig(common::serialize::toQVariantMap(cfgRef));
     }
 
     this->printer.printErr(LINGLONG_ERRV("unknown operation"));

libs/linglong/src/linglong/cli/cli.h

@@ -13,6 +13,7 @@
 #include "linglong/api/types/v1/RepositoryCacheLayersItem.hpp"
 #include "linglong/cli/interactive_notifier.h"
 #include "linglong/cli/printer.h"
+#include "linglong/common/serialize/json.h"
 #include "linglong/repo/ostree_repo.h"
 #include "linglong/runtime/container_builder.h"
 #include "linglong/utils/error/error.h"
@@ -238,7 +239,7 @@ class Cli : public QObject
             return LINGLONG_ERR(reply.error().message(), reply.error().type());
         }
 
-        auto result = utils::serialize::fromQVariantMap<T>(reply.value());
+        auto result = common::serialize::fromQVariantMap<T>(reply.value());
         if (!result) {
             LogF("bug detected: {}", result.error());
             std::abort();

libs/utils/src/linglong/utils/dbus/properties_forwarder.cpp → libs/linglong/src/linglong/common/dbus/properties_forwarder.cpp

@@ -4,14 +4,16 @@
 
 #include "properties_forwarder.h"
 
+#include "linglong/utils/log/log.h"
+
 #include <QCoreApplication>
 #include <QDBusMessage>
-#include <QDebug>
 #include <QMetaProperty>
 
+#include <cstdlib>
 #include <utility>
 
-namespace linglong::utils::dbus {
+namespace linglong::common::dbus {
 
 PropertiesForwarder::PropertiesForwarder(QDBusConnection connection,
                                          QString path,
@@ -23,12 +25,14 @@ PropertiesForwarder::PropertiesForwarder(QDBusConnection connection,
     , connection(std::move(connection))
 {
     if (parent == nullptr) {
-        qFatal("parent is nullptr");
+        LogE("parent is nullptr");
+        std::abort();
     }
 
     const auto *mo = parent->metaObject();
     if (mo == nullptr) {
-        qFatal("couldn't find metaObject of parent.");
+        LogE("couldn't find metaObject of parent.");
+        std::abort();
     }
 
     for (auto i = mo->propertyOffset(); i < mo->propertyCount(); ++i) {
@@ -43,7 +47,7 @@ PropertiesForwarder::PropertiesForwarder(QDBusConnection connection,
     }
 }
 
-error::Result<void> PropertiesForwarder::forward() noexcept
+utils::error::Result<void> PropertiesForwarder::forward() noexcept
 {
     LINGLONG_TRACE("forward propertiesChanged")
     auto msg = QDBusMessage::createSignal(this->path,
@@ -66,7 +70,7 @@ void PropertiesForwarder::PropertyChanged()
 
     const auto *mo = sender->metaObject();
     if (mo == nullptr) {
-        qCritical() << __PRETTY_FUNCTION__ << "relay propertiesChanged failed.";
+        LogE("relay propertiesChanged failed.");
         return;
     }
 
@@ -87,7 +91,7 @@ void PropertiesForwarder::PropertyChanged()
     }
 
     if (propName.isEmpty()) {
-        qCritical() << "can't find corresponding property:" << signature;
+        LogE("can't find corresponding property: {}", signature.toStdString());
         return;
     }
 
@@ -100,4 +104,4 @@ void PropertiesForwarder::PropertyChanged()
     propCache.insert(propName, prop.read(sender));
 }
 
-} // namespace linglong::utils::dbus
+} // namespace linglong::common::dbus

libs/utils/src/linglong/utils/dbus/properties_forwarder.h → libs/linglong/src/linglong/common/dbus/properties_forwarder.h

@@ -10,7 +10,7 @@
 #include <QDBusObjectPath>
 #include <QObject>
 
-namespace linglong::utils::dbus {
+namespace linglong::common::dbus {
 
 class PropertiesForwarder : public QObject
 {
@@ -23,7 +23,7 @@ class PropertiesForwarder : public QObject
     PropertiesForwarder(PropertiesForwarder &&) = delete;
     PropertiesForwarder &operator=(PropertiesForwarder &&) = delete;
 
-    error::Result<void> forward() noexcept;
+    utils::error::Result<void> forward() noexcept;
 
 public Q_SLOTS:
     void PropertyChanged();
@@ -35,4 +35,4 @@ public Q_SLOTS:
     QVariantMap propCache;
 };
 
-} // namespace linglong::utils::dbus
+} // namespace linglong::common::dbus

libs/utils/src/linglong/utils/dbus/register.cpp → libs/linglong/src/linglong/common/dbus/register.cpp

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-#include "linglong/utils/dbus/register.h"
+#include "linglong/common/dbus/register.h"

libs/utils/src/linglong/utils/dbus/register.h → libs/linglong/src/linglong/common/dbus/register.h

@@ -6,22 +6,22 @@
 
 #pragma once
 
-#include "linglong/utils/dbus/log.h"
+#include "linglong/common/formatter.h"
 #include "linglong/utils/error/error.h"
-#include "tl/expected.hpp"
+#include "linglong/utils/log/log.h"
 
 #include <QDBusConnection>
 #include <QDBusError>
 
-namespace linglong::utils::dbus {
+namespace linglong::common::dbus {
 
 [[nodiscard]] inline auto registerDBusObject(QDBusConnection conn,
                                              const QString &path,
-                                             QObject *obj) -> tl::expected<void, error::Error>
+                                             QObject *obj) -> utils::error::Result<void>
 {
     LINGLONG_TRACE("register D-Bus object");
     if (conn.registerObject(path, obj)) {
-        qCDebug(linglong_utils_dbus) << "register object to dbus on" << path;
+        LogD("register object to dbus on {}", path);
         return LINGLONG_OK;
     }
 
@@ -31,20 +31,19 @@ namespace linglong::utils::dbus {
 inline void unregisterDBusObject(QDBusConnection conn, const QString &path)
 {
     conn.unregisterObject(path);
-    qCDebug(linglong_utils_dbus) << "unregister object to dbus on" << path;
+    LogD("unregister object to dbus on {}", path);
 }
 
 [[nodiscard]] inline auto registerDBusService(QDBusConnection conn, const QString &serviceName)
-  -> error::Result<void>
+  -> utils::error::Result<void>
 {
     LINGLONG_TRACE("register D-Bus service");
 
     if (conn.registerService(serviceName)) {
-        qCDebug(linglong_utils_dbus) << "register dbus name" << serviceName;
+        LogD("register dbus name {}", serviceName);
         return LINGLONG_OK;
     }
 
-    error::Error err;
     // FIXME: use real ERROR CODE defined in API.
     if (conn.lastError().isValid()) {
         return LINGLONG_ERR(conn.lastError().name() + ": " + conn.lastError().message());
@@ -54,22 +53,21 @@ inline void unregisterDBusObject(QDBusConnection conn, const QString &path)
 }
 
 [[nodiscard]] inline auto unregisterDBusService(QDBusConnection conn, const QString &serviceName)
-  -> tl::expected<void, error::Error>
+  -> utils::error::Result<void>
 {
     LINGLONG_TRACE("unregister D-Bus service");
 
     if (conn.unregisterService(serviceName)) {
-        qCDebug(linglong_utils_dbus) << "unregister dbus name" << serviceName;
+        LogD("unregister dbus name {}", serviceName);
         return LINGLONG_OK;
     }
 
     // FIXME: use real ERROR CODE defined in API.
-    error::Error err;
     if (conn.lastError().isValid()) {
         return LINGLONG_ERR(conn.lastError().name() + ": " + conn.lastError().message());
     }
 
     return LINGLONG_ERR("unknown");
 }
 
-} // namespace linglong::utils::dbus
+} // namespace linglong::common::dbus