Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Repository class refactoring #95

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
27 changes: 17 additions & 10 deletions include/cloysterhpc/services/repo.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,27 @@ 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 {
dhilst marked this conversation as resolved.
Show resolved Hide resolved
std::string group;
std::string name;
Expand All @@ -88,28 +90,33 @@ struct ELRepo {

// (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>&);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing the variable name.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The variable name is not needed in the declaration and the context is obvious, but I will fixed because of conventions

public:
ELRepoFile(const std::filesystem::path& path)
: GenericFile(path)
{
}
{}

virtual void read() override;
virtual void write() override;

std::vector<ELRepo> parse();
void unparse(const std::vector<ELRepo>& repositories);
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 );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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_
34 changes: 29 additions & 5 deletions src/services/repo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ std::vector<ELRepo> ELRepoFile::parse()
{
this->read();
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need "this"?


return this->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();
}
Copy link
Collaborator

@dhilst dhilst Jan 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, now

  • Add m_repositories member as a vector of ELRepo with a getter
  • The getter should load the data into the member if the member is empty and return at the end

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inside of ELRepo?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inside ELRepoFile



std::vector<ELRepo> ELRepoFile::parseData()
{
auto reponames = m_file->get_groups();

std::vector<ELRepo> repositories;
Expand Down Expand Up @@ -117,15 +130,26 @@ std::vector<ELRepo> ELRepoFile::parse()
return repositories;
}

void ELRepoFile::unparse(const std::vector<ELRepo>& repositories)
{

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();
}


void ELRepoFile::unparse(const std::vector<ELRepo>& repositories, std::stringstream& ss)
{
this->unparseData(repositories);
ss.seekp(0);
ss << m_file->to_data();
}
Loading