mkrieger/byos_laravel
1
0
Fork 0
mirror of https://github.com/usetrmnl/byos_laravel.git synced 2026-01-13 15:07:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(#80): display endpoint respects preferred bmp image format

Browse source
This commit is contained in:
Benjamin Nussbaum 2025-08-18 17:53:05 +02:00
parent 4e3b47e4eb
commit 2ed3fd5ca9
3 changed files with 144 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

46
routes/api.php
View file

@ -126,10 +126,25 @@ Route::get('/display', function (Request $request) {
$image_path = 'images/setup-logo.bmp';
$filename = 'setup-logo.bmp';
} else {
if (isset($device->last_firmware_version)
&& version_compare($device->last_firmware_version, '1.5.2', '<')
&& Storage::disk('public')->exists('images/generated/'.$image_uuid.'.bmp')) {
$image_path = 'images/generated/'.$image_uuid.'.bmp';
// Determine image format based on device settings
$preferred_format = 'png'; // Default to PNG for newer firmware
if (! $device->device_model_id) {
// No device model, use device's image_format setting
if (str_contains($device->image_format, 'bmp')) {
$preferred_format = 'bmp';
}
// For 'auto' or unknown formats, fall back to firmware version logic
if (isset($device->last_firmware_version)
&& version_compare($device->last_firmware_version, '1.5.2', '<')
&& Storage::disk('public')->exists('images/generated/'.$image_uuid.'.bmp')) {
$preferred_format = 'bmp';
}
}
// Check if a preferred format exists, otherwise fall back
if (Storage::disk('public')->exists('images/generated/'.$image_uuid.'.'.$preferred_format)) {
$image_path = 'images/generated/'.$image_uuid.'.'.$preferred_format;
} elseif (Storage::disk('public')->exists('images/generated/'.$image_uuid.'.png')) {
$image_path = 'images/generated/'.$image_uuid.'.png';
} else {
@ -422,10 +437,25 @@ Route::get('/current_screen', function (Request $request) {
$image_path = 'images/setup-logo.bmp';
$filename = 'setup-logo.bmp';
} else {
if (isset($device->last_firmware_version)
&& version_compare($device->last_firmware_version, '1.5.2', '<')
&& Storage::disk('public')->exists('images/generated/'.$image_uuid.'.bmp')) {
$image_path = 'images/generated/'.$image_uuid.'.bmp';
// Determine image format based on device settings
$preferred_format = 'png'; // Default to PNG for newer firmware
if (! $device->device_model_id) {
// No device model, use device's image_format setting
if (str_contains($device->image_format, 'bmp')) {
$preferred_format = 'bmp';
}
// For 'auto' or unknown formats, fall back to firmware version logic
if (isset($device->last_firmware_version)
&& version_compare($device->last_firmware_version, '1.5.2', '<')
&& Storage::disk('public')->exists('images/generated/'.$image_uuid.'.bmp')) {
$preferred_format = 'bmp';
}
}
// Check if preferred format exists, otherwise fall back
if (Storage::disk('public')->exists('images/generated/'.$image_uuid.'.'.$preferred_format)) {
$image_path = 'images/generated/'.$image_uuid.'.'.$preferred_format;
} elseif (Storage::disk('public')->exists('images/generated/'.$image_uuid.'.png')) {
$image_path = 'images/generated/'.$image_uuid.'.png';
} else {