From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Sun, 28 May 2023 14:57:21 +0000 (+0200)
Subject: feat: replace id3parser with mp3info
X-Git-Tag: v28.0.0beta1~813^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F38498%2Fhead;p=nextcloud-server.git

feat: replace id3parser with mp3info

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---

diff --git a/3rdparty b/3rdparty
index 216b791c908..268aaeff738 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 216b791c9081f06a4ed6581a436020647dd41bbd
+Subproject commit 268aaeff738002179c0f5e9d9542ec362d987a5f
diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php
index ff6ff86c966..4c5f932f477 100644
--- a/lib/private/Preview/MP3.php
+++ b/lib/private/Preview/MP3.php
@@ -28,11 +28,10 @@
  */
 namespace OC\Preview;
 
-use ID3Parser\ID3Parser;
-
 use OCP\Files\File;
 use OCP\IImage;
 use Psr\Log\LoggerInterface;
+use wapmorgan\Mp3Info\Mp3Info;
 
 class MP3 extends ProviderV2 {
 	/**
@@ -46,11 +45,12 @@ class MP3 extends ProviderV2 {
 	 * {@inheritDoc}
 	 */
 	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$getID3 = new ID3Parser();
-
 		$tmpPath = $this->getLocalFile($file);
+
 		try {
-			$tags = $getID3->analyze($tmpPath);
+			$audio = new Mp3Info($tmpPath, true);
+			/** @var string|null|false $picture */
+			$picture = $audio->getCover();
 		} catch (\Throwable $e) {
 			\OC::$server->get(LoggerInterface::class)->info($e->getMessage(), [
 				'exception' => $e,
@@ -61,12 +61,7 @@ class MP3 extends ProviderV2 {
 			$this->cleanTmpFiles();
 		}
 
-		$picture = isset($tags['id3v2']['APIC'][0]['data']) ? $tags['id3v2']['APIC'][0]['data'] : null;
-		if (is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
-			$picture = $tags['id3v2']['PIC'][0]['data'];
-		}
-
-		if (!is_null($picture)) {
+		if (is_string($picture)) {
 			$image = new \OCP\Image();
 			$image->loadFromData($picture);