From 6e4acc64ad256178cee7905402b48bafcd49f84c Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Wed, 19 Jan 2022 12:09:12 +0000
Subject: [PATCH] fix(images): set default mimetype if none is specified when
getting size info
---
app/Entities/Media/Image.php | 6 ++++--
app/Helpers/id3_helper.php | 6 ++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/Entities/Media/Image.php b/app/Entities/Media/Image.php
index b379b0382e..4c00c67b57 100644
--- a/app/Entities/Media/Image.php
+++ b/app/Entities/Media/Image.php
@@ -33,14 +33,16 @@ class Image extends BaseMedia
{
helper('media');
- $extension = $this->file_extension;
- $mimetype = $this->file_mimetype;
foreach ($this->sizes as $name => $size) {
if (array_key_exists('extension', $size)) {
$extension = $size['extension'];
+ } else {
+ $extension = $this->file_extension;
}
if (array_key_exists('mimetype', $size)) {
$mimetype = $size['mimetype'];
+ } else {
+ $mimetype = $this->file_mimetype;
}
$this->{$name . '_path'} = $this->file_directory . '/' . $this->file_name . '_' . $name . '.' . $extension;
$this->{$name . '_url'} = media_base_url($this->{$name . '_path'});
diff --git a/app/Helpers/id3_helper.php b/app/Helpers/id3_helper.php
index abf89a6143..be6ae69fd6 100644
--- a/app/Helpers/id3_helper.php
+++ b/app/Helpers/id3_helper.php
@@ -30,9 +30,7 @@ if (! function_exists('write_audio_file_tags')) {
$tagwriter->tagformats = ['id3v2.4'];
$tagwriter->tag_encoding = $TextEncoding;
- $cover = new File(media_path($episode->cover->id3_path));
-
- $APICdata = file_get_contents($cover->getRealPath());
+ $APICdata = file_get_contents(media_path($episode->cover->id3_path));
// TODO: variables used for podcast specific tags
// $podcastUrl = $episode->podcast->link;
@@ -73,7 +71,7 @@ if (! function_exists('write_audio_file_tags')) {
'picturetypeid' => 2,
'data' => $APICdata,
'description' => 'cover',
- 'mime' => $cover->getMimeType(),
+ 'mime' => $episode->cover->file_mimetype,
];
$tagwriter->tag_data = $TagData;
--
GitLab