kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 05:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1663 Improve FileSystem detection - prevent infinite recursion by removing visited entries - add vfat to <4GB filesystems

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2020-01-09 15:24:39 +00:00
parent 648a8b72de
commit cbee2b970d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/MountFileSystemChecker.kt
View File

@ -27,15 +27,13 @@ class MountFileSystemChecker : FileSystemChecker {
override fun checkFilesystemSupports4GbFiles(path: String) = override fun checkFilesystemSupports4GbFiles(path: String) =
recursivelyDetermineFilesystem(mountPoints(), path) recursivelyDetermineFilesystem(mountPoints(), path)
private fun recursivelyDetermineFilesystem( private fun recursivelyDetermineFilesystem(mountPoints: List<MountInfo>, path: String):
mountPoints: List<MountInfo>, FileSystemCapability =
path: String
): FileSystemCapability =
mountPoints.maxBy { it.matchCount(path) } mountPoints.maxBy { it.matchCount(path) }
?.takeIf { it.matchCount(path) > 0 } ?.takeIf { it.matchCount(path) > 0 }
?.let { ?.let {
when { when {
it.isVirtual -> recursivelyDetermineFilesystem(mountPoints, it.device) it.isVirtual -> recursivelyDetermineFilesystem(mountPoints - it, it.device)
it.supports4GBFiles -> CAN_WRITE_4GB it.supports4GBFiles -> CAN_WRITE_4GB
it.doesNotSupport4GBFiles -> CANNOT_WRITE_4GB it.doesNotSupport4GBFiles -> CANNOT_WRITE_4GB
else -> INCONCLUSIVE else -> INCONCLUSIVE
@ -65,8 +63,8 @@ data class MountInfo(val device: String, val mountPoint: String, val fileSystem:
val doesNotSupport4GBFiles = DOES_NOT_SUPPORT_4GB_FILE_SYSTEMS.contains(fileSystem) val doesNotSupport4GBFiles = DOES_NOT_SUPPORT_4GB_FILE_SYSTEMS.contains(fileSystem)
companion object { companion object {
private val VIRTUAL_FILE_SYSTEMS = listOf("fuse", "sdcardfs", "tmpfs") private val VIRTUAL_FILE_SYSTEMS = listOf("fuse", "sdcardfs")
private val SUPPORTS_4GB_FILE_SYSTEMS = listOf("ext4", "exfat") private val SUPPORTS_4GB_FILE_SYSTEMS = listOf("ext4", "exfat")
private val DOES_NOT_SUPPORT_4GB_FILE_SYSTEMS = listOf("fat32") private val DOES_NOT_SUPPORT_4GB_FILE_SYSTEMS = listOf("fat32", "vfat")
} }
} }