added move action into asset workspace
This commit is contained in:
+99
@@ -7,6 +7,8 @@ import p.packer.messages.assets.AssetFamilyCatalog;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.messages.GetAssetActionsRequest;
|
||||
import p.packer.messages.GetAssetActionsResult;
|
||||
import p.packer.messages.MoveAssetRequest;
|
||||
import p.packer.messages.MoveAssetResult;
|
||||
import p.packer.messages.assets.OutputFormatCatalog;
|
||||
import p.packer.messages.assets.PackerAssetState;
|
||||
import p.packer.messages.assets.PackerBuildParticipation;
|
||||
@@ -31,6 +33,7 @@ import p.packer.PackerWorkspaceService;
|
||||
import p.packer.models.PackerAssetDeclarationParseResult;
|
||||
import p.packer.models.PackerDeleteAssetEvaluation;
|
||||
import p.packer.models.PackerAssetIdentity;
|
||||
import p.packer.models.PackerMoveAssetEvaluation;
|
||||
import p.packer.models.PackerRegisterAssetEvaluation;
|
||||
import p.packer.models.PackerAssetSummary;
|
||||
import p.packer.models.PackerDiagnostic;
|
||||
@@ -171,6 +174,14 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
return writeCoordinator.execute(project, () -> registerAssetInWriteLane(safeRequest, events));
|
||||
}
|
||||
|
||||
@Override
|
||||
public MoveAssetResult moveAsset(MoveAssetRequest request) {
|
||||
final MoveAssetRequest safeRequest = Objects.requireNonNull(request, "request");
|
||||
final PackerProjectContext project = safeRequest.project();
|
||||
final PackerOperationEventEmitter events = new PackerOperationEventEmitter(project, eventSink);
|
||||
return writeCoordinator.execute(project, () -> moveAssetInWriteLane(safeRequest, events));
|
||||
}
|
||||
|
||||
@Override
|
||||
public DeleteAssetResult deleteAsset(DeleteAssetRequest request) {
|
||||
final DeleteAssetRequest safeRequest = Objects.requireNonNull(request, "request");
|
||||
@@ -352,6 +363,69 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
}
|
||||
}
|
||||
|
||||
private MoveAssetResult moveAssetInWriteLane(
|
||||
MoveAssetRequest request,
|
||||
PackerOperationEventEmitter events) {
|
||||
final PackerProjectContext project = request.project();
|
||||
workspaceFoundation.initWorkspace(new InitWorkspaceRequest(project));
|
||||
final PackerRuntimeSnapshot snapshot = runtimeRegistry.getOrLoad(project).snapshot();
|
||||
final PackerMoveAssetEvaluation evaluation = actionReadService.evaluateMove(snapshot, project, request.assetReference(), request.targetRoot());
|
||||
if (!evaluation.canMove()) {
|
||||
return moveFailureResult(
|
||||
events,
|
||||
Objects.requireNonNullElse(evaluation.reason(), "Asset cannot be moved."),
|
||||
evaluation.resolved().assetRoot(),
|
||||
evaluation.resolved().assetRoot().resolve("asset.json"),
|
||||
List.of(relativeAssetRoot(project, evaluation.resolved().assetRoot())));
|
||||
}
|
||||
|
||||
final Path sourceRoot = evaluation.resolved().assetRoot();
|
||||
final Path targetRoot = evaluation.targetRoot().orElseThrow();
|
||||
final Path targetManifestPath = evaluation.targetManifestPath().orElseThrow();
|
||||
final String sourceRelativeRoot = relativeAssetRoot(project, sourceRoot);
|
||||
final String targetRelativeRoot = evaluation.targetRelativeRoot().orElseThrow();
|
||||
try {
|
||||
Files.createDirectories(targetRoot.getParent());
|
||||
Files.move(sourceRoot, targetRoot);
|
||||
|
||||
final PackerRegistryState registry = workspaceFoundation.loadRegistry(project);
|
||||
final Optional<PackerRegistryEntry> updatedEntry = evaluation.resolved().registryEntry()
|
||||
.map(entry -> new PackerRegistryEntry(entry.assetId(), entry.assetUuid(), targetRelativeRoot, entry.includedInBuild()));
|
||||
final PackerRegistryState updatedRegistry = updatedEntry
|
||||
.map(entry -> replaceRegistryEntryRoot(registry, entry))
|
||||
.orElse(registry);
|
||||
if (!updatedRegistry.equals(registry)) {
|
||||
workspaceFoundation.saveRegistry(project, updatedRegistry);
|
||||
}
|
||||
runtimeRegistry.update(project, (currentSnapshot, generation) -> runtimePatchService.afterMoveAsset(
|
||||
currentSnapshot,
|
||||
generation,
|
||||
updatedRegistry,
|
||||
updatedEntry,
|
||||
sourceRoot,
|
||||
targetRoot,
|
||||
targetManifestPath));
|
||||
final AssetReference canonicalReference = updatedEntry.isPresent()
|
||||
? AssetReference.forAssetId(updatedEntry.get().assetId())
|
||||
: AssetReference.forRelativeAssetRoot(targetRelativeRoot);
|
||||
final MoveAssetResult result = new MoveAssetResult(
|
||||
PackerOperationStatus.SUCCESS,
|
||||
"Asset moved: " + sourceRelativeRoot + " -> " + targetRelativeRoot,
|
||||
canonicalReference,
|
||||
targetRoot,
|
||||
targetManifestPath);
|
||||
events.emit(PackerEventKind.ACTION_APPLIED, result.summary(), List.of(sourceRelativeRoot, targetRelativeRoot));
|
||||
return result;
|
||||
} catch (IOException exception) {
|
||||
return moveFailureResult(
|
||||
events,
|
||||
"Unable to move asset: " + exception.getMessage(),
|
||||
sourceRoot,
|
||||
sourceRoot.resolve("asset.json"),
|
||||
List.of(sourceRelativeRoot, targetRelativeRoot));
|
||||
}
|
||||
}
|
||||
|
||||
private CreateAssetResult failureResult(
|
||||
PackerOperationEventEmitter events,
|
||||
String summary,
|
||||
@@ -399,6 +473,22 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
return result;
|
||||
}
|
||||
|
||||
private MoveAssetResult moveFailureResult(
|
||||
PackerOperationEventEmitter events,
|
||||
String summary,
|
||||
Path assetRoot,
|
||||
Path manifestPath,
|
||||
List<String> affectedAssets) {
|
||||
final MoveAssetResult result = new MoveAssetResult(
|
||||
PackerOperationStatus.FAILED,
|
||||
summary,
|
||||
null,
|
||||
assetRoot,
|
||||
manifestPath);
|
||||
events.emit(PackerEventKind.ACTION_FAILED, result.summary(), affectedAssets);
|
||||
return result;
|
||||
}
|
||||
|
||||
private void writeManifest(Path manifestPath, CreateAssetRequest request, String assetUuid) throws IOException {
|
||||
final Map<String, Object> manifest = new LinkedHashMap<>();
|
||||
manifest.put("schema_version", 1);
|
||||
@@ -504,4 +594,13 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
.toList();
|
||||
return registry.withAssets(updatedEntries, registry.nextAssetId());
|
||||
}
|
||||
|
||||
private PackerRegistryState replaceRegistryEntryRoot(
|
||||
PackerRegistryState registry,
|
||||
PackerRegistryEntry updatedEntry) {
|
||||
final List<PackerRegistryEntry> updatedEntries = registry.assets().stream()
|
||||
.map(candidate -> candidate.assetId() == updatedEntry.assetId() ? updatedEntry : candidate)
|
||||
.toList();
|
||||
return registry.withAssets(updatedEntries, registry.nextAssetId());
|
||||
}
|
||||
}
|
||||
|
||||
+129
-9
@@ -1,6 +1,5 @@
|
||||
package p.packer.services;
|
||||
|
||||
import p.packer.dtos.PackerAssetActionAvailabilityDTO;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.messages.GetAssetActionsRequest;
|
||||
import p.packer.messages.GetAssetActionsResult;
|
||||
@@ -14,6 +13,7 @@ import p.packer.models.PackerAssetDeclaration;
|
||||
import p.packer.models.PackerAssetDeclarationParseResult;
|
||||
import p.packer.models.PackerDeleteAssetEvaluation;
|
||||
import p.packer.models.PackerDiagnostic;
|
||||
import p.packer.models.PackerMoveAssetEvaluation;
|
||||
import p.packer.models.PackerRegisterAssetEvaluation;
|
||||
import p.packer.models.PackerRegistryEntry;
|
||||
import p.packer.models.PackerResolvedAssetReference;
|
||||
@@ -44,6 +44,7 @@ public final class PackerAssetActionReadService {
|
||||
final PackerProjectContext project = Objects.requireNonNull(request, "request").project();
|
||||
final PackerRuntimeSnapshot snapshot = runtimeRegistry.getOrLoad(project).snapshot();
|
||||
final PackerRegisterAssetEvaluation registerEvaluation = evaluateRegister(snapshot, project, request.assetReference());
|
||||
final PackerMoveAssetEvaluation moveEvaluation = evaluateMove(snapshot, project, request.assetReference(), null);
|
||||
final PackerDeleteAssetEvaluation deleteEvaluation = evaluateDelete(snapshot, project, request.assetReference());
|
||||
final List<PackerAssetActionAvailability> actions = new ArrayList<>();
|
||||
if (registerEvaluation.resolved().registryEntry().isEmpty()) {
|
||||
@@ -53,6 +54,13 @@ public final class PackerAssetActionReadService {
|
||||
true,
|
||||
registerEvaluation.reason()));
|
||||
}
|
||||
if (moveEvaluation.resolved().runtimeAsset().isPresent()) {
|
||||
actions.add(new PackerAssetActionAvailability(
|
||||
AssetAction.MOVE,
|
||||
moveEvaluation.canMove(),
|
||||
true,
|
||||
moveEvaluation.reason()));
|
||||
}
|
||||
if (deleteEvaluation.resolved().runtimeAsset().isPresent()) {
|
||||
actions.add(new PackerAssetActionAvailability(
|
||||
AssetAction.DELETE,
|
||||
@@ -62,9 +70,12 @@ public final class PackerAssetActionReadService {
|
||||
}
|
||||
|
||||
final PackerOperationStatus status;
|
||||
if (registerEvaluation.resolved().runtimeAsset().isEmpty() && deleteEvaluation.resolved().runtimeAsset().isEmpty()) {
|
||||
if (registerEvaluation.resolved().runtimeAsset().isEmpty()
|
||||
&& moveEvaluation.resolved().runtimeAsset().isEmpty()
|
||||
&& deleteEvaluation.resolved().runtimeAsset().isEmpty()) {
|
||||
status = PackerOperationStatus.FAILED;
|
||||
} else if (combinedDiagnostics(registerEvaluation.diagnostics(), deleteEvaluation.diagnostics()).stream().anyMatch(PackerDiagnostic::blocking)) {
|
||||
} else if (combinedDiagnostics(registerEvaluation.diagnostics(), moveEvaluation.diagnostics(), deleteEvaluation.diagnostics())
|
||||
.stream().anyMatch(PackerDiagnostic::blocking)) {
|
||||
status = PackerOperationStatus.PARTIAL;
|
||||
} else {
|
||||
status = PackerOperationStatus.SUCCESS;
|
||||
@@ -73,7 +84,10 @@ public final class PackerAssetActionReadService {
|
||||
status,
|
||||
"Asset action capabilities resolved from runtime snapshot.",
|
||||
PackerReadMessageMapper.toAssetActionAvailabilityDTOs(actions),
|
||||
PackerReadMessageMapper.toDiagnosticDTOs(combinedDiagnostics(registerEvaluation.diagnostics(), deleteEvaluation.diagnostics())));
|
||||
PackerReadMessageMapper.toDiagnosticDTOs(combinedDiagnostics(
|
||||
registerEvaluation.diagnostics(),
|
||||
moveEvaluation.diagnostics(),
|
||||
deleteEvaluation.diagnostics())));
|
||||
}
|
||||
|
||||
public PackerRegisterAssetEvaluation evaluateRegister(
|
||||
@@ -153,6 +167,98 @@ public final class PackerAssetActionReadService {
|
||||
return new PackerDeleteAssetEvaluation(resolved, diagnostics, true, null);
|
||||
}
|
||||
|
||||
public PackerMoveAssetEvaluation evaluateMove(
|
||||
PackerRuntimeSnapshot snapshot,
|
||||
PackerProjectContext project,
|
||||
AssetReference assetReference,
|
||||
String requestedTargetRoot) {
|
||||
final PackerResolvedAssetReference resolved = assetReferenceResolver.resolve(project, snapshot, assetReference);
|
||||
final List<PackerDiagnostic> diagnostics = new ArrayList<>(resolved.diagnostics());
|
||||
if (resolved.runtimeAsset().isEmpty()) {
|
||||
diagnostics.add(new PackerDiagnostic(
|
||||
PackerDiagnosticSeverity.ERROR,
|
||||
PackerDiagnosticCategory.STRUCTURAL,
|
||||
"asset.json was not found for the requested asset root.",
|
||||
resolved.assetRoot().resolve("asset.json"),
|
||||
true));
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"asset.json was not found for the requested asset root.",
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
if (requestedTargetRoot == null) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
true,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
final String normalizedTargetRoot = normalizeRelativeAssetRoot(requestedTargetRoot);
|
||||
if (normalizedTargetRoot == null) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root must stay inside assets/ and use a non-blank relative path.",
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty());
|
||||
}
|
||||
|
||||
final Path targetRoot = PackerWorkspacePaths.assetRoot(project, normalizedTargetRoot);
|
||||
if (!targetRoot.startsWith(PackerWorkspacePaths.assetsRoot(project))) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root must stay inside assets/.",
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetRoot.resolve("asset.json")));
|
||||
}
|
||||
|
||||
if (targetRoot.equals(resolved.assetRoot())) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root must differ from the current asset root.",
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetRoot.resolve("asset.json")));
|
||||
}
|
||||
|
||||
final Path targetManifestPath = targetRoot.resolve("asset.json");
|
||||
if (java.nio.file.Files.isRegularFile(targetManifestPath)) {
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
false,
|
||||
"Target root already contains asset.json.",
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetManifestPath));
|
||||
}
|
||||
|
||||
return new PackerMoveAssetEvaluation(
|
||||
resolved,
|
||||
diagnostics,
|
||||
true,
|
||||
null,
|
||||
Optional.of(normalizedTargetRoot),
|
||||
Optional.of(targetRoot),
|
||||
Optional.of(targetManifestPath));
|
||||
}
|
||||
|
||||
private String firstBlockingReason(List<PackerDiagnostic> diagnostics, String fallback) {
|
||||
return diagnostics.stream()
|
||||
.filter(PackerDiagnostic::blocking)
|
||||
@@ -162,11 +268,25 @@ public final class PackerAssetActionReadService {
|
||||
.orElse(fallback);
|
||||
}
|
||||
|
||||
private List<PackerDiagnostic> combinedDiagnostics(
|
||||
List<PackerDiagnostic> left,
|
||||
List<PackerDiagnostic> right) {
|
||||
final List<PackerDiagnostic> combined = new ArrayList<>(left);
|
||||
combined.addAll(right);
|
||||
@SafeVarargs
|
||||
private List<PackerDiagnostic> combinedDiagnostics(List<PackerDiagnostic>... groups) {
|
||||
final List<PackerDiagnostic> combined = new ArrayList<>();
|
||||
for (List<PackerDiagnostic> group : groups) {
|
||||
combined.addAll(group);
|
||||
}
|
||||
return combined;
|
||||
}
|
||||
|
||||
private String normalizeRelativeAssetRoot(String candidate) {
|
||||
final String raw = Objects.requireNonNullElse(candidate, "").trim().replace('\\', '/');
|
||||
if (raw.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
final Path normalized = Path.of(raw).normalize();
|
||||
if (normalized.isAbsolute() || normalized.startsWith("..")) {
|
||||
return null;
|
||||
}
|
||||
final String value = normalized.toString().replace('\\', '/');
|
||||
return value.isBlank() ? null : value;
|
||||
}
|
||||
}
|
||||
|
||||
+30
@@ -76,4 +76,34 @@ public final class PackerRuntimePatchService {
|
||||
.toList();
|
||||
return new PackerRuntimeSnapshot(generation, updatedRegistry, updatedAssets);
|
||||
}
|
||||
|
||||
public PackerRuntimeSnapshot afterMoveAsset(
|
||||
PackerRuntimeSnapshot snapshot,
|
||||
long generation,
|
||||
PackerRegistryState updatedRegistry,
|
||||
java.util.Optional<PackerRegistryEntry> updatedRegistryEntry,
|
||||
Path sourceRoot,
|
||||
Path targetRoot,
|
||||
Path targetManifestPath) {
|
||||
final PackerAssetDeclarationParseResult parsed = declarationParser.parse(targetManifestPath);
|
||||
final List<PackerRuntimeAsset> updatedAssets = new ArrayList<>();
|
||||
boolean patched = false;
|
||||
for (PackerRuntimeAsset asset : snapshot.assets()) {
|
||||
if (asset.assetRoot().equals(sourceRoot.toAbsolutePath().normalize())) {
|
||||
updatedAssets.add(new PackerRuntimeAsset(
|
||||
targetRoot,
|
||||
targetManifestPath,
|
||||
updatedRegistryEntry,
|
||||
parsed));
|
||||
patched = true;
|
||||
} else {
|
||||
updatedAssets.add(asset);
|
||||
}
|
||||
}
|
||||
if (!patched) {
|
||||
throw new IllegalStateException("Unable to patch runtime snapshot for moved asset: " + sourceRoot);
|
||||
}
|
||||
updatedAssets.sort(Comparator.comparing(asset -> asset.assetRoot().toString(), String.CASE_INSENSITIVE_ORDER));
|
||||
return new PackerRuntimeSnapshot(generation, updatedRegistry, updatedAssets);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user