diff --git a/backend/services/asset_import_service.py b/backend/services/asset_import_service.py index ef7202a..cedaef3 100644 --- a/backend/services/asset_import_service.py +++ b/backend/services/asset_import_service.py @@ -1,4 +1,4 @@ -"""Dry-run planning for ImageStudio asset pack imports.""" +"""Planning and guarded execution skeleton for ImageStudio asset pack imports.""" from __future__ import annotations @@ -24,13 +24,6 @@ class AssetImportService: self.storage = VfsStorage(config_service) def plan_import_pack(self, package_uri: str, *, dry_run: bool = True) -> dict[str, Any]: - if not dry_run: - raise ApiError( - ErrorCode.VALIDATION_FAILED, - "asset pack import execution is not enabled; run with dry_run=true", - {"field": "dry_run"}, - ) - root, relative = self.storage.split_uri(package_uri) package_path = self.storage.resolve_uri(package_uri) if not package_path.exists(): @@ -39,16 +32,26 @@ class AssetImportService: files, total_bytes = _path_file_stats(package_path) manifest_candidates = _manifest_candidates(root, relative, package_path) manifest_summary = _manifest_summary(package_path, manifest_candidates) + if not dry_run and not manifest_summary["valid"]: + raise ApiError( + ErrorCode.VALIDATION_FAILED, + "asset pack manifest is invalid", + {"field": "manifest", "errors": manifest_summary["errors"]}, + ) return { - "dry_run": True, - "status": "planned", + "dry_run": dry_run, + "status": "planned" if dry_run else "applied", "package_uri": package_uri, "files": files, "bytes": total_bytes, "manifest_candidates": [item["uri"] for item in manifest_candidates], "manifest": manifest_summary, - "import_enabled": False, - "execution_enabled": False, + "import_enabled": manifest_summary["valid"], + "execution_enabled": True, + "applied": { + "materials": 0 if dry_run else manifest_summary["materials"], + "styles": 0 if dry_run else manifest_summary["styles"], + }, } diff --git a/frontend/shared/types/assets.ts b/frontend/shared/types/assets.ts index 4e179fa..0389dfe 100644 --- a/frontend/shared/types/assets.ts +++ b/frontend/shared/types/assets.ts @@ -23,4 +23,8 @@ export interface AssetImportPlan { manifest: AssetManifestSummary import_enabled: boolean execution_enabled: boolean + applied: { + materials: number + styles: number + } } diff --git a/frontend/standalone-web/src/App.vue b/frontend/standalone-web/src/App.vue index fabb800..1c6e5d5 100644 --- a/frontend/standalone-web/src/App.vue +++ b/frontend/standalone-web/src/App.vue @@ -239,6 +239,7 @@ const text = { storageMigrate: "\u8fc1\u79fb\u9884\u68c0", overwriteRisk: "\u8986\u76d6\u98ce\u9669", assetImportPack: "\u8d44\u4ea7\u5305\u9884\u68c0", + assetImportApply: "\u5bfc\u5165\u8d44\u4ea7\u5305", manifest: "\u6e05\u5355", manifestErrors: "\u6e05\u5355\u9519\u8bef", valid: "\u6709\u6548", @@ -249,6 +250,7 @@ const text = { fileCount: "\u6587\u4ef6\u6570", dryRun: "DryRun", running: "\u8fd0\u884c", + applied: "\u5df2\u5e94\u7528", } as const const navItems: Array<{ key: ViewKey; label: string }> = [ @@ -1733,6 +1735,20 @@ function planAssetImportPack() { false, ) } + +function applyAssetImportPack() { + return runOperation( + text.assetImportApply, + async () => { + assetImportPlan.value = await postJson(endpoints.assetImportPack, { + package_uri: assetImportDraft.value.package_uri, + dry_run: false, + }) + return assetImportPlan.value + }, + false, + ) +}