From 2e2af7be7e875bba16efe2c6ca39bc2fcf44a402 Mon Sep 17 00:00:00 2001 From: bQUARKz Date: Sat, 21 Nov 2026 15:38:49 +0000 Subject: [PATCH] fix(studio): keep project directory checks behind core services --- .../p/studio/api/project/ProjectCatalog.java | 4 +++ .../core/project/ProjectCatalogService.java | 6 +++++ .../project/ProjectCatalogServiceTest.java | 27 +++++++++++++++++++ .../window/StudioWindowCoordinator2.java | 3 +-- .../ui/javafx2/window/ProjectOpeningTest.java | 1 + 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCatalog.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCatalog.java index a8433aa1..1eabaa3b 100644 --- a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCatalog.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCatalog.java @@ -2,10 +2,14 @@ package p.studio.api.project; import java.nio.file.Path; import java.util.List; +import java.util.Optional; public interface ProjectCatalog { Path projectsRoot(); + /** Returns the configured projects root only if it currently exists as a directory, without creating it. */ + Optional existingProjectsRoot(); + List listProjects(); ProjectReference openProject(Path projectPath); diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectCatalogService.java b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectCatalogService.java index 2660c7dd..fddeecfb 100644 --- a/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectCatalogService.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectCatalogService.java @@ -16,6 +16,7 @@ import java.util.Comparator; import java.util.List; import java.util.Locale; import java.util.Objects; +import java.util.Optional; import java.util.stream.Stream; public final class ProjectCatalogService implements ProjectCatalog { @@ -43,6 +44,11 @@ public final class ProjectCatalogService implements ProjectCatalog { return projectsRoot; } + @Override + public Optional existingProjectsRoot() { + return Files.isDirectory(projectsRoot) ? Optional.of(projectsRoot) : Optional.empty(); + } + @Override public List listProjects() { if (!Files.isDirectory(projectsRoot)) { diff --git a/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectCatalogServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectCatalogServiceTest.java index 9600a491..deb144fe 100644 --- a/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectCatalogServiceTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectCatalogServiceTest.java @@ -11,12 +11,39 @@ import java.nio.file.Files; import java.nio.file.Path; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; class ProjectCatalogServiceTest { @TempDir Path tempDir; + @Test + void exposesExistingProjectsDirectoryWithoutChangingConfiguredRoot() { + final ProjectCatalogService service = service(tempDir.resolve("child/..")); + + assertEquals(tempDir.toAbsolutePath().normalize(), service.existingProjectsRoot().orElseThrow()); + assertEquals(service.projectsRoot(), service.existingProjectsRoot().orElseThrow()); + } + + @Test + void doesNotCreateMissingProjectsRootForDirectorySelection() { + final Path missing = tempDir.resolve("missing"); + final ProjectCatalogService service = service(missing); + + assertTrue(service.existingProjectsRoot().isEmpty()); + assertEquals(missing.toAbsolutePath().normalize(), service.projectsRoot()); + assertFalse(Files.exists(missing)); + } + + @Test + void doesNotOfferRegularFileAsProjectsDirectory() throws Exception { + final Path file = Files.writeString(tempDir.resolve("projects"), "not a directory"); + + assertTrue(service(file).existingProjectsRoot().isEmpty()); + assertEquals("not a directory", Files.readString(file)); + } + @Test void createsAndReopensAProjectWithLocalSetup() throws Exception { final ProjectCatalogService service = service(tempDir); diff --git a/prometeu-studio-ui-javafx-2/src/main/java/p/studio/ui/javafx2/window/StudioWindowCoordinator2.java b/prometeu-studio-ui-javafx-2/src/main/java/p/studio/ui/javafx2/window/StudioWindowCoordinator2.java index 034bde47..13713d84 100644 --- a/prometeu-studio-ui-javafx-2/src/main/java/p/studio/ui/javafx2/window/StudioWindowCoordinator2.java +++ b/prometeu-studio-ui-javafx-2/src/main/java/p/studio/ui/javafx2/window/StudioWindowCoordinator2.java @@ -18,7 +18,6 @@ import p.studio.ui.javafx2.components.*; import p.studio.ui.javafx2.play.PlaybackViewport; import p.studio.ui.javafx2.shell.MinimalShell; import java.nio.file.Path; -import java.nio.file.Files; import java.util.*; import java.util.concurrent.*; import java.util.function.*; @@ -141,7 +140,7 @@ public final class StudioWindowCoordinator2 implements AutoCloseable { } private void reloadProjects(Path selection){ chooser.busy(true); - background(()->{var root=catalog.projectsRoot();return new ProjectList(known.listKnownProjects(),Files.isDirectory(root)?root:null);},(result,failure)->{ + background(()->new ProjectList(known.listKnownProjects(),catalog.existingProjectsRoot().orElse(null)),(result,failure)->{ if(project!=null)return; chooser.busy(busy||opening.busy());if(failure!=null){error(failure);return;} initialDirectory=result.root();chooser.projects(result.projects(),selection); diff --git a/prometeu-studio-ui-javafx-2/src/test/java/p/studio/ui/javafx2/window/ProjectOpeningTest.java b/prometeu-studio-ui-javafx-2/src/test/java/p/studio/ui/javafx2/window/ProjectOpeningTest.java index 4fc995e6..270bc4f1 100644 --- a/prometeu-studio-ui-javafx-2/src/test/java/p/studio/ui/javafx2/window/ProjectOpeningTest.java +++ b/prometeu-studio-ui-javafx-2/src/test/java/p/studio/ui/javafx2/window/ProjectOpeningTest.java @@ -39,6 +39,7 @@ class ProjectOpeningTest { Fixture(){ ProjectCatalog catalog=new ProjectCatalog(){ public Path projectsRoot(){return ROOT;} + public Optional existingProjectsRoot(){return Optional.of(ROOT);} public List listProjects(){return List.of(REF);} public ProjectReference openProject(Path path){fail("catalog");return REF;} public ProjectReference openProjectManifest(Path path){return openProject(path);}