refactor: organize application source hierarchy (#2)

* refactor: organize viewer source and refresh dependencies

* refactor: organize application source hierarchy

---------

Co-authored-by: whackur <whackur@gmail.com>

Author: whaclaw-bot

Cargo.lock

@@ -7,7 +7,7 @@
 use std::sync::mpsc;
 use std::thread;
 
-use crate::util::{REAP_TIMEOUT, try_timed_join};
+use crate::platform::threading::{REAP_TIMEOUT, try_timed_join};
 
 use git2::{Oid, Repository};
 

docs/architecture.md

@@ -3,7 +3,7 @@
 use std::sync::mpsc::Receiver;
 use std::thread::JoinHandle;
 
-use crate::util::{REAP_TIMEOUT, try_timed_join};
+use crate::platform::threading::{REAP_TIMEOUT, try_timed_join};
 
 use super::commit_log_fetch::CommitLogPageMsg;
 

src/app/commit_log_fetch.rs

@@ -1,7 +1,7 @@
 use super::{App, Focus, NoticeKind, ViewMode};
 use crate::git::diff::{load_commit_files, load_commit_log};
 use crate::runtime::terminal::TerminalFullscreen;
-use crate::session::SessionState;
+use crate::workspace::persistence::SessionState;
 
 impl App {
     // The live view, except for a selection still waiting on its first

src/app/commit_log_pagination.rs

@@ -114,7 +114,7 @@ fn save_session_round_trips_list_fullscreen() {
 fn restore_session_list_fullscreen_forces_filelist_focus() {
     let mut app = app_with_files(vec![]);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::DiffViewer),
         list_fullscreen: true,
         ..Default::default()
@@ -132,7 +132,7 @@ fn restore_session_prefers_terminal_fullscreen_over_list_fullscreen() {
         title: "shell".into(),
     }];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         terminal_fullscreen: true,
         list_fullscreen: true,
@@ -182,7 +182,7 @@ fn restore_session_restores_active_pane_even_when_focus_is_not_terminal() {
         },
     ];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         active_pane: 1,
         ..Default::default()
@@ -200,7 +200,7 @@ fn restore_session_fullscreen_forces_terminal_focus() {
         title: "shell".into(),
     }];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         terminal_fullscreen: true,
         ..Default::default()
@@ -214,7 +214,7 @@ fn restore_session_fullscreen_forces_terminal_focus() {
 fn restore_session_diff_fullscreen_forces_diff_focus() {
     let mut app = app_with_files(vec![]);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         diff_fullscreen: true,
         ..Default::default()
@@ -232,7 +232,7 @@ fn restore_session_prefers_terminal_fullscreen_over_diff_fullscreen() {
         title: "shell".into(),
     }];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         terminal_fullscreen: true,
         diff_fullscreen: true,
@@ -263,7 +263,7 @@ fn save_session_round_trips_diff_fullscreen() {
 fn restore_session_normalizes_accent_index() {
     let mut app = app_with_files(vec![]);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         accent_idx: usize::MAX,
         ..Default::default()
     });
@@ -289,7 +289,7 @@ fn restore_session_keeps_log_scroll_after_loading_commit_diff() {
     let mut app = app_with_files(vec![]);
     app.repo_path = path;
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Log),
         scroll: 2,
         ..Default::default()

src/app/session_io.rs

@@ -51,7 +51,7 @@ fn a_saved_mode_lands_immediately_and_survives_being_changed() {
         ..app_with_files(vec![])
     };
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         ..Default::default()
     });
@@ -85,7 +85,7 @@ fn a_saved_selection_is_restored_by_the_first_snapshot() {
         ..app_with_files(vec![])
     };
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         selected_file: Some("b.rs".to_string()),
         ..Default::default()
     });

src/app/tests/session_restore.rs

@@ -25,7 +25,7 @@ fn restore_session_overrides_fresh_launch_terminal_focus() {
     app.ensure_initial_terminal(&[]);
     assert_eq!(app.focus, Focus::Terminal);
     // A restored session must win over the fresh-launch terminal focus.
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         ..Default::default()
     });
@@ -40,7 +40,7 @@ fn restore_pane_focus_wins_immediately_without_snapshot() {
     let mut app = app_with_fake_backend();
     app.ensure_initial_terminal(&[]);
     assert_eq!(app.focus, Focus::Terminal);
-    app.restore_pane_focus(&crate::session::SessionState {
+    app.restore_pane_focus(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         ..Default::default()
     });

src/app/tests/snapshot.rs

@@ -127,7 +127,7 @@ fn restoring_tree_session_clears_lingering_status_search() {
     app.search_push('x');
     assert!(app.status_view.search_active);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         ..Default::default()
     });
@@ -163,7 +163,7 @@ fn restore_tree_session_ignores_unsafe_expanded_paths() {
     let (dir, path) = make_tree_repo();
     let mut app = app_on(&path);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         tree_expanded: vec![
             "../../..".to_string(),
@@ -191,7 +191,7 @@ fn restore_tree_session_prunes_expansion_gone_since_save() {
     std::fs::rename(Path::new(&path).join("src"), Path::new(&path).join("lib")).unwrap();
     let mut app = app_on(&path);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         tree_expanded: vec!["src".to_string()],
         tree_selected_path: Some("src".to_string()),

src/app/tests/terminal_init.rs

@@ -1,5 +1,5 @@
 use crate::app::App;
-use crate::session::SessionState;
+use crate::workspace::persistence::SessionState;
 
 pub(crate) fn init_app(
     repo_path: &str,