Merge pull request #4826 from uklotzde/lp1979864-modplug

lp1979864: Fix synchronization time stamps of ModPlug files
mixxxdj · Jun 26, 2022 · 1cd826a · 1cd826a
2 parents df85a74 + 1b811cd
commit 1cd826a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/sources/soundsourcemodplug.cpp b/src/sources/soundsourcemodplug.cpp
@@ -105,8 +105,8 @@ SoundSourceModPlug::importTrackMetadataAndCoverImage(
                 audio::Bitrate(8),
                 Duration::fromMillis(ModPlug::ModPlug_GetLength(pModFile)),
         });
-
-        return std::make_pair(ImportResult::Succeeded, QFileInfo(modFile).lastModified());
+        const auto sourceSynchronizedAt = getFileSynchronizedAt(modFile);
+        return std::make_pair(ImportResult::Succeeded, sourceSynchronizedAt);
     }
 
     // The modplug library currently does not support reading cover-art from

diff --git a/src/sources/soundsourceproxy.cpp b/src/sources/soundsourceproxy.cpp
@@ -689,6 +689,11 @@ SoundSourceProxy::UpdateTrackFromSourceResult SoundSourceProxy::updateTrackFromS
             importTrackMetadataAndCoverImage(
                     &trackMetadata,
                     pCoverImg);
+    VERIFY_OR_DEBUG_ASSERT(!sourceSynchronizedAt.isValid() ||
+            sourceSynchronizedAt.timeSpec() == Qt::UTC) {
+        qWarning() << "Converting source synchronization time to UTC:" << sourceSynchronizedAt;
+        sourceSynchronizedAt = sourceSynchronizedAt.toUTC();
+    }
     if (metadataImportResult ==
             mixxx::MetadataSource::ImportResult::Failed) {
         kLogger.warning()