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

👷 use fetch url to fetch netprofiles with fallback from gucc

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-07-11 10:13:04 +04:00
parent 3d51b777cc
commit 0b78d91cd7
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.cpp
View File

@ -39,9 +39,9 @@ bool Config::initialize() noexcept {
s_config->m_data["READY_PARTITIONS"] = std::vector<std::string>{}; s_config->m_data["READY_PARTITIONS"] = std::vector<std::string>{};
s_config->m_data["ZFS_ZPOOL_NAMES"] = std::vector<std::string>{}; s_config->m_data["ZFS_ZPOOL_NAMES"] = std::vector<std::string>{};
// TODO(vnepogodin): change location and try first remote location(e.g from CDN) or // URLs to fetch net profiles
// local location as a fallback. s_config->m_data["NET_PROFILES_URL"] = "https://raw.githubusercontent.com/CachyOS/New-Cli-Installer/master/net-profiles.toml";
s_config->m_data["NET_PROFILES_URL"] = "net-profiles.toml"; s_config->m_data["NET_PROFILES_FALLBACK_URL"] = "file:///var/lib/cachyos-installer/net-profiles.toml";
// Mounting // Mounting
s_config->m_data["MOUNTPOINT"] = "/mnt"; s_config->m_data["MOUNTPOINT"] = "/mnt";

31
src/utils.cpp
View File

@ -9,6 +9,7 @@
#include "gucc/autologin.hpp" #include "gucc/autologin.hpp"
#include "gucc/bootloader.hpp" #include "gucc/bootloader.hpp"
#include "gucc/cpu.hpp" #include "gucc/cpu.hpp"
#include "gucc/fetch_file.hpp"
#include "gucc/file_utils.hpp" #include "gucc/file_utils.hpp"
#include "gucc/fs_utils.hpp" #include "gucc/fs_utils.hpp"
#include "gucc/hwclock.hpp" #include "gucc/hwclock.hpp"
@ -589,11 +590,12 @@ void lvm_detect(std::optional<std::function<void()>> func_callback) noexcept {
} }
auto get_pkglist_base(const std::string_view& packages) noexcept -> std::optional<std::vector<std::string>> { auto get_pkglist_base(const std::string_view& packages) noexcept -> std::optional<std::vector<std::string>> {
auto* config_instance = Config::instance(); auto* config_instance = Config::instance();
auto& config_data = config_instance->data(); auto& config_data = config_instance->data();
const auto& server_mode = std::get<std::int32_t>(config_data["SERVER_MODE"]); const auto& server_mode = std::get<std::int32_t>(config_data["SERVER_MODE"]);
const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]); const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]);
const auto& net_profs_url = std::get<std::string>(config_data["NET_PROFILES_URL"]); const auto& net_profs_url = std::get<std::string>(config_data["NET_PROFILES_URL"]);
const auto& net_profs_fallback_url = std::get<std::string>(config_data["NET_PROFILES_FALLBACK_URL"]);
const auto& root_filesystem = gucc::fs::utils::get_mountpoint_fs(mountpoint_info); const auto& root_filesystem = gucc::fs::utils::get_mountpoint_fs(mountpoint_info);
const auto& is_root_on_zfs = (root_filesystem == "zfs"); const auto& is_root_on_zfs = (root_filesystem == "zfs");
@ -617,12 +619,12 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::optiona
pkg_list.insert(pkg_list.cend(), {"bcachefs-tools"}); pkg_list.insert(pkg_list.cend(), {"bcachefs-tools"});
} }
auto net_profs_content = gucc::file_utils::read_whole_file(net_profs_url); auto net_profs_content = gucc::fetch::fetch_file_from_url(net_profs_url, net_profs_fallback_url);
if (net_profs_content.empty()) { if (!net_profs_content) {
spdlog::error("Failed to get net profiles content"); spdlog::error("Failed to get net profiles content");
return std::nullopt; return std::nullopt;
} }
auto base_net_profs = gucc::profile::parse_base_profiles(net_profs_content); auto base_net_profs = gucc::profile::parse_base_profiles(*net_profs_content);
if (!base_net_profs.has_value()) { if (!base_net_profs.has_value()) {
spdlog::error("Failed to parse net profiles"); spdlog::error("Failed to parse net profiles");
return std::nullopt; return std::nullopt;
@ -644,16 +646,17 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::optiona
} }
auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::optional<std::vector<std::string>> { auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::optional<std::vector<std::string>> {
auto* config_instance = Config::instance(); auto* config_instance = Config::instance();
auto& config_data = config_instance->data(); auto& config_data = config_instance->data();
const auto& net_profs_url = std::get<std::string>(config_data["NET_PROFILES_URL"]); const auto& net_profs_url = std::get<std::string>(config_data["NET_PROFILES_URL"]);
const auto& net_profs_fallback_url = std::get<std::string>(config_data["NET_PROFILES_FALLBACK_URL"]);
auto net_profs_content = gucc::file_utils::read_whole_file(net_profs_url); auto net_profs_content = gucc::fetch::fetch_file_from_url(net_profs_url, net_profs_fallback_url);
if (net_profs_content.empty()) { if (!net_profs_content) {
spdlog::error("Failed to get net profiles content"); spdlog::error("Failed to get net profiles content");
return std::nullopt; return std::nullopt;
} }
auto desktop_net_profs = gucc::profile::parse_desktop_profiles(net_profs_content); auto desktop_net_profs = gucc::profile::parse_desktop_profiles(*net_profs_content);
if (!desktop_net_profs.has_value()) { if (!desktop_net_profs.has_value()) {
spdlog::error("Failed to parse net profiles"); spdlog::error("Failed to parse net profiles");
return std::nullopt; return std::nullopt;