Skip to content

Replace id3parser with mp3info #38498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nfebe merged 1 commit into from
Jun 28, 2023
Merged

Replace id3parser with mp3info #38498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 21 files
+2 −0 .gitignore
+0 −674 christophwurst/id3parser/LICENSE
+0 −22 christophwurst/id3parser/src/ID3Parser.php
+0 −356 christophwurst/id3parser/src/getID3/Tags/getid3_id3v1.php
+0 −3,374 christophwurst/id3parser/src/getID3/Tags/getid3_id3v2.php
+0 −252 christophwurst/id3parser/src/getID3/getid3.php
+0 −13 christophwurst/id3parser/src/getID3/getid3_exception.php
+0 −155 christophwurst/id3parser/src/getID3/getid3_handler.php
+0 −1,161 christophwurst/id3parser/src/getID3/getid3_lib.php
+1 −1 composer.json
+47 −41 composer.lock
+45 −51 composer/ClassLoader.php
+1 −7 composer/autoload_classmap.php
+1 −1 composer/autoload_psr4.php
+9 −12 composer/autoload_static.php
+49 −43 composer/installed.json
+11 −11 composer/installed.php
+165 −0 wapmorgan/mp3info/LICENSE
+18 −0 wapmorgan/mp3info/data/bitRateTable.php
+8 −0 wapmorgan/mp3info/data/sampleRateTable.php
+1,081 −0 wapmorgan/mp3info/src/Mp3Info.php
17 changes: 6 additions & 11 deletions lib/private/Preview/MP3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand All @@ -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,
Expand All @@ -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);

Expand Down