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

do all that thumbnail fetching only if there is no custom image set

Browse source
This commit is contained in:
tibbi 2020-02-12 17:15:04 +01:00
parent 57e77abde0
commit 2f0bf7cbec
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
View file

@ -860,8 +860,7 @@ fun Context.createDirectoryFromMedia(path: String, curMedia: ArrayList<Medium>,
includedFolders: MutableSet<String>, getProperFileSize: Boolean): Directory { includedFolders: MutableSet<String>, getProperFileSize: Boolean): Directory {
val OTGPath = config.OTGPath val OTGPath = config.OTGPath
val grouped = MediaFetcher(this).groupMedia(curMedia, path) val grouped = MediaFetcher(this).groupMedia(curMedia, path)
val sortedMedia = grouped.filter { it is Medium }.toMutableList() as ArrayList<Medium> var thumbnail: String? = null
var thumbnail = sortedMedia.firstOrNull { getDoesFilePathExist(it.path, OTGPath) }?.path ?: ""
albumCovers.forEach { albumCovers.forEach {
if (it.path == path && getDoesFilePathExist(it.tmb, OTGPath)) { if (it.path == path && getDoesFilePathExist(it.tmb, OTGPath)) {
@ -869,8 +868,13 @@ fun Context.createDirectoryFromMedia(path: String, curMedia: ArrayList<Medium>,
} }
} }
if (config.OTGPath.isNotEmpty() && thumbnail.startsWith(config.OTGPath)) { if (thumbnail == null) {
thumbnail = thumbnail.getOTGPublicPath(applicationContext) val sortedMedia = grouped.filter { it is Medium }.toMutableList() as ArrayList<Medium>
thumbnail = sortedMedia.firstOrNull { getDoesFilePathExist(it.path, OTGPath) }?.path ?: ""
}
if (config.OTGPath.isNotEmpty() && thumbnail!!.startsWith(config.OTGPath)) {
thumbnail = thumbnail!!.getOTGPublicPath(applicationContext)
} }
val isSortingAscending = config.directorySorting.isSortingAscending() val isSortingAscending = config.directorySorting.isSortingAscending()
@ -883,7 +887,7 @@ fun Context.createDirectoryFromMedia(path: String, curMedia: ArrayList<Medium>,
val size = if (getProperFileSize) curMedia.sumByLong { it.size } else 0L val size = if (getProperFileSize) curMedia.sumByLong { it.size } else 0L
val mediaTypes = curMedia.getDirMediaTypes() val mediaTypes = curMedia.getDirMediaTypes()
val sortValue = getDirectorySortingValue(curMedia, path, dirName, size) val sortValue = getDirectorySortingValue(curMedia, path, dirName, size)
return Directory(null, path, thumbnail, dirName, curMedia.size, lastModified, dateTaken, size, getPathLocation(path), mediaTypes, sortValue) return Directory(null, path, thumbnail!!, dirName, curMedia.size, lastModified, dateTaken, size, getPathLocation(path), mediaTypes, sortValue)
} }
fun Context.getDirectorySortingValue(media: ArrayList<Medium>, path: String, name: String, size: Long): String { fun Context.getDirectorySortingValue(media: ArrayList<Medium>, path: String, name: String, size: Long): String {