Fix bug in Motion photo detection (#1464)

ente-io · Nov 2, 2023 · 34e5b45 · 34e5b45
2 parents c11365d + baef66d
commit 34e5b45
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -278,6 +278,7 @@
 				"${BUILT_PRODUCTS_DIR}/background_fetch/background_fetch.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
+				"${BUILT_PRODUCTS_DIR}/file_saver/file_saver.framework",
 				"${BUILT_PRODUCTS_DIR}/fk_user_agent/fk_user_agent.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_email_sender/flutter_email_sender.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_image_compress/flutter_image_compress.framework",
@@ -356,6 +357,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/background_fetch.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_saver.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fk_user_agent.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_email_sender.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress.framework",

diff --git a/lib/models/file/extensions/file_props.dart b/lib/models/file/extensions/file_props.dart
@@ -6,7 +6,7 @@ import "package:photos/models/file/trash_file.dart";
 extension FilePropsExtn on EnteFile {
   bool get isLivePhoto => fileType == FileType.livePhoto;
 
-  bool get isMotionPhoto => pubMagicMetadata?.mvi != null;
+  bool get isMotionPhoto => (pubMagicMetadata?.mvi ?? 0) > 0;
 
   bool get isLiveOrMotionPhoto => isLivePhoto || isMotionPhoto;
 

diff --git a/lib/models/metadata/file_magic.dart b/lib/models/metadata/file_magic.dart
@@ -43,7 +43,7 @@ class PubMagicMetadata {
   double? lat;
   double? long;
 
-  // Motion Video Index. Positive value indicates that the file is a motion
+  // Motion Video Index. Positive value (>0) indicates that the file is a motion
   // photo
   int? mvi;
 

diff --git a/lib/ui/viewer/file/zoomable_live_image_new.dart b/lib/ui/viewer/file/zoomable_live_image_new.dart
@@ -185,6 +185,12 @@ class _ZoomableLiveImageNewState extends State<ZoomableLiveImageNew>
         return motionPhoto.getMotionVideoFile(
           index: index,
         );
+      } else if (_enteFile.isMotionPhoto && _enteFile.canEditMetaInfo) {
+        _logger.finest('Incorrectly tagged as MP, reset tag ${_enteFile.tag}');
+        FileMagicService.instance.updatePublicMagicMetadata(
+          [_enteFile],
+          {motionVideoIndexKey: 0},
+        ).ignore();
       }
     }
     return null;

diff --git a/pubspec.lock b/pubspec.lock
@@ -1268,10 +1268,10 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: c0409b2e812c7457908a6e492abae6e4f5b457a7
+      resolved-ref: e4edd3a158c667976660a788e908d1faf5c5a4f8
       url: "https://github.com/ente-io/motion_photo.git"
     source: git
-    version: "0.0.3"
+    version: "0.0.5"
   motionphoto:
     dependency: "direct main"
     description: