curiosite/LwaApplication
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the character sheet save system to use separate files for sheets

Browse source
This commit is contained in:
Thomas Andres Gomez 2024-11-28 22:14:06 +01:00
parent de13bf2c74
commit 4606122264
7 changed files with 95 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

42
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/repository/StorePath.kt
View file

@ -1,27 +1,37 @@
package com.pixelized.desktop.lwa.repository
fun operatingSystem(
name: String = System.getProperty("os.name")
): OperatingSystem {
return when {
name.contains(other = "win", ignoreCase = true) -> OperatingSystem.Windows
name.contains(other = "mac", ignoreCase = true) -> OperatingSystem.Macintosh
enum class OperatingSystem(
val home: String = System.getProperty("user.home"),
) {
Windows,
Macintosh;
companion object {
val current: OperatingSystem = run {
val name = System.getProperty("os.name")
when {
name.contains(other = "win", ignoreCase = true) -> Windows
name.contains(other = "mac", ignoreCase = true) -> Macintosh
else -> error("Unsupported operating system: $name")
}
}
enum class OperatingSystem(
val home: String,
) {
Windows(home = System.getProperty("user.home")),
Macintosh(home = System.getProperty("user.home")),
}
}
fun storePath(
operatingSystem: OperatingSystem = operatingSystem()
os: OperatingSystem = OperatingSystem.current,
): String {
return when (operatingSystem) {
OperatingSystem.Windows -> "${operatingSystem.home}\\AppData\\Roaming\\Pixelized\\"
OperatingSystem.Macintosh -> "${operatingSystem.home}/Library/Pixelized/"
return when (os) {
OperatingSystem.Windows -> "${os.home}\\AppData\\Roaming\\Pixelized\\"
OperatingSystem.Macintosh -> "${os.home}/Library/Pixelized/"
}
}
fun characterStorePath(
os: OperatingSystem = OperatingSystem.current,
): String {
return when (os) {
OperatingSystem.Windows -> "${storePath(os = os)}characters\\"
OperatingSystem.Macintosh -> "${storePath(os = os)}characters/"
}
}

16
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/repository/characterSheet/CharacterSheetRepository.kt
View file

@ -52,23 +52,11 @@ class CharacterSheetRepository(
}
fun save(characterSheet: CharacterSheet) {
val savedSheets = store.load().toMutableList()
val savedIndex = savedSheets.indexOfFirst { it.id == characterSheet.id }
if (savedIndex >= 0) {
// this sheet is already saved. update it
savedSheets[savedIndex] = characterSheet
} else {
// add the character sheet to the list.
savedSheets.add(characterSheet)
}
// save the list of characters sheet.
store.save(sheets = savedSheets)
store.save(sheet = characterSheet)
}
fun delete(id: String) {
val savedSheets = store.load().toMutableList()
savedSheets.removeIf { it.id == id }
store.save(sheets = savedSheets)
store.delete(id = id)
}
fun setDiminishedForCharacter(id: String, diminished: Int) {

67
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/repository/characterSheet/CharacterSheetStore.kt
View file

@ -2,7 +2,7 @@ package com.pixelized.desktop.lwa.repository.characterSheet
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheet
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheetJson
import com.pixelized.desktop.lwa.repository.storePath
import com.pixelized.desktop.lwa.repository.characterStorePath
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.serialization.encodeToString
@ -12,8 +12,7 @@ import java.io.File
class CharacterSheetStore(
private val factory: CharacterSheetJsonFactory,
) {
private val root = File(storePath()).also { it.mkdirs() }
private val files = File(root, NAME).also { it.createNewFile() }
private val characterDirectory = File(characterStorePath()).also { it.mkdirs() }
private val flow = MutableStateFlow(value = load())
fun characterSheetFlow(): StateFlow<List<CharacterSheet>> = flow
@ -23,23 +22,49 @@ class CharacterSheetStore(
FileWriteException::class,
JsonConversionException::class,
)
fun save(sheets: List<CharacterSheet>) {
fun save(sheet: CharacterSheet) {
// convert the character sheet into json format.
val json = try {
sheets
.map(factory::convertToJson)
.let(Json::encodeToString)
factory.convertToJson(sheet = sheet).let(Json::encodeToString)
} catch (exception: Exception) {
throw JsonConversionException(root = exception)
}
// write the character file.
try {
files.writeText(
val file = characterSheetFile(id = sheet.id)
file.writeText(
text = json,
charset = Charsets.UTF_8,
)
} catch (exception: Exception) {
throw FileWriteException(root = exception)
}
flow.value = sheets
// Update the dataflow.
flow.value = flow.value
.toMutableList()
.also { data ->
val index = data.indexOfFirst { it.id == sheet.id }
if (index >= 0) {
data[index] = sheet
} else {
data.add(sheet)
}
}
.sortedBy {
it.name
}
}
fun delete(id: String): Boolean {
val file = characterSheetFile(id = id)
flow.value = flow.value.toMutableList()
.also { data ->
data.removeIf { it.id == id }
}
.sortedBy {
it.name
}
return file.delete()
}
@Throws(
@ -48,25 +73,33 @@ class CharacterSheetStore(
JsonConversionException::class,
)
fun load(): List<CharacterSheet> {
return characterDirectory
.listFiles()
?.mapNotNull { file ->
val json = try {
files.readText(charset = Charsets.UTF_8)
file.readText(charset = Charsets.UTF_8)
} catch (exception: Exception) {
throw FileReadException(root = exception)
}
return if (json.isBlank()) {
emptyList()
} else {
// Guard, if the json is blank no character have been save, ignore this file.
if (json.isBlank()) {
return@mapNotNull null
}
try {
val sheets = Json.decodeFromString<List<CharacterSheetJson>>(json)
sheets.map { factory.convertFromJson(it) }
val sheet = Json.decodeFromString<CharacterSheetJson>(json)
factory.convertFromJson(sheet)
} catch (exception: Exception) {
throw JsonConversionException(root = exception)
}
}
?.sortedBy {
it.name
}
?: emptyList()
}
companion object {
private const val NAME = "characters_sheet.json"
private fun characterSheetFile(id: String): File {
return File("${characterStorePath()}${id}.json")
}
sealed class CharacterSheetStoreException(root: Exception) : Exception(root)

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/CharacterSheetEditPage.kt
View file

@ -69,8 +69,8 @@ data class CharacterSheetEditPageUio(
val charisma: SimpleFieldUio,
val movement: SimpleFieldUio,
val maxHp: SimpleFieldUio,
val currentHp: SimpleFieldUio,
val maxPp: SimpleFieldUio,
val currentHp: SimpleFieldUio,
val currentPp: SimpleFieldUio,
val damageBonus: SimpleFieldUio,
val armor: SimpleFieldUio,

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/common/SkillFieldFactory.kt
View file

@ -34,7 +34,7 @@ class SkillFieldFactory {
return SkillFieldUio(
id = id,
label = createWrapper(
label = mutableStateOf(labelValue),
label = mutableStateOf(label),
value = labelValue,
),
base = createWrapper(

18
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/main/MainPageViewModel.kt
View file

@ -7,7 +7,6 @@ import androidx.lifecycle.ViewModel
import com.lordcodes.turtle.shellRun
import com.pixelized.desktop.lwa.repository.OperatingSystem
import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository
import com.pixelized.desktop.lwa.repository.operatingSystem
import com.pixelized.desktop.lwa.repository.storePath
import com.pixelized.desktop.lwa.utils.extention.collectAsState
@ -28,17 +27,12 @@ class MainPageViewModel(
}
}
fun openSaveDirectory() {
when (val os = operatingSystem()) {
OperatingSystem.Windows -> shellRun(
"explorer.exe",
listOf(storePath(operatingSystem = os))
)
OperatingSystem.Macintosh -> shellRun(
"open",
listOf(storePath(operatingSystem = os))
)
fun openSaveDirectory(
os: OperatingSystem = OperatingSystem.current
) {
when (os) {
OperatingSystem.Windows -> shellRun("explorer.exe", listOf(storePath(os = os)))
OperatingSystem.Macintosh -> shellRun("open", listOf(storePath(os = os)))
}
}
}

BIN
output.zip
View file

Binary file not shown.