marijo/movmaker-webui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update thumbnail logic to use [id]_thumb.jpg in out-dir

Browse source
This commit is contained in:
hbrain 2026-06-02 07:58:40 +02:00
parent f91f84c12d
commit 663243e956
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.php
View file

@ -62,8 +62,8 @@ function video_thumb_public_url($config, $videoName){
if ($videoName === '') return ''; if ($videoName === '') return '';
$base = pathinfo($videoName, PATHINFO_FILENAME); $base = pathinfo($videoName, PATHINFO_FILENAME);
foreach (['jpg','jpeg','png','webp','gif'] as $ext) { foreach (['jpg','jpeg','png','webp','gif'] as $ext) {
$file = $config['thumbs_dir'] . '/' . $base . '.' . $ext; $file = $config['videos_dir'] . '/' . $base . '_thumb.' . $ext;
if (is_file($file)) return $config['public_thumbs'] . '/' . rawurlencode($base . '.' . $ext) . '?v=' . filemtime($file); if (is_file($file)) return $config['public_videos'] . '/' . rawurlencode($base . '_thumb.' . $ext) . '?v=' . filemtime($file);
} }
return ''; return '';
} }

10
new.php
View file

@ -576,8 +576,8 @@ function video_thumb_public_url($config, $videoName){
if ($videoName === '') return ''; if ($videoName === '') return '';
$base = pathinfo($videoName, PATHINFO_FILENAME); $base = pathinfo($videoName, PATHINFO_FILENAME);
foreach (['jpg','jpeg','png','webp','gif'] as $ext) { foreach (['jpg','jpeg','png','webp','gif'] as $ext) {
$file = $config['thumbs_dir'] . '/' . $base . '.' . $ext; $file = $config['videos_dir'] . '/' . $base . '_thumb.' . $ext;
if (is_file($file)) return $config['public_thumbs'] . '/' . rawurlencode($base . '.' . $ext) . '?v=' . filemtime($file); if (is_file($file)) return $config['public_videos'] . '/' . rawurlencode($base . '_thumb.' . $ext) . '?v=' . filemtime($file);
} }
return ''; return '';
} }
@ -861,15 +861,17 @@ try {
if (!$outputs) throw new RuntimeException('No rendered video found for this input directory yet.'); if (!$outputs) throw new RuntimeException('No rendered video found for this input directory yet.');
$src = $dir . '/' . $file; $src = $dir . '/' . $file;
$ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
$written = []; $written = [];
foreach ($outputs as $out) { foreach ($outputs as $out) {
$base = pathinfo($out, PATHINFO_FILENAME); $base = pathinfo($out, PATHINFO_FILENAME);
// Remove any old thumbnail files in thumbs_dir
foreach (['jpg','jpeg','png','webp','gif'] as $oldExt) { foreach (['jpg','jpeg','png','webp','gif'] as $oldExt) {
$old = $config['thumbs_dir'] . '/' . $base . '.' . $oldExt; $old = $config['thumbs_dir'] . '/' . $base . '.' . $oldExt;
if (is_file($old)) @unlink($old); if (is_file($old)) @unlink($old);
} }
$target = $config['thumbs_dir'] . '/' . $base . '.' . $ext;
// Copy new thumbnail to videos_dir with _thumb.jpg suffix
$target = $config['videos_dir'] . '/' . $base . '_thumb.jpg';
if (!@copy($src, $target)) throw new RuntimeException('Failed to write thumbnail.'); if (!@copy($src, $target)) throw new RuntimeException('Failed to write thumbnail.');
@chmod($target, 0664); @chmod($target, 0664);
$written[] = basename($target); $written[] = basename($target);