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

improved xmp

Browse source
This commit is contained in:
Thibault Deckers 2022-10-25 23:13:58 +02:00
parent 5b960d0a90
commit 9fa977a7c1
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt
View file

@ -125,8 +125,8 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
var foundExif = false var foundExif = false
var foundXmp = false var foundXmp = false
fun processXmp(xmpMeta: XMPMeta, dirMap: MutableMap<String, String>) { fun processXmp(xmpMeta: XMPMeta, dirMap: MutableMap<String, String>, allowMultiple: Boolean = false) {
if (foundXmp) return if (foundXmp && !allowMultiple) return
foundXmp = true foundXmp = true
try { try {
for (prop in xmpMeta) { for (prop in xmpMeta) {
@ -340,7 +340,7 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
} }
if (dir is XmpDirectory) { if (dir is XmpDirectory) {
processXmp(dir.xmpMeta, dirMap) processXmp(dir.xmpMeta, dirMap, allowMultiple = true)
} }
} }
@ -492,8 +492,8 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
var foundExif = false var foundExif = false
var foundXmp = false var foundXmp = false
fun processXmp(xmpMeta: XMPMeta) { fun processXmp(xmpMeta: XMPMeta, allowMultiple: Boolean = false) {
if (foundXmp) return if (foundXmp && !allowMultiple) return
foundXmp = true foundXmp = true
try { try {
if (xmpMeta.doesPropExist(XMP.DC_SUBJECT_PROP_NAME)) { if (xmpMeta.doesPropExist(XMP.DC_SUBJECT_PROP_NAME)) {
@ -599,7 +599,9 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
// XMP // XMP
if (!isLargeMp4(mimeType, sizeBytes)) { if (!isLargeMp4(mimeType, sizeBytes)) {
metadata.getDirectoriesOfType(XmpDirectory::class.java).map { it.xmpMeta }.forEach(::processXmp) metadata.getDirectoriesOfType(XmpDirectory::class.java).map { it.xmpMeta }.forEach {
processXmp(it, allowMultiple = true)
}
// XMP fallback to IPTC // XMP fallback to IPTC
if (!metadataMap.containsKey(KEY_XMP_TITLE) || !metadataMap.containsKey(KEY_XMP_SUBJECTS)) { if (!metadataMap.containsKey(KEY_XMP_TITLE) || !metadataMap.containsKey(KEY_XMP_SUBJECTS)) {
@ -905,8 +907,8 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
val fields: FieldMap = hashMapOf() val fields: FieldMap = hashMapOf()
var foundXmp = false var foundXmp = false
fun processXmp(xmpMeta: XMPMeta) { fun processXmp(xmpMeta: XMPMeta, allowMultiple: Boolean = false) {
if (foundXmp) return if (foundXmp && !allowMultiple) return
foundXmp = true foundXmp = true
try { try {
xmpMeta.getSafeInt(XMP.GPANO_CROPPED_AREA_LEFT_PROP_NAME) { fields["croppedAreaLeft"] = it } xmpMeta.getSafeInt(XMP.GPANO_CROPPED_AREA_LEFT_PROP_NAME) { fields["croppedAreaLeft"] = it }
@ -925,7 +927,9 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
try { try {
Metadata.openSafeInputStream(context, uri, mimeType, sizeBytes)?.use { input -> Metadata.openSafeInputStream(context, uri, mimeType, sizeBytes)?.use { input ->
val metadata = Helper.safeRead(input) val metadata = Helper.safeRead(input)
metadata.getDirectoriesOfType(XmpDirectory::class.java).map { it.xmpMeta }.forEach(::processXmp) metadata.getDirectoriesOfType(XmpDirectory::class.java).map { it.xmpMeta }.forEach {
processXmp(it, allowMultiple = true)
}
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.w(LOG_TAG, "failed to read metadata by metadata-extractor for mimeType=$mimeType uri=$uri", e) Log.w(LOG_TAG, "failed to read metadata by metadata-extractor for mimeType=$mimeType uri=$uri", e)
@ -991,8 +995,8 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
val xmpStrings = mutableListOf<String>() val xmpStrings = mutableListOf<String>()
var foundXmp = false var foundXmp = false
fun processXmp(xmpMeta: XMPMeta) { fun processXmp(xmpMeta: XMPMeta, allowMultiple: Boolean = false) {
if (foundXmp) return if (foundXmp && !allowMultiple) return
foundXmp = true foundXmp = true
try { try {
xmpStrings.add(XMPMetaFactory.serializeToString(xmpMeta, xmpSerializeOptions)) xmpStrings.add(XMPMetaFactory.serializeToString(xmpMeta, xmpSerializeOptions))
@ -1005,7 +1009,9 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
try { try {
Metadata.openSafeInputStream(context, uri, mimeType, sizeBytes)?.use { input -> Metadata.openSafeInputStream(context, uri, mimeType, sizeBytes)?.use { input ->
val metadata = Helper.safeRead(input) val metadata = Helper.safeRead(input)
metadata.getDirectoriesOfType(XmpDirectory::class.java).map { it.xmpMeta }.forEach(::processXmp) metadata.getDirectoriesOfType(XmpDirectory::class.java).map { it.xmpMeta }.forEach {
processXmp(it, allowMultiple = true)
}
} }
} catch (e: Exception) { } catch (e: Exception) {
result.error("getXmp-exception", "failed to read XMP for mimeType=$mimeType uri=$uri", e.message) result.error("getXmp-exception", "failed to read XMP for mimeType=$mimeType uri=$uri", e.message)

2
lib/widgets/viewer/info/metadata/xmp_ns/misc.dart
View file

@ -79,6 +79,8 @@ class XmpPlusNamespace extends XmpNamespace {
@override @override
late final List<XmpCardData> cards = [ late final List<XmpCardData> cards = [
XmpCardData(RegExp(nsPrefix + r'CopyrightOwner\[(\d+)\]/(.*)')),
XmpCardData(RegExp(nsPrefix + r'ImageCreator\[(\d+)\]/(.*)')),
XmpCardData(RegExp(nsPrefix + r'Licensor\[(\d+)\]/(.*)')), XmpCardData(RegExp(nsPrefix + r'Licensor\[(\d+)\]/(.*)')),
]; ];
} }