From 3757f390c36aa60ba3146799ff2764c8341f55b3 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 28 May 2023 16:57:21 +0200 Subject: [PATCH] feat: replace id3parser with mp3info Signed-off-by: Daniel Kesselberg --- 3rdparty | 2 +- lib/private/Preview/MP3.php | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/3rdparty b/3rdparty index 216b791c9081f..268aaeff73800 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 ff6ff86c9663d..4c5f932f47792 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 @@ public function getMimeType(): string { * {@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 @@ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage { $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);