Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-01-23 22:42:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🧹 pacmanconf_repo: refactor a bit

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-04-30 13:29:31 +04:00
parent e151bc32bf
commit 4ef6bd13da
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pacmanconf_repo.cpp
View File

@ -30,7 +30,7 @@
namespace detail::pacmanconf { namespace detail::pacmanconf {
bool push_repos_front(const std::string_view& file_path, const std::string_view& value) noexcept { bool push_repos_front(std::string_view file_path, std::string_view value) noexcept {
using StringVec = std::vector<std::string>; using StringVec = std::vector<std::string>;
auto&& file_content = utils::read_whole_file(file_path); auto&& file_content = utils::read_whole_file(file_path);
if (file_content.empty()) { if (file_content.empty()) {
@ -40,7 +40,7 @@ bool push_repos_front(const std::string_view& file_path, const std::string_view&
auto&& content_lines = file_content | ranges::views::split('\n') | ranges::to<std::vector<std::string>>(); auto&& content_lines = file_content | ranges::views::split('\n') | ranges::to<std::vector<std::string>>();
for (std::size_t i = 1; i < content_lines.size(); ++i) { for (std::size_t i = 1; i < content_lines.size(); ++i) {
const std::string_view current_line{content_lines[i - 1]}; const std::string_view current_line{content_lines[i - 1]};
if (current_line.empty() || current_line.starts_with("#") || !current_line.starts_with("[") || current_line.starts_with("[options]")) { if (current_line.empty() || current_line.starts_with('#') || !current_line.starts_with('[') || current_line.starts_with("[options]")) {
continue; continue;
} }
@ -51,30 +51,28 @@ bool push_repos_front(const std::string_view& file_path, const std::string_view&
break; break;
} }
std::string&& result = content_lines | ranges::views::join('\n') | ranges::to<std::string>();
std::ofstream pacmanconf_file{file_path.data()}; std::ofstream pacmanconf_file{file_path.data()};
if (!pacmanconf_file.is_open()) { if (!pacmanconf_file.is_open()) {
spdlog::error("[PACMANCONFREPO] '{}' open failed: {}", file_path, std::strerror(errno)); spdlog::error("[PACMANCONFREPO] '{}' open failed: {}", file_path, std::strerror(errno));
return false; return false;
} }
std::string&& result = content_lines | ranges::views::join('\n') | ranges::to<std::string>();
pacmanconf_file << result; pacmanconf_file << result;
return true; return true;
} }
auto get_repo_list(const std::string_view& file_path) noexcept -> std::vector<std::string> { auto get_repo_list(std::string_view file_path) noexcept -> std::vector<std::string> {
auto&& file_content = utils::read_whole_file(file_path); auto&& file_content = utils::read_whole_file(file_path);
if (file_content.empty()) { if (file_content.empty()) {
spdlog::error("[PACMANCONFREPO] '{}' error occurred!", file_path); spdlog::error("[PACMANCONFREPO] '{}' error occurred!", file_path);
return {}; return {};
} }
auto&& result = file_content | ranges::views::split('\n') return file_content | ranges::views::split('\n')
| ranges::views::filter([](auto&& rng) { | ranges::views::filter([](auto&& rng) {
auto&& line = std::string_view(&*rng.begin(), static_cast<size_t>(ranges::distance(rng))); auto&& line = std::string_view(&*rng.begin(), static_cast<size_t>(ranges::distance(rng)));
return !(line.empty() || line.starts_with("#") || !line.starts_with("[") || line.starts_with("[options]")); return !line.empty() && !line.starts_with('#') && line.starts_with('[') && !line.starts_with("[options]");
}) })
| ranges::to<std::vector<std::string>>(); | ranges::to<std::vector<std::string>>();
return result;
} }
} // namespace detail::pacmanconf } // namespace detail::pacmanconf

4
src/pacmanconf_repo.hpp
View File

@ -6,8 +6,8 @@
#include <vector> // for vector #include <vector> // for vector
namespace detail::pacmanconf { namespace detail::pacmanconf {
bool push_repos_front(const std::string_view& file_path, const std::string_view& value) noexcept; bool push_repos_front(std::string_view file_path, std::string_view value) noexcept;
auto get_repo_list(const std::string_view& file_path) noexcept -> std::vector<std::string>; auto get_repo_list(std::string_view file_path) noexcept -> std::vector<std::string>;
} // namespace detail::pacmanconf } // namespace detail::pacmanconf
#endif // PACMANCONF_REPO_HPP #endif // PACMANCONF_REPO_HPP