0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CL Opts: remove now-unnecessary final_log_redirect_to_file member

Browse source
This commit is contained in:
Charles Dang 2024-08-01 13:12:16 -04:00
parent 80fbc3bab0
commit 4a016139ed
3 changed files with 33 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/commandline_options.cpp
View file

@ -161,7 +161,6 @@ commandline_options::commandline_options(const std::vector<std::string>& args)
, no_log_sanitize(false)
, log_to_file(false)
, no_log_to_file(false)
, final_log_redirect_to_file(true)
, translation_percent()
, args_(args.begin() + 1, args.end())
, args0_(*args.begin())

2
src/commandline_options.hpp
View file

@ -252,8 +252,6 @@ public:
bool log_to_file;
/** True if --no-log-to-file was given on the command line. Results in logs not being redirected to a log file. */
bool no_log_to_file;
/** final result of determining whether to log to file or not */
bool final_log_redirect_to_file;
/** Non-empty if --all-translations or --translations-over is given on the command line. */
utils::optional<unsigned int> translation_percent;
private:

66
src/wesnoth.cpp
View file

@ -276,38 +276,38 @@ static int process_command_args(commandline_options& cmdline_opts)
lg::set_log_sanitize(false);
}
// decide whether to redirect output to a file or not
if(cmdline_opts.log_to_file) {
cmdline_opts.final_log_redirect_to_file = true;
} else if(cmdline_opts.no_log_to_file) {
cmdline_opts.final_log_redirect_to_file = false;
} else {
// write_to_log_file means that writing to the log file will be done, if true.
// if false, output will be written to the terminal
// on windows, if wesnoth was not started from a console, then it will allocate one
cmdline_opts.final_log_redirect_to_file = !getenv("WESNOTH_NO_LOG_FILE")
// command line options that imply not redirecting output to a log file
// Some switches force a Windows console to be attached to the process even
// if Wesnoth is an IMAGE_SUBSYSTEM_WINDOWS_GUI executable because they
// turn it into a CLI application. Also, --no-log-to-file in particular attaches
// a console to a regular GUI game session.
&& !cmdline_opts.data_path
&& !cmdline_opts.help
&& !cmdline_opts.logdomains
&& !cmdline_opts.nogui
&& !cmdline_opts.report
&& !cmdline_opts.simple_version
&& !cmdline_opts.userdata_path
&& !cmdline_opts.version
&& !cmdline_opts.do_diff
&& !cmdline_opts.do_patch
&& !cmdline_opts.preprocess
&& !cmdline_opts.render_image
&& !cmdline_opts.screenshot
&& !cmdline_opts.headless_unit_test
&& !cmdline_opts.validate_schema
&& !cmdline_opts.validate_wml;
}
// If true, output will be redirected to file, else output be written to console.
// On Windows, if Wesnoth was not started from a console, one will be allocated.
const auto should_redirect_to_file = [&cmdline_opts] {
if(cmdline_opts.log_to_file) {
return true;
} else if(cmdline_opts.no_log_to_file) {
return false;
} else {
return !getenv("WESNOTH_NO_LOG_FILE")
// command line options that imply not redirecting output to a log file
// Some switches force a Windows console to be attached to the process even
// if Wesnoth is an IMAGE_SUBSYSTEM_WINDOWS_GUI executable because they
// turn it into a CLI application. Also, --no-log-to-file in particular attaches
// a console to a regular GUI game session.
&& !cmdline_opts.data_path
&& !cmdline_opts.help
&& !cmdline_opts.logdomains
&& !cmdline_opts.nogui
&& !cmdline_opts.report
&& !cmdline_opts.simple_version
&& !cmdline_opts.userdata_path
&& !cmdline_opts.version
&& !cmdline_opts.do_diff
&& !cmdline_opts.do_patch
&& !cmdline_opts.preprocess
&& !cmdline_opts.render_image
&& !cmdline_opts.screenshot
&& !cmdline_opts.headless_unit_test
&& !cmdline_opts.validate_schema
&& !cmdline_opts.validate_wml;
}
};
if(cmdline_opts.usercache_dir) {
filesystem::set_cache_dir(*cmdline_opts.usercache_dir);
@ -323,7 +323,7 @@ static int process_command_args(commandline_options& cmdline_opts)
}
// userdata is initialized, so initialize logging to file if enabled
if(cmdline_opts.final_log_redirect_to_file) {
if(should_redirect_to_file()) {
lg::set_log_to_file();
}
#ifdef _WIN32