allow locking of session and dir

Author: m42e

Cargo.lock

@@ -14,6 +14,7 @@ enum-map = "2.1.0"
 log = "0.4"
 textwrap = "0.15"
 humantime = "2.1.0"
+once_cell = "1.19.0"
 
 [dev-dependencies]
 regex = "*"

Cargo.toml

@@ -0,0 +1,54 @@
+use once_cell::sync::Lazy;
+use std::sync::{Mutex, MutexGuard};
+
+struct AppState {
+    focus_session: Option<String>,
+    focus_dir: Option<String>,
+}
+static APP_STATE: Lazy<Mutex<AppState>> = Lazy::new(|| {
+    Mutex::new(AppState{
+        focus_session : None,
+        focus_dir:  None,
+    })
+});
+
+
+fn access_app_state() -> MutexGuard<'static, AppState> {
+    APP_STATE.lock().unwrap()
+}
+
+pub fn focus_session(session: &str){
+    let mut app_state = access_app_state();
+    app_state.focus_session = Some(session.to_string());
+}
+
+pub fn get_focus_session() -> Option<String>{
+    let app_state = access_app_state();
+    return match app_state.focus_session.as_ref() {
+        Some(v) => return Some(v.to_string()),
+        None => None,
+    };
+}
+
+pub fn reset_focus_session(){
+    let mut app_state = access_app_state();
+    app_state.focus_session = None;
+}
+
+pub fn focus_dir(dir: &str){
+    let mut app_state = access_app_state();
+    app_state.focus_dir = Some(dir.to_string());
+}
+
+pub fn get_focus_dir() -> Option<String>{
+    let app_state = access_app_state();
+    return match app_state.focus_dir.as_ref() {
+        Some(v) => return Some(v.to_string()),
+        None => None,
+    };
+}
+
+pub fn reset_focus_dir(){
+    let mut app_state = access_app_state();
+    app_state.focus_dir = None;
+}

src/focus.rs

@@ -39,6 +39,12 @@ impl History {
     pub fn command(&self) -> &String {
         return &self.cmd;
     }
+    pub fn session(&self) -> String {
+        return self.session.to_string();
+    }
+    pub fn dir(&self) -> String {
+        return self.dir.to_string();
+    }
 }
 
 impl History {

src/history.rs

@@ -1,11 +1,18 @@
 extern crate skim;
 mod environment;
+mod focus;
 mod history;
 mod location;
 mod query;
 mod title;
 
 use crate::environment::*;
+use crate::focus::focus_dir;
+use crate::focus::focus_session;
+use crate::focus::get_focus_dir;
+use crate::focus::get_focus_session;
+use crate::focus::reset_focus_dir;
+use crate::focus::reset_focus_session;
 use crate::history::History;
 use crate::location::Location;
 use crate::query::build_query_string;
@@ -99,6 +106,8 @@ fn show_history(thequery: String) -> Result<String, String> {
                 "f3:abort",
                 "f4:abort",
                 "f5:abort",
+                "f6:abort",
+                "f7:abort",
                 "ctrl-r:abort",
                 "ctrl-u:half-page-up",
                 "ctrl-d:half-page-down",
@@ -170,6 +179,28 @@ fn process_result(
             Key::F(5) => {
                 *grouped = !*grouped;
             }
+            Key::F(6) => {
+                if get_focus_session().is_none() {
+                    focus_session(
+                        &((*sel.selected_items[0]).as_any().downcast_ref::<History>())
+                            .unwrap()
+                            .session(),
+                    );
+                } else {
+                    reset_focus_session();
+                }
+            }
+            Key::F(7) => {
+                if get_focus_dir().is_none() {
+                    focus_dir(
+                        &((*sel.selected_items[0]).as_any().downcast_ref::<History>())
+                            .unwrap()
+                            .dir(),
+                    );
+                } else {
+                    reset_focus_dir();
+                }
+            }
             Key::Ctrl('r') => {
                 *loc = match *loc {
                     Location::Session => Location::Directory,
@@ -205,7 +236,7 @@ fn main() -> Result<()> {
     }(args);
 
     if query == "--version" {
-        println!("v0.8.7");
+        println!("v0.8.8");
         std::process::exit(1);
     }
 

src/main.rs

@@ -1,5 +1,8 @@
 use crate::environment::*;
 use crate::location::Location;
+use crate::focus::get_focus_session;
+use crate::focus::get_focus_dir;
+
 
 pub fn build_query_string(theloc: &Location, grouped: bool) -> String {
     let mut query = String::from("select history.id as id, commands.argv as cmd,");
@@ -26,11 +29,27 @@ pub fn build_query_string(theloc: &Location, grouped: bool) -> String {
     };
     match theloc {
         Location::Session => {
-            query.push_str(&format!(" session == {} and", &get_current_session_id()));
+            let session = get_focus_session().unwrap_or(get_current_session_id());
+            query.push_str(&format!(" session == {} and", session));
         }
 
         Location::Directory => {
-            query.push_str(&format!(" places.dir like '{}' and", &get_current_dir()));
+            let session = get_focus_dir().unwrap_or(get_current_dir());
+            query.push_str(&format!(" places.dir like '{}' and", session));
+        }
+
+        _ => {}
+    };
+    match theloc {
+        Location::Machine | Location::Everywhere => {
+            let session = get_focus_session();
+            let dir = get_focus_dir();
+            if dir.is_some() {
+                query.push_str(&format!(" places.dir like '{}' and", dir.unwrap()));
+            }
+            if session.is_some() {
+            query.push_str(&format!(" session == {} and", session.unwrap()));
+            }
         }
 
         _ => {}

src/query.rs

@@ -1,4 +1,6 @@
 use crate::environment::*;
+use crate::focus::get_focus_dir;
+use crate::focus::get_focus_session;
 use crate::location::Location;
 use enum_map::enum_map;
 
@@ -12,6 +14,15 @@ pub fn generate_title(location: &Location) -> String {
         };
     }(&location);
 
+    let format_extra_info = |info: Option<String>, title: &str| -> String {
+        return match info {
+            Some(ri) => format!("{}: {} ", &title, &ri,),
+            None => String::from(""),
+        };
+    };
+    let focus_session = format_extra_info(get_focus_session(), "Session");
+    let focus_dir = format_extra_info(get_focus_dir(), "Directory");
+
     let location_map = enum_map! {
         Location::Session => "Session location history",
         Location::Directory => "Directory location history",
@@ -22,28 +33,30 @@ pub fn generate_title(location: &Location) -> String {
     let header_map = enum_map! {
         Location::Session =>
 " ┏━━━━━━━━━━━┱─────────────┬────────┬──────────────┐
- ┃F1: Session┃F2: Directory│F3: Host│F4: Everywhere│ F5: Toggle group
-━┛           ┗━━━━━━━━━━━━━┷━━━━━━━━┷━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━",
+ ┃F1: Session┃F2: Directory│F3: Host│F4: Everywhere│ F5: Toggle group, F6: Lock Session, F7: Lock Dir
+━┛           ┗━━━━━━━━━━━━━┷━━━━━━━━┷━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━",
         Location::Directory =>
 " ┌───────────┲━━━━━━━━━━━━━┱────────┬──────────────┐
- │F1: Session┃F2: Directory┃F3: Host│F4: Everywhere│ F5: Toggle group
-━┷━━━━━━━━━━━┛             ┗━━━━━━━━┷━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━",
+ │F1: Session┃F2: Directory┃F3: Host│F4: Everywhere│ F5: Toggle group, F6: Lock Session, F7: Lock Dir
+━┷━━━━━━━━━━━┛             ┗━━━━━━━━┷━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━",
 
         Location::Machine =>
 " ┌───────────┬─────────────┲━━━━━━━━┱──────────────┐
- │F1: Session│F2: Directory┃F3: Host┃F4: Everywhere│ F5: Toggle group
-━┷━━━━━━━━━━━┷━━━━━━━━━━━━━┛        ┗━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━",
+ │F1: Session│F2: Directory┃F3: Host┃F4: Everywhere│ F5: Toggle group, F6: Lock Session, F7: Lock Dir
+━┷━━━━━━━━━━━┷━━━━━━━━━━━━━┛        ┗━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━",
 
         Location::Everywhere =>
 " ┌───────────┬─────────────┬────────┲━━━━━━━━━━━━━━┓
- │F1: Session│F2: Directory│F3: Host┃F4: Everywhere┃ F5: Toggle group
-━┷━━━━━━━━━━━┷━━━━━━━━━━━━━┷━━━━━━━━┛              ┗━━━━━━━━━━━━━━━━━",
+ │F1: Session│F2: Directory│F3: Host┃F4: Everywhere┃ F5: Toggle group, F6: Lock Session, F7: Lock Dir
+━┷━━━━━━━━━━━┷━━━━━━━━━━━━━┷━━━━━━━━┛              ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━",
     };
 
     let title = format!(
-        "{} {}\n{}\n",
+        "{} {} {}{}\n{}\n",
         &location_map[location.clone()],
         &extra_info,
+        &focus_session,
+        &focus_dir,
         &header_map[location.clone()],
     );
     return title.to_string();

src/title.rs

@@ -2,7 +2,7 @@ XDG_BIN_PATH=${XDG_DATA_HOME:-$HOME/.local/share}/zsh-histdb-skim/
 BIN_DIR=${HISTDB_SKIM_PATH:-${XDG_BIN_PATH}}
 BIN_PATH=${BIN_DIR}/zsh-histdb-skim
 
-HISTB_SKIM_VERSION="v0.8.7"
+HISTB_SKIM_VERSION="v0.8.8"
 
 histdb-skim-get-os(){
   UNAME_STR=`uname -a`