Skip to content

Commit c2e8c36

Browse files
committed
Refactored SceneEditorRepository into Datasource
1 parent d209513 commit c2e8c36

16 files changed

+1090
-1119
lines changed

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/data/id/datasources/SceneIdDatasource.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.darkrockstudios.apps.hammer.common.data.id.datasources
22

33
import com.darkrockstudios.apps.hammer.common.data.ProjectDef
44
import com.darkrockstudios.apps.hammer.common.data.sceneeditorrepository.SceneDatasource
5-
import com.darkrockstudios.apps.hammer.common.data.sceneeditorrepository.SceneEditorRepository
65
import com.darkrockstudios.apps.hammer.common.data.sceneeditorrepository.filterScenePathsOkio
76
import com.darkrockstudios.apps.hammer.common.fileio.okio.toOkioPath
87
import okio.FileSystem
@@ -15,7 +14,7 @@ class SceneIdDatasource(
1514

1615
val maxId: Int = fileSystem.listRecursively(sceneDir)
1716
.filterScenePathsOkio().maxOfOrNull { path ->
18-
SceneEditorRepository.getSceneIdFromFilename(path.name)
17+
SceneDatasource.getSceneIdFromFilename(path.name)
1918
} ?: -1
2019

2120
return maxId

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/data/projectsync/synchronizers/ClientSceneSynchronizer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class ClientSceneSynchronizer(
133133
order = serverEntity.order
134134
)
135135

136-
val scenePath = sceneEditorRepository.getPathFromFilesystem(sceneItem)
136+
val scenePath = sceneEditorRepository.resolveScenePathFromFilesystem(sceneItem.id)
137137
?: throw IllegalStateException("Scene $id has no path")
138138

139139
val content = SceneContent(sceneItem, serverEntity.content)

0 commit comments

Comments
 (0)