added move action into asset workspace

This commit is contained in:
2026-03-24 13:42:47 +00:00
parent 29a2398b1d
commit bf4dc17469
24 changed files with 1651 additions and 387 deletions
@@ -19,6 +19,8 @@ import p.packer.messages.DeleteAssetResult;
import p.packer.messages.GetAssetActionsRequest;
import p.packer.messages.GetAssetDetailsRequest;
import p.packer.messages.ListAssetsRequest;
import p.packer.messages.MoveAssetRequest;
import p.packer.messages.MoveAssetResult;
import p.packer.messages.RegisterAssetRequest;
import p.packer.messages.RegisterAssetResult;
import p.packer.messages.assets.AssetAction;
@@ -201,15 +203,16 @@ final class FileSystemPackerWorkspaceServiceTest {
AssetReference.forRelativeAssetRoot("orphans/ui_sounds")));
assertEquals(PackerOperationStatus.SUCCESS, result.status());
assertEquals(2, result.actions().size());
assertEquals(3, result.actions().size());
assertEquals(AssetAction.REGISTER, result.actions().get(0).action());
assertTrue(result.actions().get(0).visible());
assertTrue(result.actions().get(0).enabled());
assertNull(result.actions().get(0).reason());
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
assertEquals(AssetAction.MOVE, result.actions().get(1).action());
assertTrue(result.actions().get(1).visible());
assertTrue(result.actions().get(1).enabled());
assertNull(result.actions().get(1).reason());
assertEquals(AssetAction.DELETE, result.actions().get(2).action());
}
@Test
@@ -222,9 +225,11 @@ final class FileSystemPackerWorkspaceServiceTest {
AssetReference.forAssetId(1)));
assertEquals(PackerOperationStatus.SUCCESS, result.status());
assertEquals(1, result.actions().size());
assertEquals(AssetAction.DELETE, result.actions().getFirst().action());
assertTrue(result.actions().getFirst().enabled());
assertEquals(2, result.actions().size());
assertEquals(AssetAction.MOVE, result.actions().get(0).action());
assertTrue(result.actions().get(0).enabled());
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
assertTrue(result.actions().get(1).enabled());
}
@Test
@@ -270,8 +275,9 @@ final class FileSystemPackerWorkspaceServiceTest {
final var actionsResult = service.getAssetActions(new GetAssetActionsRequest(
project(projectRoot),
registerResult.assetReference()));
assertEquals(1, actionsResult.actions().size());
assertEquals(AssetAction.DELETE, actionsResult.actions().getFirst().action());
assertEquals(2, actionsResult.actions().size());
assertEquals(AssetAction.MOVE, actionsResult.actions().get(0).action());
assertEquals(AssetAction.DELETE, actionsResult.actions().get(1).action());
assertEquals(1, loader.loadCount());
}
@@ -285,12 +291,13 @@ final class FileSystemPackerWorkspaceServiceTest {
AssetReference.forRelativeAssetRoot("bad")));
assertEquals(PackerOperationStatus.PARTIAL, result.status());
assertEquals(2, result.actions().size());
assertEquals(3, result.actions().size());
assertEquals(AssetAction.REGISTER, result.actions().get(0).action());
assertFalse(result.actions().get(0).enabled());
assertNotNull(result.actions().get(0).reason());
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
assertEquals(AssetAction.MOVE, result.actions().get(1).action());
assertTrue(result.actions().get(1).enabled());
assertEquals(AssetAction.DELETE, result.actions().get(2).action());
}
@Test
@@ -350,12 +357,13 @@ final class FileSystemPackerWorkspaceServiceTest {
final var actions = service.getAssetActions(new GetAssetActionsRequest(
project(projectRoot),
AssetReference.forRelativeAssetRoot("orphans/ui_clone")));
assertEquals(2, actions.actions().size());
assertEquals(3, actions.actions().size());
assertEquals(AssetAction.REGISTER, actions.actions().get(0).action());
assertFalse(actions.actions().get(0).enabled());
assertNotNull(actions.actions().get(0).reason());
assertEquals(AssetAction.DELETE, actions.actions().get(1).action());
assertEquals(AssetAction.MOVE, actions.actions().get(1).action());
assertTrue(actions.actions().get(1).enabled());
assertEquals(AssetAction.DELETE, actions.actions().get(2).action());
final RegisterAssetResult registerResult = service.registerAsset(new RegisterAssetRequest(
project(projectRoot),
@@ -393,6 +401,126 @@ final class FileSystemPackerWorkspaceServiceTest {
assertTrue(listResult.assets().isEmpty());
}
@Test
void movesRegisteredAssetAndKeepsRegisteredIdentity() throws Exception {
final Path projectRoot = tempDir.resolve("move-registered");
final FileSystemPackerWorkspaceService service = service();
final CreateAssetResult createResult = service.createAsset(new CreateAssetRequest(
project(projectRoot),
"ui/source-atlas",
"source_atlas",
AssetFamilyCatalog.IMAGE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
OutputCodecCatalog.NONE,
true));
Files.writeString(projectRoot.resolve("assets/ui/source-atlas/atlas.png"), "fixture");
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
project(projectRoot),
createResult.assetReference(),
"ui/renamed-atlas"));
assertEquals(PackerOperationStatus.SUCCESS, moveResult.status());
assertEquals(createResult.assetReference(), moveResult.assetReference());
assertFalse(Files.exists(projectRoot.resolve("assets/ui/source-atlas/asset.json")));
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/ui/renamed-atlas/asset.json")));
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/ui/renamed-atlas/atlas.png")));
final var details = service.getAssetDetails(new GetAssetDetailsRequest(project(projectRoot), createResult.assetReference()));
assertEquals(PackerOperationStatus.SUCCESS, details.status());
assertEquals(PackerAssetState.REGISTERED, details.details().summary().state());
assertEquals(projectRoot.resolve("assets/ui/renamed-atlas").toAbsolutePath().normalize(), details.details().summary().identity().assetRoot());
}
@Test
void movesUnregisteredAssetAndReturnsNewRootReference() throws Exception {
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("move-unregistered"));
final FileSystemPackerWorkspaceService service = service();
Files.writeString(projectRoot.resolve("assets/orphans/ui_sounds/readme.txt"), "keep");
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
project(projectRoot),
AssetReference.forRelativeAssetRoot("orphans/ui_sounds"),
"recovered/ui_sounds_renamed"));
assertEquals(PackerOperationStatus.SUCCESS, moveResult.status());
assertEquals(AssetReference.forRelativeAssetRoot("recovered/ui_sounds_renamed"), moveResult.assetReference());
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/recovered/ui_sounds_renamed/asset.json")));
assertTrue(Files.isRegularFile(projectRoot.resolve("assets/recovered/ui_sounds_renamed/readme.txt")));
final var details = service.getAssetDetails(new GetAssetDetailsRequest(project(projectRoot), moveResult.assetReference()));
assertEquals(PackerOperationStatus.SUCCESS, details.status());
assertEquals(PackerAssetState.UNREGISTERED, details.details().summary().state());
assertEquals(projectRoot.resolve("assets/recovered/ui_sounds_renamed").toAbsolutePath().normalize(), details.details().summary().identity().assetRoot());
}
@Test
void blocksMoveOutsideAssetsRoot() throws Exception {
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("move-outside"));
final FileSystemPackerWorkspaceService service = service();
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
project(projectRoot),
AssetReference.forRelativeAssetRoot("orphans/ui_sounds"),
"../outside/ui_sounds"));
assertEquals(PackerOperationStatus.FAILED, moveResult.status());
assertNull(moveResult.assetReference());
}
@Test
void blocksMoveWhenTargetAlreadyContainsAssetManifest() throws Exception {
final Path projectRoot = tempDir.resolve("move-target-asset");
final FileSystemPackerWorkspaceService service = service();
final CreateAssetResult source = service.createAsset(new CreateAssetRequest(
project(projectRoot),
"ui/source",
"source",
AssetFamilyCatalog.IMAGE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
OutputCodecCatalog.NONE,
false));
final CreateAssetResult target = service.createAsset(new CreateAssetRequest(
project(projectRoot),
"ui/target",
"target",
AssetFamilyCatalog.IMAGE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
OutputCodecCatalog.NONE,
false));
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
project(projectRoot),
source.assetReference(),
"ui/target"));
assertEquals(PackerOperationStatus.FAILED, moveResult.status());
assertNull(moveResult.assetReference());
assertNotNull(target.assetReference());
}
@Test
void moveAssetPatchesLoadedSnapshotWithoutWholeProjectReload() throws Exception {
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("move-no-reload"));
final CountingLoader loader = countingLoader();
final FileSystemPackerWorkspaceService service = service(ignored -> { }, loader);
service.listAssets(new ListAssetsRequest(project(projectRoot)));
assertEquals(1, loader.loadCount());
final MoveAssetResult moveResult = service.moveAsset(new MoveAssetRequest(
project(projectRoot),
AssetReference.forRelativeAssetRoot("orphans/ui_sounds"),
"recovered/ui_sounds_moved"));
assertEquals(PackerOperationStatus.SUCCESS, moveResult.status());
assertEquals(1, loader.loadCount());
final var details = service.getAssetDetails(new GetAssetDetailsRequest(project(projectRoot), moveResult.assetReference()));
assertEquals(PackerOperationStatus.SUCCESS, details.status());
assertEquals(1, loader.loadCount());
}
@Test
void deletesUnregisteredAssetJsonAndRemovesItFromSnapshot() throws Exception {
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("delete-unregistered"));