Session resurrection

src/sessions.rs

@@ -6,8 +6,8 @@ use suggest::Suggest;
 use zellij_utils::{
     anyhow,
     consts::{
-        session_info_cache_file_name, session_info_folder_for_session,
-        session_layout_cache_file_name, ZELLIJ_SESSION_INFO_CACHE_DIR, ZELLIJ_SOCK_DIR,
+        session_info_folder_for_session, session_layout_cache_file_name,
+        ZELLIJ_SESSION_INFO_CACHE_DIR, ZELLIJ_SOCK_DIR,
     },
     envs,
     humantime::format_duration,
@@ -164,7 +164,7 @@ pub(crate) fn print_sessions(mut sessions: Vec<(String, Duration, bool)>, no_for
                 let timestamp = format!("[Created {} ago]", format_duration(*timestamp));
                 println!("{} {} {}", session_name, timestamp, suffix);
             } else {
-                let session_name = format!("\u{1b}[32;1m{}\u{1b}[m", session_name);
+                let formatted_session_name = format!("\u{1b}[32;1m{}\u{1b}[m", session_name);
                 let suffix = if curr_session == *session_name {
                     format!("(current)")
                 } else if *is_dead {
@@ -176,7 +176,7 @@ pub(crate) fn print_sessions(mut sessions: Vec<(String, Duration, bool)>, no_for
                     "[Created \u{1b}[35;1m{}\u{1b}[m ago]",
                     format_duration(*timestamp)
                 );
-                println!("{} {} {}", session_name, timestamp, suffix);
+                println!("{} {} {}", formatted_session_name, timestamp, suffix);
             }
         })
 }
@@ -324,7 +324,7 @@ pub(crate) fn resurrection_layout(session_name_to_resurrect: &str) -> Option<Lay
     let resurrectable_sessions = get_resurrectable_sessions();
     resurrectable_sessions
         .iter()
-        .find_map(|(name, timestamp, layout)| {
+        .find_map(|(name, _timestamp, layout)| {
             if name == session_name_to_resurrect {
                 Some(layout.clone())
             } else {

zellij-server/src/background_jobs.rs

@@ -1,7 +1,7 @@
 use zellij_utils::async_std::task;
 use zellij_utils::consts::{
     session_info_cache_file_name, session_info_folder_for_session, session_layout_cache_file_name,
-    ZELLIJ_SESSION_INFO_CACHE_DIR, ZELLIJ_SOCK_DIR,
+    ZELLIJ_SOCK_DIR,
 };
 use zellij_utils::data::SessionInfo;
 use zellij_utils::errors::{prelude::*, BackgroundJobContext, ContextType};
@@ -10,7 +10,6 @@ use std::collections::{BTreeMap, HashMap};
 use std::fs;
 use std::io::Write;
 use std::os::unix::fs::FileTypeExt;
-use std::path::PathBuf;
 use std::sync::{
     atomic::{AtomicBool, Ordering},
     Arc, Mutex,

zellij-server/src/output/mod.rs

@@ -81,13 +81,12 @@ fn write_changed_styles(
 
 fn serialize_chunks_with_newlines(
     character_chunks: Vec<CharacterChunk>,
-    sixel_chunks: Option<&Vec<SixelImageChunk>>,
+    _sixel_chunks: Option<&Vec<SixelImageChunk>>, // TODO: fix this sometime
     link_handler: Option<&mut Rc<RefCell<LinkHandler>>>,
 ) -> Result<String> {
     let err_context = || "failed to serialize input chunks".to_string();
 
     let mut vte_output = String::new();
-    let mut sixel_vte: Option<String> = None;
     let link_handler = link_handler.map(|l_h| l_h.borrow());
     for character_chunk in character_chunks {
         let chunk_changed_colors = character_chunk.changed_colors();

zellij-server/src/panes/floating_panes/mod.rs

@@ -157,7 +157,7 @@ impl FloatingPanes {
 
         // move clients from the previously active pane to the new pane we just inserted
         self.move_clients_between_panes(pane_id, with_pane_id);
-        self.set_pane_frames();
+        let _ = self.set_pane_frames();
         removed_pane
     }
     pub fn remove_pane(&mut self, pane_id: PaneId) -> Option<Box<dyn Pane>> {
@@ -603,7 +603,7 @@ impl FloatingPanes {
     pub fn move_active_pane(
         &mut self,
         search_backwards: bool,
-        os_api: &mut Box<dyn ServerOsApi>,
+        _os_api: &mut Box<dyn ServerOsApi>,
         client_id: ClientId,
     ) {
         let active_pane_id = self.get_active_pane_id(client_id).unwrap();

zellij-server/src/panes/grid.rs

@@ -1051,7 +1051,6 @@ impl Grid {
                 for line in &self.viewport {
                     to_serialize.push(line.clone())
                 }
-                let to_serialize_len = to_serialize.len();
                 self.output_buffer.serialize(to_serialize.as_slice()).ok()
             },
             None => self.output_buffer.serialize(&self.viewport).ok(),

zellij-server/src/route.rs

@@ -173,17 +173,13 @@ pub(crate) fn route_action(
                 .send_to_screen(ScreenInstruction::DumpScreen(val, client_id, full))
                 .with_context(err_context)?;
         },
-        Action::DumpLayout(layout) => {
+        Action::DumpLayout => {
             let default_shell = match default_shell {
                 Some(TerminalAction::RunCommand(run_command)) => Some(run_command.command),
                 _ => None,
             };
             senders
-                .send_to_screen(ScreenInstruction::DumpLayout(
-                    client_id,
-                    layout,
-                    default_shell,
-                ))
+                .send_to_screen(ScreenInstruction::DumpLayout(default_shell, client_id))
                 .with_context(err_context)?;
         },
         Action::EditScrollback => {

zellij-server/src/screen.rs

@@ -12,15 +12,14 @@ use zellij_utils::data::{
 use zellij_utils::errors::prelude::*;
 use zellij_utils::input::command::RunCommand;
 use zellij_utils::input::options::Clipboard;
-use zellij_utils::pane_size::{PaneGeom, Size, SizeInPixels};
+use zellij_utils::pane_size::{Size, SizeInPixels};
 use zellij_utils::{
     input::command::TerminalAction,
     input::layout::{
         FloatingPaneLayout, Layout, PluginUserConfiguration, Run, RunPlugin, RunPluginLocation,
         SwapFloatingLayout, SwapTiledLayout, TiledPaneLayout,
     },
     position::Position,
-    session_serialization::{GlobalLayoutManifest, PaneLayoutManifest, TabLayoutManifest},
 };
 
 use crate::background_jobs::BackgroundJob;
@@ -35,7 +34,7 @@ use crate::{
     panes::PaneId,
     plugins::PluginInstruction,
     pty::{ClientTabIndexOrPaneId, PtyInstruction, VteBytes},
-    tab::{Pane, Tab},
+    tab::Tab,
     thread_bus::Bus,
     ui::{
         loading_indication::LoadingIndication,
@@ -171,7 +170,7 @@ pub enum ScreenInstruction {
     Exit,
     ClearScreen(ClientId),
     DumpScreen(String, ClientId, bool),
-    DumpLayout(ClientId, Option<String>, Option<PathBuf>), // PathBuf is the default configured
+    DumpLayout(Option<PathBuf>, ClientId), // PathBuf is the default configured
     // shell
     EditScrollback(ClientId),
     ScrollUp(ClientId),
@@ -1878,9 +1877,9 @@ impl Screen {
     ) -> Result<()> {
         let err_context = || format!("failed to replace pane");
         let suppress_pane = |tab: &mut Tab, pane_id: PaneId, new_pane_id: PaneId| {
-            tab.suppress_pane_and_replace_with_pid(pane_id, new_pane_id, run);
+            let _ = tab.suppress_pane_and_replace_with_pid(pane_id, new_pane_id, run);
             if let Some(pane_title) = pane_title {
-                tab.rename_pane(pane_title.as_bytes().to_vec(), new_pane_id);
+                let _ = tab.rename_pane(pane_title.as_bytes().to_vec(), new_pane_id);
             }
             if let Some(hold_for_command) = hold_for_command {
                 let is_first_run = true;
@@ -1901,7 +1900,7 @@ impl Screen {
                             );
                         },
                     }
-                })
+                });
             },
             ClientTabIndexOrPaneId::PaneId(pane_id) => {
                 let tab_index = self
@@ -1919,7 +1918,7 @@ impl Screen {
                     },
                 };
             },
-            ClientTabIndexOrPaneId::TabIndex(tab_index) => {
+            ClientTabIndexOrPaneId::TabIndex(_tab_index) => {
                 log::error!("Cannot replace pane with tab index");
             },
         }
@@ -2162,7 +2161,7 @@ pub(crate) fn screen_thread_main(
                             log::error!("Tab index not found: {:?}", tab_index);
                         }
                     },
-                    ClientTabIndexOrPaneId::PaneId(pane_id) => {
+                    ClientTabIndexOrPaneId::PaneId(_pane_id) => {
                         log::error!("cannot open a pane with a pane id??");
                     },
                 };
@@ -2396,8 +2395,7 @@ pub(crate) fn screen_thread_main(
                 screen.render()?;
                 screen.unblock_input()?;
             },
-            ScreenInstruction::DumpLayout(client_id, layout, default_shell) => {
-                // TODO: ordering
+            ScreenInstruction::DumpLayout(default_shell, client_id) => {
                 let err_context = || format!("Failed to dump layout");
                 let session_layout_metadata = screen.get_layout_metadata(default_shell);
                 screen
@@ -3426,7 +3424,6 @@ pub(crate) fn screen_thread_main(
                 invoked_with,
                 client_id_tab_index_or_pane_id,
             ) => {
-                let err_context = || format!("Failed to replace pane");
                 screen.replace_pane(
                     new_pane_id,
                     hold_for_command,

zellij-server/src/tab/mod.rs

@@ -471,7 +471,7 @@ pub trait Pane {
         None
     }
     fn rename(&mut self, _buf: Vec<u8>) {}
-    fn serialize(&self, scrollback_lines_to_serialize: Option<usize>) -> Option<String> {
+    fn serialize(&self, _scrollback_lines_to_serialize: Option<usize>) -> Option<String> {
         None
     }
 }
@@ -1166,7 +1166,7 @@ impl Tab {
         match new_pane_id {
             PaneId::Terminal(new_pane_id) => {
                 let next_terminal_position = self.get_next_terminal_position(); // TODO: this is not accurate in this case
-                let mut new_pane = TerminalPane::new(
+                let new_pane = TerminalPane::new(
                     new_pane_id,
                     PaneGeom::default(), // the initial size will be set later
                     self.style,
@@ -1191,7 +1191,7 @@ impl Tab {
                 };
                 match replaced_pane {
                     Some(replaced_pane) => {
-                        resize_pty!(
+                        let _ = resize_pty!(
                             replaced_pane,
                             self.os_api,
                             self.senders,
@@ -1213,8 +1213,7 @@ impl Tab {
                 }
             },
             PaneId::Plugin(plugin_pid) => {
-                // TBD, currently unsupported
-                let mut new_pane = PluginPane::new(
+                let new_pane = PluginPane::new(
                     plugin_pid,
                     PaneGeom::default(), // this will be filled out later
                     self.senders
@@ -1244,7 +1243,7 @@ impl Tab {
                 };
                 match replaced_pane {
                     Some(replaced_pane) => {
-                        resize_pty!(
+                        let _ = resize_pty!(
                             replaced_pane,
                             self.os_api,
                             self.senders,
@@ -2465,7 +2464,7 @@ impl Tab {
                     pane_id
                 )
             })
-            .and_then(|(is_scrollback_editor, suppressed_pane)| {
+            .and_then(|(_is_scrollback_editor, suppressed_pane)| {
                 let suppressed_pane_id = suppressed_pane.pid();
                 let replaced_pane = if self.are_floating_panes_visible() {
                     Some(self.floating_panes.replace_pane(pane_id, suppressed_pane)).transpose()?
@@ -3592,7 +3591,7 @@ impl Tab {
         let mut floating_pane_info = self.floating_panes.pane_info();
         pane_info.append(&mut tiled_pane_info);
         pane_info.append(&mut floating_pane_info);
-        for (pane_id, (is_scrollback_editor, pane)) in self.suppressed_panes.iter() {
+        for (pane_id, (_is_scrollback_editor, pane)) in self.suppressed_panes.iter() {
             let mut pane_info_for_suppressed_pane = pane_info_for_pane(pane_id, pane);
             pane_info_for_suppressed_pane.is_floating = false;
             pane_info_for_suppressed_pane.is_suppressed = true;

zellij-utils/src/cli.rs

@@ -302,11 +302,8 @@ pub enum CliAction {
         #[clap(short, long, value_parser, default_value("false"), takes_value(false))]
         full: bool,
     },
-    /// Dump current layout to a specified or default layout directory,
-    /// and in case path is not provided - stdout
-    DumpLayout {
-        path: Option<PathBuf>,
-    },
+    /// Dump current layout to stdout
+    DumpLayout,
     /// Open the pane scrollback in your default editor
     EditScrollback,
     /// Scroll up in the focused pane

zellij-utils/src/home.rs

@@ -2,27 +2,13 @@
 //! # This module contain everything you'll need to access local system paths
 //! containing configuration and layouts
 
-use crate::input::theme::Themes;
-use crate::{
-    consts::{
-        SYSTEM_DEFAULT_CONFIG_DIR, SYSTEM_DEFAULT_DATA_DIR_PREFIX, ZELLIJ_DEFAULT_THEMES,
-        ZELLIJ_PROJ_DIR,
-    },
-    errors::prelude::*,
-    input::{
-        config::{Config, ConfigError},
-        layout::Layout,
-        options::Options,
-    },
-};
-use clap::{Args, IntoApp};
-use clap_complete::Shell;
+use crate::consts::{SYSTEM_DEFAULT_DATA_DIR_PREFIX, ZELLIJ_PROJ_DIR};
+
+#[cfg(not(test))]
+use crate::consts::SYSTEM_DEFAULT_CONFIG_DIR;
+
 use directories::BaseDirs;
-use log::info;
-use serde::{Deserialize, Serialize};
-use std::{
-    convert::TryFrom, fmt::Write as FmtWrite, io::Write, path::Path, path::PathBuf, process,
-};
+use std::{path::Path, path::PathBuf};
 
 pub(crate) const CONFIG_LOCATION: &str = ".config/zellij";
 
@@ -43,6 +29,7 @@ pub fn find_default_config_dir() -> Option<PathBuf> {
 }
 
 /// Order in which config directories are checked
+#[cfg(not(test))]
 pub(crate) fn default_config_dirs() -> Vec<Option<PathBuf>> {
     vec![
         home_config_dir(),
@@ -63,26 +50,6 @@ pub fn get_default_data_dir() -> PathBuf {
     .unwrap_or_else(xdg_data_dir)
 }
 
-#[cfg(not(test))]
-pub(crate) fn get_default_themes() -> Themes {
-    let mut themes = Themes::default();
-    for file in ZELLIJ_DEFAULT_THEMES.files() {
-        if let Some(content) = file.contents_utf8() {
-            match Themes::from_string(&content.to_string()) {
-                Ok(theme) => themes = themes.merge(theme),
-                Err(_) => {},
-            }
-        }
-    }
-
-    themes
-}
-
-#[cfg(test)]
-pub(crate) fn get_default_themes() -> Themes {
-    Themes::default()
-}
-
 pub fn xdg_config_dir() -> PathBuf {
     ZELLIJ_PROJ_DIR.config_dir().to_owned()
 }

zellij-utils/src/input/actions.rs

@@ -125,7 +125,7 @@ pub enum Action {
     /// Dumps the screen to a file
     DumpScreen(String, bool),
     /// Dumps
-    DumpLayout(Option<String>),
+    DumpLayout,
     /// Scroll up in focus pane.
     EditScrollback,
     ScrollUp,
@@ -282,9 +282,7 @@ impl Action {
                 path.as_os_str().to_string_lossy().into(),
                 full,
             )]),
-            CliAction::DumpLayout { path } => Ok(vec![Action::DumpLayout(
-                path.map(|p| p.as_os_str().to_string_lossy().into()),
-            )]),
+            CliAction::DumpLayout => Ok(vec![Action::DumpLayout]),
             CliAction::EditScrollback => Ok(vec![Action::EditScrollback]),
             CliAction::ScrollUp => Ok(vec![Action::ScrollUp]),
             CliAction::ScrollDown => Ok(vec![Action::ScrollDown]),