fix: Add verbosity flag, removed in https://github.com/neovide/neovide/pull/1016, set default verbosity to "warn".

macos-click-through
Serg Tereshchenko 3 years ago committed by Keith Simmons
parent cf8b48f5f5
commit 6e93bd7552

@ -9,6 +9,7 @@ pub struct CmdLineSettings {
pub neovim_args: Vec<String>, pub neovim_args: Vec<String>,
// Command-line arguments only // Command-line arguments only
pub geometry: Dimensions, pub geometry: Dimensions,
pub verbosity: u64,
pub log_to_file: bool, pub log_to_file: bool,
pub no_fork: bool, pub no_fork: bool,
pub remote_tcp: Option<String>, pub remote_tcp: Option<String>,
@ -32,6 +33,7 @@ impl Default for CmdLineSettings {
neovim_args: vec![], neovim_args: vec![],
// Command-line arguments only // Command-line arguments only
geometry: DEFAULT_WINDOW_GEOMETRY, geometry: DEFAULT_WINDOW_GEOMETRY,
verbosity: 0,
log_to_file: false, log_to_file: false,
no_fork: false, no_fork: false,
remote_tcp: None, remote_tcp: None,
@ -64,6 +66,7 @@ pub fn handle_command_line_arguments(args: Vec<String>) -> Result<(), String> {
.help("Specify Arguments to pass down to neovim"), .help("Specify Arguments to pass down to neovim"),
) )
// Command-line arguments only // Command-line arguments only
.arg(Arg::with_name("verbosity").short("v"))
.arg( .arg(
Arg::with_name("geometry") Arg::with_name("geometry")
.long("geometry") .long("geometry")
@ -149,9 +152,10 @@ pub fn handle_command_line_arguments(args: Vec<String>) -> Result<(), String> {
.map(|opt| opt.map(|v| v.to_owned()).collect()) .map(|opt| opt.map(|v| v.to_owned()).collect())
.unwrap_or_default(), .unwrap_or_default(),
// Command-line arguments only // Command-line arguments only
verbosity: matches.occurrences_of("verbosity"),
geometry: parse_window_geometry(matches.value_of("geometry").map(|i| i.to_owned()))?, geometry: parse_window_geometry(matches.value_of("geometry").map(|i| i.to_owned()))?,
log_to_file: matches.is_present("log_to_file"), log_to_file: matches.is_present("log_to_file"),
no_fork: matches.is_present("nofork"), no_fork: matches.is_present("nofork") || matches.is_present("verbosity"),
remote_tcp: matches.value_of("remote_tcp").map(|i| i.to_owned()), remote_tcp: matches.value_of("remote_tcp").map(|i| i.to_owned()),
wsl: matches.is_present("wsl"), wsl: matches.is_present("wsl"),
// Command-line flags with environment variable fallback // Command-line flags with environment variable fallback

@ -180,6 +180,12 @@ fn main() {
#[cfg(not(test))] #[cfg(not(test))]
pub fn init_logger() { pub fn init_logger() {
let settings = SETTINGS.get::<CmdLineSettings>(); let settings = SETTINGS.get::<CmdLineSettings>();
let verbosity = match settings.verbosity {
0 => "warn",
1 => "info",
2 => "debug",
_ => "trace",
};
let logger = if settings.log_to_file { let logger = if settings.log_to_file {
Logger::with_env_or_str("neovide") Logger::with_env_or_str("neovide")

Loading…
Cancel
Save