saulteafarmer/castopod
1
0
Fork 0
mirror of https://code.castopod.org/adaures/castopod synced 2025-05-29 05:22:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace hardcoded media root with media_path helper method in settings controller

Browse Source
This commit is contained in:
Yassine Doghri 2022-01-13 16:45:08 +00:00
parent 89dee41d58
commit e65e236bbc
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
modules/Admin/Controllers/SettingsController.php
View File

@ -56,16 +56,16 @@ class SettingsController extends BaseController
helper(['filesystem', 'media']); helper(['filesystem', 'media']);
// delete site folder in media before repopulating it // delete site folder in media before repopulating it
delete_files(ROOTPATH . 'public/media/site/'); delete_files(media_path('/site'));
// save original in disk // save original in disk
$originalFilename = save_media($siteIconFile, 'site', 'icon'); $originalFilename = save_media($siteIconFile, 'site', 'icon');
// convert jpeg image to png if not // convert jpeg image to png if not
if ($siteIconFile->getClientMimeType() !== 'image/png') { if ($siteIconFile->getClientMimeType() !== 'image/png') {
service('image')->withFile(ROOTPATH . 'public/media/' . $originalFilename) service('image')->withFile(media_path($originalFilename))
->convert(IMAGETYPE_JPEG) ->convert(IMAGETYPE_JPEG)
->save(ROOTPATH . 'public/media/site/icon.png'); ->save(media_path('/site/icon.png'));
} }
// generate random hash to use as a suffix to renew browser cache // generate random hash to use as a suffix to renew browser cache
@ -73,24 +73,24 @@ class SettingsController extends BaseController
// generate ico // generate ico
$ico_lib = new PHP_ICO(); $ico_lib = new PHP_ICO();
$ico_lib->add_image(ROOTPATH . 'public/media/site/icon.png', [[32, 32], [64, 64]]); $ico_lib->add_image(media_path('/site/icon.png'), [[32, 32], [64, 64]]);
$ico_lib->save_ico(ROOTPATH . "public/media/site/favicon.{$randomHash}.ico"); $ico_lib->save_ico(media_path("/site/favicon.{$randomHash}.ico"));
// resize original to needed sizes // resize original to needed sizes
foreach ([64, 180, 192, 512] as $size) { foreach ([64, 180, 192, 512] as $size) {
service('image') service('image')
->withFile(ROOTPATH . 'public/media/site/icon.png') ->withFile(media_path('/site/icon.png'))
->resize($size, $size) ->resize($size, $size)
->save(media_path("/site/icon-{$size}.{$randomHash}.png")); ->save(media_path("/site/icon-{$size}.{$randomHash}.png"));
} }
service('settings') service('settings')
->set('App.siteIcon', [ ->set('App.siteIcon', [
'ico' => media_path("/site/favicon.{$randomHash}.ico"), 'ico' => '/' . media_path("/site/favicon.{$randomHash}.ico"),
'64' => media_path("/site/icon-64.{$randomHash}.png"), '64' => '/' . media_path("/site/icon-64.{$randomHash}.png"),
'180' => media_path("/site/icon-180.{$randomHash}.png"), '180' => '/' . media_path("/site/icon-180.{$randomHash}.png"),
'192' => media_path("/site/icon-192.{$randomHash}.png"), '192' => '/' . media_path("/site/icon-192.{$randomHash}.png"),
'512' => media_path("/site/icon-512.{$randomHash}.png"), '512' => '/' . media_path("/site/icon-512.{$randomHash}.png"),
]); ]);
} }
@ -99,9 +99,9 @@ class SettingsController extends BaseController
public function deleteIcon(): RedirectResponse public function deleteIcon(): RedirectResponse
{ {
helper('filesystem'); helper(['filesystem', 'media']);
// delete site folder in media // delete site folder in media
delete_files(ROOTPATH . 'public/media/site/'); delete_files(media_path('/site'));
service('settings') service('settings')
->forget('App.siteIcon'); ->forget('App.siteIcon');
@ -111,13 +111,12 @@ class SettingsController extends BaseController
public function regenerateImages(): RedirectResponse public function regenerateImages(): RedirectResponse
{ {
helper('media');
$allPodcasts = (new PodcastModel())->findAll(); $allPodcasts = (new PodcastModel())->findAll();
foreach ($allPodcasts as $podcast) { foreach ($allPodcasts as $podcast) {
$podcastImages = glob( $podcastImages = glob(media_path("/podcasts/{$podcast->handle}/*_*{jpg,png,webp}"), GLOB_BRACE);
ROOTPATH . 'public/' . config('App')->mediaRoot . "/podcasts/{$podcast->handle}/*_*{jpg,png,webp}",
GLOB_BRACE
);
if ($podcastImages) { if ($podcastImages) {
foreach ($podcastImages as $podcastImage) { foreach ($podcastImages as $podcastImage) {
@ -138,10 +137,7 @@ class SettingsController extends BaseController
} }
} }
$personsImages = glob( $personsImages = glob(media_path('/persons/*_*{jpg,png,webp}'), GLOB_BRACE);
ROOTPATH . 'public/' . config('App')->mediaRoot . '/persons/*_*{jpg,png,webp}',
GLOB_BRACE
);
if ($personsImages) { if ($personsImages) {
foreach ($personsImages as $personsImage) { foreach ($personsImages as $personsImage) {
if (is_file($personsImage)) { if (is_file($personsImage)) {
@ -167,10 +163,7 @@ class SettingsController extends BaseController
// Delete all podcast image sizes to recreate them // Delete all podcast image sizes to recreate them
$allPodcasts = (new PodcastModel())->findAll(); $allPodcasts = (new PodcastModel())->findAll();
foreach ($allPodcasts as $podcast) { foreach ($allPodcasts as $podcast) {
$podcastImages = glob( $podcastImages = glob(media_path("/podcasts/{$podcast->handle}/*_*{jpg,png,webp}"), GLOB_BRACE);
ROOTPATH . 'public/' . config('App')->mediaRoot . "/podcasts/{$podcast->handle}/*_*{jpg,png,webp}",
GLOB_BRACE
);
if ($podcastImages) { if ($podcastImages) {
foreach ($podcastImages as $podcastImage) { foreach ($podcastImages as $podcastImage) {
@ -182,10 +175,7 @@ class SettingsController extends BaseController
} }
// Delete all person image sizes to recreate them // Delete all person image sizes to recreate them
$personsImages = glob( $personsImages = glob(media_path('/persons/*_*{jpg,png,webp}'), GLOB_BRACE);
ROOTPATH . 'public/' . config('App')->mediaRoot . '/persons/*_*{jpg,png,webp}',
GLOB_BRACE
);
if ($personsImages) { if ($personsImages) {
foreach ($personsImages as $personsImage) { foreach ($personsImages as $personsImage) {
if (is_file($personsImage)) { if (is_file($personsImage)) {