π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fix filename timestamp parsing
Neeraj Guptada78b58968d9
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 327b3527cf..faf69e3556 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@@ -349,50 +349,67 @@ bool isValidGregorianDate({return true;}-final RegExp _filenameExp = RegExp('[\\.A-Za-z]*');-DateTime? parseDateTimeFromFileNameV2(String fileName, {// Year bounds reduce false dates parsed from filenames.int minYear = 1990,int? maxYear,}) {- // Include next year for 31 December edge cases.- maxYear ??= currentYear + 1;- String val = fileName.replaceAll(_filenameExp, '');- if (val.isNotEmpty && !_isNumeric(val[0])) {- val = val.substring(1, val.length);- }- if (val.isNotEmpty && !_isNumeric(val[val.length - 1])) {- val = val.substring(0, val.length - 1);+ final date = _filenameDate.matchAsPrefix(fileName);+ if (date == null) return null;++ final year = int.parse(date[1]!);+ final month = int.parse(date[3]!);+ final day = int.parse(date[4]!);+ if (year < minYear ||+ year > (maxYear ?? currentYear + 1) ||+ !isValidGregorianDate(day: day, month: month, year: year)) {+ return null;}- final int countOfHyphen = val.split("-").length - 1;- final int countUnderScore = val.split("_").length - 1;- String valForParser = val;- if (countOfHyphen == 1) {- valForParser = val.replaceAll("-", "T");- } else if (countUnderScore == 1 || countUnderScore == 2) {- valForParser = val.replaceFirst("_", "T");- if (countUnderScore == 2) {- valForParser = valForParser.split("_")[0];- }- } else if (countOfHyphen == 2) {- valForParser = val.replaceAll(".", ":");- } else if (countOfHyphen == 6 || countOfHyphen == 7) {- final splits = val.split("-");- valForParser =- "${splits[0]}${splits[1]}${splits[2]}T${splits[3]}${splits[4]}${splits[5]}";++ final time = _filenameTime.matchAsPrefix(fileName, date.end);+ if (time == null) {+ // Don't turn an unrecognized time into a date-only result.+ return _filenameDateSuffix.matchAsPrefix(fileName, date.end) != null+ ? DateTime(year, month, day)+ : null;}- final result = DateTime.tryParse(valForParser);- if (result != null && result.year >= minYear && result.year <= maxYear) {- return result;+ if (_filenameTimeSuffix.matchAsPrefix(fileName, time.end) == null) {+ return null;}- return null;-}-bool _isNumeric(String? s) {- if (s == null) {- return false;+ final hour = int.parse(time[1]!);+ final minute = int.parse(time[3]!);+ final second = int.parse(time[4]!);+ if (hour > 23 || minute > 59 || second > 59) return null;++ 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);}- return double.tryParse(s) != null;+ final utc = DateTime.utc(year, month, day, hour, minute, second, 0, micros);+ if (zone.length == 1) return utc;++ final offset = zone.substring(1).replaceAll(':', '');+ final offsetHour = int.parse(offset.substring(0, 2));+ final offsetMinute = int.parse(offset.substring(2));+ if (offsetHour > 23 || offsetMinute > 59) return null;+ final offsetMinutes =+ (offsetHour * 60 + offsetMinute) * (zone[0] == '-' ? -1 : 1);+ return utc.subtract(Duration(minutes: offsetMinutes));}++// 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 _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 _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 10c620fd1c..062607d7d2 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@@ -1,5 +1,4 @@import 'package:ente_pure_utils/ente_pure_utils.dart';-import 'package:flutter/foundation.dart';import 'package:flutter_test/flutter_test.dart';void main() {@@ -33,51 +32,147 @@ void main() {});});- test("parseDateTimeFromFile", () {- final List<String> validParsing = [- "IMG-20221109-WA0000",- '''Screenshot_20220807-195908_Firefox''',- '''Screenshot_20220507-195908''',- "2022-02-18 16.00.12-DCMX.png",- "20221107_231730",- "2020-11-01 02.31.02",- "IMG_20210921_144423",- "2019-10-31 155703",- "IMG_20210921_144423_783",- "Screenshot_2022-06-21-16-51-29-164_newFormat.heic",- "Screenshot 20221106 211633.com.google.android.apps.nbu.paisa.user.jpg",- "signal-2022-12-17-15-16-04-718.jpg",- "signal-2022-12-17-15-16-04-718-2.jpg",- ];- for (String val in validParsing) {- final parsedValue = parseDateTimeFromFileNameV2(val);- expect(- parsedValue != null,- true,- reason: "Failed to parse time from $val",- );- if (kDebugMode) {- debugPrint("Parsed $val as ${parsedValue?.toIso8601String()}");- }+ group("filename dates", () {+ final cases = {+ "IMG-20221109-WA0000": DateTime(2022, 11, 9),+ "Screenshot_20220807-195908_Firefox": DateTime(2022, 8, 7, 19, 59, 8),+ "Screenshot_20220507-195908": DateTime(2022, 5, 7, 19, 59, 8),+ "2022-02-18 16.00.12-DCMX.png": DateTime(2022, 2, 18, 16, 0, 12),+ "20221107_231730": DateTime(2022, 11, 7, 23, 17, 30),+ "2020-11-01 02.31.02": DateTime(2020, 11, 1, 2, 31, 2),+ "IMG_20210921_144423": DateTime(2021, 9, 21, 14, 44, 23),+ "2019-10-31 155703": DateTime(2019, 10, 31, 15, 57, 3),+ "IMG_20210921_144423_783": DateTime(2021, 9, 21, 14, 44, 23),+ "Screenshot_2022-06-21-16-51-29-164_newFormat.heic": DateTime(+ 2022,+ 6,+ 21,+ 16,+ 51,+ 29,+ ),+ "Screenshot 20221106 211633.com.google.android.apps.nbu.paisa.user.jpg":+ DateTime(2022, 11, 6, 21, 16, 33),+ "signal-2022-12-17-15-16-04-718.jpg": DateTime(2022, 12, 17, 15, 16, 4),+ "signal-2022-12-17-15-16-04-718-2.jpg": DateTime(2022, 12, 17, 15, 16, 4),+ "signal-2026-08-31-195517.jpeg": DateTime(2026, 8, 31, 19, 55, 17),+ "signal-2026-08-31-195517-1.jpeg": DateTime(2026, 8, 31, 19, 55, 17),+ "signal-2026-08-31-195517.mp4": DateTime(2026, 8, 31, 19, 55, 17),+ "signal-2026-08-31-195517-12.mp4": DateTime(2026, 8, 31, 19, 55, 17),+ "PHOTO-2026-07-02-15-15-31.jpg": DateTime(2026, 7, 2, 15, 15, 31),+ "PHOTO-2026-07-02-15-15-31-1.jpg": DateTime(2026, 7, 2, 15, 15, 31),+ "2024-02-29 23:59:59.jpg": DateTime(2024, 2, 29, 23, 59, 59),+ "2000-02-29.jpg": DateTime(2000, 2, 29),+ "2024-01-01.jpg": DateTime(2024, 1, 1),+ "20240101.mp4": DateTime(2024, 1, 1),+ "IMG-20240101-WA0001.jpg": 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(+ 2024,+ 1,+ 1,+ 12,+ 34,+ 56,+ 123,+ 456,+ ),+ "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 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),+ "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(+ 2024,+ 1,+ 1,+ 10,+ 34,+ 56,+ 123,+ 456,+ ),+ "signal-2026-08-31-195517-0100.jpeg": DateTime(2026, 8, 31, 19, 55, 17),+ };+ for (final entry in cases.entries) {+ test("parses ${entry.key}", () {+ expect(parseDateTimeFromFileNameV2(entry.key), entry.value);+ });}- });- test("test invalid datetime parsing", () {- final List<String> badParsing = [+ for (final name in [+ "",+ "photo.jpg",+ "IMG_0123.JPG","Snapchat-431959199.mp4.","Snapchat-400000000.mp4","Snapchat-900000000.mp4",- ];- for (String val in badParsing) {- final parsedValue = parseDateTimeFromFileNameV2(val);+ "2023-02-29.jpg",+ "2024-02-30.jpg",+ "2024-00-01.jpg",+ "2024-13-01.jpg",+ "2024-01-00.jpg",+ "2024-04-31.jpg",+ "2024-01-01-240000.jpg",+ "2024-01-01-126000.jpg",+ "2024-01-01-120060.jpg",+ "2024-01-01-12-34.jpg",+ "2024-01-01-12-34:56.jpg",+ "2024-01-01-1234567.jpg",+ "2024-0101-123456.jpg",+ "20240101-1.jpg",+ "120240101-123456.jpg",+ "2024a0101-123456.jpg",+ "IMG_20240101_1234.jpg",+ "2024-01-01 12:34.jpg",+ "2024-01-01 12:34:56.jpg",+ "2024-01-01t12:34:56.jpg",+ "2024-01-01.123456.jpg",+ "20240101abcdef987654.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-24:00.jpg",+ "2024-01-01 12:34:56-02:60.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",+ "2024-01-01 12:34:56.1234567.jpg",+ "2024-01-01 12:34:56,garbage.jpg",+ "2024-01-01 12:34:56 extra.jpg",+ "2024-01-01 12:34:56Zgarbage.jpg",+ ]) {+ test("rejects $name", () {+ expect(parseDateTimeFromFileNameV2(name), isNull);+ });+ }++ test("respects year bounds", () {+ expect(parseDateTimeFromFileNameV2("19891231.jpg"), isNull);expect(- parsedValue == null,- true,- reason: "parsing should have failed $val",+ parseDateTimeFromFileNameV2("19891231.jpg", minYear: 1980),+ DateTime(1989, 12, 31),);- if (kDebugMode) {- debugPrint("Parsed $val as ${parsedValue?.toIso8601String()}");- }- }+ expect(+ parseDateTimeFromFileNameV2("1900-02-29.jpg", minYear: 1900),+ isNull,+ );+ expect(+ parseDateTimeFromFileNameV2("20260831.jpg", maxYear: 2025),+ isNull,+ );+ expect(+ parseDateTimeFromFileNameV2("20260831.jpg", maxYear: 2026),+ DateTime(2026, 8, 31),+ );+ final nextYear = currentYear + 1;+ expect(+ parseDateTimeFromFileNameV2("$nextYear-01-01.jpg"),+ DateTime(nextYear, 1, 1),+ );+ expect(parseDateTimeFromFileNameV2("${nextYear + 1}-01-01.jpg"), isNull);+ });});}