studio session persistent

This commit is contained in:
2026-04-04 07:34:49 +01:00
parent a824b2185f
commit eb2520fa40
23 changed files with 815 additions and 994 deletions
@@ -6,6 +6,7 @@ import java.util.Objects;
public final class ProjectStudioPaths {
private static final String STUDIO_DIR = ".studio";
private static final String ACTIVITIES_FILE = "activities.json";
private static final String SETUP_FILE = "setup.json";
private static final String STATE_FILE = "state.json";
private ProjectStudioPaths() {
@@ -32,4 +33,11 @@ public final class ProjectStudioPaths {
.toAbsolutePath()
.normalize();
}
public static Path setupPath(ProjectReference projectReference) {
return studioRoot(projectReference)
.resolve(SETUP_FILE)
.toAbsolutePath()
.normalize();
}
}
@@ -0,0 +1,22 @@
package p.studio.projectstate;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public record ProjectLocalStudioSetup(String prometeuRuntimePath) {
public ProjectLocalStudioSetup {
prometeuRuntimePath = normalizeText(prometeuRuntimePath);
}
public static ProjectLocalStudioSetup defaults() {
return new ProjectLocalStudioSetup(null);
}
private static String normalizeText(final String value) {
if (value == null) {
return null;
}
final String trimmed = value.trim();
return trimmed.isEmpty() ? null : trimmed;
}
}
@@ -0,0 +1,27 @@
package p.studio.projectstate;
import com.fasterxml.jackson.databind.ObjectMapper;
import p.studio.projects.ProjectReference;
import p.studio.projects.ProjectStudioPaths;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
public final class ProjectLocalStudioSetupService {
private static final ObjectMapper MAPPER = new ObjectMapper();
public ProjectLocalStudioSetup load(final ProjectReference projectReference) {
final Path setupPath = ProjectStudioPaths.setupPath(projectReference);
if (!Files.isRegularFile(setupPath)) {
return ProjectLocalStudioSetup.defaults();
}
try {
final ProjectLocalStudioSetup loaded = MAPPER.readValue(setupPath.toFile(), ProjectLocalStudioSetup.class);
return loaded == null ? ProjectLocalStudioSetup.defaults() : loaded;
} catch (IOException | RuntimeException ignored) {
return ProjectLocalStudioSetup.defaults();
}
}
}
@@ -9,7 +9,6 @@ import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public record ProjectLocalStudioState(
int version,
ProjectLocalSetup projectLocalSetup,
ShellLayout shellLayout,
OpenShellState openShellState,
EditorRestorationState editorRestoration) {
@@ -17,7 +16,6 @@ public record ProjectLocalStudioState(
public ProjectLocalStudioState {
version = version <= 0 ? CURRENT_VERSION : version;
projectLocalSetup = projectLocalSetup == null ? ProjectLocalSetup.defaults() : projectLocalSetup.normalize();
shellLayout = shellLayout == null ? ShellLayout.defaults() : shellLayout.normalize();
openShellState = openShellState == null ? OpenShellState.defaults() : openShellState.normalize();
editorRestoration = editorRestoration == null ? EditorRestorationState.defaults() : editorRestoration.normalize();
@@ -26,41 +24,21 @@ public record ProjectLocalStudioState(
public static ProjectLocalStudioState defaults() {
return new ProjectLocalStudioState(
CURRENT_VERSION,
ProjectLocalSetup.defaults(),
ShellLayout.defaults(),
OpenShellState.defaults(),
EditorRestorationState.defaults());
}
public ProjectLocalStudioState withShellLayout(final ShellLayout nextShellLayout) {
return new ProjectLocalStudioState(version, projectLocalSetup, nextShellLayout, openShellState, editorRestoration);
return new ProjectLocalStudioState(version, nextShellLayout, openShellState, editorRestoration);
}
public ProjectLocalStudioState withOpenShellState(final OpenShellState nextOpenShellState) {
return new ProjectLocalStudioState(version, projectLocalSetup, shellLayout, nextOpenShellState, editorRestoration);
return new ProjectLocalStudioState(version, shellLayout, nextOpenShellState, editorRestoration);
}
public ProjectLocalStudioState withEditorRestoration(final EditorRestorationState nextEditorRestoration) {
return new ProjectLocalStudioState(version, projectLocalSetup, shellLayout, openShellState, nextEditorRestoration);
}
public ProjectLocalStudioState withProjectLocalSetup(final ProjectLocalSetup nextProjectLocalSetup) {
return new ProjectLocalStudioState(version, nextProjectLocalSetup, shellLayout, openShellState, editorRestoration);
}
@JsonIgnoreProperties(ignoreUnknown = true)
public record ProjectLocalSetup(String prometeuRuntimePath) {
public ProjectLocalSetup {
prometeuRuntimePath = normalizeText(prometeuRuntimePath);
}
public static ProjectLocalSetup defaults() {
return new ProjectLocalSetup(null);
}
private ProjectLocalSetup normalize() {
return new ProjectLocalSetup(prometeuRuntimePath);
}
return new ProjectLocalStudioState(version, shellLayout, openShellState, nextEditorRestoration);
}
@JsonIgnoreProperties(ignoreUnknown = true)
@@ -98,6 +98,11 @@ public final class MainView extends BorderPane {
editorWorkspace.reapplyPendingLayoutState();
}
public void close() {
persistProjectLocalState();
host.deactivateCurrentWorkspace();
}
private void loadWorkspace(WorkspaceId workspaceId) {
host.change(workspaceId);
if (workspaceLifecycleInitialized) {
@@ -154,6 +154,7 @@ public final class StudioWindowCoordinator {
projectStage.setScene(scene);
windowStateService.installProjectShellState(projectStage, projectReference, PROJECT_WIDTH, PROJECT_HEIGHT);
projectStage.setOnHidden(ignored -> {
mainView.close();
projectSession.close();
launcherView.reloadProjects();
launcherStage.show();
@@ -24,13 +24,7 @@ public final class WorkspaceHost extends StackPane {
public void change(final WorkspaceId id) {
if (currentWorkspaceId == id) return;
if (currentWorkspaceId != null) {
final var oldWorkspace = workspaces.get(currentWorkspaceId);
StudioWorkspaceLifecycleSupport.deactivate(oldWorkspace);
final var n = oldWorkspace.rootNode();
n.setVisible(false);
n.setManaged(false);
}
deactivateCurrentWorkspace();
final var nextWorkspace = workspaces.get(id);
if (nextWorkspace == null) {
@@ -44,4 +38,19 @@ public final class WorkspaceHost extends StackPane {
currentWorkspaceId = id;
StudioWorkspaceLifecycleSupport.activate(nextWorkspace);
}
public void deactivateCurrentWorkspace() {
if (currentWorkspaceId == null) {
return;
}
final var oldWorkspace = workspaces.get(currentWorkspaceId);
if (oldWorkspace != null) {
StudioWorkspaceLifecycleSupport.deactivate(oldWorkspace);
final var n = oldWorkspace.rootNode();
n.setVisible(false);
n.setManaged(false);
}
currentWorkspaceId = null;
}
}
@@ -57,7 +57,6 @@ final class StudioProjectSessionFactoryTest {
private ProjectReference loadedProjectReference;
private final ProjectLocalStudioState loadedState = new ProjectLocalStudioState(
ProjectLocalStudioState.CURRENT_VERSION,
new ProjectLocalStudioState.ProjectLocalSetup("/opt/prometeu"),
ProjectLocalStudioState.ShellLayout.defaults(),
new ProjectLocalStudioState.OpenShellState("EDITOR"),
ProjectLocalStudioState.EditorRestorationState.defaults());
@@ -20,6 +20,7 @@ import p.studio.vfs.messages.VfsRefreshRequest;
import java.nio.file.Path;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
final class StudioProjectSessionTest {
@Test
@@ -55,12 +56,12 @@ final class StudioProjectSessionTest {
stateService,
ProjectLocalStudioState.defaults());
final ProjectLocalStudioState nextState = ProjectLocalStudioState.defaults()
.withProjectLocalSetup(new ProjectLocalStudioState.ProjectLocalSetup("/opt/prometeu/runtime"));
.withOpenShellState(new ProjectLocalStudioState.OpenShellState("EDITOR"));
session.replaceProjectLocalStudioState(nextState);
session.close();
assertEquals("/opt/prometeu/runtime", stateService.savedState.projectLocalSetup().prometeuRuntimePath());
assertSame(nextState, stateService.savedState);
}
private ProjectReference projectReference() {
@@ -0,0 +1,54 @@
package p.studio.projectstate;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.studio.projects.ProjectReference;
import p.studio.projects.ProjectStudioPaths;
import java.nio.file.Files;
import java.nio.file.Path;
import static org.junit.jupiter.api.Assertions.assertEquals;
final class ProjectLocalStudioSetupServiceTest {
@TempDir
Path tempDir;
@Test
void loadsDedicatedProjectSetupFile() throws Exception {
final ProjectLocalStudioSetupService service = new ProjectLocalStudioSetupService();
final ProjectReference project = project("main");
Files.createDirectories(ProjectStudioPaths.studioRoot(project));
Files.writeString(
ProjectStudioPaths.setupPath(project),
"""
{
"prometeuRuntimePath": "/opt/prometeu/runtime"
}
""");
assertEquals(new ProjectLocalStudioSetup("/opt/prometeu/runtime"), service.load(project));
}
@Test
void missingDedicatedProjectSetupFileFallsBackToDefaults() {
final ProjectLocalStudioSetupService service = new ProjectLocalStudioSetupService();
assertEquals(ProjectLocalStudioSetup.defaults(), service.load(project("main")));
}
@Test
void malformedDedicatedProjectSetupFileFallsBackToDefaults() throws Exception {
final ProjectLocalStudioSetupService service = new ProjectLocalStudioSetupService();
final ProjectReference project = project("main");
Files.createDirectories(ProjectStudioPaths.studioRoot(project));
Files.writeString(ProjectStudioPaths.setupPath(project), "{ not valid json");
assertEquals(ProjectLocalStudioSetup.defaults(), service.load(project));
}
private ProjectReference project(final String name) {
final Path projectRoot = tempDir.resolve(name);
return new ProjectReference("Main", "1.0.0", "pbs", 1, projectRoot);
}
}
@@ -22,7 +22,6 @@ final class ProjectLocalStudioStateServiceTest {
final ProjectReference project = project("main");
final ProjectLocalStudioState state = new ProjectLocalStudioState(
ProjectLocalStudioState.CURRENT_VERSION,
new ProjectLocalStudioState.ProjectLocalSetup("/opt/prometeu/runtime"),
new ProjectLocalStudioState.ShellLayout(
new ProjectLocalStudioState.EditorLayoutState(
List.of(0.25d),
@@ -66,10 +65,7 @@ final class ProjectLocalStudioStateServiceTest {
ProjectStudioPaths.statePath(project),
"""
{
"version": 99,
"projectLocalSetup": {
"prometeuRuntimePath": "/opt/legacy/runtime"
}
"version": 99
}
""");