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

👷 gucc: use std ranges from C++23 in pacmanconf

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-07-13 03:12:21 +04:00
parent dc107950b4
commit c32faf3dfa
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gucc/src/pacmanconf_repo.cpp
View File

@ -3,32 +3,12 @@
#include "gucc/string_utils.hpp" #include "gucc/string_utils.hpp"
#include <fstream> // for ofstream #include <fstream> // for ofstream
#include <ranges> // for ranges::*
#include <string> // for string #include <string> // for string
#include <vector> // for vector #include <vector> // for vector
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnull-dereference"
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#include <range/v3/algorithm/find_if.hpp>
#include <range/v3/range/conversion.hpp>
#include <range/v3/view/filter.hpp>
#include <range/v3/view/split.hpp>
#if defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
namespace gucc::detail::pacmanconf { namespace gucc::detail::pacmanconf {
bool push_repos_front(std::string_view file_path, std::string_view value) noexcept { bool push_repos_front(std::string_view file_path, std::string_view value) noexcept {
@ -40,15 +20,15 @@ bool push_repos_front(std::string_view file_path, std::string_view value) noexce
auto file_split_view = utils::make_split_view(file_content); auto file_split_view = utils::make_split_view(file_content);
// Find the insertion point (using ranges for iteration) // Find the insertion point (using ranges for iteration)
auto insertion_point_it = ranges::find_if( auto insertion_point_it = std::ranges::find_if(
file_split_view, file_split_view,
[](auto&& rng) { [](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>(std::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]");
}); });
// Handle case where insertion point is not found // Handle case where insertion point is not found
if (insertion_point_it == ranges::end(file_split_view)) { if (insertion_point_it == std::ranges::end(file_split_view)) {
// No suitable insertion point found // No suitable insertion point found
spdlog::error("[PACMANCONFREPO] Could not find a suitable insertion point in {}", file_path); spdlog::error("[PACMANCONFREPO] Could not find a suitable insertion point in {}", file_path);
return false; return false;
@ -73,12 +53,12 @@ auto get_repo_list(std::string_view file_path) noexcept -> std::vector<std::stri
spdlog::error("[PACMANCONFREPO] '{}' error occurred!", file_path); spdlog::error("[PACMANCONFREPO] '{}' error occurred!", file_path);
return {}; return {};
} }
return file_content | ranges::views::split('\n') return file_content | std::ranges::views::split('\n')
| ranges::views::filter([](auto&& rng) { | std::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>(std::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>>(); | std::ranges::to<std::vector<std::string>>();
} }
} // namespace gucc::detail::pacmanconf } // namespace gucc::detail::pacmanconf