Extract glibmm from diskImage, move it to files.cpp

Author: dhilst

conanfile.py

@@ -1,14 +1,12 @@
 from conan import ConanFile
 from conan.tools.cmake import cmake_layout, CMakeToolchain, CMake
-from conan.tools.gnu import PkgConfigDeps
 
 class MyProjectConan(ConanFile):
     name = "CloysterHPC"
     version = "0.1.1"
     settings = "os", "arch", "compiler", "build_type"
 
     def requirements(self):
-        self.tool_requires("pkgconf/1.9.3")  # Ensure pkg-config is available
         self.requires("cli11/[>=2.4.0 <2.5.0]")
         self.requires("spdlog/[>=1.14.0 <1.15.0]")
         self.requires("fmt/[>=10.0.0 <12.0.0]")
@@ -17,6 +15,8 @@ def requirements(self):
         self.requires("gsl-lite/[>=0.41.0 <0.42.0]")
         self.requires("doctest/[>=2.4.0 <2.5.0]")
         self.requires("sdbus-cpp/[>=2.0.0 <2.1.0]")
+
+        # We're using host's glibmm
         # self.requires("glibmm/[>=2.78.1 <2.79.0]")
 
         # Override libmount to unify on 2.39.2.
@@ -31,8 +31,6 @@ def layout(self):
     def generate(self):
         tc = CMakeToolchain(self)
         tc.generate()
-        pkg = PkgConfigDeps(self)
-        pkg.generate()
 
     def build(self):
         cmake = CMake(self)

include/cloysterhpc/functions.h

@@ -6,7 +6,6 @@
 #include <boost/process/pipe.hpp>
 #include <cloysterhpc/services/repos.h>
 #include <filesystem>
-// #include <glibmm/ustring.h>
 #include <list>
 #include <optional>
 #include <string>

include/cloysterhpc/services/files.h

@@ -91,6 +91,10 @@ static_assert(cloyster::concepts::IsSaveable<KeyFile>);
 static_assert(concepts::IsMoveable<KeyFile>);
 static_assert(!concepts::IsCopyable<KeyFile>);
 
+
+std::string checksum(const std::string& data);
+std::string checksum(const std::filesystem::path& path, const std::size_t chunkSize = 16384);
+
 };
 
 #endif

setupDevEnvironment.sh

@@ -123,10 +123,12 @@ case "$os_version" in
     ;;
   9)
     dnf -y install python pip libasan libubsan gcc-toolset-14 \
-      gcc-toolset-14-libubsan-devel gcc-toolset-14-libasan-devel cppcheck
+      gcc-toolset-14-libubsan-devel gcc-toolset-14-libasan-devel cppcheck \
+      glibmm24 glibmm24-devel
     ;;
   10)
-    dnf -y install python pip libubsan libasan liblsan libtsan libhwasan
+    dnf -y install python pip libubsan libasan liblsan libtsan libhwasan \
+      glibmm-2.68 glibmm-2.68-devel
     ;;
 esac
 

src/diskImage.cpp

@@ -8,14 +8,9 @@
 #include <cloysterhpc/functions.h>
 #include <cloysterhpc/models/os.h>
 #include <cloysterhpc/services/log.h>
-#include <cstddef>
-#include <fstream>
-#include <ios>
-#include <istream>
+#include <cloysterhpc/services/files.h>
 #include <unordered_map>
-#include <vector>
 
-#include <glibmm.h>
 
 // @FIXME: This file need some work
 //
@@ -109,42 +104,16 @@ bool DiskImage::hasVerifiedChecksum(const std::filesystem::path& path)
             "e" }
     };
 
-    Glib::Checksum checksum(Glib::Checksum::ChecksumType::CHECKSUM_SHA256);
+    auto checksum = cloyster::services::files::checksum(path);
+    LOG_INFO("SHA256 checksum of file {} is: {}", path.string(), checksum);
 
-    std::ifstream file(path, std::ios::in | std::ios::binary);
-    if (!file.is_open()) {
-        throw std::filesystem::filesystem_error(
-            "Failed to open file", path, std::error_code());
-    }
-
-    // Read the file in chunks of 16834 bytes
-    constexpr std::size_t chunk_size = 16384;
-    std::vector<std::byte> buffer(chunk_size);
-
-    while (file.read(reinterpret_cast<std::istream::char_type*>(buffer.data()),
-        static_cast<std::streamsize>(buffer.size()))) {
-        auto bytesRead = static_cast<gsize>(file.gcount());
-
-        checksum.update(
-            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
-    }
-
-    // Handle any leftover bytes after the while loop ends
-    auto bytesRead = static_cast<gsize>(file.gcount());
-    if (bytesRead > 0) {
-        checksum.update(
-            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
-    }
-
-    LOG_INFO(fmt::format("SHA256 checksum of file {} is: {}", path.string(),
-        checksum.get_string()));
-
-    if (checksum.get_string()
+    if (checksum
         == hash_map.find(path.filename().string())->second) {
         LOG_TRACE("Checksum - The disk image is valid")
         return true;
     }
 
+
     LOG_TRACE("Checksum - The disk image is invalid. Maybe you're using a "
               "custom image?");
     return false;

src/services/files.cpp

@@ -1,8 +1,12 @@
-#include <concepts>
 #include <ranges>
 #include <stdexcept>
 #include <utility>
+#include <cstddef>
+#include <fstream>
+#include <ios>
+#include <istream>
 
+#include <glibmm/checksum.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/keyfile.h>
 
@@ -127,4 +131,40 @@ void KeyFile::save() { m_impl->safeToFile(m_impl->m_path); }
 
 void KeyFile::load() { m_impl->loadFromFile(m_impl->m_path); }
 
+std::string checksum(const std::string& data)
+{
+    Glib::Checksum checksum(Glib::Checksum::ChecksumType::CHECKSUM_SHA256);
+    checksum.update(data);
+    return checksum.get_string();
+}
+
+std::string checksum(const std::filesystem::path& path, const std::size_t chunkSize)
+{
+    Glib::Checksum checksum(Glib::Checksum::ChecksumType::CHECKSUM_SHA256);
+    std::ifstream file(path, std::ios::in | std::ios::binary);
+    if (!file.is_open()) {
+        throw std::filesystem::filesystem_error(
+            "Failed to open file", path, std::error_code());
+    }
+
+    std::vector<std::byte> buffer(chunkSize);
+
+    while (file.read(reinterpret_cast<std::istream::char_type*>(buffer.data()),
+        static_cast<std::streamsize>(buffer.size()))) {
+        auto bytesRead = static_cast<gsize>(file.gcount());
+
+        checksum.update(
+            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
+    }
+
+    // Handle any leftover bytes after the while loop ends
+    auto bytesRead = static_cast<gsize>(file.gcount());
+    if (bytesRead > 0) {
+        checksum.update(
+            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
+    }
+
+    return checksum.get_string();
+}
+
 } // namespace cloyster::services::files