rhpidfyre/libpse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

history now writes to the fs .history properly

Browse Source
This commit is contained in:
rhpidfyre 2025-01-12 18:22:33 -05:00
parent f8d97ded00
commit 41c611c0ca
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/history.rs
View File

@ -4,18 +4,42 @@ use crate::{rc::{self}, session::{self, MapDisplay}, valid_pbuf::IsValid};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct History { pub struct History {
file: Option<PathBuf>, fs_history: Option<Vec<String>>,
history: Vec<String>, history: Vec<String>,
file: Option<PathBuf>,
} }
impl History { impl History {
pub fn init() -> Self { pub fn init() -> Self {
let file = rc::config_dir().map(|mut config_dir| {
config_dir.push(".history");
config_dir.is_valid_file_or_create(b"");
config_dir
});
let fs_history = file.as_ref().and_then(|file| {
File::open(file).map_or_display_none(|file| {
Some(BufReader::new(file).lines().map_while(Result::ok).collect::<Vec<String>>())
})
});
Self { Self {
history: Vec::new(), history: Vec::new(),
file: rc::config_dir().map(|mut history_pbuf| { fs_history,
history_pbuf.push(".history"); file,
history_pbuf.is_valid_file_or_create(b""); }
history_pbuf }
}),
pub fn write_to_file_fallible(&mut self) {
if self.history.is_empty() { return; }
if let (Some(history_file), Some(fs_history)) = (&self.file, &self.fs_history) {
OpenOptions::new()
.append(true)
.open(history_file.as_path())
.map_or_display(|mut file| {
let newline_maybe = if fs_history.is_empty() { "" } else { "\n" };
if let Err(write_err) = file.write_all(format!("{newline_maybe}{}", self.history.join("\n")).as_bytes()) {
session::shell_error(write_err);
};
});
} }
} }
@ -25,28 +49,4 @@ impl History {
None => self.history.push(command.to_owned()), None => self.history.push(command.to_owned()),
}; };
} }
pub fn write_to_file_fallible(&mut self) {
if !self.history.is_empty() {
if let Some(history_file) = &self.file {
OpenOptions::new().append(true).open(history_file.as_path()).map_or_display(|mut file| {
let history_content = match self.history.len()==1 {
true => format!("\n{}", self.history[0]),
false => self.history.join("\n")
};
if let Err(write_err) = file.write_all(history_content.as_bytes()) {
session::shell_error(write_err);
};
});
}
}
}
pub fn read_file_fallible(&self) -> Option<Vec<String>> {
self.file.as_ref().and_then(|history_file| {
File::open(history_file).map_or_display_none(|file| {
Some(BufReader::new(file).lines().map_while(Result::ok).collect::<Vec<String>>())
})
})
}
} }