refactor: Remove Qt dependencies from the utils

Changes:
- Reimplement `linglong::utils::Cmd`.
- Add unit tests for the new `Cmd` implementation and file operations.
- Use thred-safe errorString instead of strerror.
- submodules only affects git kind source.
- Remove unused code.

Signed-off-by: reddevillg <reddevillg@gmail.com>

Author: reddevillg

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ exclude: |
     misc/image/|
     po/|
     tools/quicktype/|
-    tools/openapi-c-libcurl-client/|
+    tools/openapi-c-libcurl-client/
   )
 
 repos:

apps/ll-cli/src/main.cpp

@@ -112,7 +112,7 @@ int lockCheck() noexcept
             return 0;
         }
 
-        qCritical() << "failed to open lock" << lock << ::strerror(errno);
+        qCritical() << "failed to open lock" << lock << errorString(errno);
         return -1;
     }
 

apps/ll-driver-detect/src/main.cpp

@@ -8,7 +8,7 @@
 #include "driver_detection_config.h"
 #include "driver_detection_manager.h"
 #include "driver_detector.h"
-#include "linglong/utils/command/cmd.h"
+#include "linglong/utils/cmd.h"
 #include "linglong/utils/error/error.h"
 #include "linglong/utils/gettext.h"
 #include "linglong/utils/global/initialize.h"
@@ -105,8 +105,7 @@ installDriverPackage(const std::vector<GraphicsDriverInfo> &drivers)
             }
 
             // Execute ll-cli install command to install the package
-            auto ret = linglong::utils::command::Cmd("ll-cli").exec(
-              { "install", QString::fromStdString(driverInfo.packageName) });
+            auto ret = linglong::utils::Cmd("ll-cli").exec({ "install", driverInfo.packageName });
             if (!ret) {
                 return LINGLONG_ERR("Installation command failed: " + ret.error().message());
             }

apps/ll-driver-detect/src/nvidia_driver_detector.cpp

@@ -4,7 +4,7 @@
 
 #include "nvidia_driver_detector.h"
 
-#include "linglong/utils/command/cmd.h"
+#include "linglong/utils/cmd.h"
 #include "linglong/utils/error/error.h"
 #include "linglong/utils/log/log.h"
 
@@ -53,13 +53,12 @@ utils::error::Result<void> NVIDIADriverDetector::checkPackageExists(const std::s
 {
     LINGLONG_TRACE("Check if NVIDIA driver package exists in repository");
     // Execute ll-cli search command to check driver package existence
-    auto ret = linglong::utils::command::Cmd("ll-cli").exec(
-      { "search", QString::fromStdString(packageName) });
+    auto ret = linglong::utils::Cmd("ll-cli").exec({ "search", packageName });
     if (!ret) {
         return LINGLONG_ERR("Search command failed: " + ret.error().message());
     }
 
-    if (!ret->contains(QString::fromStdString(packageName))) {
+    if (ret->find(packageName) == std::string::npos) {
         return LINGLONG_ERR("Driver package not found in linglong repo: " + packageName);
     }
     return LINGLONG_OK;
@@ -72,12 +71,12 @@ NVIDIADriverDetector::checkPackageInstalled(const std::string &packageName)
 
     try {
         // First execute ll-cli info to get the package info
-        auto listResult =
-          linglong::utils::command::Cmd("ll-cli").exec({ "info", packageName.c_str() });
+        auto listResult = linglong::utils::Cmd("ll-cli").exec({ "info", packageName });
 
         if (!listResult) {
-            LogD("Can not get package info with `ll-cli info`, maybe the package is not installed: {}",
-                 listResult.error().message());
+            LogD(
+              "Can not get package info with `ll-cli info`, maybe the package is not installed: {}",
+              listResult.error().message());
             return false;
         }
 

libs/linglong/src/linglong/builder/linglong_builder.cpp

@@ -20,7 +20,7 @@
 #include "linglong/repo/config.h"
 #include "linglong/repo/ostree_repo.h"
 #include "linglong/runtime/container.h"
-#include "linglong/utils/command/cmd.h"
+#include "linglong/utils/cmd.h"
 #include "linglong/utils/error/error.h"
 #include "linglong/utils/file.h"
 #include "linglong/utils/global/initialize.h"
@@ -985,11 +985,8 @@ utils::error::Result<void> Builder::generateAppConf() noexcept
         scriptFile = dir->filePath("app-conf-generator");
         QFile::copy(":/scripts/app-conf-generator", scriptFile);
     }
-    auto output =
-      utils::command::Cmd("bash").exec({ "-e",
-                                         scriptFile,
-                                         QString::fromStdString(project.package.id),
-                                         QString::fromStdString(buildOutput.string()) });
+    auto output = utils::Cmd("bash").exec(
+      { "-e", scriptFile.toStdString(), project.package.id, buildOutput.string() });
     if (!output) {
         return LINGLONG_ERR(output);
     }
@@ -1700,8 +1697,8 @@ utils::error::Result<void> Builder::extractLayer(const QString &layerPath,
         return LINGLONG_ERR(layerDir);
     }
 
-    auto output =
-      utils::command::Cmd("cp").exec({ "-r", layerDir->absolutePath(), destDir.absolutePath() });
+    auto output = utils::Cmd("cp").exec(
+      { "-r", layerDir->absolutePath().toStdString(), destDir.absolutePath().toStdString() });
     if (!output) {
         return LINGLONG_ERR(output);
     }

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

@@ -7,7 +7,6 @@
 #include "source_fetcher.h"
 
 #include "configure.h"
-#include "linglong/utils/command/cmd.h"
 #include "linglong/utils/error/error.h"
 #include "linglong/utils/global/initialize.h"
 #include "linglong/utils/log/log.h"
@@ -55,15 +54,15 @@ auto SourceFetcher::fetch(QDir destination) noexcept -> utils::error::Result<voi
         LogD("Dumping {} from qrc to {}", scriptName, scriptFile);
         QFile::copy(":/scripts/" + scriptName, scriptFile);
     }
-    auto output =
-      m_cmd->setEnv("GIT_SUBMODULES", source.submodules.value_or(true) ? "true" : "")
-        .exec({
-          scriptFile,
-          destination.absoluteFilePath(getSourceName()),
-          QString::fromStdString(*source.url),
-          QString::fromStdString(source.kind == "git" ? *source.commit : *source.digest),
-          this->cacheDir.absolutePath(),
-        });
+    if (source.kind == "git") {
+        m_cmd->setEnv("GIT_SUBMODULES", source.submodules.value_or(true) ? "true" : "");
+    }
+    auto output = m_cmd->exec(
+      std::vector<std::string>{ scriptFile.toStdString(),
+                                destination.absoluteFilePath(getSourceName()).toStdString(),
+                                *source.url,
+                                source.kind == "git" ? *source.commit : *source.digest,
+                                this->cacheDir.absolutePath().toStdString() });
     if (!output.has_value()) {
         LogE("output error: {}", output.error());
         return LINGLONG_ERR("stderr:", output);

libs/linglong/src/linglong/builder/source_fetcher.h

@@ -8,7 +8,7 @@
 
 #include "linglong/api/types/v1/BuilderConfig.hpp"
 #include "linglong/api/types/v1/BuilderProjectSource.hpp"
-#include "linglong/utils/command/cmd.h"
+#include "linglong/utils/cmd.h"
 #include "linglong/utils/error/error.h"
 
 #include <QDir>
@@ -25,13 +25,13 @@ class SourceFetcher
 
     auto fetch(QDir destination) noexcept -> utils::error::Result<void>;
 
-    void setCommand(std::shared_ptr<utils::command::Cmd> cmd) { this->m_cmd = cmd; }
+    void setCommand(std::shared_ptr<utils::Cmd> cmd) { this->m_cmd = cmd; }
 
 private:
     QString getSourceName();
     QDir cacheDir;
     api::types::v1::BuilderProjectSource source;
-    std::shared_ptr<utils::command::Cmd> m_cmd = std::make_shared<utils::command::Cmd>("sh");
+    std::shared_ptr<utils::Cmd> m_cmd = std::make_shared<utils::Cmd>("sh");
 };
 
 } // namespace linglong::builder

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

@@ -483,8 +483,7 @@ int Cli::run(const RunOptions &options)
     // placeholder file
     auto fd = ::open(pidFile.c_str(), O_WRONLY | O_CREAT | O_EXCL, mode);
     if (fd == -1) {
-        qCritical()
-          << QString{ "create file %1 error: %2" }.arg(pidFile.c_str()).arg(::strerror(errno));
+        LogE("create file {} error: {}", pidFile, errorString(errno));
         QCoreApplication::exit(-1);
         return -1;
     }
@@ -1712,7 +1711,7 @@ int Cli::content(const ContentOptions &options)
         if (real != nullptr) {
             target = real;
         } else {
-            qCritical() << "resolve symlink " << file.c_str() << " error: " << ::strerror(errno);
+            LogE("resolve symlink {} error: {}", file, errorString(errno));
         }
     }
 
@@ -1992,7 +1991,7 @@ Cli::RequestDirectories(const api::types::v1::PackageInfoV2 &info) noexcept
 
     auto fd = ::shm_open(info.id.c_str(), O_RDWR | O_CREAT, 0600);
     if (fd < 0) {
-        return LINGLONG_ERR(QString{ "shm_open error:" } + ::strerror(errno));
+        return LINGLONG_ERR("shm_open error:" + errorString(errno));
     }
     auto closeFd = utils::finally::finally([fd] {
         ::close(fd);
@@ -2017,7 +2016,7 @@ Cli::RequestDirectories(const api::types::v1::PackageInfoV2 &info) noexcept
                 continue;
             }
 
-            return LINGLONG_ERR(QString{ "fcntl lock error: " } + ::strerror(errno));
+            return LINGLONG_ERR("fcntl lock error: " + errorString(errno));
         }
 
         if (!anotherRunning) {
@@ -2027,7 +2026,7 @@ Cli::RequestDirectories(const api::types::v1::PackageInfoV2 &info) noexcept
         lock.l_type = F_UNLCK;
         ret = ::fcntl(fd, F_SETLK, &lock);
         if (ret == -1) {
-            return LINGLONG_ERR(QString{ "fcntl unlock error: " } + ::strerror(errno));
+            return LINGLONG_ERR("fcntl unlock error: " + errorString(errno));
         }
 
         return LINGLONG_OK;
@@ -2037,11 +2036,11 @@ Cli::RequestDirectories(const api::types::v1::PackageInfoV2 &info) noexcept
     auto releaseResource = utils::finally::finally([&info, &lock, fd] {
         lock.l_type = F_UNLCK;
         if (::fcntl(fd, F_SETLK, &lock) == -1) {
-            qDebug() << "failed to unlock mem file:" << ::strerror(errno);
+            LogD("failed to unlock mem file: {}", errorString(errno));
         }
 
         if (::shm_unlink(info.id.c_str()) == -1) {
-            qDebug() << "shm_unlink error:" << ::strerror(errno);
+            LogD("shm_unlink error: {}", errorString(errno));
         }
     });
 

libs/linglong/src/linglong/package/layer_file.cpp

@@ -8,6 +8,8 @@
 
 #include "linglong/api/types/v1/Generators.hpp"
 #include "linglong/api/types/v1/LayerInfo.hpp"
+#include "linglong/utils/error/error.h"
+#include "linglong/utils/log/formatter.h"
 #include "linglong/utils/serialize/json.h"
 
 #include <QDataStream>
@@ -31,7 +33,7 @@ utils::error::Result<QSharedPointer<LayerFile>> LayerFile::New(const QString &pa
     LINGLONG_TRACE("install layer file from path")
     auto fd = ::open(path.toLocal8Bit(), O_RDONLY);
     if (fd < 0) {
-        return LINGLONG_ERR("failed to open " + path + ":" + ::strerror(errno));
+        return LINGLONG_ERR(fmt::format("failed to open {}: {}", path, ::errorString(errno)));
     }
 
     return New(fd);

libs/linglong/src/linglong/package/layer_packager.cpp

@@ -8,8 +8,8 @@
 
 #include "linglong/api/types/v1/Generators.hpp"
 #include "linglong/api/types/v1/LayerInfo.hpp"
-#include "linglong/utils/command/cmd.h"
-#include "linglong/utils/command/env.h"
+#include "linglong/utils/cmd.h"
+#include "linglong/utils/file.h"
 #include "linglong/utils/log/log.h"
 
 #include <QDataStream>
@@ -28,8 +28,7 @@ LayerPackager::LayerPackager()
     // maybe refactor on later
     auto ret = this->initWorkDir();
     if (!ret) {
-        qCritical() << "init work dir failed";
-        Q_ASSERT(false);
+        LogE("init work dir failed");
     }
 }
 
@@ -48,16 +47,15 @@ utils::error::Result<void> LayerPackager::initWorkDir()
     // 优先使用环境变量LINGLONG_TMPDIR指定的目录，默认为/var/tmp，避免/tmp是tmpfs内存不足
     auto uuid = QUuid::createUuid().toString(QUuid::Id128);
     auto dirName = "linglong-layer-workdir-" + uuid.toStdString();
-    auto tmpDir = utils::command::getEnv("LINGLONG_TMPDIR");
-    auto dirPath = std::filesystem::path(tmpDir.value_or("/var/tmp")) / dirName;
+    auto *tmpDir = std::getenv("LINGLONG_TMPDIR");
+    auto dirPath = std::filesystem::path(tmpDir ? tmpDir : "/var/tmp") / dirName;
     auto ret = this->mkdirDir(dirPath);
     if (!ret.has_value()) {
         // 如果/var/tmp目录无权限创建，则使用临时目录
         dirPath = std::filesystem::temp_directory_path() / dirName;
         ret = this->mkdirDir(dirPath);
         if (!ret) {
-            qCritical() << "failed to set work dir" << ret.error().message();
-            Q_ASSERT(false);
+            LogE("failed to set work dir: {}", ret.error());
         }
     }
     this->workDir = dirPath;
@@ -84,16 +82,15 @@ utils::error::Result<void> LayerPackager::mkdirDir(const std::string &path) noex
 LayerPackager::~LayerPackager()
 {
     if (this->isMounted) {
-        auto ret = utils::command::Cmd("fusermount")
+        auto ret = utils::Cmd("fusermount")
                      .exec({ "-z", "-u", (this->workDir / "unpack").string().c_str() });
         if (!ret) {
-            qWarning() << "failed to umount " << (this->workDir / "unpack").c_str()
-                       << ", please umount it manually";
+            LogW("failed to umount {}, please umount it manually",
+                 (this->workDir / "unpack").string());
         }
     }
     if (!std::filesystem::remove_all(this->workDir)) {
         LogE("failed to remove {}", this->workDir);
-        Q_ASSERT(false);
     }
 }
 
@@ -151,23 +148,21 @@ LayerPackager::pack(const LayerDir &dir, const QString &layerFilePath) const
 
     // compress data with erofs
     const auto &compressedFilePath = this->workDir / "tmp.erofs";
-    const auto &ignoreRegex = QString{ "--exclude-regex=minified*" };
     // 使用-b统一指定block size为4096(2^12), 避免不同系统的兼容问题
     // loongarch64默认使用(16384)2^14, 在x86和arm64不受支持, 会导致无法推包
-    auto ret = utils::command::Cmd("mkfs.erofs")
-                 .exec({ "-z" + compressor,
-                         "-b4096",
-                         compressedFilePath.string().c_str(),
-                         ignoreRegex,
-                         dir.absolutePath() });
+    auto ret = utils::Cmd("mkfs.erofs")
+                 .exec(std::vector<std::string>{ "-z" + compressor.toStdString(),
+                                                 "-b4096",
+                                                 compressedFilePath.string(),
+                                                 "--exclude-regex=minified*",
+                                                 dir.absolutePath().toStdString() });
     if (!ret) {
         return LINGLONG_ERR(ret);
     }
 
-    ret = utils::command::Cmd("sh").exec(
-      { "-c", QString("cat %1 >> %2").arg(compressedFilePath.string().c_str(), layerFilePath) });
-    if (!ret) {
-        LINGLONG_ERR(ret);
+    auto res = utils::concatFile(compressedFilePath, layerFilePath.toStdString());
+    if (!res) {
+        return LINGLONG_ERR(res);
     }
 
     auto result = LayerFile::New(layerFilePath);
@@ -242,8 +237,10 @@ utils::error::Result<LayerDir> LayerPackager::unpack(LayerFile &file)
             }
             fuseOffset = "0";
         }
-        auto ret = utils::command::Cmd("erofsfuse")
-                     .exec({ "--offset=" + fuseOffset, fdPath, unpackDir.absolutePath() });
+        auto ret = utils::Cmd("erofsfuse")
+                     .exec({ "--offset=" + fuseOffset.toStdString(),
+                             fdPath.toStdString(),
+                             unpackDir.absolutePath().toStdString() });
         if (!ret) {
             return LINGLONG_ERR(ret);
         }
@@ -252,15 +249,16 @@ utils::error::Result<LayerDir> LayerPackager::unpack(LayerFile &file)
     }
     // 判断fsck.erofs命令是否存在，fsck.erofs是erofs-utils的命令，可用于解压erofs文件
     // 在旧版本中fsck.erofs不支持offset参数，所以需要提前将erofs文件复制到临时目录
-    auto erofsFscExistsRet = utils::command::Cmd("fsck.erofs").exists();
+    auto erofsFscExistsRet = utils::Cmd("fsck.erofs").exists();
     if (erofsFscExistsRet) {
         fdPath = (this->workDir / "layer.erofs").string().c_str();
         auto ret = this->copyFile(file, fdPath.toStdString(), *offset);
         if (!ret) {
             return LINGLONG_ERR(ret);
         }
-        auto cmdRet = utils::command::Cmd("fsck.erofs")
-                        .exec({ "--extract=" + unpackDir.absolutePath(), fdPath });
+        auto cmdRet =
+          utils::Cmd("fsck.erofs")
+            .exec({ "--extract=" + unpackDir.absolutePath().toStdString(), fdPath.toStdString() });
         if (!cmdRet) {
             return LINGLONG_ERR(cmdRet);
         }
@@ -278,7 +276,7 @@ void LayerPackager::setCompressor(const QString &compressor) noexcept
 
 utils::error::Result<bool> LayerPackager::checkErofsFuseExists() const
 {
-    return utils::command::Cmd("erofsfuse").exists();
+    return utils::Cmd("erofsfuse").exists();
 }
 
 } // namespace linglong::package