Extract out history parts.

crates/nu-cli/src/commands/history.rs

@@ -1,10 +1,32 @@
-use crate::cli::History as HistoryFile;
 use crate::commands::WholeStreamCommand;
 use crate::prelude::*;
+use nu_data::config::NuConfig;
 use nu_errors::ShellError;
 use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
 use std::fs::File;
 use std::io::{BufRead, BufReader};
+use std::path::PathBuf;
+
+const DEFAULT_LOCATION: &str = "history.txt";
+
+pub fn history_path(config: &NuConfig) -> PathBuf {
+    let vars = config.vars.lock();
+
+    let default_path = nu_data::config::user_data()
+        .map(|mut p| {
+            p.push(DEFAULT_LOCATION);
+            p
+        })
+        .unwrap_or_else(|_| PathBuf::from(DEFAULT_LOCATION));
+
+    vars.get("history-path")
+        .map_or(default_path.clone(), |custom_path| {
+            match custom_path.as_string() {
+                Ok(path) => PathBuf::from(path),
+                Err(_) => default_path,
+            }
+        })
+}
 
 pub struct History;
 
@@ -32,9 +54,10 @@ impl WholeStreamCommand for History {
 }
 
 fn history(args: CommandArgs, _registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
+    let config = NuConfig::new();
     let tag = args.call_info.name_tag;
-    let history_path = HistoryFile::path();
-    let file = File::open(history_path);
+    let path = history_path(&config);
+    let file = File::open(path);
     if let Ok(file) = file {
         let reader = BufReader::new(file);
         let output = reader.lines().filter_map(move |line| match line {