Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-02-02 14:56:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix not updating bestDateTime when updating file property

Browse source
This commit is contained in:
Ming Ming 2022-10-29 19:05:23 +08:00
parent 054d6bbae5
commit 037fbd845d
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/lib/entity/file.dart
View file

@ -6,6 +6,7 @@ import 'package:nc_photos/account.dart';
import 'package:nc_photos/ci_string.dart'; import 'package:nc_photos/ci_string.dart';
import 'package:nc_photos/entity/exif.dart'; import 'package:nc_photos/entity/exif.dart';
import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/entity/file_descriptor.dart';
import 'package:nc_photos/entity/file_util.dart' as file_util;
import 'package:nc_photos/json_util.dart' as json_util; import 'package:nc_photos/json_util.dart' as json_util;
import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/or_null.dart';
import 'package:nc_photos/string_extension.dart'; import 'package:nc_photos/string_extension.dart';
@ -568,11 +569,11 @@ class File with EquatableMixin implements FileDescriptor {
} }
extension FileExtension on File { extension FileExtension on File {
DateTime get bestDateTime => DateTime get bestDateTime => file_util.getBestDateTime(
overrideDateTime ?? overrideDateTime: overrideDateTime,
metadata?.exif?.dateTimeOriginal ?? dateTimeOriginal: metadata?.exif?.dateTimeOriginal,
lastModified ?? lastModified: lastModified,
DateTime.now().toUtc(); );
bool isOwned(CiString userId) => ownerId == null || ownerId == userId; bool isOwned(CiString userId) => ownerId == null || ownerId == userId;
} }

11
app/lib/entity/file/data_source.dart
View file

@ -469,6 +469,17 @@ class FileSqliteDbDataSource implements FileDataSource {
: sql.Value(overrideDateTime.obj), : sql.Value(overrideDateTime.obj),
isFavorite: isFavorite:
favorite == null ? const sql.Value.absent() : sql.Value(favorite), favorite == null ? const sql.Value.absent() : sql.Value(favorite),
bestDateTime: overrideDateTime == null && metadata == null
? const sql.Value.absent()
: sql.Value(file_util.getBestDateTime(
overrideDateTime: overrideDateTime == null
? f.overrideDateTime
: overrideDateTime.obj,
dateTimeOriginal: metadata == null
? f.metadata?.exif?.dateTimeOriginal
: metadata.obj?.exif?.dateTimeOriginal,
lastModified: f.lastModified,
)),
); );
await (db.update(db.accountFiles) await (db.update(db.accountFiles)
..where((t) => t.rowId.equals(rowIds.accountFileRowId))) ..where((t) => t.rowId.equals(rowIds.accountFileRowId)))

6
app/lib/entity/file_util.dart
View file

@ -96,6 +96,12 @@ bool isMissingMetadata(File file) =>
isSupportedImageFormat(file) && isSupportedImageFormat(file) &&
(file.metadata == null || file.location == null); (file.metadata == null || file.location == null);
DateTime getBestDateTime({
DateTime? overrideDateTime,
DateTime? dateTimeOriginal,
DateTime? lastModified,
}) => overrideDateTime ?? dateTimeOriginal ?? lastModified ?? DateTime.now().toUtc();
final supportedFormatMimes = [ final supportedFormatMimes = [
"image/jpeg", "image/jpeg",
"image/png", "image/png",