1 files changed, 30 insertions, 36 deletions

diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php
index dec838b6e5a..add0028738e 100644
--- a/lib/private/Preview/MP3.php
+++ b/lib/private/Preview/MP3.php
@@ -1,37 +1,18 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Georg Ehrke <oc.list@georgehrke.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Olivier Paroz <github@oparoz.com>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Tanghus <thomas@tanghus.net>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OC\Preview;
 
-use ID3Parser\ID3Parser;
-
 use OCP\Files\File;
 use OCP\IImage;
+use OCP\Server;
+use Psr\Log\LoggerInterface;
+use wapmorgan\Mp3Info\Mp3Info;
+use function OCP\Log\logger;
 
 class MP3 extends ProviderV2 {
 	/**
@@ -45,18 +26,31 @@ class MP3 extends ProviderV2 {
 	 * {@inheritDoc}
 	 */
 	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$getID3 = new ID3Parser();
-
 		$tmpPath = $this->getLocalFile($file);
-		$tags = $getID3->analyze($tmpPath);
-		$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 ($tmpPath === false) {
+			Server::get(LoggerInterface::class)->error(
+				'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
+				['app' => 'core']
+			);
+			return null;
+		}
+
+		try {
+			$audio = new Mp3Info($tmpPath, true);
+			/** @var string|null|false $picture */
+			$picture = $audio->getCover();
+		} catch (\Throwable $e) {
+			logger('core')->info('Error while getting cover from mp3 file: ' . $e->getMessage(), [
+				'fileId' => $file->getId(),
+				'filePath' => $file->getPath(),
+			]);
+			return null;
+		} finally {
+			$this->cleanTmpFiles();
 		}
 
-		if (!is_null($picture)) {
-			$image = new \OC_Image();
+		if (is_string($picture)) {
+			$image = new \OCP\Image();
 			$image->loadFromData($picture);
 
 			if ($image->valid()) {