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

minor fixes

Browse source
This commit is contained in:
Thibault Deckers 2022-05-13 12:21:36 +09:00
parent da99f6d138
commit b0df94a4fa
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -461,14 +461,14 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
// * `context.getContentResolver().getType()` sometimes returns an incorrect value // * `context.getContentResolver().getType()` sometimes returns an incorrect value
// * `MediaMetadataRetriever.setDataSource()` sometimes fails with `status = 0x80000000` // * `MediaMetadataRetriever.setDataSource()` sometimes fails with `status = 0x80000000`
// * file extension is unreliable // * file extension is unreliable
// In the end, `metadata-extractor` is the most reliable, except for `tiff`/`dvd`/`mov` (false positives, false negatives), // In the end, `metadata-extractor` is the most reliable, except for `tiff`/`dvd`/`mov`/`zip` (false positives, false negatives),
// in which case we trust the file extension // in which case we trust the file extension
// cf https://github.com/drewnoakes/metadata-extractor/issues/296 // cf https://github.com/drewnoakes/metadata-extractor/issues/296
if (path?.matches(TIFF_EXTENSION_PATTERN) == true) { if (path?.matches(TIFF_EXTENSION_PATTERN) == true) {
metadataMap[KEY_MIME_TYPE] = MimeTypes.TIFF metadataMap[KEY_MIME_TYPE] = MimeTypes.TIFF
} else { } else {
dir.getSafeString(FileTypeDirectory.TAG_DETECTED_FILE_MIME_TYPE) { dir.getSafeString(FileTypeDirectory.TAG_DETECTED_FILE_MIME_TYPE) {
if (it != MimeTypes.TIFF && it != MimeTypes.DVD && it != MimeTypes.MOV) { if (it != MimeTypes.TIFF && it != MimeTypes.DVD && it != MimeTypes.MOV && it != MimeTypes.ZIP) {
metadataMap[KEY_MIME_TYPE] = it metadataMap[KEY_MIME_TYPE] = it
} }
} }

4
android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
View file

@ -46,6 +46,7 @@ object MimeTypes {
// vector // vector
const val SVG = "image/svg+xml" const val SVG = "image/svg+xml"
// video
private const val AVI = "video/avi" private const val AVI = "video/avi"
private const val AVI_VND = "video/vnd.avi" private const val AVI_VND = "video/vnd.avi"
const val DVD = "video/dvd" const val DVD = "video/dvd"
@ -57,6 +58,9 @@ object MimeTypes {
private const val OGV = "video/ogg" private const val OGV = "video/ogg"
private const val WEBM = "video/webm" private const val WEBM = "video/webm"
// others
const val ZIP = "application/zip"
fun isImage(mimeType: String?) = mimeType != null && mimeType.startsWith("image") fun isImage(mimeType: String?) = mimeType != null && mimeType.startsWith("image")
fun isVideo(mimeType: String?) = mimeType != null && mimeType.startsWith("video") fun isVideo(mimeType: String?) = mimeType != null && mimeType.startsWith("video")

9
lib/model/entry_metadata_edition.dart
View file

@ -22,7 +22,9 @@ extension ExtraAvesEntryMetadataEdition on AvesEntry {
final appliedModifier = await _applyDateModifierToEntry(userModifier); final appliedModifier = await _applyDateModifierToEntry(userModifier);
if (appliedModifier == null) { if (appliedModifier == null) {
if (!isMissingAtPath) {
await reportService.recordError('failed to get date for modifier=$userModifier, entry=$this', null); await reportService.recordError('failed to get date for modifier=$userModifier, entry=$this', null);
}
return {}; return {};
} }
@ -374,7 +376,12 @@ extension ExtraAvesEntryMetadataEdition on AvesEntry {
switch (source) { switch (source) {
case DateFieldSource.fileModifiedDate: case DateFieldSource.fileModifiedDate:
try { try {
date = path != null ? await File(path!).lastModified() : null; if (path != null) {
final file = File(path!);
if (await file.exists()) {
date = await file.lastModified();
}
}
} on FileSystemException catch (_) {} } on FileSystemException catch (_) {}
break; break;
default: default:

3
lib/ref/mime_types.dart
View file

@ -14,6 +14,7 @@ class MimeTypes {
static const webp = 'image/webp'; static const webp = 'image/webp';
static const art = 'image/x-jg'; static const art = 'image/x-jg';
static const cdr = 'image/x-coreldraw';
static const djvu = 'image/vnd.djvu'; static const djvu = 'image/vnd.djvu';
static const jxl = 'image/jxl'; static const jxl = 'image/jxl';
static const psdVnd = 'image/vnd.adobe.photoshop'; static const psdVnd = 'image/vnd.adobe.photoshop';
@ -70,7 +71,7 @@ class MimeTypes {
static const Set<String> rawImages = {arw, cr2, crw, dcr, dng, erf, k25, kdc, mrw, nef, nrw, orf, pef, raf, raw, rw2, sr2, srf, srw, x3f}; static const Set<String> rawImages = {arw, cr2, crw, dcr, dng, erf, k25, kdc, mrw, nef, nrw, orf, pef, raf, raw, rw2, sr2, srf, srw, x3f};
// TODO TLAD [codec] make it dynamic if it depends on OS/lib versions // TODO TLAD [codec] make it dynamic if it depends on OS/lib versions
static const Set<String> undecodableImages = {art, crw, djvu, jxl, psdVnd, psdX, octetStream, zip}; static const Set<String> undecodableImages = {art, cdr, crw, djvu, jxl, psdVnd, psdX, octetStream, zip};
static const Set<String> _knownOpaqueImages = {heic, heif, jpeg}; static const Set<String> _knownOpaqueImages = {heic, heif, jpeg};