Centralize legacy app startup
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include "app_core/about_menu.h"
|
||||
#include "app_core/app_preferences.h"
|
||||
#include "app_core/app_status.h"
|
||||
#include "app_core/app_startup.h"
|
||||
#include "app_core/brush_ui.h"
|
||||
#include "app_core/canvas_hotkey.h"
|
||||
#include "app_core/canvas_tool_ui.h"
|
||||
@@ -227,6 +228,13 @@ struct PlanAppPreferencesArgs {
|
||||
int cursor_mode = 0;
|
||||
};
|
||||
|
||||
struct PlanAppStartupArgs {
|
||||
int run_counter = 0;
|
||||
bool auto_timelapse_enabled = true;
|
||||
bool vr_controllers_enabled = true;
|
||||
bool license_valid = true;
|
||||
};
|
||||
|
||||
struct PlanAppStatusArgs {
|
||||
std::string document_name = "no-name";
|
||||
bool unsaved = false;
|
||||
@@ -1852,6 +1860,7 @@ void print_help()
|
||||
<< " plan-cloud-upload-all [--file-count N] [--no-progress-ui]\n"
|
||||
<< " plan-recording-session [--running] [--frame-count N] [--platform-deletes-recorded-files]\n"
|
||||
<< " plan-app-preferences [--ui-scale N] [--display-density N] [--current-scale N] [--scale-option N] [--viewport-scale N] [--rtl] [--timelapse-disabled] [--recording-running] [--vr-controllers-disabled] [--cursor-mode N]\n"
|
||||
<< " plan-app-startup [--run-counter N] [--auto-timelapse-disabled] [--vr-controllers-disabled] [--license-invalid]\n"
|
||||
<< " plan-app-status [--doc-name NAME] [--unsaved] [--resolution N] [--resolution-index N] [--zoom N] [--history-bytes N] [--recording-running] [--encoder-available] [--encoded-frames N] [--framebuffer-fetch] [--float32] [--float32-linear] [--float16]\n"
|
||||
<< " plan-tools-menu --command panels|options|clear-grids|reset-camera|shortcuts|sonarpen [--sonarpen-available]\n"
|
||||
<< " plan-tools-panel --panel presets|color|color-advanced|layers|brush|grids|animation [--already-visible]\n"
|
||||
@@ -3416,6 +3425,70 @@ int plan_app_preferences(int argc, char** argv)
|
||||
return 0;
|
||||
}
|
||||
|
||||
pp::foundation::Status parse_plan_app_startup_args(
|
||||
int argc,
|
||||
char** argv,
|
||||
PlanAppStartupArgs& args)
|
||||
{
|
||||
for (int i = 2; i < argc; ++i) {
|
||||
const std::string_view key(argv[i]);
|
||||
if (key == "--run-counter") {
|
||||
if (i + 1 >= argc) {
|
||||
return pp::foundation::Status::invalid_argument("missing value for option");
|
||||
}
|
||||
const auto value = parse_i32_arg(argv[++i]);
|
||||
if (!value) {
|
||||
return value.status();
|
||||
}
|
||||
args.run_counter = value.value();
|
||||
} else if (key == "--auto-timelapse-disabled") {
|
||||
args.auto_timelapse_enabled = false;
|
||||
} else if (key == "--vr-controllers-disabled") {
|
||||
args.vr_controllers_enabled = false;
|
||||
} else if (key == "--license-invalid") {
|
||||
args.license_valid = false;
|
||||
} else {
|
||||
return pp::foundation::Status::invalid_argument("unknown option");
|
||||
}
|
||||
}
|
||||
|
||||
return pp::foundation::Status::success();
|
||||
}
|
||||
|
||||
int plan_app_startup(int argc, char** argv)
|
||||
{
|
||||
PlanAppStartupArgs args;
|
||||
const auto status = parse_plan_app_startup_args(argc, argv, args);
|
||||
if (!status.ok()) {
|
||||
print_error("plan-app-startup", status.message);
|
||||
return 2;
|
||||
}
|
||||
|
||||
const auto plan = pp::app::plan_app_startup(
|
||||
args.run_counter,
|
||||
args.auto_timelapse_enabled,
|
||||
args.vr_controllers_enabled,
|
||||
args.license_valid);
|
||||
if (!plan) {
|
||||
print_error("plan-app-startup", plan.status().message);
|
||||
return 2;
|
||||
}
|
||||
|
||||
std::cout << "{\"ok\":true,\"command\":\"plan-app-startup\""
|
||||
<< ",\"state\":{\"runCounter\":" << args.run_counter
|
||||
<< ",\"autoTimelapseEnabled\":" << json_bool(args.auto_timelapse_enabled)
|
||||
<< ",\"vrControllersEnabled\":" << json_bool(args.vr_controllers_enabled)
|
||||
<< ",\"licenseValid\":" << json_bool(args.license_valid)
|
||||
<< "},\"plan\":{\"previousRunCounter\":" << plan.value().previous_run_counter
|
||||
<< ",\"nextRunCounter\":" << plan.value().next_run_counter
|
||||
<< ",\"savePreferences\":" << json_bool(plan.value().save_preferences)
|
||||
<< ",\"startTimelapse\":" << json_bool(plan.value().start_timelapse)
|
||||
<< ",\"vrControllersEnabled\":" << json_bool(plan.value().vr_controllers_enabled)
|
||||
<< ",\"showLicenseWarning\":" << json_bool(plan.value().show_license_warning)
|
||||
<< "}}\n";
|
||||
return 0;
|
||||
}
|
||||
|
||||
pp::foundation::Status parse_plan_tools_menu_args(
|
||||
int argc,
|
||||
char** argv,
|
||||
@@ -8492,6 +8565,10 @@ int main(int argc, char** argv)
|
||||
return plan_app_preferences(argc, argv);
|
||||
}
|
||||
|
||||
if (command == "plan-app-startup") {
|
||||
return plan_app_startup(argc, argv);
|
||||
}
|
||||
|
||||
if (command == "plan-app-status") {
|
||||
return plan_app_status(argc, argv);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user