fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

filter wrong directories sooner

This commit is contained in:
tibbi 2017-02-26 12:26:32 +01:00
parent e243de95d1
commit ad8cd557ce
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt
View File

@ -25,32 +25,29 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
val parents = context.getParents()
parents.forEach {
val dir = File(it)
if (dir.isDirectory) {
val filenames = dir.list()
if (filenames?.size ?: 0 > 0) {
for (filename in filenames) {
val isImage = filename.isImageFast() || filename.isGif()
val isVideo = if (isImage) false else filename.isVideoFast()
val filenames = File(it).list()
if (filenames?.size ?: 0 > 0) {
for (filename in filenames) {
val isImage = filename.isImageFast() || filename.isGif()
val isVideo = if (isImage) false else filename.isVideoFast()
if (!isImage && !isVideo)
continue
if (!isImage && !isVideo)
continue
if (isVideo && (isPickImage || showMedia == IMAGES))
continue
if (isVideo && (isPickImage || showMedia == IMAGES))
continue
if (isImage && (isPickVideo || showMedia == VIDEOS))
continue
if (isImage && (isPickVideo || showMedia == VIDEOS))
continue
val file = File(it, filename)
val size = file.length()
if (size == 0L)
continue
val file = File(it, filename)
val size = file.length()
if (size == 0L)
continue
val dateModified = file.lastModified()
val medium = Medium(filename, file.absolutePath, isVideo, dateModified, dateModified, size)
media.add(medium)
}
val dateModified = file.lastModified()
val medium = Medium(filename, file.absolutePath, isVideo, dateModified, dateModified, size)
media.add(medium)
}
}
}

2
app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
View File

@ -68,7 +68,7 @@ fun Context.getParents(): ArrayList<String> {
}
val parents = ArrayList<String>()
parentsSet.mapTo(parents, { it })
parentsSet.filterTo(parents, { File(it).isDirectory })
if (config.showHiddenFolders) {
parents.addAll(getNoMediaFolders())