From cc5a2b549ef0f2142431b57c0f08144e5fd7928e Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 5 Apr 2016 15:58:12 +0200 Subject: Replace getid3 with ID3Parser --- lib/private/preview/mp3.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php index b984cb4e10d..c7b70457afe 100644 --- a/lib/private/preview/mp3.php +++ b/lib/private/preview/mp3.php @@ -23,6 +23,8 @@ */ namespace OC\Preview; +use ID3Parser\ID3Parser; + class MP3 extends Provider { /** * {@inheritDoc} @@ -35,15 +37,17 @@ class MP3 extends Provider { * {@inheritDoc} */ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - $getID3 = new \getID3(); + $getID3 = new ID3Parser(); $tmpPath = $fileview->toTmpFile($path); - $tags = $getID3->analyze($tmpPath); - \getid3_lib::CopyTagsToComments($tags); - if(isset($tags['id3v2']['APIC'][0]['data'])) { - $picture = @$tags['id3v2']['APIC'][0]['data']; - unlink($tmpPath); + unlink($tmpPath); + $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)) { $image = new \OC_Image(); $image->loadFromData($picture); -- cgit v1.2.3