Refactored SceneEditorRepository into Datasource

Wavesonics · Oct 25, 2024 · c2e8c36 · c2e8c36
1 parent d209513
commit c2e8c36
Show file tree

Hide file tree

Showing 16 changed files with 1,090 additions and 1,119 deletions.
diff --git a/...in/kotlin/com/darkrockstudios/apps/hammer/common/data/id/datasources/SceneIdDatasource.kt b/...in/kotlin/com/darkrockstudios/apps/hammer/common/data/id/datasources/SceneIdDatasource.kt
@@ -2,7 +2,6 @@ package com.darkrockstudios.apps.hammer.common.data.id.datasources
 
 import com.darkrockstudios.apps.hammer.common.data.ProjectDef
 import com.darkrockstudios.apps.hammer.common.data.sceneeditorrepository.SceneDatasource
-import com.darkrockstudios.apps.hammer.common.data.sceneeditorrepository.SceneEditorRepository
 import com.darkrockstudios.apps.hammer.common.data.sceneeditorrepository.filterScenePathsOkio
 import com.darkrockstudios.apps.hammer.common.fileio.okio.toOkioPath
 import okio.FileSystem
@@ -15,7 +14,7 @@ class SceneIdDatasource(
 
 		val maxId: Int = fileSystem.listRecursively(sceneDir)
 			.filterScenePathsOkio().maxOfOrNull { path ->
-				SceneEditorRepository.getSceneIdFromFilename(path.name)
+				SceneDatasource.getSceneIdFromFilename(path.name)
 			} ?: -1
 
 		return maxId

diff --git a/...krockstudios/apps/hammer/common/data/projectsync/synchronizers/ClientSceneSynchronizer.kt b/...krockstudios/apps/hammer/common/data/projectsync/synchronizers/ClientSceneSynchronizer.kt
@@ -133,7 +133,7 @@ class ClientSceneSynchronizer(
 				order = serverEntity.order
 			)
 
-			val scenePath = sceneEditorRepository.getPathFromFilesystem(sceneItem)
+			val scenePath = sceneEditorRepository.resolveScenePathFromFilesystem(sceneItem.id)
 				?: throw IllegalStateException("Scene $id has no path")
 
 			val content = SceneContent(sceneItem, serverEntity.content)