CrispyPin/lili
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

show error when failing to open a file

Browse source
This commit is contained in:
Crispy 2023-03-12 21:45:12 +01:00
parent 2bc0cde14b
commit cf1a4c510d
2 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/editor.rs
View file

@ -42,9 +42,9 @@ struct Cursor {
type Line = Range<usize>; type Line = Range<usize>;
impl Editor { impl Editor {
pub fn open_file(clipboard: Clipboard, path: PathBuf) -> Option<Self> { pub fn open_file(clipboard: Clipboard, path: PathBuf) -> std::io::Result<Self> {
let text = fs::read_to_string(&path).ok()?; let text = fs::read_to_string(&path)?;
Some(Editor { Ok(Editor {
text, text,
lines: Vec::new(), lines: Vec::new(),
scroll: 0, scroll: 0,

36
src/main.rs
View file

@ -4,7 +4,7 @@ use crossterm::{
execute, queue, execute, queue,
style::{Color, Colors, ResetColor, SetColors}, style::{Color, Colors, ResetColor, SetColors},
terminal::{ terminal::{
disable_raw_mode, enable_raw_mode, Clear, ClearType, EnterAlternateScreen, self, disable_raw_mode, enable_raw_mode, Clear, ClearType, EnterAlternateScreen,
LeaveAlternateScreen, LeaveAlternateScreen,
}, },
}; };
@ -33,6 +33,7 @@ struct Navigator {
path: PathBuf, path: PathBuf,
init_path: PathBuf, init_path: PathBuf,
immediate_open: bool, immediate_open: bool,
message: Option<String>,
} }
impl Navigator { impl Navigator {
@ -49,7 +50,7 @@ impl Navigator {
path = arg.canonicalize().unwrap(); path = arg.canonicalize().unwrap();
break; break;
} else if arg.is_file() { } else if arg.is_file() {
if let Some(editor) = Editor::open_file(clipboard.clone(), arg) { if let Ok(editor) = Editor::open_file(clipboard.clone(), arg) {
editors.push(editor); editors.push(editor);
} }
} else { } else {
@ -68,6 +69,7 @@ impl Navigator {
init_path: path.clone(), init_path: path.clone(),
path, path,
immediate_open, immediate_open,
message: None,
} }
} }
@ -82,6 +84,7 @@ impl Navigator {
loop { loop {
self.get_files(); self.get_files();
self.draw(); self.draw();
self.message = None;
self.input(); self.input();
} }
} }
@ -123,6 +126,11 @@ impl Navigator {
queue!(stdout(), ResetColor).unwrap(); queue!(stdout(), ResetColor).unwrap();
} }
if let Some(text) = &self.message {
queue!(stdout(), MoveTo(0, terminal::size().unwrap().1)).unwrap();
print!("{text}");
}
stdout().flush().unwrap(); stdout().flush().unwrap();
} }
@ -144,6 +152,10 @@ impl Navigator {
} }
} }
fn message(&mut self, text: String) {
self.message = Some(text);
}
fn nav_up(&mut self) { fn nav_up(&mut self) {
self.selected = self.selected.saturating_sub(1); self.selected = self.selected.saturating_sub(1);
} }
@ -170,22 +182,26 @@ impl Navigator {
self.selected = self.editors.len(); self.selected = self.editors.len();
} else if path.is_file() { } else if path.is_file() {
let path = path.canonicalize().unwrap(); let path = path.canonicalize().unwrap();
self.selected = self.editors.len(); let mut editor_index = self.editors.len();
for (i, editor) in self.editors.iter().enumerate() { for (i, editor) in self.editors.iter().enumerate() {
if editor.path() == Some(&path) { if editor.path() == Some(&path) {
self.selected = i; editor_index = i;
break; break;
} }
} }
if self.selected == self.editors.len() { if editor_index == self.editors.len() {
if let Some(editor) = match Editor::open_file(
Editor::open_file(self.clipboard.clone(), path.canonicalize().unwrap()) self.clipboard.clone(),
{ path.canonicalize().unwrap(),
self.editors.push(editor); ) {
} else { Ok(editor) => self.editors.push(editor),
Err(err) => {
self.message(format!("Could not open file: {err}"));
return; return;
} }
} }
}
self.selected = editor_index;
self.open_selected(); self.open_selected();
} }
} }