add cli flag to open files tab with selected file #2510

Author: laktak

src/app.rs

@@ -1,5 +1,6 @@
 use crate::{
 	accessors,
+	args::CliArgs,
 	cmdbar::CommandBar,
 	components::{
 		command_pump, event_pump, CommandInfo, Component,
@@ -150,14 +151,14 @@ impl App {
 	///
 	#[allow(clippy::too_many_lines)]
 	pub fn new(
-		repo: RepoPathRef,
+		cliargs: CliArgs,
 		sender_git: Sender<AsyncGitNotification>,
 		sender_app: Sender<AsyncAppNotification>,
 		input: Input,
 		theme: Theme,
-		select_file: Option<PathBuf>,
 		key_config: KeyConfig,
 	) -> Result<Self> {
+		let repo = RefCell::new(cliargs.repo_path.clone());
 		log::trace!("open repo at: {:?}", &repo);
 
 		let repo_path_text =
@@ -231,7 +232,7 @@ impl App {
 			popup_stack: PopupStack::default(),
 		};
 
-		if let Some(file) = select_file {
+		if let Some(file) = cliargs.select_file {
 			app.set_tab(2)?;
 			// convert to relative git path
 			if let Ok(abs) = file.canonicalize() {

src/args.rs

@@ -23,6 +23,7 @@ const WATCHER_FLAG_ID: &str = "watcher";
 const DEFAULT_THEME: &str = "theme.ron";
 const DEFAULT_GIT_DIR: &str = ".";
 
+#[derive(Clone)]
 pub struct CliArgs {
 	pub theme: PathBuf,
 	pub select_file: Option<PathBuf>,

src/main.rs

@@ -79,7 +79,10 @@ mod tabs;
 mod ui;
 mod watcher;
 
-use crate::{app::App, args::process_cmdline};
+use crate::{
+	app::App,
+	args::{process_cmdline, CliArgs},
+};
 use anyhow::{anyhow, bail, Result};
 use app::QuitState;
 use asyncgit::{
@@ -102,10 +105,9 @@ use scopeguard::defer;
 use scopetime::scope_time;
 use spinner::Spinner;
 use std::{
-	cell::RefCell,
 	io::{self, Stdout},
 	panic,
-	path::{Path, PathBuf},
+	path::Path,
 	time::{Duration, Instant},
 };
 use ui::style::Theme;
@@ -163,7 +165,7 @@ macro_rules! log_eprintln {
 fn main() -> Result<()> {
 	let app_start = Instant::now();
 
-	let cliargs = process_cmdline()?;
+	let mut cliargs = process_cmdline()?;
 
 	asyncgit::register_tracing_logging();
 	ensure_valid_path(&cliargs.repo_path)?;
@@ -180,9 +182,8 @@ fn main() -> Result<()> {
 
 	set_panic_handler()?;
 
-	let mut repo_path = cliargs.repo_path;
-	let mut select_file = cliargs.select_file;
-	let mut terminal = start_terminal(io::stdout(), &repo_path)?;
+	let mut terminal =
+		start_terminal(io::stdout(), &cliargs.repo_path)?;
 	let input = Input::new();
 
 	let updater = if cliargs.notify_watcher {
@@ -194,9 +195,8 @@ fn main() -> Result<()> {
 	loop {
 		let quit_state = run_app(
 			app_start,
-			repo_path.clone(),
+			cliargs.clone(),
 			theme.clone(),
-			select_file.clone(),
 			key_config.clone(),
 			&input,
 			updater,
@@ -205,8 +205,12 @@ fn main() -> Result<()> {
 
 		match quit_state {
 			QuitState::OpenSubmodule(p) => {
-				repo_path = p;
-				select_file = None;
+				cliargs = CliArgs {
+					repo_path: p,
+					select_file: None,
+					theme: cliargs.theme,
+					notify_watcher: cliargs.notify_watcher,
+				}
 			}
 			_ => break,
 		}
@@ -218,9 +222,8 @@ fn main() -> Result<()> {
 #[allow(clippy::too_many_arguments)]
 fn run_app(
 	app_start: Instant,
-	repo: RepoPath,
+	cliargs: CliArgs,
 	theme: Theme,
-	select_file: Option<PathBuf>,
 	key_config: KeyConfig,
 	input: &Input,
 	updater: Updater,
@@ -233,8 +236,9 @@ fn run_app(
 
 	let (rx_ticker, rx_watcher) = match updater {
 		Updater::NotifyWatcher => {
-			let repo_watcher =
-				RepoWatcher::new(repo_work_dir(&repo)?.as_str());
+			let repo_watcher = RepoWatcher::new(
+				repo_work_dir(&cliargs.repo_path)?.as_str(),
+			);
 
 			(never(), repo_watcher.receiver())
 		}
@@ -244,12 +248,11 @@ fn run_app(
 	let spinner_ticker = tick(SPINNER_INTERVAL);
 
 	let mut app = App::new(
-		RefCell::new(repo),
+		cliargs,
 		tx_git,
 		tx_app,
 		input.clone(),
 		theme,
-		select_file,
 		key_config,
 	)?;