Skip to content
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

fix(characters): improve fullsize image format handling around design updates #1165

Merged
merged 1 commit into from
Dec 27, 2024
Merged

fix(characters): improve fullsize image format handling around design updates #1165

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
72 changes: 72 additions & 0 deletions app/Console/Commands/FixCharacterImageFormats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php

namespace App\Console\Commands;

use App\Models\Character\CharacterDesignUpdate;
use App\Models\Character\CharacterImage;
use Illuminate\Console\Command;
use Intervention\Image\Facades\Image;

class FixCharacterImageFormats extends Command {
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'app:fix-character-image-formats';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Converts existing fullsize character and design update images not stored as the configured file format.';

/**
* Execute the console command.
*/
public function handle() {
$masterlistFormat = config('lorekeeper.settings.masterlist_image_format');
$fullsizeFormat = config('lorekeeper.settings.masterlist_fullsizes_format');

$images = CharacterImage::where('fullsize_extension', '!=', $fullsizeFormat);
if ($images->count()) {
$this->info('Processing '.$images->count().' images...');
$images->update(['fullsize_extension' => $fullsizeFormat]);

foreach ($images->get() as $image) {
if (file_exists($image->imagePath.'/'.$image->id.'_'.$image->hash.'_'.$image->fullsize_hash.'_full.'.$masterlistFormat)) {
Image::make($image->imagePath.'/'.$image->id.'_'.$image->hash.'_'.$image->fullsize_hash.'_full.'.$masterlistFormat)->save($image->imagePath.'/'.$image->fullsizeFileName, 100, $fullsizeFormat);

if (file_exists($image->imagePath.'/'.$image->fullsizeFileName)) {
unlink($image->imagePath.'/'.$image->id.'_'.$image->hash.'_'.$image->fullsize_hash.'_full.'.$masterlistFormat);
}
}
}
}

$updates = CharacterDesignUpdate::where('status', '!=', 'Approved');
if ($updates->count()) {
$this->info('Processing '.$updates->count().' updates...');
foreach ($updates->get() as $update) {
$updates->update(['extension' => $fullsizeFormat]);

if (file_exists($update->imagePath.'/'.$update->id.'_'.$update->hash.'.'.$masterlistFormat)) {
Image::make($update->imagePath.'/'.$update->id.'_'.$update->hash.'.'.$masterlistFormat)->save($update->imagePath.'/'.$update->imageFileName, 100, $fullsizeFormat);

if (file_exists($update->imagePath.'/'.$update->imageFileName)) {
unlink($update->imagePath.'/'.$update->id.'_'.$update->hash.'.'.$masterlistFormat);
}
}

if (!file_exists($update->imagePath.'/'.$update->thumbnailFileName) && file_exists($update->imagePath.'/'.$update->id.'_'.$update->hash.'_th.'.$fullsizeFormat)) {
Image::make($update->imagePath.'/'.$update->id.'_'.$update->hash.'_th.'.$fullsizeFormat)->save($update->imagePath.'/'.$update->thumbnailFileName, 100, $masterlistFormat);

if (file_exists($update->imagePath.'/'.$update->thumbnailFileName)) {
unlink($update->imagePath.'/'.$update->id.'_'.$update->hash.'_th.'.$fullsizeFormat);
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion app/Models/Character/CharacterDesignUpdate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public function getImageUrlAttribute() {
* @return string
*/
public function getThumbnailFileNameAttribute() {
return $this->id.'_'.$this->hash.'_th.'.$this->extension;
return $this->id.'_'.$this->hash.'_th.'.(config('lorekeeper.settings.masterlist_image_format') != $this->extension ? config('lorekeeper.settings.masterlist_image_format') : $this->extension);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/Services/CharacterManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public function processImage($characterImage) {
}

// Save the processed image
$image->save($characterImage->imagePath.'/'.$characterImage->fullsizeFileName, 100, config('lorekeeper.settings.masterlist_fullsizes_format'));
$image->save($characterImage->imagePath.'/'.$characterImage->fullsizeFileName, 100, config('lorekeeper.settings.masterlist_fullsizes_format') != null ? config('lorekeeper.settings.masterlist_fullsizes_format') : $characterImage->fullsize_extension);
} else {
// Delete fullsize if it was previously created.
if (isset($characterImage->fullsize_hash) ? file_exists(public_path($characterImage->imageDirectory.'/'.$characterImage->fullsizeFileName)) : false) {
Expand Down
39 changes: 22 additions & 17 deletions app/Services/DesignUpdateManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,13 @@ public function saveRequestImage($data, $request, $isAdmin = false) {
$imageData['use_cropper'] = isset($data['use_cropper']);
}
if (!$isAdmin && isset($data['image'])) {
$imageData['extension'] = (config('lorekeeper.settings.masterlist_image_format') ? config('lorekeeper.settings.masterlist_image_format') : ($data['extension'] ?? $data['image']->getClientOriginalExtension()));
if (config('lorekeeper.settings.store_masterlist_fullsizes') != null) {
$imageData['extension'] = config('lorekeeper.settings.masterlist_fullsizes_format');
} elseif (config('lorekeeper.settings.masterlist_image_format') != null) {
$imageData['extension'] = config('lorekeeper.settings.masterlist_image_format');
} else {
$imageData['extension'] = $data['image']->getClientOriginalExtension();
}
$imageData['has_image'] = true;
}
$request->update($imageData);
Expand Down Expand Up @@ -550,24 +556,23 @@ public function approveRequest($data, $request, $user) {
}
}

$extension = config('lorekeeper.settings.masterlist_image_format') != null ? config('lorekeeper.settings.masterlist_image_format') : $request->extension;

// Create a new image with the request data
$image = CharacterImage::create([
'character_id' => $request->character_id,
'is_visible' => 1,
'hash' => $request->hash,
'fullsize_hash' => $request->fullsize_hash ? $request->fullsize_hash : randomString(15),
'extension' => $extension,
'use_cropper' => $request->use_cropper,
'x0' => $request->x0,
'x1' => $request->x1,
'y0' => $request->y0,
'y1' => $request->y1,
'species_id' => $request->species_id,
'subtype_id' => ($request->character->is_myo_slot && isset($request->character->image->subtype_id)) ? $request->character->image->subtype_id : $request->subtype_id,
'rarity_id' => $request->rarity_id,
'sort' => 0,
'character_id' => $request->character_id,
'is_visible' => 1,
'hash' => $request->hash,
'fullsize_hash' => $request->fullsize_hash ? $request->fullsize_hash : randomString(15),
'extension' => config('lorekeeper.settings.masterlist_image_format') != null ? config('lorekeeper.settings.masterlist_image_format') : $request->extension,
'fullsize_extension' => config('lorekeeper.settings.masterlist_fullsizes_format') != null ? config('lorekeeper.settings.masterlist_fullsizes_format') : $request->extension,
'use_cropper' => $request->use_cropper,
'x0' => $request->x0,
'x1' => $request->x1,
'y0' => $request->y0,
'y1' => $request->y1,
'species_id' => $request->species_id,
'subtype_id' => ($request->character->is_myo_slot && isset($request->character->image->subtype_id)) ? $request->character->image->subtype_id : $request->subtype_id,
'rarity_id' => $request->rarity_id,
'sort' => 0,
]);

// Shift the image credits over to the new image
Expand Down
Loading