nullptr/Wallenc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sync): обработал отсутствие journal и lock при синхронизации

Browse Source 
Добавил readSystemFileBytesOrEmpty и подключил в Local/Yandex accessors,
чтобы фоновый sync не падал с FileNotFound на пустых journal/lock.
This commit is contained in:
Роман Пытков
2026-05-21 11:05:04 +03:00
parent c58bcdc35b
commit da8b970078
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/common/SystemFileRead.kt Normal file
View File

@@ -0,0 +1,12 @@
package com.github.nullptroma.wallenc.domain.vault.storages.common
import com.github.nullptroma.wallenc.domain.errors.WallencException
import java.io.InputStream
/** Читает системный файл; отсутствие файла — пустой массив байт (не исключение). */
internal suspend fun readSystemFileBytesOrEmpty(open: suspend () -> InputStream): ByteArray =
try {
open().use { it.readBytes() }
} catch (_: WallencException.Storage.FileNotFound) {
ByteArray(0)
}

5
domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorageAccessor.kt
View File

@@ -1,6 +1,7 @@
package com.github.nullptroma.wallenc.domain.vault.storages.local package com.github.nullptroma.wallenc.domain.vault.storages.local
import com.github.nullptroma.wallenc.domain.errors.WallencException import com.github.nullptroma.wallenc.domain.errors.WallencException
import com.github.nullptroma.wallenc.domain.vault.storages.common.readSystemFileBytesOrEmpty
import com.fasterxml.jackson.core.JacksonException import com.fasterxml.jackson.core.JacksonException
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -572,7 +573,7 @@ class LocalStorageAccessor(
} }
override suspend fun readSyncJournal(): List<StorageSyncJournalEntry> = withContext(ioDispatcher) { override suspend fun readSyncJournal(): List<StorageSyncJournalEntry> = withContext(ioDispatcher) {
val bytes = openReadSystemFile(SYNC_JOURNAL_FILENAME).use { it.readBytes() } val bytes = readSystemFileBytesOrEmpty { openReadSystemFile(SYNC_JOURNAL_FILENAME) }
if (bytes.isEmpty()) { if (bytes.isEmpty()) {
return@withContext emptyList() return@withContext emptyList()
} }
@@ -602,7 +603,7 @@ class LocalStorageAccessor(
} }
override suspend fun readSyncLock(): StorageSyncLock? = withContext(ioDispatcher) { override suspend fun readSyncLock(): StorageSyncLock? = withContext(ioDispatcher) {
val bytes = openReadSystemFile(SYNC_LOCK_FILENAME).use { it.readBytes() } val bytes = readSystemFileBytesOrEmpty { openReadSystemFile(SYNC_LOCK_FILENAME) }
if (bytes.isEmpty()) { if (bytes.isEmpty()) {
return@withContext null return@withContext null
} }

5
domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorageAccessor.kt
View File

@@ -2,6 +2,7 @@ package com.github.nullptroma.wallenc.domain.vault.storages.yandex
import com.github.nullptroma.wallenc.domain.errors.WallencException import com.github.nullptroma.wallenc.domain.errors.WallencException
import com.github.nullptroma.wallenc.domain.vault.errors.toVaultWallencException import com.github.nullptroma.wallenc.domain.vault.errors.toVaultWallencException
import com.github.nullptroma.wallenc.domain.vault.storages.common.readSystemFileBytesOrEmpty
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskAuthException import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskAuthException
@@ -597,7 +598,7 @@ class YandexStorageAccessor(
} }
override suspend fun readSyncJournal(): List<StorageSyncJournalEntry> = withContext(ioDispatcher) { override suspend fun readSyncJournal(): List<StorageSyncJournalEntry> = withContext(ioDispatcher) {
val bytes = openReadSystemFile(SYNC_JOURNAL_FILENAME).use { it.readBytes() } val bytes = readSystemFileBytesOrEmpty { openReadSystemFile(SYNC_JOURNAL_FILENAME) }
if (bytes.isEmpty()) { if (bytes.isEmpty()) {
return@withContext emptyList() return@withContext emptyList()
} }
@@ -631,7 +632,7 @@ class YandexStorageAccessor(
} }
override suspend fun readSyncLock(): StorageSyncLock? = withContext(ioDispatcher) { override suspend fun readSyncLock(): StorageSyncLock? = withContext(ioDispatcher) {
val bytes = openReadSystemFile(SYNC_LOCK_FILENAME).use { it.readBytes() } val bytes = readSystemFileBytesOrEmpty { openReadSystemFile(SYNC_LOCK_FILENAME) }
if (bytes.isEmpty()) { if (bytes.isEmpty()) {
return@withContext null return@withContext null
} }