From 220e61784b54d10922c10bdc67fd9835a9ef9ad6 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Mon, 26 Sep 2022 22:31:04 +0200
Subject: [PATCH] minor fixes

---
 lib/model/video/metadata.dart               | 2 +-
 lib/services/media/media_fetch_service.dart | 5 ++---
 test/model/video/metadata_test.dart         | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/model/video/metadata.dart b/lib/model/video/metadata.dart
index 451361e18..c050e6155 100644
--- a/lib/model/video/metadata.dart
+++ b/lib/model/video/metadata.dart
@@ -140,7 +140,7 @@ class VideoMetadataFormatter {
           hour = int.tryParse(match.group(5)!) ?? 0;
           minute = int.tryParse(match.group(6)!) ?? 0;
           second = int.tryParse(match.group(7)!) ?? 0;
-          pm = match.group(9) == 'pm';
+          pm = {'pm', 'p. m.'}.contains(match.group(9));
         }
 
         final date = DateTime(year, month, day, hour + (pm ? 12 : 0), minute, second, 0);
diff --git a/lib/services/media/media_fetch_service.dart b/lib/services/media/media_fetch_service.dart
index ad07eb85a..c3d13a55d 100644
--- a/lib/services/media/media_fetch_service.dart
+++ b/lib/services/media/media_fetch_service.dart
@@ -81,9 +81,8 @@ class PlatformMediaFetchService implements MediaFetchService {
       }) as Map;
       return AvesEntry.fromMap(result);
     } on PlatformException catch (e, stack) {
-      // do not report issues with simple parameter-less media content
-      // as it is likely an obsolete Media Store entry
-      if (!uri.startsWith('content://media/') || uri.contains('?')) {
+      // do not report issues with media content as it is likely an obsolete Media Store entry
+      if (!uri.startsWith('content://media/')) {
         await reportService.recordError(e, stack);
       }
     }
diff --git a/test/model/video/metadata_test.dart b/test/model/video/metadata_test.dart
index 6983fbac8..833621c23 100644
--- a/test/model/video/metadata_test.dart
+++ b/test/model/video/metadata_test.dart
@@ -9,7 +9,7 @@ void main() {
     expect(VideoMetadataFormatter.parseVideoDate('UTC 2021-05-30 19:14:21'), DateTime(2021, 5, 30, 19, 14, 21).millisecondsSinceEpoch);
     expect(VideoMetadataFormatter.parseVideoDate('2021/10/31 21:23:17'), DateTime(2021, 10, 31, 21, 23, 17).millisecondsSinceEpoch);
     expect(VideoMetadataFormatter.parseVideoDate('2021-09-10T7:14:49 pmZ'), DateTime(2021, 9, 10, 19, 14, 49).millisecondsSinceEpoch);
-    expect(VideoMetadataFormatter.parseVideoDate('2022-01-28T5:07:46 p. m.Z'), DateTime(2022, 1, 28, 5, 7, 46).millisecondsSinceEpoch);
+    expect(VideoMetadataFormatter.parseVideoDate('2022-01-28T5:07:46 p. m.Z'), DateTime(2022, 1, 28, 17, 7, 46).millisecondsSinceEpoch);
     expect(VideoMetadataFormatter.parseVideoDate('2012-1-1T12:00:00Z'), DateTime(2012, 1, 1, 12, 0, 0).millisecondsSinceEpoch);
     expect(VideoMetadataFormatter.parseVideoDate('2020.10.14'), DateTime(2020, 10, 14).millisecondsSinceEpoch);
   });