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

use thoe shorter version of cursor looping

This commit is contained in:
tibbi 2020-10-01 17:30:01 +02:00
parent 60b44c27be
commit a7b35e36b2
1 changed files with 40 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,19 +442,14 @@ class MediaFetcher(val context: Context) {
val selection = "${Images.Media.DATA} LIKE ? AND ${Images.Media.DATA} NOT LIKE ?" val selection = "${Images.Media.DATA} LIKE ? AND ${Images.Media.DATA} NOT LIKE ?"
val selectionArgs = arrayOf("$folder/%", "$folder/%/%") val selectionArgs = arrayOf("$folder/%", "$folder/%/%")
val cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, null) context.queryCursor(uri, projection, selection, selectionArgs) { cursor ->
cursor?.use { try {
if (cursor.moveToFirst()) { val dateTaken = cursor.getLongValue(Images.Media.DATE_TAKEN)
do { if (dateTaken != 0L) {
try { val name = cursor.getStringValue(Images.Media.DISPLAY_NAME)
val dateTaken = cursor.getLongValue(Images.Media.DATE_TAKEN) dateTakens["$folder/$name"] = dateTaken
if (dateTaken != 0L) { }
val name = cursor.getStringValue(Images.Media.DISPLAY_NAME) } catch (e: Exception) {
dateTakens["$folder/$name"] = dateTaken
}
} catch (e: Exception) {
}
} while (cursor.moveToNext())
} }
} }
} }
@ -482,19 +477,14 @@ class MediaFetcher(val context: Context) {
val uri = Files.getContentUri("external") val uri = Files.getContentUri("external")
try { try {
val cursor = context.contentResolver.query(uri, projection, null, null, null) context.queryCursor(uri, projection) { cursor ->
cursor?.use { try {
if (cursor.moveToFirst()) { val dateTaken = cursor.getLongValue(Images.Media.DATE_TAKEN)
do { if (dateTaken != 0L) {
try { val path = cursor.getStringValue(Images.Media.DATA)
val dateTaken = cursor.getLongValue(Images.Media.DATE_TAKEN) dateTakens[path] = dateTaken
if (dateTaken != 0L) { }
val path = cursor.getStringValue(Images.Media.DATA) } catch (e: Exception) {
dateTakens[path] = dateTaken
}
} catch (e: Exception) {
}
} while (cursor.moveToNext())
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
@ -521,19 +511,14 @@ class MediaFetcher(val context: Context) {
val selection = "${Images.Media.DATA} LIKE ? AND ${Images.Media.DATA} NOT LIKE ?" val selection = "${Images.Media.DATA} LIKE ? AND ${Images.Media.DATA} NOT LIKE ?"
val selectionArgs = arrayOf("$folder/%", "$folder/%/%") val selectionArgs = arrayOf("$folder/%", "$folder/%/%")
val cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, null) context.queryCursor(uri, projection, selection, selectionArgs) { cursor ->
cursor?.use { try {
if (cursor.moveToFirst()) { val lastModified = cursor.getLongValue(Images.Media.DATE_MODIFIED) * 1000
do { if (lastModified != 0L) {
try { val name = cursor.getStringValue(Images.Media.DISPLAY_NAME)
val lastModified = cursor.getLongValue(Images.Media.DATE_MODIFIED) * 1000 lastModifieds["$folder/$name"] = lastModified
if (lastModified != 0L) { }
val name = cursor.getStringValue(Images.Media.DISPLAY_NAME) } catch (e: Exception) {
lastModifieds["$folder/$name"] = lastModified
}
} catch (e: Exception) {
}
} while (cursor.moveToNext())
} }
} }
} }
@ -551,19 +536,14 @@ class MediaFetcher(val context: Context) {
val uri = Files.getContentUri("external") val uri = Files.getContentUri("external")
try { try {
val cursor = context.contentResolver.query(uri, projection, null, null, null) context.queryCursor(uri, projection) { cursor ->
cursor?.use { try {
if (cursor.moveToFirst()) { val lastModified = cursor.getLongValue(Images.Media.DATE_MODIFIED) * 1000
do { if (lastModified != 0L) {
try { val path = cursor.getStringValue(Images.Media.DATA)
val lastModified = cursor.getLongValue(Images.Media.DATE_MODIFIED) * 1000 lastModifieds[path] = lastModified
if (lastModified != 0L) { }
val path = cursor.getStringValue(Images.Media.DATA) } catch (e: Exception) {
lastModifieds[path] = lastModified
}
} catch (e: Exception) {
}
} while (cursor.moveToNext())
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
@ -584,19 +564,14 @@ class MediaFetcher(val context: Context) {
val selection = "${Images.Media.DATA} LIKE ? AND ${Images.Media.DATA} NOT LIKE ?" val selection = "${Images.Media.DATA} LIKE ? AND ${Images.Media.DATA} NOT LIKE ?"
val selectionArgs = arrayOf("$folder/%", "$folder/%/%") val selectionArgs = arrayOf("$folder/%", "$folder/%/%")
val cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, null) context.queryCursor(uri, projection, selection, selectionArgs) { cursor ->
cursor?.use { try {
if (cursor.moveToFirst()) { val size = cursor.getLongValue(Images.Media.SIZE)
do { if (size != 0L) {
try { val name = cursor.getStringValue(Images.Media.DISPLAY_NAME)
val size = cursor.getLongValue(Images.Media.SIZE) sizes["$folder/$name"] = size
if (size != 0L) { }
val name = cursor.getStringValue(Images.Media.DISPLAY_NAME) } catch (e: Exception) {
sizes["$folder/$name"] = size
}
} catch (e: Exception) {
}
} while (cursor.moveToNext())
} }
} }
} }