Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 15:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve camera title detection

Browse Source
This commit is contained in:
Terranom674
2026-08-16 22:45:41 +02:00
parent f16b38b555
commit 590ad9d7e3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/batch_titles.inc.php
View File

@@ -212,15 +212,18 @@ function bratonien_tools_batch_titles_is_replaceable($image)
return true; return true;
} }
$file = (string)($image['file'] ?? ''); $file = trim((string)($image['file'] ?? ''));
$file_base = pathinfo($file, PATHINFO_FILENAME); $file_base = pathinfo($file, PATHINFO_FILENAME);
if ($file_base !== '' && strcasecmp($title, $file_base) === 0) if (
($file !== '' && strcasecmp($title, $file) === 0)
|| ($file_base !== '' && strcasecmp($title, $file_base) === 0)
)
{ {
return true; return true;
} }
return (bool)preg_match( return (bool)preg_match(
'/^(?:DSC[F]?|IMG|PXL|DCIM|SAM|PIC|PHOTO|IMAGE)[-_ ]?\d+(?:[-_ ].*)?$/i', '/^(?:DSC[F]?|IMG|PXL|DCIM|SAM|PIC|PHOTO|IMAGE)[-_ ]?\d+(?:[-_ ].*)?(?:\.[A-Z0-9]{2,5})?$/i',
$title $title
); );
} }