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

remove some seemingly redundant code at checking file paths individually

This commit is contained in:
tibbi 2017-12-19 12:27:05 +01:00
parent 3f72652ed8
commit f96360a497
1 changed files with 6 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
View File

@ -98,9 +98,6 @@ class MediaFetcher(val context: Context) {
val config = context.config val config = context.config
val filterMedia = config.filterMedia val filterMedia = config.filterMedia
val showHidden = config.shouldShowHidden val showHidden = config.shouldShowHidden
val includedFolders = config.includedFolders.map { "${it.trimEnd('/')}/" }
val excludedFolders = config.excludedFolders.map { "${it.trimEnd('/')}/" }
val noMediaFolders = getNoMediaFolders()
val isThirdPartyIntent = config.isThirdPartyIntent val isThirdPartyIntent = config.isThirdPartyIntent
cur.use { cur.use {
@ -143,40 +140,14 @@ class MediaFetcher(val context: Context) {
if (size <= 0L) if (size <= 0L)
continue continue
var isExcluded = false if (!file.exists())
excludedFolders.forEach { continue
if (path.startsWith(it)) {
isExcluded = true
includedFolders.forEach {
if (path.startsWith(it)) {
isExcluded = false
}
}
}
}
if (!isExcluded && !showHidden) { val dateTaken = cur.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
noMediaFolders.forEach { val dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L
if (path.startsWith(it)) {
isExcluded = true
}
}
}
if (!isExcluded && !showHidden && path.contains("/.")) { val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size)
isExcluded = true curMedia.add(medium)
}
if (!isExcluded || isThirdPartyIntent) {
if (!file.exists())
continue
val dateTaken = cur.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
val dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L
val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size)
curMedia.add(medium)
}
} catch (e: Exception) { } catch (e: Exception) {
continue continue
} }
@ -301,31 +272,4 @@ class MediaFetcher(val context: Context) {
"$sortValue ASC" "$sortValue ASC"
} }
} }
private fun getNoMediaFolders(): ArrayList<String> {
val folders = ArrayList<String>()
val noMediaCondition = "${MediaStore.Files.FileColumns.MEDIA_TYPE} = ${MediaStore.Files.FileColumns.MEDIA_TYPE_NONE}"
val uri = MediaStore.Files.getContentUri("external")
val columns = arrayOf(MediaStore.Files.FileColumns.DATA)
val where = "$noMediaCondition AND ${MediaStore.Files.FileColumns.TITLE} LIKE ?"
val args = arrayOf("%$NOMEDIA%")
var cursor: Cursor? = null
try {
cursor = context.contentResolver.query(uri, columns, where, args, null)
if (cursor?.moveToFirst() == true) {
do {
val path = cursor.getString(cursor.getColumnIndex(MediaStore.Files.FileColumns.DATA)) ?: continue
val noMediaFile = File(path)
if (noMediaFile.exists())
folders.add("${noMediaFile.parent}/")
} while (cursor.moveToNext())
}
} finally {
cursor?.close()
}
return folders
}
} }