Route command conversion through app core

This commit is contained in:
2026-06-05 06:31:38 +02:00
parent 548b6d3ae5
commit 1df93c23f7
11 changed files with 393 additions and 8 deletions

View File

@@ -10,6 +10,7 @@
#include "app_core/canvas_hotkey.h"
#include "app_core/canvas_tool_ui.h"
#include "app_core/canvas_view.h"
#include "app_core/command_convert.h"
#include "app_core/document_animation.h"
#include "app_core/document_canvas.h"
#include "app_core/document_export.h"
@@ -262,6 +263,12 @@ struct PlanAppFrameArgs {
bool bad_resize = false;
};
struct PlanCommandConvertArgs {
std::string project_path = "D:/Paint/demo.ppi";
std::string output_path = "D:/Paint/demo.png";
int canvas_resolution = 1024;
};
struct PlanBrushPackageExportArgs {
std::string path;
std::string author;
@@ -1968,6 +1975,22 @@ const char* timelapse_recording_action_name(pp::app::TimelapseRecordingAction ac
return "no-op";
}
const char* command_convert_step_name(pp::app::CommandConvertStep step) noexcept
{
switch (step) {
case pp::app::CommandConvertStep::apply_renderer_state:
return "apply-renderer-state";
case pp::app::CommandConvertStep::create_canvas:
return "create-canvas";
case pp::app::CommandConvertStep::open_project:
return "open-project";
case pp::app::CommandConvertStep::export_equirectangular:
return "export-equirectangular";
}
return "unknown";
}
pp::foundation::Result<float> parse_float_arg(std::string_view text)
{
float value = 0.0F;
@@ -2029,6 +2052,7 @@ void print_help()
<< " plan-app-startup-resources [--width N] [--height N] [--bad-size]\n"
<< " plan-app-frame [--redraw] [--animate] [--no-designer-layout] [--no-main-layout] [--no-canvas] [--no-canvas-document] [--vr-active] [--ui-hidden] [--vr-only] [--resize-width N] [--resize-height N] [--bad-resize]\n"
<< " plan-app-shutdown\n"
<< " plan-command-convert [--project FILE] [--output FILE] [--canvas-resolution N]\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-brush-package-import --kind abr|ppbr --path FILE\n"
<< " plan-brush-package-export --path FILE [--author NAME] [--email EMAIL] [--url URL] [--description TEXT] [--dest-path DIR] [--export-data|--no-export-data] [--header-image]\n"
@@ -3860,6 +3884,73 @@ int plan_app_shutdown(int argc, char** argv)
return 0;
}
pp::foundation::Status parse_plan_command_convert_args(
int argc,
char** argv,
PlanCommandConvertArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
if (key == "--project") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
args.project_path = argv[++i];
} else if (key == "--output") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
args.output_path = argv[++i];
} else if (key == "--canvas-resolution") {
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.canvas_resolution = value.value();
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
int plan_command_convert(int argc, char** argv)
{
PlanCommandConvertArgs args;
const auto status = parse_plan_command_convert_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-command-convert", status.message);
return 2;
}
const auto plan = pp::app::plan_command_convert(
args.project_path,
args.output_path,
args.canvas_resolution);
if (!plan) {
print_error("plan-command-convert", plan.status().message);
return 2;
}
std::cout << "{\"ok\":true,\"command\":\"plan-command-convert\""
<< ",\"project\":\"" << json_escape(plan.value().project_path)
<< "\",\"output\":\"" << json_escape(plan.value().output_path)
<< "\",\"canvasResolution\":" << plan.value().canvas_resolution
<< ",\"steps\":[";
for (std::size_t i = 0; i < plan.value().steps.size(); ++i) {
if (i > 0) {
std::cout << ",";
}
std::cout << "\"" << command_convert_step_name(plan.value().steps[i]) << "\"";
}
std::cout << "]}\n";
return 0;
}
pp::foundation::Status parse_plan_brush_package_import_args(
int argc,
char** argv,
@@ -10115,6 +10206,10 @@ int main(int argc, char** argv)
return plan_app_shutdown(argc, argv);
}
if (command == "plan-command-convert") {
return plan_command_convert(argc, argv);
}
if (command == "plan-brush-package-import") {
return plan_brush_package_import(argc, argv);
}