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

🧹 gucc: refactor fstab

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-07-06 02:01:17 +04:00
parent 5a7a93d033
commit 36b205a463
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gucc/src/fstab.cpp
View File

@ -50,23 +50,41 @@ constexpr auto convert_fsname_fstab(std::string_view fsname) noexcept -> std::st
return fsname; return fsname;
} }
auto string_tolower(std::string_view text) noexcept -> std::string { constexpr auto get_check_number(std::string_view mountpoint, std::string_view fstype) noexcept -> std::int32_t {
if (mountpoint == "/"sv && fstype != "btrfs"sv) {
return 1;
} else if (mountpoint != "swap"sv && fstype != "btrfs"sv) {
return 2;
}
return 0;
}
constexpr auto get_mount_options(std::string_view mount_opts, std::string_view btrfs_subvolume, std::string_view fstype) noexcept -> std::string {
if (fstype == "btrfs"sv && !btrfs_subvolume.empty()) {
return fmt::format(FMT_COMPILE("subvol={},{}"), btrfs_subvolume, mount_opts);
}
return std::string{mount_opts};
}
constexpr auto string_tolower(std::string_view text) noexcept -> std::string {
std::string res{text}; std::string res{text};
ranges::transform(res, res.begin(), ranges::transform(res, res.begin(),
[](char char_elem) { return static_cast<char>(std::tolower(static_cast<unsigned char>(char_elem))); }); [](char char_elem) { return static_cast<char>(std::tolower(static_cast<unsigned char>(char_elem))); });
return res; return res;
} }
constexpr auto get_converted_fs(std::string_view fstype) noexcept -> std::string {
auto lower_fstype = string_tolower(fstype);
return std::string{convert_fsname_fstab(lower_fstype)};
}
} // namespace } // namespace
namespace gucc::fs { namespace gucc::fs {
auto gen_fstab_entry(const Partition& partition) noexcept -> std::optional<std::string> { auto gen_fstab_entry(const Partition& partition) noexcept -> std::optional<std::string> {
// Apperently some FS names named differently in /etc/fstab. // Apperently some FS names named differently in /etc/fstab.
const auto& fstype = [](auto&& fstype) -> std::string { const auto& fstype = get_converted_fs(partition.fstype);
auto lower_fstype = string_tolower(fstype);
return std::string{convert_fsname_fstab(lower_fstype)};
}(partition.fstype);
const auto& luks_mapper_name = partition.luks_mapper_name; const auto& luks_mapper_name = partition.luks_mapper_name;
const auto& mountpoint = partition.mountpoint; const auto& mountpoint = partition.mountpoint;
@ -78,21 +96,8 @@ auto gen_fstab_entry(const Partition& partition) noexcept -> std::optional<std::
return std::nullopt; return std::nullopt;
} }
const auto check_num = [](auto&& mountpoint, auto&& fstype) -> std::int32_t { const auto check_num = get_check_number(mountpoint, fstype);
if (mountpoint == "/"sv && fstype != "btrfs"sv) { const auto& mount_options = get_mount_options(partition.mount_opts, partition.subvolume.value_or(""), fstype);
return 1;
} else if (mountpoint != "swap"sv && fstype != "btrfs"sv) {
return 2;
}
return 0;
}(mountpoint, fstype);
const auto& mount_options = [](auto&& mount_opts, auto&& subvolume, auto&& fstype) -> std::string {
if (fstype == "btrfs"sv && !subvolume.empty()) {
return fmt::format(FMT_COMPILE("subvol={},{}"), subvolume, mount_opts);
}
return {mount_opts};
}(partition.mount_opts, partition.subvolume.value_or(""), fstype);
std::string device_str{partition.device}; std::string device_str{partition.device};
if (luks_mapper_name) { if (luks_mapper_name) {