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

оптимизация лишних чтений мета-файла

Browse Source
This commit is contained in:
Пытков Роман
2024-12-21 23:49:14 +03:00
parent 577939e953
commit 277abfda52
2 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
data/src/main/java/com/github/nullptroma/wallenc/data/vaults/local/LocalStorageAccessor.kt
View File

@@ -11,6 +11,7 @@ import com.github.nullptroma.wallenc.domain.datatypes.DataPackage
import com.github.nullptroma.wallenc.domain.datatypes.DataPage
import com.github.nullptroma.wallenc.domain.models.IDirectory
import com.github.nullptroma.wallenc.domain.models.IFile
import com.github.nullptroma.wallenc.domain.models.IMetaInfo
import com.github.nullptroma.wallenc.domain.models.IStorageAccessor
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
@@ -96,6 +97,9 @@ class LocalStorageAccessor(
callback(child)
}
if (useCallbackForSelf)
callback(dir)
if (maxDepth != 0) {
val nextMaxDepth = if (maxDepth > 0) maxDepth - 1 else maxDepth
for (child in children) {
@@ -105,10 +109,10 @@ class LocalStorageAccessor(
}
}
}
if (useCallbackForSelf)
else if (useCallbackForSelf) {
callback(dir)
}
}
/**
* Перебирает все файлы и каталоги в relativePath и возвращает с мета-информацией
@@ -117,13 +121,22 @@ class LocalStorageAccessor(
private suspend fun scanStorage(
baseStoragePath: String,
maxDepth: Int,
fileCallback: suspend (LocalFile) -> Unit = {},
dirCallback: suspend (LocalDirectory) -> Unit = {}
fileCallback: (suspend (File, LocalFile) -> Unit)? = null,
dirCallback: (suspend (File, LocalDirectory) -> Unit)? = null
) {
if (!checkAvailable())
throw Exception("Not available")
val basePath = Path(_absolutePath.pathString, baseStoragePath)
val workedFiles = mutableSetOf<String>()
val workedMetaFiles = mutableSetOf<String>()
var count = 0
scanFileSystem(basePath.toFile(), maxDepth, { file ->
// Если парный файл уже был обработан - скип. Это позволит не читать metaFile дважды
if(workedFiles.contains(file.absolutePath) || workedMetaFiles.contains(file.absolutePath)) {
count++
return@scanFileSystem
}
val filePath = Path(file.absolutePath)
// если это файл с мета-информацией - пропустить
@@ -132,15 +145,26 @@ class LocalStorageAccessor(
try {
val reader = file.bufferedReader()
val meta : LocalMetaInfo = _jackson.readValue(reader)
val fileInMeta = File(Path(_absolutePath.pathString, meta.path).pathString)
if (!fileInMeta.exists())
val pathString = Path(_absolutePath.pathString, meta.path).pathString
val originalFile = File(pathString)
if (!originalFile.exists())
file.delete()
// если успешно прочитано - отправить колбек и добавить обработанный файл
workedFiles.add(pathString)
workedMetaFiles.add(file.absolutePath)
if (file.isFile) {
fileCallback?.invoke(originalFile, LocalFile(meta))
} else {
dirCallback?.invoke(originalFile, LocalDirectory(meta, null))
}
} catch (e: JacksonException) {
file.delete()
}
return@scanFileSystem
}
else {
val metaFilePath = Path(
if (file.isFile) {
file.absolutePath + META_INFO_POSTFIX
@@ -168,10 +192,13 @@ class LocalStorageAccessor(
metaInfo = readMeta
}
workedFiles.add(file.absolutePath)
workedMetaFiles.add(metaFile.absolutePath)
if (file.isFile) {
fileCallback(LocalFile(metaInfo))
fileCallback?.invoke(file, LocalFile(metaInfo))
} else {
dirCallback(LocalDirectory(metaInfo, null))
dirCallback?.invoke(file, LocalDirectory(metaInfo, null))
}
}
})
}
@@ -206,8 +233,8 @@ class LocalStorageAccessor(
var size = 0L
var numOfFiles = 0
scanStorage(baseStoragePath = "/", maxDepth = -1, fileCallback = {
size += it.metaInfo.size
scanStorage(baseStoragePath = "/", maxDepth = -1, fileCallback = { _, localFile ->
size += localFile.metaInfo.size
numOfFiles++
})
@@ -220,8 +247,8 @@ class LocalStorageAccessor(
return@withContext listOf()
val list = mutableListOf<IFile>()
scanStorage(baseStoragePath = "/", maxDepth = -1, fileCallback = {
list.add(it)
scanStorage(baseStoragePath = "/", maxDepth = -1, fileCallback = { _, localFile ->
list.add(localFile)
})
return@withContext list
}
@@ -231,8 +258,8 @@ class LocalStorageAccessor(
return@withContext listOf()
val list = mutableListOf<IFile>()
scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = {
list.add(it)
scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = { _, localFile ->
list.add(localFile)
})
return@withContext list
}
@@ -243,7 +270,7 @@ class LocalStorageAccessor(
val buf = mutableListOf<IFile>()
var pageNumber = 0
scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = {
scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = { _, localFile ->
if(buf.size == DATA_PAGE_LENGTH) {
val page = DataPage(
list = buf.toList(),
@@ -256,7 +283,7 @@ class LocalStorageAccessor(
emit(page)
buf.clear()
}
buf.add(it)
buf.add(localFile)
})
// отправка последней страницы
val page = DataPage(

6
presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/local/vault/LocalVaultScreen.kt
View File

@@ -25,9 +25,9 @@ fun LocalVaultScreen(modifier: Modifier = Modifier,
Card(modifier = Modifier.clickable {
viewModel.printAllFilesToLog(it)
}) {
val available = it.isAvailable.collectAsStateWithLifecycle()
val numOfFiles = it.isAvailable.collectAsStateWithLifecycle()
val size = it.isAvailable.collectAsStateWithLifecycle()
val available by it.isAvailable.collectAsStateWithLifecycle()
val numOfFiles by it.numberOfFiles.collectAsStateWithLifecycle()
val size by it.size.collectAsStateWithLifecycle()
Column {
Text(it.uuid.toString())
Text("IsAvailable: $available")