Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Hosted Weblate 2025-02-04 18:48:44 +00:00
commit 8efc17c98c
No known key found for this signature in database
GPG key ID: A3FAAA06E6569B4C
4 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
View file

@ -6,6 +6,7 @@ import android.content.ContextWrapper
import android.net.Uri import android.net.Uri
import android.util.Log import android.util.Log
import android.webkit.MimeTypeMap import android.webkit.MimeTypeMap
import deckers.thibault.aves.model.EntryFields
import deckers.thibault.aves.model.FieldMap import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.model.SourceEntry import deckers.thibault.aves.model.SourceEntry
import deckers.thibault.aves.utils.LogUtils import deckers.thibault.aves.utils.LogUtils
@ -88,9 +89,9 @@ internal class FileImageProvider : ImageProvider() {
} }
return hashMapOf( return hashMapOf(
"uri" to Uri.fromFile(newFile).toString(), EntryFields.URI to Uri.fromFile(newFile).toString(),
"path" to newFile.path, EntryFields.PATH to newFile.path,
"dateModifiedSecs" to newFile.lastModified() / 1000, EntryFields.DATE_MODIFIED_SECS to newFile.lastModified() / 1000,
) )
} }
@ -98,8 +99,8 @@ internal class FileImageProvider : ImageProvider() {
try { try {
val file = File(path) val file = File(path)
if (file.exists()) { if (file.exists()) {
newFields["dateModifiedSecs"] = file.lastModified() / 1000 newFields[EntryFields.DATE_MODIFIED_SECS] = file.lastModified() / 1000
newFields["sizeBytes"] = file.length() newFields[EntryFields.SIZE_BYTES] = file.length()
} }
callback.onSuccess(newFields) callback.onSuccess(newFields)
} catch (e: SecurityException) { } catch (e: SecurityException) {

11
android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
View file

@ -64,6 +64,7 @@ import java.util.TimeZone
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface import androidx.exifinterface.media.ExifInterfaceFork as ExifInterface
import androidx.core.net.toUri import androidx.core.net.toUri
import deckers.thibault.aves.model.EntryFields
abstract class ImageProvider { abstract class ImageProvider {
open fun fetchSingle(context: Context, uri: Uri, sourceMimeType: String?, allowUnsized: Boolean, callback: ImageOpCallback) { open fun fetchSingle(context: Context, uri: Uri, sourceMimeType: String?, allowUnsized: Boolean, callback: ImageOpCallback) {
@ -74,10 +75,10 @@ abstract class ImageProvider {
return if (StorageUtils.isInVault(context, path)) { return if (StorageUtils.isInVault(context, path)) {
val uri = Uri.fromFile(File(path)) val uri = Uri.fromFile(File(path))
hashMapOf( hashMapOf(
"origin" to SourceEntry.ORIGIN_VAULT, EntryFields.ORIGIN to SourceEntry.ORIGIN_VAULT,
"uri" to uri.toString(), EntryFields.URI to uri.toString(),
"contentId" to null, EntryFields.CONTENT_ID to null,
"path" to path, EntryFields.PATH to path,
) )
} else { } else {
MediaStoreImageProvider().scanNewPathByMediaStore(context, path, mimeType) MediaStoreImageProvider().scanNewPathByMediaStore(context, path, mimeType)
@ -361,7 +362,7 @@ abstract class ImageProvider {
) )
val newFields = scanNewPath(activity, targetPath, exportMimeType) val newFields = scanNewPath(activity, targetPath, exportMimeType)
val targetUri = (newFields["uri"] as String).toUri() val targetUri = (newFields[EntryFields.URI] as String).toUri()
if (writeMetadata) { if (writeMetadata) {
copyMetadata( copyMetadata(
context = activity, context = activity,

16
android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
View file

@ -598,8 +598,8 @@ class MediaStoreImageProvider : ImageProvider() {
} }
return if (toBin) { return if (toBin) {
hashMapOf( hashMapOf(
"trashed" to true, EntryFields.TRASHED to true,
"trashPath" to targetPath, EntryFields.TRASH_PATH to targetPath,
) )
} else { } else {
scanNewPath(activity, targetPath, mimeType) scanNewPath(activity, targetPath, mimeType)
@ -912,13 +912,13 @@ class MediaStoreImageProvider : ImageProvider() {
val cursor = context.contentResolver.query(uri, projection, null, null, null) val cursor = context.contentResolver.query(uri, projection, null, null, null)
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
val newFields = hashMapOf<String, Any?>( val newFields = hashMapOf<String, Any?>(
"origin" to SourceEntry.ORIGIN_MEDIA_STORE_CONTENT, EntryFields.ORIGIN to SourceEntry.ORIGIN_MEDIA_STORE_CONTENT,
"uri" to uri.toString(), EntryFields.URI to uri.toString(),
"contentId" to uri.tryParseId(), EntryFields.CONTENT_ID to uri.tryParseId(),
"path" to path, EntryFields.PATH to path,
) )
cursor.getColumnIndex(MediaStore.MediaColumns.DATE_ADDED).let { if (it != -1) newFields["dateAddedSecs"] = cursor.getInt(it) } cursor.getColumnIndex(MediaStore.MediaColumns.DATE_ADDED).let { if (it != -1) newFields[EntryFields.DATE_ADDED_SECS] = cursor.getInt(it) }
cursor.getColumnIndex(MediaStore.MediaColumns.DATE_MODIFIED).let { if (it != -1) newFields["dateModifiedSecs"] = cursor.getInt(it) } cursor.getColumnIndex(MediaStore.MediaColumns.DATE_MODIFIED).let { if (it != -1) newFields[EntryFields.DATE_MODIFIED_SECS] = cursor.getInt(it) }
cursor.close() cursor.close()
return newFields return newFields
} }

17
android/app/src/main/kotlin/deckers/thibault/aves/model/provider/UnknownContentProvider.kt
View file

@ -7,6 +7,7 @@ import android.provider.OpenableColumns
import android.util.Log import android.util.Log
import deckers.thibault.aves.metadata.Metadata import deckers.thibault.aves.metadata.Metadata
import deckers.thibault.aves.metadata.metadataextractor.Helper import deckers.thibault.aves.metadata.metadataextractor.Helper
import deckers.thibault.aves.model.EntryFields
import deckers.thibault.aves.model.FieldMap import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.model.SourceEntry import deckers.thibault.aves.model.SourceEntry
import deckers.thibault.aves.utils.LogUtils import deckers.thibault.aves.utils.LogUtils
@ -43,9 +44,9 @@ open class UnknownContentProvider : ImageProvider() {
} }
val fields: FieldMap = hashMapOf( val fields: FieldMap = hashMapOf(
"origin" to SourceEntry.ORIGIN_UNKNOWN_CONTENT, EntryFields.ORIGIN to SourceEntry.ORIGIN_UNKNOWN_CONTENT,
"uri" to uri.toString(), EntryFields.URI to uri.toString(),
"sourceMimeType" to mimeType, EntryFields.SOURCE_MIME_TYPE to mimeType,
) )
try { try {
// some providers do not provide the mandatory `OpenableColumns` // some providers do not provide the mandatory `OpenableColumns`
@ -53,11 +54,11 @@ open class UnknownContentProvider : ImageProvider() {
// e.g. `content://mms/part/[id]` on Android KitKat // e.g. `content://mms/part/[id]` on Android KitKat
val cursor = context.contentResolver.query(uri, null, null, null, null) val cursor = context.contentResolver.query(uri, null, null, null, null)
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME).let { if (it != -1) fields["title"] = cursor.getString(it) } cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME).let { if (it != -1) fields[EntryFields.TITLE] = cursor.getString(it) }
cursor.getColumnIndex(OpenableColumns.SIZE).let { if (it != -1) fields["sizeBytes"] = cursor.getLong(it) } cursor.getColumnIndex(OpenableColumns.SIZE).let { if (it != -1) fields[EntryFields.SIZE_BYTES] = cursor.getLong(it) }
cursor.getColumnIndex(MediaStore.MediaColumns.DATA).let { if (it != -1) fields["path"] = cursor.getString(it) } cursor.getColumnIndex(MediaStore.MediaColumns.DATA).let { if (it != -1) fields[EntryFields.PATH] = cursor.getString(it) }
// mime type fallback if it was not provided and not found via `metadata-extractor` // mime type fallback if it was not provided and not found via `metadata-extractor`
cursor.getColumnIndex(MediaStore.MediaColumns.MIME_TYPE).let { if (it != -1 && mimeType == null) fields["sourceMimeType"] = cursor.getString(it) } cursor.getColumnIndex(MediaStore.MediaColumns.MIME_TYPE).let { if (it != -1 && mimeType == null) fields[EntryFields.SOURCE_MIME_TYPE] = cursor.getString(it) }
cursor.close() cursor.close()
} }
} catch (e: Exception) { } catch (e: Exception) {
@ -65,7 +66,7 @@ open class UnknownContentProvider : ImageProvider() {
return return
} }
if (fields["sourceMimeType"] == null) { if (fields[EntryFields.SOURCE_MIME_TYPE] == null) {
callback.onFailure(Exception("Failed to find MIME type for uri=$uri")) callback.onFailure(Exception("Failed to find MIME type for uri=$uri"))
return return
} }