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

info: improved PNG text chunks display

Browse source
This commit is contained in:
Thibault Deckers 2021-10-10 13:17:14 +09:00
parent 22c6e5641c
commit f72b3e775f
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import androidx.exifinterface.media.ExifInterface
import com.adobe.internal.xmp.XMPException import com.adobe.internal.xmp.XMPException
import com.adobe.internal.xmp.properties.XMPPropertyInfo import com.adobe.internal.xmp.properties.XMPPropertyInfo
import com.drew.imaging.ImageMetadataReader import com.drew.imaging.ImageMetadataReader
import com.drew.lang.KeyValuePair
import com.drew.lang.Rational import com.drew.lang.Rational
import com.drew.metadata.Tag import com.drew.metadata.Tag
import com.drew.metadata.avi.AviDirectory import com.drew.metadata.avi.AviDirectory
@ -66,6 +67,7 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.nio.charset.StandardCharsets
import java.text.ParseException import java.text.ParseException
import java.util.* import java.util.*
import kotlin.math.roundToLong import kotlin.math.roundToLong
@ -166,6 +168,22 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
} else { } else {
dirMap.putAll(tags.map { tagMapper(it) }) dirMap.putAll(tags.map { tagMapper(it) })
} }
} else if (dir is PngDirectory) {
for (tag in tags) {
val tagType = tag.tagType
if (tagType == PngDirectory.TAG_TEXTUAL_DATA) {
val pairs = dir.getObject(tagType) as List<*>
dirMap.putAll(pairs.map {
val kv = it as KeyValuePair
// PNG spec says encoding charset is always Latin-1 / ISO-8859-1
// but in practice UTF-8 is sometimes used in PNG-iTXt chunks
val charset = if (baseDirName == "PNG-iTXt") StandardCharsets.UTF_8 else kv.value.charset
Pair(kv.key, String(kv.value.bytes, charset))
})
} else {
dirMap[tag.tagName] = tag.description
}
}
} else { } else {
dirMap.putAll(tags.map { Pair(it.tagName, it.description) }) dirMap.putAll(tags.map { Pair(it.tagName, it.description) })
} }