Skip to content

armgit / ente

Public Imported from GitHub
0

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

check pre1981 fallback

laurenspriemdde9ae24c115
diff --git a/mobile/apps/photos/lib/module/metadata/asset_date_times.dart b/mobile/apps/photos/lib/module/metadata/asset_date_times.dart
index 9452051db2..f4d9999612 100644
--- a/mobile/apps/photos/lib/module/metadata/asset_date_times.dart
+++ b/mobile/apps/photos/lib/module/metadata/asset_date_times.dart
@@ -1,3 +1,5 @@
+import "dart:math";
+
import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:logging/logging.dart";
import "package:path/path.dart";
@@ -13,6 +15,15 @@ const _minDateTimeSecondsSinceEpoch = -_maxDateTimeSecondsSinceEpoch;
typedef AssetDateTimes = ({int creationTime, int modificationTime});
+/// Compares at the whole-second precision provided by photo_manager.
+bool isAssetAtOrAfterSyncCutoff(AssetDateTimes dateTimes, int cutoffTime) {
+ final latestAssetTimeSecond =
+ max(dateTimes.creationTime, dateTimes.modificationTime) ~/
+ Duration.microsecondsPerSecond;
+ final cutoffTimeSecond = cutoffTime ~/ Duration.microsecondsPerSecond;
+ return latestAssetTimeSecond >= cutoffTimeSecond;
+}
+
AssetDateTimes resolveAssetDateTimes(AssetEntity asset) {
final uploadTime = DateTime.now().toUtc().microsecondsSinceEpoch;
final creationTime = _validMicrosecondsSinceEpoch(asset.createDateSecond);
@@ -27,9 +38,17 @@ AssetDateTimes resolveAssetDateTimes(AssetEntity asset) {
return (creationTime: uploadTime, modificationTime: uploadTime);
}
if (creationTime == null) {
- _logger.info("Asset creation time is invalid; using modification time");
+ _logger.info(
+ "Asset creation time is invalid; resolving from modification time",
+ );
+ final resolvedCreationTime = _resolveCreationTime(
+ asset,
+ modificationTime!,
+ modificationTime,
+ uploadTime,
+ );
return (
- creationTime: modificationTime!,
+ creationTime: resolvedCreationTime,
modificationTime: modificationTime,
);
}
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 17bcfec167..30a3009c1b 100644
--- a/mobile/apps/photos/lib/services/sync/import/local_assets.dart
+++ b/mobile/apps/photos/lib/services/sync/import/local_assets.dart
@@ -1,5 +1,4 @@
import 'dart:io';
-import 'dart:math';
import 'package:computer/computer.dart';
import 'package:logging/logging.dart';
@@ -210,15 +209,17 @@ Tuple2<Set<String>, List<EnteFile>> _getLocalIDsAndFilesFromAssets(
) {
final pathEntity = args["pathEntity"] as AssetPathEntity;
final assetList = args["assetList"];
- final fromTime = args["fromTime"];
+ final fromTime = args["fromTime"] as int;
final alreadySeenLocalIDs = args["alreadySeenLocalIDs"] as Set<String>;
final List<EnteFile> files = [];
final Set<String> localIDs = {};
for (AssetEntity entity in assetList) {
localIDs.add(entity.id);
final dateTimes = resolveAssetDateTimes(entity);
- final bool assetCreatedOrUpdatedAfterGivenTime =
- max(dateTimes.creationTime, dateTimes.modificationTime) >= fromTime;
+ final bool assetCreatedOrUpdatedAfterGivenTime = isAssetAtOrAfterSyncCutoff(
+ dateTimes,
+ fromTime,
+ );
if (!alreadySeenLocalIDs.contains(entity.id) &&
assetCreatedOrUpdatedAfterGivenTime) {
final file = fileFromAsset(pathEntity.name, entity, dateTimes: dateTimes);