Add admin run and show switches
This commit is contained in:
hbrain
parent
a49600a5d9
commit
fcae25d28a
4 changed files with 58 additions and 5 deletions
12
feed.php
12
feed.php
|
|
@ -3,6 +3,15 @@ date_default_timezone_set('Europe/Copenhagen');
|
|||
$config = require __DIR__ . "/config.php";
|
||||
function x($s){ return htmlspecialchars((string)$s, ENT_XML1 | ENT_QUOTES, "UTF-8"); }
|
||||
function nice_title($s){ return trim(ucwords(str_replace(['_','-'], ' ', $s))); }
|
||||
function hidden_video_outputs($config){
|
||||
$hidden = [];
|
||||
foreach (glob($config['uploads_dir'].'/*', GLOB_ONLYDIR) ?: [] as $dir) {
|
||||
if (!is_file($dir . '/.mvlog-hidden')) continue;
|
||||
$state = is_file($dir . '/.movmaker-state.json') ? json_decode((string)file_get_contents($dir . '/.movmaker-state.json'), true) : [];
|
||||
if (is_array($state) && !empty($state['output'])) $hidden[basename((string)$state['output'])] = true;
|
||||
}
|
||||
return $hidden;
|
||||
}
|
||||
function video_metadata($path){
|
||||
$base = pathinfo($path, PATHINFO_FILENAME);
|
||||
$meta = ['title'=>nice_title($base),'date'=>date('Y-m-d',filemtime($path)),'location'=>'','description'=>''];
|
||||
|
|
@ -22,7 +31,8 @@ function video_metadata($path){
|
|||
$scheme = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'https';
|
||||
$host = $_SERVER['HTTP_HOST'] ?? 'bubulescu.org';
|
||||
$baseUrl = $scheme . '://' . $host . rtrim(dirname($_SERVER['SCRIPT_NAME']), '/');
|
||||
$videos = glob($config['videos_dir'].'/*.{mp4,webm,mov,m4v}', GLOB_BRACE) ?: [];
|
||||
$hiddenOutputs = hidden_video_outputs($config);
|
||||
$videos = array_values(array_filter(glob($config['videos_dir'].'/*.{mp4,webm,mov,m4v}', GLOB_BRACE) ?: [], fn($v)=>empty($hiddenOutputs[basename($v)])));
|
||||
usort($videos, fn($a,$b)=>filemtime($b)<=>filemtime($a));
|
||||
$videos = array_slice($videos,0,20);
|
||||
header('Content-Type: application/rss+xml; charset=UTF-8');
|
||||
|
|
|
|||
12
index.php
12
index.php
|
|
@ -5,6 +5,15 @@ foreach (["videos_dir", "thumbs_dir", "uploads_dir"] as $d) if (!is_dir($config[
|
|||
if (!is_dir(__DIR__ . "/cache")) mkdir(__DIR__ . "/cache", 0775, true);
|
||||
function h($s){ return htmlspecialchars((string)$s, ENT_QUOTES, "UTF-8"); }
|
||||
function nice_title($s){ return trim(ucwords(str_replace(['_','-'], ' ', $s))); }
|
||||
function hidden_video_outputs($config){
|
||||
$hidden = [];
|
||||
foreach (glob($config['uploads_dir'].'/*', GLOB_ONLYDIR) ?: [] as $dir) {
|
||||
if (!is_file($dir . '/.mvlog-hidden')) continue;
|
||||
$state = is_file($dir . '/.movmaker-state.json') ? json_decode((string)file_get_contents($dir . '/.movmaker-state.json'), true) : [];
|
||||
if (is_array($state) && !empty($state['output'])) $hidden[basename((string)$state['output'])] = true;
|
||||
}
|
||||
return $hidden;
|
||||
}
|
||||
function video_metadata($path){
|
||||
$base = pathinfo($path, PATHINFO_FILENAME);
|
||||
$meta = ['title' => nice_title($base), 'date' => date('Y-m-d', filemtime($path)), 'sort_date' => date('Y-m-d', filemtime($path)), 'location' => '', 'description' => ''];
|
||||
|
|
@ -75,7 +84,8 @@ function load_video_cache($videos){
|
|||
}
|
||||
return $newItems;
|
||||
}
|
||||
$videos = glob($config['videos_dir'].'/*.{mp4,webm,mov,m4v}', GLOB_BRACE) ?: [];
|
||||
$hiddenOutputs = hidden_video_outputs($config);
|
||||
$videos = array_values(array_filter(glob($config['videos_dir'].'/*.{mp4,webm,mov,m4v}', GLOB_BRACE) ?: [], fn($v)=>empty($hiddenOutputs[basename($v)])));
|
||||
$videoCache = load_video_cache($videos);
|
||||
usort($videos, function($a, $b) use ($videoCache) {
|
||||
$am = $videoCache[basename($a)] ?? [];
|
||||
|
|
|
|||
37
new.php
37
new.php
|
|
@ -6,7 +6,7 @@ foreach (["videos_dir", "thumbs_dir", "uploads_dir"] as $d) if (!is_dir($config[
|
|||
function h($s){ return htmlspecialchars((string)$s, ENT_QUOTES, "UTF-8"); }
|
||||
function slugify($s){ $s = strtolower(trim($s)); $s = preg_replace('/[^a-z0-9]+/', '-', $s); return trim($s, '-') ?: 'movie'; }
|
||||
function rrmdir($dir){ if(!is_dir($dir)) return; foreach(scandir($dir) as $f){ if($f==='.'||$f==='..') continue; $p="$dir/$f"; is_dir($p)?rrmdir($p):unlink($p);} rmdir($dir); }
|
||||
function input_dirs($base){ $dirs = glob($base.'/*', GLOB_ONLYDIR) ?: []; usort($dirs, fn($a,$b)=>filemtime($b)<=>filemtime($a)); return $dirs; }
|
||||
function input_dirs($base){ return glob($base.'/*', GLOB_ONLYDIR) ?: []; }
|
||||
function safe_input_dir($base, $name){ $name = basename((string)$name); $path = realpath($base . '/' . $name); $root = realpath($base); if (!$path || !$root || !str_starts_with($path, $root . DIRECTORY_SEPARATOR) || !is_dir($path)) throw new RuntimeException('Invalid input directory.'); return $path; }
|
||||
function read_data($dir){
|
||||
$data = ['title'=>'','date'=>'','place'=>'','description'=>'','captions'=>[],'video_audio'=>[]]; $file = $dir . '/data.txt';
|
||||
|
|
@ -133,6 +133,16 @@ function unique_input_dir($base, $slug){
|
|||
if (!file_exists($candidate)) return $candidate;
|
||||
}
|
||||
}
|
||||
function input_dir_sort_date($dir){
|
||||
$data = read_data($dir);
|
||||
return input_dir_date_from_text($data['date'] ?? '') ?? input_dir_date_from_media($dir);
|
||||
}
|
||||
function sort_input_dirs_by_metadata_date(&$dirs){
|
||||
usort($dirs, function($a, $b) {
|
||||
$cmp = strcmp(input_dir_sort_date($b), input_dir_sort_date($a));
|
||||
return $cmp !== 0 ? $cmp : strnatcasecmp(basename($b), basename($a));
|
||||
});
|
||||
}
|
||||
function orphan_videos($config){
|
||||
$referenced = [];
|
||||
foreach (input_dirs($config['uploads_dir']) as $dir) {
|
||||
|
|
@ -152,6 +162,18 @@ function input_dir_status($dir){
|
|||
return in_array($status, ['processing', 'stale'], true) ? $status : '';
|
||||
}
|
||||
function input_dir_running($dir){ return input_dir_status($dir) !== ''; }
|
||||
function input_dir_enabled($dir){ return is_file($dir . '/.movmaker-enabled'); }
|
||||
function set_input_dir_enabled($dir, $enabled){
|
||||
$path = $dir . '/.movmaker-enabled';
|
||||
if ($enabled) { file_put_contents($path, "enabled\n"); chmod($path, 0664); }
|
||||
elseif (is_file($path)) unlink($path);
|
||||
}
|
||||
function input_dir_visible($dir){ return !is_file($dir . '/.mvlog-hidden'); }
|
||||
function set_input_dir_visible($dir, $visible){
|
||||
$path = $dir . '/.mvlog-hidden';
|
||||
if ($visible) { if (is_file($path)) unlink($path); }
|
||||
else { file_put_contents($path, "hidden\n"); chmod($path, 0664); }
|
||||
}
|
||||
function paginate($items, $page, $perPage = 10){
|
||||
$total = count($items);
|
||||
$pages = max(1, (int)ceil($total / $perPage));
|
||||
|
|
@ -208,6 +230,16 @@ try {
|
|||
write_data($dir, $_POST);
|
||||
$msg = "Created movmaker input directory: in-dir/$slug";
|
||||
$_GET['edit'] = $slug;
|
||||
} elseif ($action === 'set_enabled') {
|
||||
$dir = safe_input_dir($config['uploads_dir'], $_POST['dir'] ?? '');
|
||||
set_input_dir_enabled($dir, !empty($_POST['enabled']));
|
||||
header('Location: new.php?tab=edit&msg=' . rawurlencode((!empty($_POST['enabled']) ? 'Enabled rendering for: in-dir/' : 'Disabled rendering for: in-dir/') . basename($dir)));
|
||||
exit;
|
||||
} elseif ($action === 'set_visible') {
|
||||
$dir = safe_input_dir($config['uploads_dir'], $_POST['dir'] ?? '');
|
||||
set_input_dir_visible($dir, !empty($_POST['visible']));
|
||||
header('Location: new.php?tab=edit&msg=' . rawurlencode((!empty($_POST['visible']) ? 'Shown: in-dir/' : 'Hidden: in-dir/') . basename($dir)));
|
||||
exit;
|
||||
} elseif ($action === 'update') {
|
||||
$dir = safe_input_dir($config['uploads_dir'], $_POST['dir'] ?? '');
|
||||
if (input_dir_running($dir)) throw new RuntimeException('This input directory is being rendered. Editing is disabled until the job completes.');
|
||||
|
|
@ -252,6 +284,7 @@ try {
|
|||
}
|
||||
} catch (Throwable $e) { $err = $e->getMessage(); }
|
||||
$dirs = input_dirs($config['uploads_dir']);
|
||||
sort_input_dirs_by_metadata_date($dirs);
|
||||
$orphanVideos = orphan_videos($config);
|
||||
$tab = $_GET['tab'] ?? (isset($_GET['edit']) ? 'edit' : 'new');
|
||||
$page = max(1, (int)($_GET['page'] ?? 1));
|
||||
|
|
@ -266,7 +299,7 @@ if ($editName !== '') { try { $editDir = safe_input_dir($config['uploads_dir'],
|
|||
<?php if($msg): ?><div class="ok"><?=h($msg)?></div><?php endif; ?><?php if($err): ?><div class="err"><?=h($err)?></div><?php endif; ?>
|
||||
|
||||
<?php if($tab==='videos'): ?><section><h2>Videos without input dir</h2><?php if(!$orphanVideos): ?><p>No orphan videos.</p><?php endif; ?><div class="admin-list"><?php foreach($orphanVideosPage as $v): $vn=basename($v); ?><form method="post" class="admin-item" onsubmit="return confirm('Delete this generated video?')"><div><strong><?=h($vn)?></strong><br><span><?=h(round(filesize($v)/1048576,1))?> MB</span></div><input type="hidden" name="action" value="delete_video"><input type="hidden" name="video" value="<?=h($vn)?>"><button type="submit">Delete video</button></form><?php endforeach; ?></div><?=page_links('videos',$videoPage,$videoPages)?></section><?php endif; ?>
|
||||
<?php if($tab==='edit'): ?><section><h2>Existing input dirs</h2><?php if(!$dirs): ?><p>No input directories yet.</p><?php endif; ?><div class="admin-list"><?php foreach($dirsPage as $d): $runStatus=input_dir_status($d); $running=$runStatus !== ''; $data=read_data($d); ?><div class="admin-item"><div><strong><?=h($data['title'] ?: basename($d))?></strong><br><span><?=h(basename($d))?> · <?=h(count(list_files($d)))?> files<?= $running ? ' · '.h(ucfirst($runStatus)) : '' ?></span></div><?php if($running): ?><span class="button disabled" title="Rendering now"><?=h(ucfirst($runStatus))?></span><?php else: ?><a class="button" href="?edit=<?=rawurlencode(basename($d))?>">Edit</a><?php endif; ?></div><?php endforeach; ?></div><?=page_links('edit',$editPage,$editPages)?></section><?php endif; ?>
|
||||
<?php if($tab==='edit'): ?><section><h2>Existing input dirs</h2><?php if(!$dirs): ?><p>No input directories yet.</p><?php endif; ?><div class="admin-list"><?php foreach($dirsPage as $d): $runStatus=input_dir_status($d); $running=$runStatus !== ''; $enabled=input_dir_enabled($d); $visible=input_dir_visible($d); $data=read_data($d); ?><div class="admin-item"><div class="admin-switches"><form method="post" class="inline-form"><input type="hidden" name="action" value="set_visible"><input type="hidden" name="dir" value="<?=h(basename($d))?>"><label class="switch-label"><input type="checkbox" name="visible" value="1" onchange="this.form.submit()" <?=$visible?'checked':''?>><span class="switch-ui" aria-hidden="true"></span><span class="switch-text">Show</span></label></form><form method="post" class="inline-form"><input type="hidden" name="action" value="set_enabled"><input type="hidden" name="dir" value="<?=h(basename($d))?>"><label class="switch-label"><input type="checkbox" name="enabled" value="1" onchange="this.form.submit()" <?=$enabled?'checked':''?>><span class="switch-ui" aria-hidden="true"></span><span class="switch-text">Run</span></label></form></div><div class="admin-main"><strong><?=h($data['title'] ?: basename($d))?></strong><br><span><?=h(basename($d))?> · <?=h(count(list_files($d)))?> files · <?= $enabled ? 'Rendering enabled' : 'Rendering disabled' ?> · <?= $visible ? 'Shown' : 'Hidden' ?><?= $running ? ' · '.h(ucfirst($runStatus)) : '' ?></span></div><div class="admin-actions"><?php if($running): ?><span class="button disabled" title="Rendering now"><?=h(ucfirst($runStatus))?></span><?php else: ?><a class="button" href="?edit=<?=rawurlencode(basename($d))?>">Edit</a><?php endif; ?></div></div><?php endforeach; ?></div><?=page_links('edit',$editPage,$editPages)?></section><?php endif; ?>
|
||||
<?php if($tab==='edit' && $editDir && $editRunning): ?><section><h2>Edit input dir</h2><p><code>in-dir/<?=h(basename($editDir))?></code></p><div class="err">This input directory is <?=h($editStatus)?>. Editing is disabled until the job completes.</div></section><?php endif; ?>
|
||||
<?php if($tab==='edit' && $editDir && !$editRunning): ?><section><h2>Edit input dir</h2><p><code>in-dir/<?=h(basename($editDir))?></code></p><form method="post" enctype="multipart/form-data"><input type="hidden" name="action" value="update"><input type="hidden" name="dir" value="<?=h(basename($editDir))?>"><label>Title<input name="title" value="<?=h($editData['title'])?>"></label><label>Date<input name="date" value="<?=h($editData['date'])?>"></label><label>Place<input name="place" value="<?=h($editData['place'])?>"></label><label>Description<textarea name="description" maxlength="5000" data-counter="description-counter-edit"><?=h($editData['description'])?></textarea><small id="description-counter-edit" class="counter"></small></label><label>Add images / videos<input type="file" name="media[]" multiple accept="image/*,video/*"></label><label>Add audio<input type="file" name="audio[]" multiple accept="audio/*"></label><h3>Files and captions</h3><div class="file-list"><?php foreach($editFiles as $f): $ext=strtolower(pathinfo($f, PATHINFO_EXTENSION)); $fileUrl='in-dir/'.rawurlencode(basename($editDir)).'/'.rawurlencode($f); ?><div class="caption-row"><div class="preview"><?php if(in_array($ext,['jpg','jpeg','png','webp','gif'])): ?><img src="<?=h($fileUrl)?>" alt=""><?php elseif(in_array($ext,['mp4','mov','m4v','webm'])): ?><video src="<?=h($fileUrl)?>" muted preload="metadata"></video><?php else: ?><span><?=h(strtoupper($ext ?: 'FILE'))?></span><?php endif; ?></div><div class="caption-fields"><strong><?=h($f)?></strong><?php if(in_array($ext,['jpg','jpeg','png','webp','gif','mp4','mov','m4v','webm'])): ?><input type="hidden" name="caption_files[]" value="<?=h($f)?>"><textarea name="captions[]" placeholder="Optional caption for this file"><?=h($editData['captions'][$f] ?? '')?></textarea><?php if(in_array($ext,['mp4','mov','m4v','webm'])): ?><label class="checkbox-label"><input type="checkbox" name="use_audio_files[]" value="<?=h($f)?>" <?=!empty($editData['video_audio'][$f])?'checked':''?>> <span>Use video file audio</span></label><?php endif; ?><?php else: ?><small>No caption for audio files</small><?php endif; ?></div><button type="button" onclick="deleteFile(<?=h(json_encode($f))?>)">Remove</button></div><?php endforeach; ?></div><button type="submit">Save changes</button></form><form method="post" id="delete-file-form" style="display:none"><input type="hidden" name="action" value="delete_file"><input type="hidden" name="dir" value="<?=h(basename($editDir))?>"><input type="hidden" name="file" id="delete-file-name" value=""></form><form method="post" onsubmit="return confirm('Delete this input directory?')"><input type="hidden" name="action" value="delete_dir"><input type="hidden" name="dir" value="<?=h(basename($editDir))?>"><label class="checkbox-label"><input type="checkbox" name="delete_output" value="1"> <span>Also delete generated video, if any</span></label><button class="danger" type="submit">Delete input dir</button></form></section><?php endif; ?>
|
||||
<?php if($tab==='new'): ?><section><h2>Add new movie input</h2><form method="post" enctype="multipart/form-data"><input type="hidden" name="action" value="create"><label>Title*<input name="title" required></label><label>Date<input name="date" placeholder="2026-05-25"></label><label>Place<input name="place"></label><label>Description<textarea name="description" maxlength="5000" data-counter="description-counter-new"></textarea><small id="description-counter-new" class="counter"></small></label><label>Images / videos*<input type="file" name="media[]" multiple required accept="image/*,video/*"></label><label>Audio (optional)<input type="file" name="audio[]" multiple accept="audio/*"></label><button type="submit">Create input-dir</button></form></section><?php endif; ?>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue