asset walker (WIP)
This commit is contained in:
+15
-8
@@ -7,6 +7,10 @@ import p.packer.events.PackerEvent;
|
||||
import p.packer.events.PackerEventKind;
|
||||
import p.packer.messages.*;
|
||||
import p.packer.messages.assets.*;
|
||||
import p.packer.repositories.PackerAssetWalker;
|
||||
import p.packer.repositories.PackerRuntimeLoader;
|
||||
import p.packer.repositories.PackerRuntimeRegistry;
|
||||
import p.packer.repositories.PackerRuntimeSnapshotLoader;
|
||||
import p.packer.testing.PackerFixtureLocator;
|
||||
|
||||
import java.nio.file.Files;
|
||||
@@ -193,7 +197,7 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
"NONE:packMode", "tight",
|
||||
"NONE:palette", "mono"),
|
||||
Map.of(
|
||||
"tile_size", "16",
|
||||
"tile_size", "16x16",
|
||||
"channels", "1")));
|
||||
|
||||
assertTrue(result.success());
|
||||
@@ -205,7 +209,7 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
assertEquals("NONE", manifest.path("output").path("codec").asText());
|
||||
assertEquals("tight", manifest.path("output").path("codec_configuration").path("packMode").asText());
|
||||
assertEquals("mono", manifest.path("output").path("codec_configuration").path("palette").asText());
|
||||
assertEquals("16", manifest.path("output").path("metadata").path("tile_size").asText());
|
||||
assertEquals("16x16", manifest.path("output").path("metadata").path("tile_size").asText());
|
||||
assertEquals("1", manifest.path("output").path("metadata").path("channels").asText());
|
||||
}
|
||||
|
||||
@@ -672,9 +676,10 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
private FileSystemPackerWorkspaceService service(
|
||||
p.packer.events.PackerEventSink eventSink,
|
||||
PackerRuntimeSnapshotLoader loader) {
|
||||
final var foundation = new p.packer.services.PackerWorkspaceFoundation();
|
||||
final var parser = new p.packer.services.PackerAssetDeclarationParser(new ObjectMapper());
|
||||
final var runtimeRegistry = new p.packer.services.PackerRuntimeRegistry(loader);
|
||||
final var mapper = new ObjectMapper();
|
||||
final var foundation = new p.packer.services.PackerWorkspaceFoundation(mapper);
|
||||
final var parser = new p.packer.services.PackerAssetDeclarationParser(mapper);
|
||||
final var runtimeRegistry = new PackerRuntimeRegistry(loader);
|
||||
final var resolver = new p.packer.services.PackerAssetReferenceResolver(foundation.lookup());
|
||||
final var detailsService = new p.packer.services.PackerAssetDetailsService(runtimeRegistry, resolver);
|
||||
final var actionReadService = new p.packer.services.PackerAssetActionReadService(runtimeRegistry, resolver, foundation.lookup());
|
||||
@@ -692,9 +697,11 @@ final class FileSystemPackerWorkspaceServiceTest {
|
||||
}
|
||||
|
||||
private CountingLoader countingLoader() {
|
||||
final var foundation = new p.packer.services.PackerWorkspaceFoundation();
|
||||
final var parser = new p.packer.services.PackerAssetDeclarationParser(new ObjectMapper());
|
||||
return new CountingLoader(new p.packer.services.PackerRuntimeLoader(foundation, parser));
|
||||
final var mapper = new ObjectMapper();
|
||||
final var foundation = new p.packer.services.PackerWorkspaceFoundation(mapper);
|
||||
final var parser = new p.packer.services.PackerAssetDeclarationParser(mapper);
|
||||
final var assetWalker = new PackerAssetWalker(mapper);
|
||||
return new CountingLoader(new PackerRuntimeLoader(foundation, parser, assetWalker));
|
||||
}
|
||||
|
||||
private static final class CountingLoader implements PackerRuntimeSnapshotLoader {
|
||||
|
||||
+10
-5
@@ -11,6 +11,9 @@ import p.packer.messages.PackerProjectContext;
|
||||
import p.packer.messages.assets.OutputCodecCatalog;
|
||||
import p.packer.messages.assets.PackerAssetState;
|
||||
import p.packer.messages.assets.PackerBuildParticipation;
|
||||
import p.packer.repositories.PackerAssetWalker;
|
||||
import p.packer.repositories.PackerRuntimeLoader;
|
||||
import p.packer.repositories.PackerRuntimeRegistry;
|
||||
import p.packer.testing.PackerFixtureLocator;
|
||||
|
||||
import java.nio.file.Files;
|
||||
@@ -68,7 +71,7 @@ final class PackerAssetDetailsServiceTest {
|
||||
final var manifest = mapper.readTree(manifestPath.toFile());
|
||||
final ObjectNode output = (ObjectNode) manifest.path("output");
|
||||
final ObjectNode metadata = output.putObject("metadata");
|
||||
metadata.put("tile_size", "16");
|
||||
metadata.put("tile_size", "16x16");
|
||||
metadata.put("channels", "1");
|
||||
mapper.writerWithDefaultPrettyPrinter().writeValue(manifestPath.toFile(), manifest);
|
||||
|
||||
@@ -77,7 +80,7 @@ final class PackerAssetDetailsServiceTest {
|
||||
|
||||
assertEquals(PackerOperationStatus.SUCCESS, result.status());
|
||||
assertEquals(
|
||||
Map.of("tile_size", "16", "channels", "1"),
|
||||
Map.of("tile_size", "16x16", "channels", "1"),
|
||||
result.details().metadataFields().stream().collect(java.util.stream.Collectors.toMap(
|
||||
field -> field.key(),
|
||||
field -> field.value())));
|
||||
@@ -130,9 +133,11 @@ final class PackerAssetDetailsServiceTest {
|
||||
}
|
||||
|
||||
private PackerAssetDetailsService service() {
|
||||
final var foundation = new p.packer.services.PackerWorkspaceFoundation();
|
||||
final var parser = new PackerAssetDeclarationParser(new ObjectMapper());
|
||||
final var runtimeRegistry = new PackerRuntimeRegistry(new PackerRuntimeLoader(foundation, parser));
|
||||
final var mapper = new ObjectMapper();
|
||||
final var foundation = new PackerWorkspaceFoundation(mapper);
|
||||
final var parser = new PackerAssetDeclarationParser(mapper);
|
||||
final var assetWalker = new PackerAssetWalker(mapper);
|
||||
final var runtimeRegistry = new PackerRuntimeRegistry(new PackerRuntimeLoader(foundation, parser, assetWalker));
|
||||
final var resolver = new PackerAssetReferenceResolver(foundation.lookup());
|
||||
return new PackerAssetDetailsService(runtimeRegistry, resolver);
|
||||
}
|
||||
|
||||
+8
-3
@@ -4,6 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import p.packer.messages.PackerProjectContext;
|
||||
import p.packer.repositories.PackerAssetWalker;
|
||||
import p.packer.repositories.PackerRuntimeLoader;
|
||||
import p.packer.repositories.PackerRuntimeRegistry;
|
||||
import p.packer.testing.PackerFixtureLocator;
|
||||
|
||||
import java.nio.file.Files;
|
||||
@@ -78,9 +81,11 @@ final class PackerRuntimeRegistryTest {
|
||||
}
|
||||
|
||||
private PackerRuntimeRegistry runtimeRegistry() {
|
||||
final var foundation = new PackerWorkspaceFoundation();
|
||||
final var parser = new PackerAssetDeclarationParser(new ObjectMapper());
|
||||
return new PackerRuntimeRegistry(new PackerRuntimeLoader(foundation, parser));
|
||||
final var mapper = new ObjectMapper();
|
||||
final var foundation = new PackerWorkspaceFoundation(mapper);
|
||||
final var parser = new PackerAssetDeclarationParser(mapper);
|
||||
final var assetWalker = new PackerAssetWalker(mapper);
|
||||
return new PackerRuntimeRegistry(new PackerRuntimeLoader(foundation, parser, assetWalker));
|
||||
}
|
||||
|
||||
private PackerProjectContext project(Path root) {
|
||||
|
||||
+18
-8
@@ -1,11 +1,13 @@
|
||||
package p.packer.services;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import p.packer.messages.InitWorkspaceRequest;
|
||||
import p.packer.messages.PackerProjectContext;
|
||||
import p.packer.models.PackerRegistryEntry;
|
||||
import p.packer.models.PackerRegistryState;
|
||||
import p.packer.repositories.FileSystemPackerRegistryRepository;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
@@ -18,7 +20,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
|
||||
@Test
|
||||
void initWorkspaceCreatesAssetsControlStructureAndRegistry() throws Exception {
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation();
|
||||
final var mapper = new ObjectMapper();
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation(mapper);
|
||||
final PackerProjectContext project = project(tempDir.resolve("main"));
|
||||
|
||||
final var result = foundation.initWorkspace(new InitWorkspaceRequest(project));
|
||||
@@ -35,7 +38,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
@Test
|
||||
void registryRoundTripPreservesAllocatorAndEntries() throws Exception {
|
||||
final Path projectRoot = tempDir.resolve("main");
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation();
|
||||
final var mapper = new ObjectMapper();
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation(mapper);
|
||||
final PackerProjectContext project = project(projectRoot);
|
||||
foundation.initWorkspace(new InitWorkspaceRequest(project));
|
||||
|
||||
@@ -58,7 +62,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
@Test
|
||||
void allocatorIsMonotonicAndPersistedAcrossSaveLoad() throws Exception {
|
||||
final Path projectRoot = tempDir.resolve("main");
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation();
|
||||
final var mapper = new ObjectMapper();
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation(mapper);
|
||||
final PackerProjectContext project = project(projectRoot);
|
||||
foundation.initWorkspace(new InitWorkspaceRequest(project));
|
||||
Files.createDirectories(projectRoot.resolve("assets/ui/atlas"));
|
||||
@@ -89,7 +94,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
]
|
||||
}
|
||||
""");
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository();
|
||||
final var mapper = new ObjectMapper();
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository(mapper);
|
||||
|
||||
final p.packer.exceptions.PackerRegistryException exception = assertThrows(p.packer.exceptions.PackerRegistryException.class, () -> repository.load(project(projectRoot)));
|
||||
|
||||
@@ -101,7 +107,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
final Path projectRoot = tempDir.resolve("main");
|
||||
Files.createDirectories(projectRoot.resolve("assets/.prometeu"));
|
||||
Files.writeString(projectRoot.resolve("assets/.prometeu/index.json"), "{ nope ");
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository();
|
||||
final var mapper = new ObjectMapper();
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository(mapper);
|
||||
|
||||
final p.packer.exceptions.PackerRegistryException exception = assertThrows(p.packer.exceptions.PackerRegistryException.class, () -> repository.load(project(projectRoot)));
|
||||
|
||||
@@ -119,7 +126,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
"assets": []
|
||||
}
|
||||
""");
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository();
|
||||
final var mapper = new ObjectMapper();
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository(mapper);
|
||||
|
||||
final p.packer.exceptions.PackerRegistryException exception = assertThrows(p.packer.exceptions.PackerRegistryException.class, () -> repository.load(project(projectRoot)));
|
||||
|
||||
@@ -139,7 +147,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
]
|
||||
}
|
||||
""");
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository();
|
||||
final var mapper = new ObjectMapper();
|
||||
final FileSystemPackerRegistryRepository repository = new FileSystemPackerRegistryRepository(mapper);
|
||||
|
||||
final p.packer.exceptions.PackerRegistryException exception = assertThrows(p.packer.exceptions.PackerRegistryException.class, () -> repository.load(project(projectRoot)));
|
||||
|
||||
@@ -149,7 +158,8 @@ final class PackerWorkspaceFoundationTest {
|
||||
@Test
|
||||
void lookupResolvesByIdUuidAndRootAndFailsOnMissingRoot() throws Exception {
|
||||
final Path projectRoot = tempDir.resolve("main");
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation();
|
||||
final var mapper = new ObjectMapper();
|
||||
final PackerWorkspaceFoundation foundation = new PackerWorkspaceFoundation(mapper);
|
||||
final PackerProjectContext project = project(projectRoot);
|
||||
foundation.initWorkspace(new InitWorkspaceRequest(project));
|
||||
Files.createDirectories(projectRoot.resolve("assets/ui/atlas"));
|
||||
|
||||
Reference in New Issue
Block a user