Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

better time safeguards

laurenspriem69caa95cc08f
diff --git a/mobile/apps/photos/lib/core/errors.dart b/mobile/apps/photos/lib/core/errors.dart
index 895eb7a069..7d5bf21440 100644
--- a/mobile/apps/photos/lib/core/errors.dart
+++ b/mobile/apps/photos/lib/core/errors.dart
@@ -122,26 +122,6 @@ class EncSizeMismatchError implements Exception {
String toString() => "EncSizeMismatchError: $message";
}
-class InvalidDateTimeError implements Exception {
- final String assetId;
- final String? assetTitle;
- final String field;
- final String originalError;
-
- InvalidDateTimeError({
- required this.assetId,
- this.assetTitle,
- required this.field,
- required this.originalError,
- });
-
- @override
- String toString() {
- return 'InvalidDateTimeError: $field is invalid for asset '
- '(id: $assetId, title: ${assetTitle ?? "unknown"}) - $originalError';
- }
-}
-
class BadMD5DigestError implements Exception {
final String message;
BadMD5DigestError(this.message);
diff --git a/mobile/apps/photos/lib/module/metadata/asset_date_times.dart b/mobile/apps/photos/lib/module/metadata/asset_date_times.dart
new file mode 100644
index 0000000000..9452051db2
--- /dev/null
+++ b/mobile/apps/photos/lib/module/metadata/asset_date_times.dart
@@ -0,0 +1,101 @@
+import "package:ente_pure_utils/ente_pure_utils.dart";
+import "package:logging/logging.dart";
+import "package:path/path.dart";
+import "package:photo_manager/photo_manager.dart";
+import "package:photos/core/constants.dart";
+
+final _logger = Logger("AssetDateTimes");
+
+// Dart DateTime accepts +/- 8.64e15 milliseconds; photo_manager exposes
+// timestamps as whole seconds.
+const _maxDateTimeSecondsSinceEpoch = 8640000000000;
+const _minDateTimeSecondsSinceEpoch = -_maxDateTimeSecondsSinceEpoch;
+
+typedef AssetDateTimes = ({int creationTime, int modificationTime});
+
+AssetDateTimes resolveAssetDateTimes(AssetEntity asset) {
+ final uploadTime = DateTime.now().toUtc().microsecondsSinceEpoch;
+ final creationTime = _validMicrosecondsSinceEpoch(asset.createDateSecond);
+ final modificationTime = _validMicrosecondsSinceEpoch(
+ asset.modifiedDateSecond,
+ );
+
+ if (creationTime == null && modificationTime == null) {
+ _logger.warning(
+ "Asset creation and modification times are invalid; using upload time",
+ );
+ return (creationTime: uploadTime, modificationTime: uploadTime);
+ }
+ if (creationTime == null) {
+ _logger.info("Asset creation time is invalid; using modification time");
+ return (
+ creationTime: modificationTime!,
+ modificationTime: modificationTime,
+ );
+ }
+ if (modificationTime == null) {
+ _logger.info("Asset modification time is invalid; using creation time");
+ final resolvedCreationTime = _resolveCreationTime(
+ asset,
+ creationTime,
+ creationTime,
+ uploadTime,
+ );
+ return (
+ creationTime: resolvedCreationTime,
+ modificationTime: resolvedCreationTime,
+ );
+ }
+
+ return (
+ creationTime: _resolveCreationTime(
+ asset,
+ creationTime,
+ modificationTime,
+ uploadTime,
+ ),
+ modificationTime: modificationTime,
+ );
+}
+
+int _resolveCreationTime(
+ AssetEntity asset,
+ int creationTime,
+ int modificationTime,
+ int uploadTime,
+) {
+ var resolvedCreationTime = creationTime;
+ if (creationTime >= jan011981Time) {
+ // Copied files can retain an older modification time while gaining a new
+ // filesystem creation time. Embedded metadata may replace this on upload.
+ if (modificationTime >= jan011981Time && modificationTime < creationTime) {
+ _logger.info(
+ "Asset modification time is less than creation time. "
+ "Using modification time as creation time",
+ );
+ resolvedCreationTime = modificationTime;
+ }
+ return resolvedCreationTime;
+ }
+
+ resolvedCreationTime = modificationTime >= jan011981Time
+ ? modificationTime
+ : uploadTime;
+ try {
+ final parsedDateTime = parseDateTimeFromFileNameV2(
+ basenameWithoutExtension(asset.title ?? ""),
+ );
+ return parsedDateTime?.microsecondsSinceEpoch ?? resolvedCreationTime;
+ } catch (_) {
+ return resolvedCreationTime;
+ }
+}
+
+int? _validMicrosecondsSinceEpoch(int? secondsSinceEpoch) {
+ if (secondsSinceEpoch == null ||
+ secondsSinceEpoch < _minDateTimeSecondsSinceEpoch ||
+ secondsSinceEpoch > _maxDateTimeSecondsSinceEpoch) {
+ return null;
+ }
+ return secondsSinceEpoch * Duration.microsecondsPerSecond;
+}
diff --git a/mobile/apps/photos/lib/module/metadata/local_file.dart b/mobile/apps/photos/lib/module/metadata/local_file.dart
index 56ac28f223..68768625ce 100644
--- a/mobile/apps/photos/lib/module/metadata/local_file.dart
+++ b/mobile/apps/photos/lib/module/metadata/local_file.dart
@@ -1,31 +1,27 @@
import "dart:io";
import "package:ente_pure_utils/ente_pure_utils.dart";
-import "package:logging/logging.dart";
-import "package:path/path.dart";
import "package:photo_manager/photo_manager.dart";
-import "package:photos/core/constants.dart";
-import "package:photos/core/errors.dart";
import "package:photos/models/file/file.dart";
import "package:photos/models/file/file_type.dart";
import "package:photos/models/location/location.dart";
+import "package:photos/module/metadata/asset_date_times.dart";
import "package:photos/module/metadata/exif.dart";
-final _logger = Logger("LocalFileMetadata");
-
-EnteFile fileFromAsset(String deviceFolder, AssetEntity asset) {
+EnteFile fileFromAsset(
+ String deviceFolder,
+ AssetEntity asset, {
+ AssetDateTimes? dateTimes,
+}) {
+ final resolvedDateTimes = dateTimes ?? resolveAssetDateTimes(asset);
return EnteFile()
..localID = asset.id
..title = asset.title
..deviceFolder = deviceFolder
..location = Location(latitude: asset.latitude, longitude: asset.longitude)
..fileType = fileTypeFromAsset(asset)
- ..creationTime = _creationTimeFromAsset(asset)
- ..modificationTime = _microsecondsSinceEpoch(
- asset.modifiedDateTime,
- asset,
- "modificationTime",
- )
+ ..creationTime = resolvedDateTimes.creationTime
+ ..modificationTime = resolvedDateTimes.modificationTime
..fileSubType = asset.subtype
..metadataVersion = -1;
}
@@ -60,57 +56,3 @@ void applyCreationTimeMetadata(EnteFile file, ParsedExifDateTime? exifTime) {
}
}
}
-
-int _creationTimeFromAsset(AssetEntity asset) {
- var creationTime = _microsecondsSinceEpoch(
- asset.createDateTime,
- asset,
- "createDateTime",
- );
- final modificationTime = _microsecondsSinceEpoch(
- asset.modifiedDateTime,
- asset,
- "modificationTime",
- );
- if (creationTime >= jan011981Time) {
- // Copied files can retain an older modification time while gaining a new
- // filesystem creation time. Embedded metadata may replace this on upload.
- if (modificationTime >= jan011981Time && modificationTime < creationTime) {
- _logger.info(
- "LocalID: ${asset.id} modification time is less than creation time. "
- "Using modification time as creation time",
- );
- creationTime = modificationTime;
- }
- return creationTime;
- }
-
- creationTime = modificationTime >= jan011981Time
- ? modificationTime
- : DateTime.now().toUtc().microsecondsSinceEpoch;
- try {
- final parsedDateTime = parseDateTimeFromFileNameV2(
- basenameWithoutExtension(asset.title ?? ""),
- );
- return parsedDateTime?.microsecondsSinceEpoch ?? creationTime;
- } catch (_) {
- return creationTime;
- }
-}
-
-int _microsecondsSinceEpoch(
- DateTime dateTime,
- AssetEntity asset,
- String field,
-) {
- try {
- return dateTime.microsecondsSinceEpoch;
- } on RangeError catch (e) {
- throw InvalidDateTimeError(
- assetId: asset.id,
- assetTitle: asset.title,
- field: field,
- originalError: e.message ?? e.toString(),
- );
- }
-}
diff --git a/mobile/apps/photos/lib/services/sync/import/local_assets.dart b/mobile/apps/photos/lib/services/sync/import/local_assets.dart
index 182ba35163..17bcfec167 100644
--- a/mobile/apps/photos/lib/services/sync/import/local_assets.dart
+++ b/mobile/apps/photos/lib/services/sync/import/local_assets.dart
@@ -4,10 +4,10 @@ import 'dart:math';
import 'package:computer/computer.dart';
import 'package:logging/logging.dart';
import 'package:photo_manager/photo_manager.dart';
-import 'package:photos/core/errors.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/events/local_import_progress.dart';
import 'package:photos/models/file/file.dart';
+import "package:photos/module/metadata/asset_date_times.dart";
import "package:photos/module/metadata/local_file.dart";
import "package:photos/services/sync/import/model.dart";
import 'package:tuple/tuple.dart';
@@ -202,25 +202,6 @@ Future<List<AssetEntity>> _getAllAssetLists(AssetPathEntity pathEntity) async {
return result;
}
-/// Safely extracts millisecondsSinceEpoch from DateTime, throwing InvalidDateTimeError if invalid
-int _safeGetMilliseconds(
- DateTime dateTime,
- String assetId,
- String? assetTitle,
- String label,
-) {
- try {
- return dateTime.millisecondsSinceEpoch;
- } on RangeError catch (e) {
- throw InvalidDateTimeError(
- assetId: assetId,
- assetTitle: assetTitle,
- field: label,
- originalError: e.message ?? e.toString(),
- );
- }
-}
-
// Runs in a worker isolate because a device folder can contain thousands of
// assets and this loop constructs metadata for the full folder. Re-benchmark
// large imports before moving this work onto the UI isolate.
@@ -235,23 +216,12 @@ Tuple2<Set<String>, List<EnteFile>> _getLocalIDsAndFilesFromAssets(
final Set<String> localIDs = {};
for (AssetEntity entity in assetList) {
localIDs.add(entity.id);
- final createMs = _safeGetMilliseconds(
- entity.createDateTime,
- entity.id,
- entity.title,
- 'createDateTime',
- );
- final modifiedMs = _safeGetMilliseconds(
- entity.modifiedDateTime,
- entity.id,
- entity.title,
- 'modifiedDateTime',
- );
+ final dateTimes = resolveAssetDateTimes(entity);
final bool assetCreatedOrUpdatedAfterGivenTime =
- max(createMs, modifiedMs) >= (fromTime ~/ 1000);
+ max(dateTimes.creationTime, dateTimes.modificationTime) >= fromTime;
if (!alreadySeenLocalIDs.contains(entity.id) &&
assetCreatedOrUpdatedAfterGivenTime) {
- final file = fileFromAsset(pathEntity.name, entity);
+ final file = fileFromAsset(pathEntity.name, entity, dateTimes: dateTimes);
files.add(file);
}
}