diff --git a/examples/run.rs b/examples/run.rs index 7d98bed..019e869 100644 --- a/examples/run.rs +++ b/examples/run.rs @@ -1,5 +1,5 @@ fn main() { - match xplr::app::runner().and_then(|a| a.run()) { + match xplr::runner::runner().and_then(|a| a.run()) { Ok(Some(out)) => print!("{}", out), Ok(None) => {} Err(err) => { diff --git a/src/app.rs b/src/app.rs index b15dc14..900317f 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,11 +1,9 @@ -use crate::cli::Cli; use crate::config::Config; use crate::config::Mode; use crate::explorer; use crate::input::Key; use crate::lua; use crate::permissions::Permissions; -use crate::runner::Runner; use crate::ui::Layout; use anyhow::{bail, Result}; use chrono::{DateTime, Local}; @@ -2537,13 +2535,3 @@ impl App { } } } - -/// Create a new runner object passing the default arguments -pub fn runner() -> Result { - Runner::new() -} - -/// Create a new runner object passing the given arguments -pub fn from_cli(cli: Cli) -> Result { - Runner::from_cli(cli) -} diff --git a/src/bin/xplr.rs b/src/bin/xplr.rs index 851d6af..f2fc08b 100644 --- a/src/bin/xplr.rs +++ b/src/bin/xplr.rs @@ -2,8 +2,8 @@ use std::env; -use xplr::app; use xplr::cli::Cli; +use xplr::runner; fn main() { let cli = Cli::parse(env::args()).unwrap_or_else(|e| { @@ -47,7 +47,7 @@ fn main() { } else if cli.version { println!("xplr {}", xplr::app::VERSION); } else { - match app::from_cli(cli).and_then(|a| a.run()) { + match runner::from_cli(cli).and_then(|a| a.run()) { Ok(Some(out)) => print!("{}", out), Ok(None) => {} Err(err) => { diff --git a/src/runner.rs b/src/runner.rs index b7a8043..d3d5c2c 100644 --- a/src/runner.rs +++ b/src/runner.rs @@ -568,3 +568,13 @@ impl Runner { result } } + +/// Create a new runner object passing the default arguments +pub fn runner() -> Result { + Runner::new() +} + +/// Create a new runner object passing the given arguments +pub fn from_cli(cli: Cli) -> Result { + Runner::from_cli(cli) +}