cry/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[O] Make code more readable

Browse source
This commit is contained in:
Azalea 2025-10-02 01:25:07 +08:00
parent 03615ab4ee
commit 34583294c6
1 changed files with 8 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crates/hyfetch/src/bin/hyfetch.rs
View file

@ -272,10 +272,6 @@ fn create_config(
} else if color_level.has_256 { } else if color_level.has_256 {
AnsiMode::Ansi256 AnsiMode::Ansi256
} else if color_level.has_basic { } else if color_level.has_basic {
// unimplemented!(
// "{mode} color mode not supported",
// mode = AnsiMode::Ansi16.as_ref()
// );
AnsiMode::Ansi256 AnsiMode::Ansi256
} else { } else {
unreachable!(); unreachable!();
@ -1060,38 +1056,21 @@ fn create_config(
if choice == "y" { if choice == "y" {
loop { loop {
let path_input = input(Some("Path to custom ASCII file (must be .txt and UTF-8 encoded): ")) let pth = input(Some("Path to custom ASCII file (must be UTF-8 encoded, empty to skip): "))?.trim().to_owned();
.context("failed to read input")? if pth.is_empty() {
.trim()
.to_owned();
if path_input.is_empty() {
printc!("&cNo path entered. Skipping custom ASCII file."); printc!("&cNo path entered. Skipping custom ASCII file.");
break; break;
} }
let custom_path = PathBuf::from(&path_input); let pth_buf = PathBuf::from(&pth);
if !custom_path.is_file() { if !pth_buf.is_file() {
printc!("&cError: File not found at {path_input}"); printc!("&cError: File not found at {pth}");
let try_again = literal_input("Try again?", &["y", "n"], "y", true, color_mode).context("failed to ask for choice input")?;
if try_again == "n" {
break;
}
continue; continue;
} }
if custom_path.extension().map_or(true, |ext| ext != "txt") { match fs::read_to_string(&pth_buf) {
printc!("&cError: File must have a .txt extension. Found {:?}", custom_path.extension());
let try_again = literal_input("Try again?", &["y", "n"], "y", true, color_mode).context("failed to ask for choice input")?;
if try_again == "n" {
break;
}
continue;
}
match fs::read_to_string(&custom_path) {
Ok(_) => { Ok(_) => {
custom_ascii_path = Some(path_input); custom_ascii_path = Some(pth);
update_title( update_title(
&mut title, &mut title,
&mut option_counter, &mut option_counter,
@ -1101,11 +1080,7 @@ fn create_config(
break; break;
} }
Err(e) => { Err(e) => {
printc(format!("&cError: File is not UTF-8 encoded or an unexpected error occurred: {e}"), color_mode).context("failed to print message")?; printc!("&cError: File is not UTF-8 encoded or an unexpected error occurred: {e}");
let try_again = literal_input("Try again?", &["y", "n"], "y", true, color_mode).context("failed to ask for choice input")?;
if try_again == "n" {
break;
}
continue; continue;
} }
} }