Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-26 22:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

try speeding up the process of obtaining all images and videos

Browse source
This commit is contained in:
tibbi 2017-02-20 21:59:55 +01:00
parent 07b2371b9c
commit b46da2f58a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt
View file

@ -2,9 +2,6 @@ package com.simplemobiletools.gallery.asynctasks
import android.content.Context import android.content.Context
import android.os.AsyncTask import android.os.AsyncTask
import com.simplemobiletools.commons.extensions.isGif
import com.simplemobiletools.commons.extensions.isImageFast
import com.simplemobiletools.commons.extensions.isVideoFast
import com.simplemobiletools.gallery.extensions.config import com.simplemobiletools.gallery.extensions.config
import com.simplemobiletools.gallery.extensions.getParents import com.simplemobiletools.gallery.extensions.getParents
import com.simplemobiletools.gallery.helpers.IMAGES import com.simplemobiletools.gallery.helpers.IMAGES
@ -20,6 +17,8 @@ class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo
var config = context.config var config = context.config
var showMedia = IMAGES_AND_VIDEOS var showMedia = IMAGES_AND_VIDEOS
var fileSorting = 0 var fileSorting = 0
val photoExtensions = arrayOf("jpg", "png", "jpeg", "bmp", "webp", "tiff")
val videoExtensions = arrayOf("webm", "mkv", "flv", "vob", "avi", "wmv", "mp4", "ogv", "qt", "m4p", "mpg", "m4v", "mp2", "mpeg", "3gp")
override fun onPreExecute() { override fun onPreExecute() {
super.onPreExecute() super.onPreExecute()
@ -49,8 +48,9 @@ class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo
val dir = File(path) val dir = File(path)
val files = dir.listFiles() ?: return media val files = dir.listFiles() ?: return media
for (file in files) { for (file in files) {
val isImage = file.isImageFast() || file.isGif() val filePath = file.absolutePath
val isVideo = if (isImage) false else file.isVideoFast() val isImage = localIsImage(filePath) || localIsGif(filePath)
val isVideo = if (isImage) false else localIsVideo(filePath)
if (!isImage && !isVideo) if (!isImage && !isVideo)
continue continue
@ -68,11 +68,15 @@ class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo
val name = file.name val name = file.name
val absolutePath = file.absolutePath val absolutePath = file.absolutePath
val dateModified = file.lastModified() val dateModified = file.lastModified()
media.add(Medium(name, absolutePath, isVideo, dateModified, dateModified, size)) media.add(Medium(name, absolutePath, isVideo, dateModified, dateModified, 0))
} }
return media return media
} }
private fun localIsImage(path: String) = photoExtensions.any { path.endsWith(".$it", true) }
private fun localIsGif(path: String) = path.endsWith(".gif", true)
private fun localIsVideo(path: String) = videoExtensions.any { path.endsWith(".$it", true) }
override fun onPostExecute(media: ArrayList<Medium>) { override fun onPostExecute(media: ArrayList<Medium>) {
super.onPostExecute(media) super.onPostExecute(media)
callback.invoke(media) callback.invoke(media)