Merge branch 'fix/SDK-5681' into 'release/v10.0.0'

SDK-5681 Metadata is not correctly set for synced videos (Hotfix for v10.0.0)

See merge request sdk/sdk!7004

Author: aabellagm

src/commands.cpp

@@ -1197,10 +1197,6 @@ CommandPutNodes::CommandPutNodes(MegaClient* client,
                 else
                 {
                     client->pendingattrstring(nn[i].uploadhandle, &s);
-
-#ifdef USE_MEDIAINFO
-                    client->mediaFileInfo.addUploadMediaFileAttributes(nn[i].uploadhandle, &s);
-#endif
                 }
 
                 if (s.size())

src/megaclient.cpp

@@ -6460,6 +6460,10 @@ void MegaClient::pendingattrstring(UploadHandle h, string* fa)
             }
         }
     }
+#ifdef USE_MEDIAINFO
+    // Append MediaInfo attributes, if any
+    mediaFileInfo.addUploadMediaFileAttributes(h, fa);
+#endif
 }
 
 // Upload file attribute data to fa servers. node handle can be UNDEF if we are giving fa handle back to the app

tests/integration/SdkTest_test.cpp

@@ -13995,20 +13995,18 @@ TEST_F(SdkTest, SdkTargetOverwriteTest)
 }
 
 /**
- * @brief TEST_F SdkTestAudioFileThumbnail
+ * @brief TEST_F SdkTestAudioFileAttributes
  *
- * Tests extracting thumbnail for uploaded audio file.
+ * Tests extracting thumbnail and other metadata for uploaded audio file.
  *
- * The file to be uploaded must exist or the test will fail.
- * File is expected at the directory returned by getTestDataDir().
  */
-#if !USE_FREEIMAGE || !USE_MEDIAINFO
-TEST_F(SdkTest, DISABLED_SdkTestAudioFileThumbnail)
+#ifndef USE_MEDIAINFO
+TEST_F(SdkTest, DISABLED_SdkTestAudioFileAttributes)
 #else
-TEST_F(SdkTest, SdkTestAudioFileThumbnail)
+TEST_F(SdkTest, SdkTestAudioFileAttributes)
 #endif
 {
-    LOG_info << "___TEST Audio File Thumbnail___";
+    LOG_info << "___TEST Audio thumbnail and metadata___";
 
     static const std::string AUDIO_FILENAME = "test_cover_png.mp3";
     ASSERT_TRUE(getFileFromArtifactory("test-data/" + AUDIO_FILENAME, AUDIO_FILENAME));
@@ -14029,7 +14027,12 @@ TEST_F(SdkTest, SdkTestAudioFileThumbnail)
                             nullptr /*cancelToken*/))
         << "Cannot upload test file " << AUDIO_FILENAME;
     std::unique_ptr<MegaNode> node(megaApi[0]->getNodeByPath(AUDIO_FILENAME.c_str(), rootnode.get()));
+    ASSERT_TRUE(node);
+
+    ASSERT_EQ(node->getDuration(), 2) << "Duration of the audio file is not correct.";
+#if defined(USE_FREEIMAGE)
     ASSERT_TRUE(node->hasPreview() && node->hasThumbnail());
+#endif
 }
 
 /**

tests/integration/sdk_test_sync_upload_operations_test.cpp

@@ -234,4 +234,43 @@ TEST_F(SdkTestSyncUploadsOperations, DuplicatedFilesUploadDifferentMtime)
     ASSERT_NO_FATAL_FAILURE(waitForSyncToMatchCloudAndLocalExhaustive());
 }
 
+/**
+ * @brief SdkTestSyncUploadsOperations.MultimediaFileUpload
+ *
+ * Test the metadata and thumbnails from a synced video.
+ *
+ */
+#if !defined(USE_FREEIMAGE) && !defined(USE_MEDIAINFO)
+TEST_F(SdkTestSyncUploadsOperations, DISABLED_MultimediaFileUpload)
+#else
+TEST_F(SdkTestSyncUploadsOperations, MultimediaFileUpload)
+#endif
+{
+    static const string VIDEO_FILE = "sample_video.mp4";
+    static const int AVC1_FORMAT = 887; // ID from MediaInfo
+
+    static const std::string logPre = getLogPrefix();
+    LOG_verbose << logPre << "Upload a multimedia file in a sync";
+
+    // Get file in the sync path to be uploaded by the sync.
+    ASSERT_TRUE(getFileFromArtifactory("test-data/" + VIDEO_FILE,
+                                       fs::absolute(getLocalTmpDir() / VIDEO_FILE)));
+
+    ASSERT_NO_FATAL_FAILURE(waitForSyncToMatchCloudAndLocalExhaustive());
+
+    auto uploadedNode = getNodeByPath(SYNC_REMOTE_PATH + "/" + VIDEO_FILE);
+    ASSERT_TRUE(uploadedNode);
+#ifdef USE_MEDIAINFO
+    ASSERT_EQ(uploadedNode->getDuration(), 5) << "Duration is not correct or unavailable.";
+    ASSERT_EQ(uploadedNode->getHeight(), 360) << "Height is not correct or unavailable.";
+    ASSERT_EQ(uploadedNode->getWidth(), 640) << "Width ID is not correct or unavailable.";
+    ASSERT_EQ(uploadedNode->getVideocodecid(), AVC1_FORMAT)
+        << "Codec ID is not correct or unavailable.";
+#endif
+#ifdef USE_FREEIMAGE
+    ASSERT_TRUE(uploadedNode->hasThumbnail())
+        << "Thumbnail is not available for the uploaded node.";
+#endif
+}
+
 #endif // ENABLE_SYNC