π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Preserve filename date formats and compact offsets
Neeraj Guptaf5f57028c2dd
diff --git a/mobile/packages/ente_pure_utils/lib/src/date_time_util.dart b/mobile/packages/ente_pure_utils/lib/src/date_time_util.dartindex faf69e3556..337dd03a3c 100644--- a/mobile/packages/ente_pure_utils/lib/src/date_time_util.dart+++ b/mobile/packages/ente_pure_utils/lib/src/date_time_util.dart@@ -374,7 +374,17 @@ DateTime? parseDateTimeFromFileNameV2(? DateTime(year, month, day): null;}- if (_filenameTimeSuffix.matchAsPrefix(fileName, time.end) == null) {+ var zone = time[6];+ var timeEnd = time.end;+ if (zone == null &&+ (fileName[date.end] == ' ' || fileName[date.end] == 'T')) {+ final offset = _filenameCompactOffset.matchAsPrefix(fileName, timeEnd);+ if (offset != null) {+ zone = offset[0];+ timeEnd = offset.end;+ }+ }+ if (_filenameTimeSuffix.matchAsPrefix(fileName, timeEnd) == null) {return null;}@@ -385,7 +395,6 @@ DateTime? parseDateTimeFromFileNameV2(final fraction = time[5];final micros = fraction == null ? 0 : int.parse(fraction.padRight(6, '0'));- final zone = time[6];if (zone == null) {return DateTime(year, month, day, hour, minute, second, 0, micros);}@@ -393,6 +402,7 @@ DateTime? parseDateTimeFromFileNameV2(if (zone.length == 1) return utc;final offset = zone.substring(1).replaceAll(':', '');+ if (offset.length != 4) return null;final offsetHour = int.parse(offset.substring(0, 2));final offsetMinute = int.parse(offset.substring(2));if (offsetHour > 23 || offsetMinute > 59) return null;@@ -402,14 +412,16 @@ DateTime? parseDateTimeFromFileNameV2(}// Match the first numeric portion, with consistent separators and digit bounds.-final _filenameDate = RegExp(r'^[^\d]*(\d{4})(-?)(\d{2})\2(\d{2})(?!\d)');+final _filenameDate = RegExp(r'^[^\d]*(\d{4})([-.]?)(\d{2})\2(\d{2})(?!\d)');final _filenameTime = RegExp(r'[ T_-](\d{2})([-.:]?)(\d{2})\2(\d{2})'r'(?:[.,](\d{1,6})(?!\d))?'- // Require a colon in negative offsets to distinguish Signal copy counters.r'([zZ]|\+\d{2}:?\d{2}|-\d{2}:\d{2})?(?!\d)',);-final _filenameDateSuffix = RegExp(r'(?:-WA\d+)?(?:\.[A-Za-z][A-Za-z0-9]*)?$');+final _filenameCompactOffset = RegExp(r'-\d+');+final _filenameDateSuffix = RegExp(+ r'(?:-WA\d+|[-_][A-Za-z]+)?(?:\.[A-Za-z][A-Za-z0-9]*)?$',+);final _filenameTimeSuffix = RegExp(r'(?:[-_][A-Za-z0-9_.-]+|\.[A-Za-z][A-Za-z0-9_.-]*)?$',);diff --git a/mobile/packages/ente_pure_utils/test/date_time_util_test.dart b/mobile/packages/ente_pure_utils/test/date_time_util_test.dartindex 062607d7d2..50ecd3705b 100644--- a/mobile/packages/ente_pure_utils/test/date_time_util_test.dart+++ b/mobile/packages/ente_pure_utils/test/date_time_util_test.dart@@ -66,6 +66,11 @@ void main() {"2024-01-01.jpg": DateTime(2024, 1, 1),"20240101.mp4": DateTime(2024, 1, 1),"IMG-20240101-WA0001.jpg": DateTime(2024, 1, 1),+ "IMG_2024.08.31_195517.jpg": DateTime(2024, 8, 31, 19, 55, 17),+ "2024.02.29.jpg": DateTime(2024, 2, 29),+ "2024-01-01-edited.jpg": DateTime(2024, 1, 1),+ "IMG_20240101_HDR.jpg": DateTime(2024, 1, 1),+ "IMG_20240101_HDR": DateTime(2024, 1, 1),"2024-01-01 12:34:56,789.jpg": DateTime(2024, 1, 1, 12, 34, 56, 789),"2024-01-01 12:34:56.1.jpg": DateTime(2024, 1, 1, 12, 34, 56, 100),"2024-01-01 12:34:56.123456.jpg": DateTime(@@ -81,8 +86,20 @@ void main() {"2024-01-01 12:34:56+02:00.jpg": DateTime.utc(2024, 1, 1, 10, 34, 56),"2024-01-01 12:34:56+0200.jpg": DateTime.utc(2024, 1, 1, 10, 34, 56),"2024-01-01 12:34:56-03:30.jpg": DateTime.utc(2024, 1, 1, 16, 4, 56),+ "2024-01-01 12:34:56-0330.jpg": DateTime.utc(2024, 1, 1, 16, 4, 56),+ "20240101T123456-0330.jpg": DateTime.utc(2024, 1, 1, 16, 4, 56),+ "2024-01-01T12:34:56-0330.jpg": DateTime.utc(2024, 1, 1, 16, 4, 56),+ "2024-01-01 12:34:56-0330-edited.jpg": DateTime.utc(+ 2024,+ 1,+ 1,+ 16,+ 4,+ 56,+ ),"2024-01-01 00:15:00+01:00.jpg": DateTime.utc(2023, 12, 31, 23, 15),"2024-01-01 23:45:00-00:30.jpg": DateTime.utc(2024, 1, 2, 0, 15),+ "2024-01-01 23:45:00-0030.jpg": DateTime.utc(2024, 1, 2, 0, 15),"20240101T123456Z.jpg": DateTime.utc(2024, 1, 1, 12, 34, 56),"20240101T123456z.jpg": DateTime.utc(2024, 1, 1, 12, 34, 56),"2024-01-01 12:34:56.123456+02:00.jpg": DateTime.utc(@@ -95,7 +112,20 @@ void main() {123,456,),+ "2024-01-01 12:34:56.123456-0330.jpg": DateTime.utc(+ 2024,+ 1,+ 1,+ 16,+ 4,+ 56,+ 123,+ 456,+ ),"signal-2026-08-31-195517-0100.jpeg": DateTime(2026, 8, 31, 19, 55, 17),+ "signal-2026-08-31-195517-0330.jpeg": DateTime(2026, 8, 31, 19, 55, 17),+ "signal-2026-08-31-195517-2460.jpeg": DateTime(2026, 8, 31, 19, 55, 17),+ "PHOTO-2026-07-02-15-15-31-0330.jpg": DateTime(2026, 7, 2, 15, 15, 31),};for (final entry in cases.entries) {test("parses ${entry.key}", () {@@ -111,6 +141,9 @@ void main() {"Snapchat-400000000.mp4","Snapchat-900000000.mp4","2023-02-29.jpg",+ "2023.02.29.jpg",+ "IMG_2024.08-31_195517.jpg",+ "IMG_2024.0831_195517.jpg","2024-02-30.jpg","2024-00-01.jpg","2024-13-01.jpg",@@ -127,6 +160,8 @@ void main() {"120240101-123456.jpg","2024a0101-123456.jpg","IMG_20240101_1234.jpg",+ "IMG_20240101_HDR_1234.jpg",+ "2024-01-01-edited1234.jpg","2024-01-01 12:34.jpg","2024-01-01 12:34:56.jpg","2024-01-01t12:34:56.jpg",@@ -136,6 +171,11 @@ void main() {"2024-01-01 12:34:56+02:60.jpg","2024-01-01 12:34:56-24:00.jpg","2024-01-01 12:34:56-02:60.jpg",+ "2024-01-01 12:34:56-2400.jpg",+ "2024-01-01 12:34:56-0260.jpg",+ "2024-01-01 12:34:56-03.jpg",+ "2024-01-01 12:34:56-033.jpg",+ "2024-01-01 12:34:56-03300.jpg","2024-01-01 12:34:56+02:000.jpg","2024-01-01 12:34:56+02.jpg","2024-01-01 12:34:56,7890123.jpg",