minor refactor
This commit is contained in:
parent
9f935e11f0
commit
7ba30c5898
1 changed files with 15 additions and 12 deletions
|
@ -44,10 +44,6 @@ class FilesService {
|
||||||
List<File> files,
|
List<File> files,
|
||||||
EditTimeSource source,
|
EditTimeSource source,
|
||||||
) async {
|
) async {
|
||||||
assert(
|
|
||||||
source == EditTimeSource.fileName,
|
|
||||||
"edit source ${source.name} is not supported yet",
|
|
||||||
);
|
|
||||||
final ListMatch<File> result = files.splitMatch(
|
final ListMatch<File> result = files.splitMatch(
|
||||||
(element) => element.isUploaded,
|
(element) => element.isUploaded,
|
||||||
);
|
);
|
||||||
|
@ -55,11 +51,9 @@ class FilesService {
|
||||||
// editTime For LocalFiles
|
// editTime For LocalFiles
|
||||||
final List<File> localOnlyFiles = result.unmatched;
|
final List<File> localOnlyFiles = result.unmatched;
|
||||||
for (File localFile in localOnlyFiles) {
|
for (File localFile in localOnlyFiles) {
|
||||||
final timeResult = parseDateTimeFromFileNameV2(
|
final timeResult = _parseTime(localFile, source);
|
||||||
basenameWithoutExtension(localFile.title ?? ""),
|
|
||||||
);
|
|
||||||
if (timeResult != null) {
|
if (timeResult != null) {
|
||||||
localFile.creationTime = timeResult.microsecondsSinceEpoch;
|
localFile.creationTime = timeResult;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await _filesDB.insertMultiple(localOnlyFiles);
|
await _filesDB.insertMultiple(localOnlyFiles);
|
||||||
|
@ -73,13 +67,11 @@ class FilesService {
|
||||||
fileIDToUpdateMetadata.containsKey(remoteFile.uploadedFileID)) {
|
fileIDToUpdateMetadata.containsKey(remoteFile.uploadedFileID)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
final timeResult = parseDateTimeFromFileNameV2(
|
final timeResult = _parseTime(remoteFile, source);
|
||||||
basenameWithoutExtension(remoteFile.title ?? ""),
|
|
||||||
);
|
|
||||||
if (timeResult != null) {
|
if (timeResult != null) {
|
||||||
remoteFilesToUpdate.add(remoteFile);
|
remoteFilesToUpdate.add(remoteFile);
|
||||||
fileIDToUpdateMetadata[remoteFile.uploadedFileID!] = {
|
fileIDToUpdateMetadata[remoteFile.uploadedFileID!] = {
|
||||||
pubMagicKeyEditedTime: timeResult.microsecondsSinceEpoch,
|
pubMagicKeyEditedTime: timeResult!,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -91,6 +83,17 @@ class FilesService {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int? _parseTime(File file, EditTimeSource source) {
|
||||||
|
assert(
|
||||||
|
source == EditTimeSource.fileName,
|
||||||
|
"edit source ${source.name} is not supported yet",
|
||||||
|
);
|
||||||
|
final timeResult = parseDateTimeFromFileNameV2(
|
||||||
|
basenameWithoutExtension(file.title ?? ""),
|
||||||
|
);
|
||||||
|
return timeResult?.microsecondsSinceEpoch;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum EditTimeSource {
|
enum EditTimeSource {
|
||||||
|
|
Loading…
Add table
Reference in a new issue