Rename
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -171,7 +171,7 @@ Future<List<SharedAsset>> 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<List<EnteFile>> 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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user