fix: revert options and context split

skim/src/bin/main.rs

@@ -5,8 +5,6 @@ extern crate shlex;
 extern crate skim;
 extern crate time;
 
-use self::context::SkimContext;
-use self::reader::CommandCollector;
 use clap::{Error, Parser};
 use derive_builder::Builder;
 use std::fs::File;
@@ -77,7 +75,7 @@ impl From<clap::Error> for SkMainError {
 }
 
 fn sk_main() -> Result<i32, SkMainError> {
-    let opts = parse_args()?;
+    let mut opts = parse_args()?;
 
     let reader_opts = SkimItemReaderOption::default()
         .ansi(opts.ansi)
@@ -86,13 +84,8 @@ fn sk_main() -> Result<i32, SkMainError> {
         .nth(opts.nth.iter().map(|s| s.as_str()))
         .read0(opts.read0)
         .show_error(opts.show_cmd_error);
-    let mut ctx = SkimContext {
-        cmd_collector: Rc::new(RefCell::new(SkimItemReader::new(reader_opts))),
-        query_history: vec![],
-        cmd_history: vec![],
-    };
-    ctx.init_histories(&opts);
-
+    let cmd_collector = Rc::new(RefCell::new(SkimItemReader::new(reader_opts)));
+    opts.cmd_collector = cmd_collector.clone();
     //------------------------------------------------------------------------------
     let bin_options = BinOptions {
         filter: opts.filter.clone(),
@@ -104,7 +97,7 @@ fn sk_main() -> Result<i32, SkMainError> {
     //------------------------------------------------------------------------------
     // read from pipe or command
     let rx_item = if !io::stdin().is_terminal() {
-        let rx_item = ctx.cmd_collector.borrow().of_bufread(BufReader::new(std::io::stdin()));
+        let rx_item = cmd_collector.borrow().of_bufread(BufReader::new(std::io::stdin()));
         Some(rx_item)
     } else {
         None
@@ -113,7 +106,7 @@ fn sk_main() -> Result<i32, SkMainError> {
     //------------------------------------------------------------------------------
     // filter mode
     if opts.filter.is_some() {
-        return Ok(filter(&ctx, &bin_options, &opts, rx_item)?);
+        return Ok(filter(&bin_options, &opts, rx_item)?);
     }
 
     //------------------------------------------------------------------------------
@@ -156,14 +149,14 @@ fn sk_main() -> Result<i32, SkMainError> {
 
     //------------------------------------------------------------------------------
     // write the history with latest item
-    if let Some(file) = opts.history {
+    if let Some(file) = opts.history_file {
         let limit = opts.history_size;
-        write_history_to_file(&ctx.query_history, &result.query, limit, &file)?;
+        write_history_to_file(&opts.query_history, &result.query, limit, &file)?;
     }
 
-    if let Some(file) = opts.cmd_history {
+    if let Some(file) = opts.cmd_history_file {
         let limit = opts.cmd_history_size;
-        write_history_to_file(&ctx.cmd_history, &result.cmd, limit, &file)?;
+        write_history_to_file(&opts.cmd_history, &result.cmd, limit, &file)?;
     }
 
     Ok(if result.selected_items.is_empty() { 1 } else { 0 })
@@ -204,7 +197,6 @@ pub struct BinOptions {
 }
 
 pub fn filter(
-    ctx: &SkimContext,
     bin_option: &BinOptions,
     options: &SkimOptions,
     source: Option<SkimItemReceiver>,
@@ -244,7 +236,7 @@ pub fn filter(
     let components_to_stop = Arc::new(AtomicUsize::new(0));
 
     let stream_of_item = source.unwrap_or_else(|| {
-        let (ret, _control) = ctx.cmd_collector.borrow_mut().invoke(&cmd, components_to_stop);
+        let (ret, _control) = options.cmd_collector.borrow_mut().invoke(&cmd, components_to_stop);
         ret
     });
 

skim/src/lib.rs

@@ -23,7 +23,6 @@ pub use crate::output::SkimOutput;
 use crate::reader::Reader;
 
 mod ansi;
-pub mod context;
 mod engine;
 mod event;
 pub mod field;
@@ -34,7 +33,7 @@ mod input;
 mod item;
 mod matcher;
 mod model;
-mod options;
+pub mod options;
 mod orderedvec;
 mod output;
 pub mod prelude;

skim/src/options.rs

@@ -1,7 +1,13 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
 use clap::Parser;
 use derive_builder::Builder;
 
 use crate::item::RankCriteria;
+use crate::prelude::SkimItemReader;
+use crate::reader::CommandCollector;
+use crate::util::read_file_lines;
 use crate::{CaseMatching, FuzzyAlgorithm};
 
 /// sk - fuzzy finder in Rust
@@ -469,8 +475,8 @@ pub struct SkimOptions {
     /// Load search history from the specified file and update the file on completion.
     /// When enabled, CTRL-N and CTRL-P are automatically remapped
     /// to next-history and previous-history.
-    #[arg(long, help_heading = "History")]
-    pub history: Option<String>,
+    #[arg(long = "history", help_heading = "History")]
+    pub history_file: Option<String>,
 
     /// Maximum number of query history entries to keep
     #[arg(long, default_value = "1000", help_heading = "History")]
@@ -481,8 +487,8 @@ pub struct SkimOptions {
     /// Load command query history from the specified file and update the file on completion.
     /// When enabled, CTRL-N and CTRL-P are automatically remapped
     /// to next-history and previous-history.
-    #[arg(long, help_heading = "History")]
-    pub cmd_history: Option<String>,
+    #[arg(long = "cmd-history", help_heading = "History")]
+    pub cmd_history_file: Option<String>,
 
     /// Maximum number of query history entries to keep
     #[arg(long, default_value = "1000", help_heading = "History")]
@@ -700,6 +706,13 @@ pub struct SkimOptions {
     /// Reserved for later use
     #[arg(long, hide = true, help_heading = "Reserved for later use")]
     pub phony: bool,
+
+    #[clap(skip = Rc::new(RefCell::new(SkimItemReader::default())) as Rc<RefCell<dyn CommandCollector>>)]
+    pub cmd_collector: Rc<RefCell<dyn CommandCollector>>,
+    #[clap(skip)]
+    pub query_history: Vec<String>,
+    #[clap(skip)]
+    pub cmd_history: Vec<String>,
 }
 
 impl Default for SkimOptions {
@@ -732,10 +745,21 @@ impl SkimOptions {
             self.layout = String::from("reverse");
         }
         let history_binds = String::from("ctrl-p:previous-history,ctrl-n:next-history");
-        if self.history.is_some() || self.cmd_history.is_some() {
+        if self.history_file.is_some() || self.cmd_history_file.is_some() {
+            self.init_histories();
             self.bind.push(history_binds);
         }
 
         self
     }
+    pub fn init_histories(&mut self) {
+        if let Some(histfile) = &self.history_file {
+            self.query_history.extend(read_file_lines(histfile).unwrap_or_default());
+        }
+
+        if let Some(cmd_histfile) = &self.cmd_history_file {
+            self.cmd_history
+                .extend(read_file_lines(cmd_histfile).unwrap_or_default());
+        }
+    }
 }

skim/src/query.rs

@@ -126,14 +126,14 @@ impl Query {
 
         self.replstr = options.replstr.clone();
 
-        if let Some(history_file) = &options.history {
+        if let Some(file) = &options.history_file {
             self.fz_query_history_before =
-                read_file_lines(history_file).expect(&format!("Failed to open history file {}", history_file));
+                read_file_lines(file).unwrap_or_else(|_| panic!("Failed to open history file {}", file));
         }
 
-        if let Some(cmd_history_file) = &options.cmd_history {
-            self.cmd_history_before = read_file_lines(cmd_history_file)
-                .expect(&format!("Failed to open command history file {}", cmd_history_file));
+        if let Some(file) = &options.cmd_history_file {
+            self.cmd_history_before =
+                read_file_lines(file).unwrap_or_else(|_| panic!("Failed to open command history file {}", file));
         }
     }
 

skim/src/reader.rs

@@ -65,17 +65,8 @@ pub struct Reader {
 
 impl Reader {
     pub fn with_options(options: &SkimOptions) -> Self {
-        let item_reader_option = SkimItemReaderOption::default()
-            .ansi(options.ansi)
-            .delimiter(&options.delimiter)
-            .with_nth(options.with_nth.iter().map(|s| s.as_str()))
-            .nth(options.nth.iter().map(|s| s.as_str()))
-            .read0(options.read0)
-            .show_error(options.show_cmd_error)
-            .build();
-        let cmd_collector = Rc::new(RefCell::new(SkimItemReader::new(item_reader_option)));
         Self {
-            cmd_collector,
+            cmd_collector: options.cmd_collector.clone(),
             rx_item: None,
         }
     }