diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart index bcdd6011bb..4d1094f832 100644 --- a/mobile/lib/models/file/file.dart +++ b/mobile/lib/models/file/file.dart @@ -151,7 +151,7 @@ class EnteFile { creationTime = DateTime.now().toUtc().microsecondsSinceEpoch; } try { - final parsedDateTime = parseDateTimeFromFileNameV2( + final parsedDateTime = parseDateTimeFromName( basenameWithoutExtension(asset.title ?? ""), ); if (parsedDateTime != null) { @@ -205,7 +205,7 @@ class EnteFile { // Try to get the timestamp from fileName. In case of iOS, file names are // generic IMG_XXXX, so only parse it on Android devices if (!hasExifTime && Platform.isAndroid && title != null) { - final timeFromFileName = parseDateTimeFromFileNameV2(title!); + final timeFromFileName = parseDateTimeFromName(title!); if (timeFromFileName != null) { // only use timeFromFileName if the existing creationTime and // timeFromFilename belongs to different date. diff --git a/mobile/lib/utils/share_util.dart b/mobile/lib/utils/share_util.dart index 1dfa9ea8f0..a136422eef 100644 --- a/mobile/lib/utils/share_util.dart +++ b/mobile/lib/utils/share_util.dart @@ -171,7 +171,7 @@ Future> convertIncomingSharedMediaToFile( } if (creationTime == 0) { final parsedDateTime = - parseDateTimeFromFileNameV2(basenameWithoutExtension(media.path)); + parseDateTimeFromName(basenameWithoutExtension(media.path)); if (parsedDateTime != null) { creationTime = parsedDateTime.microsecondsSinceEpoch; } else { @@ -206,26 +206,6 @@ Future> convertPicketAssets( return localFiles; } -DateTime? parseDateFromFileNam1e(String fileName) { - if (fileName.startsWith('IMG-') || fileName.startsWith('VID-')) { - // Whatsapp media files - return DateTime.tryParse(fileName.split('-')[1]); - } else if (fileName.startsWith("Screenshot_")) { - // Screenshots on droid - return DateTime.tryParse( - (fileName).replaceAll('Screenshot_', '').replaceAll('-', 'T'), - ); - } else { - return DateTime.tryParse( - (fileName) - .replaceAll("IMG_", "") - .replaceAll("VID_", "") - .replaceAll("DCIM_", "") - .replaceAll("_", " "), - ); - } -} - void shareSelected( BuildContext context, GlobalKey shareButtonKey, diff --git a/mobile/lib/utils/standalone/date_time.dart b/mobile/lib/utils/standalone/date_time.dart index bb29960319..503d70854d 100644 --- a/mobile/lib/utils/standalone/date_time.dart +++ b/mobile/lib/utils/standalone/date_time.dart @@ -166,7 +166,7 @@ bool isValidGregorianDate({ final RegExp exp = RegExp('[\\.A-Za-z]*'); -DateTime? parseDateTimeFromFileNameV2( +DateTime? parseDateTimeFromName( String fileName, { /* to avoid parsing incorrect date time from the filename, the max and min year limits the chances of parsing incorrect date times diff --git a/mobile/test/utils/date_time_util_test.dart b/mobile/test/utils/date_time_util_test.dart index ac89231ee8..10c8456987 100644 --- a/mobile/test/utils/date_time_util_test.dart +++ b/mobile/test/utils/date_time_util_test.dart @@ -21,7 +21,7 @@ void main() { "signal-2022-12-17-15-16-04-718-2.jpg", ]; for (String val in validParsing) { - final parsedValue = parseDateTimeFromFileNameV2(val); + final parsedValue = parseDateTimeFromName(val); expect( parsedValue != null, true, @@ -40,7 +40,7 @@ void main() { "Snapchat-900000000.mp4", ]; for (String val in badParsing) { - final parsedValue = parseDateTimeFromFileNameV2(val); + final parsedValue = parseDateTimeFromName(val); expect( parsedValue == null, true,