PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

optimize file fetching a bit

Browse source
This commit is contained in:
tibbi 2020-09-24 23:13:38 +02:00
parent 8f58de5126
commit ff2cbbf533
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt
View file

@ -1,7 +1,6 @@
package com.simplemobiletools.gallery.pro.extensions package com.simplemobiletools.gallery.pro.extensions
import android.os.Environment import android.os.Environment
import com.simplemobiletools.commons.extensions.containsNoMedia
import com.simplemobiletools.commons.helpers.NOMEDIA import com.simplemobiletools.commons.helpers.NOMEDIA
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
@ -18,7 +17,8 @@ fun String.shouldFolderBeVisible(excludedPaths: MutableSet<String>, includedPath
} }
val file = File(this) val file = File(this)
if (file.name.startsWith("img_", true)) { val filename = file.name
if (filename.startsWith("img_", true) && file.isDirectory) {
val files = file.list() val files = file.list()
if (files != null) { if (files != null) {
if (files.any { it.contains("burst", true) }) { if (files.any { it.contains("burst", true) }) {
@ -27,7 +27,7 @@ fun String.shouldFolderBeVisible(excludedPaths: MutableSet<String>, includedPath
} }
} }
if (!showHidden && file.isHidden) { if (!showHidden && filename.startsWith('.')) {
return false return false
} else if (includedPaths.contains(this)) { } else if (includedPaths.contains(this)) {
return true return true
@ -36,7 +36,7 @@ fun String.shouldFolderBeVisible(excludedPaths: MutableSet<String>, includedPath
val containsNoMedia = if (showHidden) { val containsNoMedia = if (showHidden) {
false false
} else { } else {
file.containsNoMedia() File(this, NOMEDIA).exists()
} }
return if (!showHidden && containsNoMedia) { return if (!showHidden && containsNoMedia) {
@ -47,7 +47,7 @@ fun String.shouldFolderBeVisible(excludedPaths: MutableSet<String>, includedPath
true true
} else if (isThisOrParentExcluded(excludedPaths)) { } else if (isThisOrParentExcluded(excludedPaths)) {
false false
} else if (!showHidden && file.isDirectory && file.canonicalFile == file.absoluteFile) { } else if (!showHidden) {
var containsNoMediaOrDot = containsNoMedia || contains("/.") var containsNoMediaOrDot = containsNoMedia || contains("/.")
if (!containsNoMediaOrDot) { if (!containsNoMediaOrDot) {
var curPath = this var curPath = this

15
app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt
View file

@ -68,7 +68,20 @@ class MediaFetcher(val context: Context) {
val includedPaths = config.includedFolders val includedPaths = config.includedFolders
val folderNomediaStatuses = HashMap<String, Boolean>() val folderNomediaStatuses = HashMap<String, Boolean>()
folders.distinctBy { it.getDistinctPath() }.filter { val distinctPathsMap = HashMap<String, String>()
val distinctPaths = folders.distinctBy {
when {
distinctPathsMap.containsKey(it) -> distinctPathsMap[it]
distinctPathsMap.contains(it.getParentPath()) -> distinctPathsMap[it.getParentPath()]
else -> {
val distinct = it.getDistinctPath()
distinctPathsMap[it.getParentPath()] = distinct.getParentPath()
distinct
}
}
}
distinctPaths.filter {
it.shouldFolderBeVisible(excludedPaths, includedPaths, shouldShowHidden, folderNomediaStatuses) { path, hasNoMedia -> it.shouldFolderBeVisible(excludedPaths, includedPaths, shouldShowHidden, folderNomediaStatuses) { path, hasNoMedia ->
folderNomediaStatuses[path] = hasNoMedia folderNomediaStatuses[path] = hasNoMedia
} }