rdelaage
/
castopod
mirror of https://code.castopod.org/adaures/castopod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: allow images to have .jpeg extension consistently

This commit is contained in:
Aonrud 2023-03-21 18:06:54 +00:00
parent 208c2715f9
commit ae5e12be3b
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/Admin/Controllers/EpisodeController.php
View File

@ -147,7 +147,7 @@ class EpisodeController extends BaseController
'slug' => 'max_length[128]', 'slug' => 'max_length[128]',
'audio_file' => 'uploaded[audio_file]|ext_in[audio_file,mp3,m4a]', 'audio_file' => 'uploaded[audio_file]|ext_in[audio_file,mp3,m4a]',
'cover' => 'cover' =>
'is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', 'is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]',
'transcript_file' => 'transcript_file' =>
'ext_in[transcript,srt]|permit_empty', 'ext_in[transcript,srt]|permit_empty',
'chapters_file' => 'ext_in[chapters,json]|permit_empty', 'chapters_file' => 'ext_in[chapters,json]|permit_empty',
@ -286,7 +286,7 @@ class EpisodeController extends BaseController
'audio_file' => 'audio_file' =>
'uploaded[audio_file]|ext_in[audio_file,mp3,m4a]|permit_empty', 'uploaded[audio_file]|ext_in[audio_file,mp3,m4a]|permit_empty',
'cover' => 'cover' =>
'is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', 'is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]',
'transcript_file' => 'transcript_file' =>
'ext_in[transcript_file,txt,html,srt,json]|permit_empty', 'ext_in[transcript_file,txt,html,srt,json]|permit_empty',
'chapters_file' => 'ext_in[chapters_file,json]|permit_empty', 'chapters_file' => 'ext_in[chapters_file,json]|permit_empty',

8
modules/Admin/Controllers/PodcastController.php
View File

@ -184,8 +184,8 @@ class PodcastController extends BaseController
{ {
$rules = [ $rules = [
'cover' => 'cover' =>
'uploaded[cover]|is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', 'uploaded[cover]|is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]',
'banner' => 'is_image[banner]|ext_in[banner,jpg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]', 'banner' => 'is_image[banner]|ext_in[banner,jpg,jpeg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]',
]; ];
if (! $this->validate($rules)) { if (! $this->validate($rules)) {
@ -299,8 +299,8 @@ class PodcastController extends BaseController
{ {
$rules = [ $rules = [
'cover' => 'cover' =>
'is_image[cover]|ext_in[cover,jpg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]', 'is_image[cover]|ext_in[cover,jpg,jpeg,png]|min_dims[cover,1400,1400]|is_image_ratio[cover,1,1]',
'banner' => 'is_image[banner]|ext_in[banner,jpg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]', 'banner' => 'is_image[banner]|ext_in[banner,jpg,jpeg,png]|min_dims[banner,1500,500]|is_image_ratio[banner,3,1]',
]; ];
if (! $this->validate($rules)) { if (! $this->validate($rules)) {

4
modules/Media/FileManagers/FS.php
View File

@ -90,7 +90,7 @@ class FS implements FileManagerInterface
helper('media'); helper('media');
$allPodcastImagesPaths = []; $allPodcastImagesPaths = [];
foreach (['jpg', 'png', 'webp'] as $ext) { foreach (['jpg', 'jpeg', 'png', 'webp'] as $ext) {
$images = glob(media_path("/podcasts/{$podcastHandle}/*_*{$ext}")); $images = glob(media_path("/podcasts/{$podcastHandle}/*_*{$ext}"));
if (! $images) { if (! $images) {
@ -114,7 +114,7 @@ class FS implements FileManagerInterface
helper('media'); helper('media');
$allPersonsImagesPaths = []; $allPersonsImagesPaths = [];
foreach (['jpg', 'png', 'webp'] as $ext) { foreach (['jpg', 'jpeg', 'png', 'webp'] as $ext) {
$images = glob(media_path("/persons/*_*{$ext}")); $images = glob(media_path("/persons/*_*{$ext}"));
if (! $images) { if (! $images) {

7
modules/Media/FileManagers/S3.php
View File

@ -136,7 +136,10 @@ class S3 implements FileManagerInterface
$prefixedPodcasts = $this->prefixKey('podcasts'); $prefixedPodcasts = $this->prefixKey('podcasts');
array_push($keys, ...preg_grep("~^{$prefixedPodcasts}\/{$podcastHandle}\/.*_.*.\.(jpg|png|webp)$~", $key)); array_push(
$keys,
...preg_grep("~^{$prefixedPodcasts}\/{$podcastHandle}\/.*_.*.\.(jpe?g|png|webp)$~", $key)
);
} }
$objectsToDelete = array_map(static function ($key): array { $objectsToDelete = array_map(static function ($key): array {
@ -178,7 +181,7 @@ class S3 implements FileManagerInterface
$prefixedPersons = $this->prefixKey('persons'); $prefixedPersons = $this->prefixKey('persons');
array_push($keys, ...preg_grep("~^{$prefixedPersons}\/.*_.*.\.(jpg|png|webp)$~", $key)); array_push($keys, ...preg_grep("~^{$prefixedPersons}\/.*_.*.\.(jpe?g|png|webp)$~", $key));
} }
$objectsToDelete = array_map(static function ($key): array { $objectsToDelete = array_map(static function ($key): array {