Refactor code to improve readability and error handling

Author: igrek51

src/app_logic.rs

@@ -83,14 +83,11 @@ impl App {
     }
 
     pub fn get_current_string_path(&self) -> String {
-        let mut all_names = self
+        let all_names = self
             .parent_nodes
             .iter()
             .map(|node| node.name.to_string())
             .collect::<Vec<String>>();
-        if !self.starting_dir.is_empty() {
-            all_names.insert(0, self.starting_dir.clone());
-        }
         if all_names.is_empty() {
             return "/".to_string();
         }
@@ -103,8 +100,9 @@ impl App {
 
         let nodes_result = list_files(std::path::Path::new(&path));
         if nodes_result.is_err() {
-            self.error_message = Some(nodes_result.unwrap_err().to_string());
+            self.error_message = Some(contextualized_error(&nodes_result.unwrap_err()));
             self.child_nodes = vec![];
+            self.render_tree_nodes();
             return;
         }
         let mut nodes = nodes_result.unwrap();
@@ -185,16 +183,12 @@ impl App {
         }
         let selected_node: FileNode = selected_node_o.unwrap();
 
-        let mut all_names = self
-            .parent_nodes
-            .iter()
-            .map(|node| node.name.to_string())
-            .collect::<Vec<String>>();
-        if !self.starting_dir.is_empty() {
-            all_names.insert(0, self.starting_dir.clone());
-        }
-        all_names.push(selected_node.name.to_string());
-        let selected_path = normalize_path(all_names.join("/"));
+        let current_path = self.get_current_string_path();
+        let selected_path = normalize_path(format!(
+            "{}/{}",
+            current_path,
+            selected_node.name.to_string()
+        ));
 
         self.picked_path = Some(selected_path);
         self.quit();

src/filesystem.rs

@@ -20,7 +20,8 @@ pub enum FileType {
 }
 
 pub fn list_files(dir_path: &Path) -> Result<Vec<FileNode>> {
-    let dir_entries: ReadDir = fs::read_dir(dir_path).context("failed to read directory")?;
+    let dir_entries: ReadDir = fs::read_dir(dir_path)
+        .with_context(|| format!("failed to read directory '{}'", dir_path.to_string_lossy()))?;
 
     let files: Vec<FileNode> = dir_entries
         .filter_map(|entry| {
@@ -74,7 +75,12 @@ pub fn get_path_file_nodes(path: &String) -> Result<Vec<FileNode>> {
         true => PathBuf::from("."),
         false => PathBuf::from(&path),
     };
-    let absolute = fs::canonicalize(&start_pathbuf).context("evaluating absolute path")?;
+    let absolute = fs::canonicalize(&start_pathbuf).with_context(|| {
+        format!(
+            "evaluating absolute path '{}'",
+            start_pathbuf.to_string_lossy()
+        )
+    })?;
     let path_parts: Vec<&str> = absolute.to_str().unwrap().split('/').collect();
 
     let nodes: Vec<FileNode> = path_parts

src/ui.rs

@@ -78,17 +78,30 @@ fn render_error_popup(app: &mut App, frame: &mut Frame) {
         .bg(Color::Red)
         .border_type(BorderType::Rounded);
 
-    let widget = Paragraph::new(error_message)
+    let error_window = Paragraph::new(error_message)
         .wrap(Wrap { trim: true })
         .block(title)
         .style(Style::default().fg(Color::White));
 
+    let ok_label = Paragraph::new("OK")
+        .style(Style::default().bold().fg(Color::LightRed).bg(Color::White))
+        .alignment(Alignment::Center);
+
     let width: u16 = (frame.size().width as f32 * 0.75f32) as u16;
     let height: u16 = frame.size().height / 2;
     let area = centered_rect(width, height, frame.size());
+
+    let ok_label_area = Rect {
+        x: area.x + 1,
+        y: area.y + area.height - 2,
+        width: area.width - 2,
+        height: 1,
+    };
+
     let buffer = frame.buffer_mut();
     Clear.render(area, buffer);
-    frame.render_widget(widget, area);
+    frame.render_widget(error_window, area);
+    frame.render_widget(ok_label, ok_label_area);
 }
 
 fn centered_rect(w: u16, h: u16, r: Rect) -> Rect {