Optionally restore last session on start

joshuamegnauth54 · joshuamegnauth54 · commit 4f537eaf09d3 · 2024-10-07T01:05:01.000-04:00
Closes: #534 This patch adds a config option to restore closed sessions on start. So, if a user had three tabs opened, all three tabs would be restored when Files is launched again.
diff --git a/i18n/en/cosmic_files.ftl b/i18n/en/cosmic_files.ftl
@@ -197,6 +197,10 @@ match-desktop = Match desktop
 dark = Dark
 light = Light
 
+### Session
+session = Session
+restore-session = Restore previous session on start
+
 # Context menu
 add-to-sidebar = Add to sidebar
 compress = Compress
diff --git a/src/app.rs b/src/app.rs
@@ -58,7 +58,7 @@ use wayland_client::{protocol::wl_output::WlOutput, Proxy};
 
 use crate::{
     clipboard::{ClipboardCopy, ClipboardKind, ClipboardPaste},
-    config::{AppTheme, Config, DesktopConfig, Favorite, IconSizes, TabConfig},
+    config::{AppTheme, Config, DesktopConfig, Favorite, IconSizes, SessionConfig, TabConfig},
     desktop_dir, fl, home_dir,
     key_bind::key_binds,
     localize::LANGUAGE_SORTER,
@@ -71,7 +71,7 @@ use crate::{
     tab::{self, HeadingOptions, ItemMetadata, Location, Tab, HOVER_DURATION},
 };
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Mode {
     App,
     Desktop,
@@ -305,10 +305,12 @@ pub enum Message {
     Rename(Option<Entity>),
     ReplaceResult(ReplaceResult),
     RestoreFromTrash(Option<Entity>),
+    SaveSession,
     SearchActivate,
     SearchClear,
     SearchInput(String),
     SearchSubmit,
+    SessionConfig(SessionConfig),
     SystemThemeModeChange(cosmic_theme::ThemeMode),
     TabActivate(Entity),
     TabNext,
@@ -1140,27 +1142,43 @@ impl App {
 
     fn settings(&self) -> Element<Message> {
         // TODO: Should dialog be updated here too?
-        widget::settings::view_column(vec![widget::settings::section()
-            .title(fl!("appearance"))
-            .add({
-                let app_theme_selected = match self.config.app_theme {
-                    AppTheme::Dark => 1,
-                    AppTheme::Light => 2,
-                    AppTheme::System => 0,
-                };
-                widget::settings::item::builder(fl!("theme")).control(widget::dropdown(
-                    &self.app_themes,
-                    Some(app_theme_selected),
-                    move |index| {
-                        Message::AppTheme(match index {
-                            1 => AppTheme::Dark,
-                            2 => AppTheme::Light,
-                            _ => AppTheme::System,
-                        })
-                    },
-                ))
-            })
-            .into()])
+        widget::settings::view_column(vec![
+            widget::settings::section()
+                .title(fl!("appearance"))
+                .add({
+                    let app_theme_selected = match self.config.app_theme {
+                        AppTheme::Dark => 1,
+                        AppTheme::Light => 2,
+                        AppTheme::System => 0,
+                    };
+                    widget::settings::item::builder(fl!("theme")).control(widget::dropdown(
+                        &self.app_themes,
+                        Some(app_theme_selected),
+                        move |index| {
+                            Message::AppTheme(match index {
+                                1 => AppTheme::Dark,
+                                2 => AppTheme::Light,
+                                _ => AppTheme::System,
+                            })
+                        },
+                    ))
+                })
+                .into(),
+            widget::settings::section()
+                .title(fl!("session"))
+                .add(
+                    widget::settings::item::builder(fl!("restore-session")).toggler(
+                        self.config.session.restore,
+                        move |restore| {
+                            Message::SessionConfig(SessionConfig {
+                                restore,
+                                ..Default::default()
+                            })
+                        },
+                    ),
+                )
+                .into(),
+        ])
         .into()
     }
 }
@@ -2326,6 +2344,24 @@ impl Application for App {
                     self.operation(Operation::Restore { paths });
                 }
             }
+            Message::SaveSession => {
+                if self.config.session.restore && self.mode == Mode::App {
+                    let session = SessionConfig {
+                        tabs: Some(
+                            self.tab_model
+                                .iter()
+                                .filter_map(|entity| {
+                                    self.tab_model
+                                        .data::<Tab>(entity)
+                                        .map(|tab| tab.location.clone())
+                                })
+                                .collect(),
+                        ),
+                        ..self.config.session
+                    };
+                    config_set!(session, session);
+                }
+            }
             Message::SearchActivate => {
                 self.search_active = true;
                 return widget::text_input::focus(self.search_id.clone());
@@ -2355,6 +2391,9 @@ impl Application for App {
                     return self.search();
                 }
             }
+            Message::SessionConfig(session) => {
+                config_set!(session, session);
+            }
             Message::SystemThemeModeChange(_theme_mode) => {
                 return self.update_config();
             }
@@ -2429,9 +2468,12 @@ impl Application for App {
                 // Remove item
                 self.tab_model.remove(entity);
 
-                // If that was the last tab, close window
+                // If that was the last tab, close window and serialize empty session if necessary
                 if self.tab_model.iter().next().is_none() {
-                    return window::close(window::Id::MAIN);
+                    return Command::batch([
+                        self.update(Message::SaveSession),
+                        window::close(window::Id::MAIN),
+                    ]);
                 }
 
                 return Command::batch([self.update_title(), self.update_watcher()]);
@@ -2695,6 +2737,7 @@ impl Application for App {
                 if let Some(window_id) = self.window_id_opt.take() {
                     return Command::batch([
                         window::close(window_id),
+                        self.update(Message::SaveSession),
                         Command::perform(async move { message::app(Message::MaybeExit) }, |x| x),
                     ]);
                 }
diff --git a/src/config.rs b/src/config.rs
@@ -9,7 +9,10 @@ use cosmic::{
 };
 use serde::{Deserialize, Serialize};
 
-use crate::{app::App, tab::View};
+use crate::{
+    app::App,
+    tab::{Location, View},
+};
 
 pub const CONFIG_VERSION: u64 = 1;
 
@@ -97,6 +100,7 @@ pub struct Config {
     pub favorites: Vec<Favorite>,
     pub show_details: bool,
     pub tab: TabConfig,
+    pub session: SessionConfig,
 }
 
 impl Config {
@@ -144,6 +148,7 @@ impl Default for Config {
             ],
             show_details: false,
             tab: TabConfig::default(),
+            session: SessionConfig::default(),
         }
     }
 }
@@ -229,3 +234,9 @@ impl IconSizes {
         percent!(self.grid, ICON_SIZE_GRID) as _
     }
 }
+
+#[derive(Clone, Debug, Default, PartialEq, Eq, CosmicConfigEntry, Deserialize, Serialize)]
+pub struct SessionConfig {
+    pub restore: bool,
+    pub tabs: Option<Vec<Location>>,
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -96,22 +96,25 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     localize::localize();
 
-    let (config_handler, config) = Config::load();
+    let (config_handler, mut config) = Config::load();
 
     let mut locations = Vec::new();
     for arg in env::args().skip(1) {
-        let location = if &arg == "--trash" {
-            Location::Trash
-        } else {
-            match fs::canonicalize(&arg) {
-                Ok(absolute) => Location::Path(absolute),
+        match &*arg {
+            "--trash" => locations.push(Location::Trash),
+            // Override session regardless of config
+            "--no-session" => _ = config.session.tabs.take(),
+            path => match fs::canonicalize(path) {
+                Ok(absolute) => locations.push(Location::Path(absolute)),
                 Err(err) => {
                     log::warn!("failed to canonicalize {:?}: {}", arg, err);
                     continue;
                 }
-            }
-        };
-        locations.push(location);
+            } 
+        }
+    }
+    if let Some(session) = config.session.restore.then(|| config.session.tabs.take()).flatten() {
+        locations.extend(session);
     }
 
     let mut settings = Settings::default();
diff --git a/src/tab.rs b/src/tab.rs
@@ -885,7 +885,7 @@ pub fn scan_desktop(
     items
 }
 
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
 pub enum Location {
     Desktop(PathBuf, String),
     Network(String, String),

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ use cosmic::{`
`9`	`9`	`};`
`10`	`10`	`use serde::{Deserialize, Serialize};`
`11`	`11`
`12`		`-use crate::{app::App, tab::View};`
	`12`	`+use crate::{`
	`13`	`+ app::App,`
	`14`	`+ tab::{Location, View},`
	`15`	`+};`
`13`	`16`
`14`	`17`	`pub const CONFIG_VERSION: u64 = 1;`
`15`	`18`
`@@ -97,6 +100,7 @@ pub struct Config {`
`97`	`100`	`pub favorites: Vec<Favorite>,`
`98`	`101`	`pub show_details: bool,`
`99`	`102`	`pub tab: TabConfig,`
	`103`	`+ pub session: SessionConfig,`
`100`	`104`	`}`
`101`	`105`
`102`	`106`	`impl Config {`
`@@ -144,6 +148,7 @@ impl Default for Config {`
`144`	`148`	`],`
`145`	`149`	`show_details: false,`
`146`	`150`	`tab: TabConfig::default(),`
	`151`	`+ session: SessionConfig::default(),`
`147`	`152`	`}`
`148`	`153`	`}`
`149`	`154`	`}`
`@@ -229,3 +234,9 @@ impl IconSizes {`
`229`	`234`	`percent!(self.grid, ICON_SIZE_GRID) as _`
`230`	`235`	`}`
`231`	`236`	`}`
	`237`	`+`
	`238`	`+#[derive(Clone, Debug, Default, PartialEq, Eq, CosmicConfigEntry, Deserialize, Serialize)]`
	`239`	`+pub struct SessionConfig {`
	`240`	`+ pub restore: bool,`
	`241`	`+ pub tabs: Option<Vec<Location>>,`
	`242`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ pub fn scan_desktop(`
`885`	`885`	`items`
`886`	`886`	`}`
`887`	`887`
`888`		`-#[derive(Clone, Debug, Eq, PartialEq)]`
	`888`	`+#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]`
`889`	`889`	`pub enum Location {`
`890`	`890`	`Desktop(PathBuf, String),`
`891`	`891`	`Network(String, String),`