WIP: Repository class refactoring

include/cloysterhpc/functions.h

@@ -4,12 +4,14 @@
 #include <boost/process/child.hpp>
 #include <boost/process/pipe.hpp>
 #include <filesystem>
+#include <glibmm/ustring.h>
 #include <list>
 #include <optional>
 #include <string>
 #include <vector>
 
 #include <boost/asio.hpp>
+#include <glibmm/keyfile.h>
 
 namespace cloyster {
 // Globals
@@ -164,6 +166,9 @@ std::string findAndReplace(const std::string_view& source,
  */
 void copyFile(std::filesystem::path source, std::filesystem::path destination);
 
+std::optional<Glib::ustring> readKeyfileString(Glib::RefPtr<Glib::KeyFile> file,
+    const std::string_view& group, const std::string_view& key);
+
 } /* namespace cloyster */
 
 #endif // CLOYSTERHPC_FUNCTIONS_H_

include/cloysterhpc/services/repo.h

@@ -58,65 +58,64 @@ class repository_exception : public std::runtime_error {
     }
 };
 
-
-
 /**
  * Generic file class
  *
- * This class should only read and write, 
+ * This class should only read and write,
  */
 class GenericFile {
 protected:
     std::filesystem::path m_path;
+
 public:
     GenericFile(const std::filesystem::path& path)
         : m_path(path)
-    {}
+    {
+    }
 
-    virtual void read() {}
-    virtual void write() {}
+    virtual void read() { }
+    virtual void write() { }
 };
 
-
-
 struct ELRepo {
     std::string group;
     std::string name;
-    std::optional<std::string> baseURL;
+    std::optional<std::string> base_url;
     std::optional<std::string> metalink;
     bool enabled;
     bool gpgcheck;
     std::string gpgkey;
 
     // (P/ todos os repositórios)
     // std::string release;
-
 };
 
-
 /**
  * Repository file class
  *
  * This class should parse the repository data
  */
 class ELRepoFile : GenericFile {
-private:    
+private:
     Glib::RefPtr<Glib::KeyFile> m_file;
 
     std::vector<ELRepo> parseData();
     void unparseData(const std::vector<ELRepo>&);
+
 public:
     ELRepoFile(const std::filesystem::path& path)
         : GenericFile(path)
-    {}
+    {
+    }
 
     virtual void read() override;
     virtual void write() override;
 
     std::vector<ELRepo> parse();
     std::vector<ELRepo> parse(const std::stringstream& ss);
-    void unparse( const std::vector<ELRepo>& repositories );
-    void unparse( const std::vector<ELRepo>& repositories, std::stringstream& ss );
+    void unparse(const std::vector<ELRepo>& repositories);
+    void unparse(
+        const std::vector<ELRepo>& repositories, std::stringstream& ss);
 };
 
 #endif // CLOYSTERHPC_REPO_H_

src/functions.cpp

@@ -351,4 +351,12 @@ void copyFile(std::filesystem::path source, std::filesystem::path destination)
     }
 }
 
+std::optional<Glib::ustring> readKeyfileString(Glib::RefPtr<Glib::KeyFile> file,
+    const std::string_view& group, const std::string_view& key)
+{
+    return file->has_key(group.data(), key.data())
+        ? std::make_optional(file->get_string(group.data(), key.data()))
+        : std::nullopt;
+}
+
 } // namespace cloyster

src/services/repo.cpp

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <cloysterhpc/functions.h>
 #include <cloysterhpc/services/repo.h>
 #include <fmt/printf.h>
 #include <glibmm/fileutils.h>
@@ -73,32 +74,24 @@ void ELRepoFile::write() { m_file->save_to_file(m_path.string()); }
 
 std::vector<ELRepo> ELRepoFile::parse()
 {
-    this->read();
+    read();
 
-    return this->parseData();
+    return parseData();
 }
 
 std::vector<ELRepo> ELRepoFile::parse(const std::stringstream& ss)
 {
     m_file = Glib::KeyFile::create();
     m_file->load_from_data(ss.str().c_str());
-    return this->parseData();
+    return parseData();
 }
 
-
-std::vector<ELRepo>  ELRepoFile::parseData()
+std::vector<ELRepo> ELRepoFile::parseData()
 {
     auto reponames = m_file->get_groups();
 
     std::vector<ELRepo> repositories;
 
-    auto get_optional_string
-        = [this](auto group, auto key) -> std::optional<Glib::ustring> {
-        return m_file->has_key(group, key)
-            ? std::make_optional(m_file->get_string(group, key))
-            : std::nullopt;
-    };
-
     for (const auto& repogroup : reponames) {
         auto name = m_file->get_string(repogroup, "name");
 
@@ -108,8 +101,10 @@ std::vector<ELRepo>  ELRepoFile::parseData()
                 repogroup.raw(), m_path.string()));
         }
 
-        auto metalink = get_optional_string(repogroup, "metalink");
-        auto baseurl = get_optional_string(repogroup, "baseurl");
+        auto metalink = cloyster::readKeyfileString(
+            m_file, std::string_view { repogroup.c_str() }, "metalink");
+        auto baseurl = cloyster::readKeyfileString(
+            m_file, std::string_view { repogroup.c_str() }, "baseurl");
 
         auto enabled = m_file->get_boolean(repogroup, "enabled");
         auto gpgcheck = m_file->get_boolean(repogroup, "gpgcheck");
@@ -120,7 +115,8 @@ std::vector<ELRepo>  ELRepoFile::parseData()
         repo.name = name.raw();
         repo.metalink
             = metalink.transform([](const auto& v) { return v.raw(); });
-        repo.baseURL = baseurl.transform([](const auto& v) { return v.raw(); });
+        repo.base_url
+            = baseurl.transform([](const auto& v) { return v.raw(); });
         repo.enabled = enabled;
         repo.gpgcheck = gpgcheck;
         repo.gpgkey = gpgkey;
@@ -131,25 +127,25 @@ std::vector<ELRepo>  ELRepoFile::parseData()
 }
 
 void ELRepoFile::unparseData(const std::vector<ELRepo>& repositories)
-{    
+{
     for (const auto& repo : repositories) {
         m_file->set_string(repo.group, "name", repo.name);
         m_file->set_boolean(repo.group, "enabled", repo.enabled);
         m_file->set_boolean(repo.group, "gpgcheck", repo.gpgcheck);
         m_file->set_string(repo.group, "gpgkey", repo.gpgkey);
-    }    
+    }
 }
-    
+
 void ELRepoFile::unparse(const std::vector<ELRepo>& repositories)
 {
-    this->unparseData(repositories);
-    this->write();
+    unparseData(repositories);
+    write();
 }
 
-   
-void ELRepoFile::unparse(const std::vector<ELRepo>& repositories, std::stringstream& ss)
+void ELRepoFile::unparse(
+    const std::vector<ELRepo>& repositories, std::stringstream& ss)
 {
-    this->unparseData(repositories);
+    unparseData(repositories);
     ss.seekp(0);
     ss << m_file->to_data();
 }