packer (WIP)
This commit is contained in:
+2
@@ -14,6 +14,7 @@ public record PackerAssetDetailsDTO(
|
||||
List<OutputCodecCatalog> availableOutputCodecs,
|
||||
Map<OutputCodecCatalog, List<PackerCodecConfigurationFieldDTO>> codecConfigurationFieldsByCodec,
|
||||
List<PackerCodecConfigurationFieldDTO> metadataFields,
|
||||
Map<String, Object> outputPipeline,
|
||||
PackerBankCompositionDetailsDTO bankComposition,
|
||||
List<Map<String, Object>> pipelinePalettes,
|
||||
List<PackerDiagnosticDTO> diagnostics) {
|
||||
@@ -25,6 +26,7 @@ public record PackerAssetDetailsDTO(
|
||||
availableOutputCodecs = List.copyOf(Objects.requireNonNull(availableOutputCodecs, "availableOutputCodecs"));
|
||||
codecConfigurationFieldsByCodec = Map.copyOf(Objects.requireNonNull(codecConfigurationFieldsByCodec, "codecConfigurationFieldsByCodec"));
|
||||
metadataFields = List.copyOf(Objects.requireNonNull(metadataFields, "metadataFields"));
|
||||
outputPipeline = Map.copyOf(Objects.requireNonNull(outputPipeline, "outputPipeline"));
|
||||
bankComposition = Objects.requireNonNull(bankComposition, "bankComposition");
|
||||
pipelinePalettes = List.copyOf(Objects.requireNonNull(pipelinePalettes, "pipelinePalettes"));
|
||||
diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics"));
|
||||
|
||||
+15
-12
@@ -1,32 +1,35 @@
|
||||
package p.packer.dtos;
|
||||
|
||||
import p.packer.messages.assets.AssetFamilyCatalog;
|
||||
import p.packer.messages.assets.OutputFormatCatalog;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
public record PackerPackSummaryAssetDTO(
|
||||
int assetId,
|
||||
String assetName,
|
||||
AssetFamilyCatalog assetFamily,
|
||||
int minArtifactCount,
|
||||
int maxArtifactCount,
|
||||
int artifactCount,
|
||||
OutputFormatCatalog outputFormat,
|
||||
Map<String, String> outputMetadata,
|
||||
Map<String, Object> outputPipeline,
|
||||
long lastModified) {
|
||||
|
||||
public PackerPackSummaryAssetDTO {
|
||||
if (assetId < 0) {
|
||||
throw new IllegalArgumentException("assetId must not be negative");
|
||||
}
|
||||
assetName = java.util.Objects.requireNonNull(assetName, "assetName").trim();
|
||||
assetFamily = java.util.Objects.requireNonNullElse(assetFamily, AssetFamilyCatalog.UNKNOWN);
|
||||
assetName = Objects.requireNonNull(assetName, "assetName").trim();
|
||||
assetFamily = Objects.requireNonNullElse(assetFamily, AssetFamilyCatalog.UNKNOWN);
|
||||
outputFormat = Objects.requireNonNullElse(outputFormat, OutputFormatCatalog.UNKNOWN);
|
||||
outputMetadata = Map.copyOf(Objects.requireNonNull(outputMetadata, "outputMetadata"));
|
||||
outputPipeline = Map.copyOf(Objects.requireNonNull(outputPipeline, "outputPipeline"));
|
||||
if (assetName.isBlank()) {
|
||||
throw new IllegalArgumentException("assetName must not be blank");
|
||||
}
|
||||
if (minArtifactCount < 0) {
|
||||
throw new IllegalArgumentException("minArtifactCount must not be negative");
|
||||
}
|
||||
if (maxArtifactCount < 0) {
|
||||
throw new IllegalArgumentException("maxArtifactCount must not be negative");
|
||||
}
|
||||
if (minArtifactCount > maxArtifactCount) {
|
||||
throw new IllegalArgumentException("minArtifactCount must not be greater than maxArtifactCount");
|
||||
if (artifactCount < 0) {
|
||||
throw new IllegalArgumentException("artifactCount must not be negative");
|
||||
}
|
||||
if (lastModified < 0L) {
|
||||
throw new IllegalArgumentException("lastModified must not be negative");
|
||||
|
||||
+2
@@ -14,6 +14,7 @@ public record PackerAssetDetails(
|
||||
List<OutputCodecCatalog> availableOutputCodecs,
|
||||
Map<OutputCodecCatalog, List<PackerCodecConfigurationField>> codecConfigurationFieldsByCodec,
|
||||
List<PackerCodecConfigurationField> metadataFields,
|
||||
Map<String, Object> outputPipeline,
|
||||
PackerBankCompositionDetails bankComposition,
|
||||
List<Map<String, Object>> pipelinePalettes,
|
||||
List<PackerDiagnostic> diagnostics) {
|
||||
@@ -25,6 +26,7 @@ public record PackerAssetDetails(
|
||||
availableOutputCodecs = List.copyOf(Objects.requireNonNull(availableOutputCodecs, "availableOutputCodecs"));
|
||||
codecConfigurationFieldsByCodec = Map.copyOf(Objects.requireNonNull(codecConfigurationFieldsByCodec, "codecConfigurationFieldsByCodec"));
|
||||
metadataFields = List.copyOf(Objects.requireNonNull(metadataFields, "metadataFields"));
|
||||
outputPipeline = Map.copyOf(Objects.requireNonNull(outputPipeline, "outputPipeline"));
|
||||
bankComposition = Objects.requireNonNull(bankComposition, "bankComposition");
|
||||
pipelinePalettes = List.copyOf(Objects.requireNonNull(pipelinePalettes, "pipelinePalettes"));
|
||||
diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics"));
|
||||
|
||||
+4
-4
@@ -681,14 +681,14 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
final AssetFamilyCatalog assetFamily = declaration != null
|
||||
? declaration.assetFamily()
|
||||
: AssetFamilyCatalog.UNKNOWN;
|
||||
final int minArtifactCount = declaration != null ? declaration.artifacts().size() : 0;
|
||||
final int maxArtifactCount = runtimeAsset.walkProjection().buildCandidateFiles().size();
|
||||
return new PackerPackSummaryAssetDTO(
|
||||
registryEntry.assetId(),
|
||||
assetName,
|
||||
assetFamily,
|
||||
minArtifactCount,
|
||||
maxArtifactCount,
|
||||
declaration != null ? declaration.artifacts().size() : 0,
|
||||
declaration != null ? declaration.outputFormat() : OutputFormatCatalog.UNKNOWN,
|
||||
declaration != null ? declaration.outputMetadata() : Map.of(),
|
||||
declaration != null ? PackerReadMessageMapper.normalizeMetadata(declaration.outputPipelineMetadata()) : Map.of(),
|
||||
0L);
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -82,6 +82,7 @@ public final class PackerAssetDetailsService {
|
||||
outputContract.availableCodecs(),
|
||||
outputContract.codecConfigurationFieldsByCodec(),
|
||||
metadataFields(outputContract.metadataFields(), declaration.outputMetadata()),
|
||||
PackerReadMessageMapper.normalizeMetadata(declaration.outputPipelineMetadata()),
|
||||
resolveBankCompositionDetails(snapshot, runtimeAsset, declaration),
|
||||
resolvePipelinePalettes(declaration),
|
||||
diagnostics);
|
||||
@@ -122,6 +123,7 @@ public final class PackerAssetDetailsService {
|
||||
List.of(OutputCodecCatalog.NONE),
|
||||
Map.of(OutputCodecCatalog.NONE, List.of()),
|
||||
List.of(),
|
||||
Map.of(),
|
||||
PackerBankCompositionDetails.EMPTY,
|
||||
List.of(),
|
||||
diagnostics);
|
||||
|
||||
+38
-8
@@ -1,5 +1,6 @@
|
||||
package p.packer.services;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import p.packer.dtos.*;
|
||||
import p.packer.messages.assets.OutputCodecCatalog;
|
||||
import p.packer.models.*;
|
||||
@@ -31,11 +32,20 @@ public final class PackerReadMessageMapper {
|
||||
details.availableOutputCodecs(),
|
||||
toCodecConfigurationFieldsByCodecDTO(details.codecConfigurationFieldsByCodec()),
|
||||
toCodecConfigurationFieldDTOs(details.metadataFields()),
|
||||
normalizeMetadata(details.outputPipeline()),
|
||||
toBankCompositionDetailsDTO(details.bankComposition()),
|
||||
details.pipelinePalettes().stream().map(PackerReadMessageMapper::normalizeMetadata).toList(),
|
||||
toDiagnosticDTOs(details.diagnostics()));
|
||||
}
|
||||
|
||||
public static Map<String, Object> normalizeMetadata(Map<String, ?> metadata) {
|
||||
return metadata.entrySet().stream().collect(Collectors.toMap(
|
||||
Map.Entry::getKey,
|
||||
entry -> normalizeMetadataValue(entry.getValue()),
|
||||
(left, right) -> left,
|
||||
java.util.LinkedHashMap::new));
|
||||
}
|
||||
|
||||
private static PackerBankCompositionDetailsDTO toBankCompositionDetailsDTO(PackerBankCompositionDetails details) {
|
||||
return new PackerBankCompositionDetailsDTO(
|
||||
details.availableFiles().stream().map(PackerReadMessageMapper::toBankCompositionFileDTO).toList(),
|
||||
@@ -53,14 +63,6 @@ public final class PackerReadMessageMapper {
|
||||
normalizeMetadata(file.metadata()));
|
||||
}
|
||||
|
||||
private static Map<String, Object> normalizeMetadata(Map<String, Object> metadata) {
|
||||
return metadata.entrySet().stream().collect(Collectors.toMap(
|
||||
Map.Entry::getKey,
|
||||
entry -> normalizeMetadataValue(entry.getValue()),
|
||||
(left, right) -> left,
|
||||
java.util.LinkedHashMap::new));
|
||||
}
|
||||
|
||||
private static Object normalizeMetadataValue(Object value) {
|
||||
if (value == null
|
||||
|| value instanceof String
|
||||
@@ -68,6 +70,34 @@ public final class PackerReadMessageMapper {
|
||||
|| value instanceof Boolean) {
|
||||
return value;
|
||||
}
|
||||
if (value instanceof JsonNode jsonNode) {
|
||||
if (jsonNode.isObject()) {
|
||||
final java.util.LinkedHashMap<String, Object> normalized = new java.util.LinkedHashMap<>();
|
||||
jsonNode.fields().forEachRemaining(entry -> normalized.put(entry.getKey(), normalizeMetadataValue(entry.getValue())));
|
||||
return Map.copyOf(normalized);
|
||||
}
|
||||
if (jsonNode.isArray()) {
|
||||
final java.util.List<Object> normalized = new java.util.ArrayList<>();
|
||||
jsonNode.forEach(item -> normalized.add(normalizeMetadataValue(item)));
|
||||
return List.copyOf(normalized);
|
||||
}
|
||||
if (jsonNode.isTextual()) {
|
||||
return jsonNode.asText();
|
||||
}
|
||||
if (jsonNode.isIntegralNumber()) {
|
||||
return jsonNode.longValue();
|
||||
}
|
||||
if (jsonNode.isFloatingPointNumber()) {
|
||||
return jsonNode.doubleValue();
|
||||
}
|
||||
if (jsonNode.isBoolean()) {
|
||||
return jsonNode.booleanValue();
|
||||
}
|
||||
if (jsonNode.isNull()) {
|
||||
return null;
|
||||
}
|
||||
return jsonNode.toString();
|
||||
}
|
||||
if (value instanceof PackerTileIndexedV1 tile) {
|
||||
final List<Integer> paletteIndices = new java.util.ArrayList<>(tile.paletteIndices().length);
|
||||
for (byte paletteIndex : tile.paletteIndices()) {
|
||||
|
||||
+9
-6
@@ -118,25 +118,28 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void packSummaryProjectsMinAndMaxArtifactCounts() throws Exception {
|
||||
void packSummaryProjectsArtifactCountAndOutputMetadata() throws Exception {
|
||||
final Path projectRoot = copyFixture("workspaces/managed-basic", tempDir.resolve("pack-summary-artifacts"));
|
||||
final Path assetRoot = projectRoot.resolve("assets/ui/atlas");
|
||||
writeTilePng(assetRoot.resolve("confirm.png"), 16);
|
||||
writeTilePng(assetRoot.resolve("cancel.png"), 16);
|
||||
final Path manifestPath = assetRoot.resolve("asset.json");
|
||||
final ObjectNode manifest = (ObjectNode) MAPPER.readTree(manifestPath.toFile());
|
||||
final var artifacts = manifest.putArray("artifacts");
|
||||
artifacts.addObject().put("file", "confirm.png").put("index", 0);
|
||||
final ObjectNode output = (ObjectNode) manifest.path("output");
|
||||
final ObjectNode metadata = output.putObject("metadata");
|
||||
metadata.put("tile_size", "16x16");
|
||||
output.putObject("pipeline").putObject("samples").putObject("1").put("offset", 0).put("length", 64);
|
||||
MAPPER.writerWithDefaultPrettyPrinter().writeValue(manifestPath.toFile(), manifest);
|
||||
final FileSystemPackerWorkspaceService service = service();
|
||||
|
||||
service.listAssets(new ListAssetsRequest(project(projectRoot), true));
|
||||
final var result = service.getPackWorkspaceSummary(new PackWorkspaceSummaryRequest(project(projectRoot)));
|
||||
|
||||
assertEquals(PackerOperationStatus.SUCCESS, result.status());
|
||||
assertEquals(1, result.packSummary().assets().size());
|
||||
assertEquals(1, result.packSummary().assets().getFirst().minArtifactCount());
|
||||
assertEquals(2, result.packSummary().assets().getFirst().maxArtifactCount());
|
||||
assertEquals(1, result.packSummary().assets().getFirst().artifactCount());
|
||||
assertEquals(OutputFormatCatalog.TILES_INDEXED_V1, result.packSummary().assets().getFirst().outputFormat());
|
||||
assertEquals("16x16", result.packSummary().assets().getFirst().outputMetadata().get("tile_size"));
|
||||
assertEquals(64L, ((Map<?, ?>) ((Map<?, ?>) result.packSummary().assets().getFirst().outputPipeline().get("samples")).get("1")).get("length"));
|
||||
assertEquals(0L, result.packSummary().assets().getFirst().lastModified());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user