Centralize legacy brush package import

This commit is contained in:
2026-06-04 14:49:22 +02:00
parent 78185b8fd5
commit 6ab64ccc82
13 changed files with 415 additions and 6 deletions

View File

@@ -2,6 +2,7 @@
#include "app_core/app_preferences.h"
#include "app_core/app_status.h"
#include "app_core/app_startup.h"
#include "app_core/brush_package_import.h"
#include "app_core/brush_package_export.h"
#include "app_core/brush_ui.h"
#include "app_core/canvas_hotkey.h"
@@ -247,6 +248,11 @@ struct PlanBrushPackageExportArgs {
bool has_header_image = false;
};
struct PlanBrushPackageImportArgs {
std::string kind = "ppbr";
std::string path;
};
struct PlanAppStatusArgs {
std::string document_name = "no-name";
bool unsaved = false;
@@ -1874,6 +1880,7 @@ void print_help()
<< " 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-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"
<< " 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"
@@ -3502,6 +3509,90 @@ int plan_app_startup(int argc, char** argv)
return 0;
}
pp::foundation::Status parse_plan_brush_package_import_args(
int argc,
char** argv,
PlanBrushPackageImportArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
if (key == "--kind" || key == "--path") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
if (key == "--kind") {
args.kind = argv[++i];
} else {
args.path = argv[++i];
}
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
pp::foundation::Result<pp::app::BrushPackageImportKind> parse_brush_package_import_kind(
std::string_view kind)
{
if (kind == "abr") {
return pp::foundation::Result<pp::app::BrushPackageImportKind>::success(
pp::app::BrushPackageImportKind::abr);
}
if (kind == "ppbr") {
return pp::foundation::Result<pp::app::BrushPackageImportKind>::success(
pp::app::BrushPackageImportKind::ppbr);
}
return pp::foundation::Result<pp::app::BrushPackageImportKind>::failure(
pp::foundation::Status::invalid_argument("unknown brush package import kind"));
}
class CliBrushPackageImportServices final : public pp::app::BrushPackageImportServices {
public:
void import_brush_package(pp::app::BrushPackageImportKind kind, std::string_view path) override
{
imports += 1;
last_kind = kind;
last_path = std::string(path);
}
int imports = 0;
pp::app::BrushPackageImportKind last_kind = pp::app::BrushPackageImportKind::ppbr;
std::string last_path;
};
int plan_brush_package_import(int argc, char** argv)
{
PlanBrushPackageImportArgs args;
const auto status = parse_plan_brush_package_import_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-brush-package-import", status.message);
return 2;
}
const auto kind = parse_brush_package_import_kind(args.kind);
if (!kind) {
print_error("plan-brush-package-import", kind.status().message);
return 2;
}
CliBrushPackageImportServices services;
const auto import_status = pp::app::execute_brush_package_import(kind.value(), args.path, services);
if (!import_status.ok()) {
print_error("plan-brush-package-import", import_status.message);
return 2;
}
std::cout << "{\"ok\":true,\"command\":\"plan-brush-package-import\""
<< ",\"request\":{\"kind\":\"" << pp::app::brush_package_import_kind_name(services.last_kind)
<< "\",\"path\":\"" << json_escape(services.last_path)
<< "\"},\"dispatches\":" << services.imports
<< "}\n";
return 0;
}
pp::foundation::Status parse_plan_brush_package_export_args(
int argc,
char** argv,
@@ -8674,6 +8765,10 @@ int main(int argc, char** argv)
return plan_app_startup(argc, argv);
}
if (command == "plan-brush-package-import") {
return plan_brush_package_import(argc, argv);
}
if (command == "plan-brush-package-export") {
return plan_brush_package_export(argc, argv);
}