add: New Test mode on the video main page and brewing page
This commit is contained in:
parent
67c8363270
commit
c6b528d5eb
2 changed files with 202 additions and 4 deletions
|
|
@ -10,6 +10,7 @@
|
|||
import Badge from '$lib/components/ui/badge/badge.svelte';
|
||||
import Spinner from '$lib/components/ui/spinner/spinner.svelte';
|
||||
import Progress from '$lib/components/ui/progress/progress.svelte';
|
||||
import { Checkbox } from '$lib/components/ui/checkbox/index.js';
|
||||
import {
|
||||
Upload,
|
||||
X,
|
||||
|
|
@ -22,7 +23,8 @@
|
|||
CalendarDays,
|
||||
Clock,
|
||||
ChevronDown,
|
||||
ImageIcon
|
||||
ImageIcon,
|
||||
FlaskConical
|
||||
} from '@lucide/svelte/icons';
|
||||
import * as adb from '$lib/core/adb/adb';
|
||||
import { env } from '$env/dynamic/public';
|
||||
|
|
@ -31,6 +33,7 @@
|
|||
const CREATE_ENDPOINT = '/api/video-mainpage';
|
||||
const LIST_ENDPOINT = '/api/video-mainpage/list';
|
||||
const UPDATE_ENDPOINT = '/api/video-mainpage/update';
|
||||
const TESTMODE_ENDPOINT = '/api/video-mainpage/testmode';
|
||||
const MACHINE_PROJECT_DIR = '/sdcard/coffeevending/taobin_project';
|
||||
const GET_IMAGE = env.PUBLIC_GET_IMAGE;
|
||||
const DURATION_TRIM = 4; // brewing play seconds = video length − 4
|
||||
|
|
@ -102,6 +105,26 @@
|
|||
let pushProgress = $state({ percent: 0, name: '', active: false });
|
||||
let isAdbConnected = $derived(Boolean(AdbInstance.instance));
|
||||
|
||||
// ── test mode (machine-local date/time override) ─────────────────────────
|
||||
// '' = unset (leave that clock field on the real value).
|
||||
let testMonth = $state('');
|
||||
let testDay = $state('');
|
||||
let testHour = $state('');
|
||||
let testMinute = $state('');
|
||||
let testEnabled = $state(true); // emits `Var TestMode = 1` so the gate fires
|
||||
let applyingTest = $state(false);
|
||||
const hasTestValues = $derived(
|
||||
[testMonth, testDay, testHour, testMinute].some((v) => v !== '')
|
||||
);
|
||||
|
||||
// Dropdown options. Hour/minute are zero-padded for display; the value is the
|
||||
// plain number string (the backend parses it with int()).
|
||||
const MONTH_OPTS = Array.from({ length: 12 }, (_, i) => String(i + 1));
|
||||
const DAY_OPTS = Array.from({ length: 31 }, (_, i) => String(i + 1));
|
||||
const HOUR_OPTS = Array.from({ length: 24 }, (_, i) => String(i));
|
||||
const MINUTE_OPTS = Array.from({ length: 60 }, (_, i) => String(i));
|
||||
const pad2 = (s: string) => s.padStart(2, '0');
|
||||
|
||||
// ── list ────────────────────────────────────────────────────────────────
|
||||
let managed = $state<ManagedVideo[]>([]);
|
||||
let readonlyList = $state<ReadonlyVideo[]>([]);
|
||||
|
|
@ -282,6 +305,49 @@
|
|||
}
|
||||
}
|
||||
|
||||
// Inject (or, when `clear`, remove) the TestMode date/time override in the
|
||||
// header of the web scripts and push them to the connected machine over ADB.
|
||||
// Never touches git/FTP — this override is machine-local by design.
|
||||
async function applyTestMode(clear = false) {
|
||||
if (!AdbInstance.instance) return addNotification('ERR:Connect a machine first');
|
||||
const body = clear
|
||||
? {}
|
||||
: {
|
||||
enabled: testEnabled,
|
||||
month: testMonth,
|
||||
day: testDay,
|
||||
hour: testHour,
|
||||
minute: testMinute
|
||||
};
|
||||
applyingTest = true;
|
||||
pushProgress = { percent: 0, name: '', active: true };
|
||||
try {
|
||||
const res = await fetch(`${TESTMODE_ENDPOINT}?country=${encodeURIComponent(country)}`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body)
|
||||
});
|
||||
const result = await res.json().catch(() => ({}));
|
||||
if (!res.ok) throw new Error(result?.message || result?.detail || 'Test-mode apply failed');
|
||||
await pushScripts(result?.content?.scripts ?? []);
|
||||
if (result?.cleared) {
|
||||
testMonth = testDay = testHour = testMinute = '';
|
||||
testEnabled = false;
|
||||
addNotification(`INFO:Test mode cleared on machine (${country})`);
|
||||
} else {
|
||||
const o = result?.override ?? {};
|
||||
addNotification(
|
||||
`INFO:Test mode pushed to machine — ${o.month ?? '–'}/${o.day ?? '–'} ${o.hour ?? '–'}:${o.minute ?? '–'} (${country})`
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
addNotification(`ERR:${error instanceof Error ? error.message : 'Test-mode failed'}`);
|
||||
} finally {
|
||||
applyingTest = false;
|
||||
pushProgress = { percent: 0, name: '', active: false };
|
||||
}
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
const user = $auth;
|
||||
if (!user) return addNotification('ERR:Not logged in');
|
||||
|
|
@ -325,9 +391,15 @@
|
|||
);
|
||||
await pushScripts(result?.content?.scripts ?? []);
|
||||
|
||||
if (result?.sftp?.error)
|
||||
addNotification(`WARN:Uploaded but FTP sync failed: ${result.sftp.error}`);
|
||||
addNotification(`INFO:Added "${name.trim()}" as brewing_adv${result.n} (${country})`);
|
||||
if (result?.duplicate) {
|
||||
addNotification(
|
||||
`WARN:"${name.trim()}" already exists as brewing_adv${result.n} — pushed to machine, no duplicate created`
|
||||
);
|
||||
} else {
|
||||
if (result?.sftp?.error)
|
||||
addNotification(`WARN:Uploaded but FTP sync failed: ${result.sftp.error}`);
|
||||
addNotification(`INFO:Added "${name.trim()}" as brewing_adv${result.n} (${country})`);
|
||||
}
|
||||
clearMain();
|
||||
clearBrewing();
|
||||
clearBrewingTxt();
|
||||
|
|
@ -629,6 +701,100 @@
|
|||
</Card.Footer>
|
||||
</Card.Root>
|
||||
|
||||
<!-- Test mode (machine-local date/time override) -->
|
||||
<Card.Root class="overflow-hidden shadow-sm">
|
||||
<Card.Header>
|
||||
<Card.Title class="flex items-center gap-2 text-lg">
|
||||
<FlaskConical class="h-5 w-5 text-muted-foreground" /> Test mode
|
||||
</Card.Title>
|
||||
<Card.Description>
|
||||
Override the machine clock (<code class="font-mono">AdvSystem*</code>) to preview
|
||||
date-gated videos. Gated by <code class="font-mono">TestMode = 1</code> and pushed to
|
||||
the connected machine only — never committed or synced. Fill only what you need.
|
||||
</Card.Description>
|
||||
</Card.Header>
|
||||
<Card.Content class="space-y-4">
|
||||
<div class="grid grid-cols-2 gap-3 sm:grid-cols-4">
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">Month</Label>
|
||||
<Select.Root type="single" bind:value={testMonth}>
|
||||
<Select.Trigger class="w-full">{testMonth || '—'}</Select.Trigger>
|
||||
<Select.Content class="max-h-60">
|
||||
<Select.Item value="">—</Select.Item>
|
||||
{#each MONTH_OPTS as m}
|
||||
<Select.Item value={m}>{m}</Select.Item>
|
||||
{/each}
|
||||
</Select.Content>
|
||||
</Select.Root>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">Day</Label>
|
||||
<Select.Root type="single" bind:value={testDay}>
|
||||
<Select.Trigger class="w-full">{testDay || '—'}</Select.Trigger>
|
||||
<Select.Content class="max-h-60">
|
||||
<Select.Item value="">—</Select.Item>
|
||||
{#each DAY_OPTS as d}
|
||||
<Select.Item value={d}>{d}</Select.Item>
|
||||
{/each}
|
||||
</Select.Content>
|
||||
</Select.Root>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">Hour</Label>
|
||||
<Select.Root type="single" bind:value={testHour}>
|
||||
<Select.Trigger class="w-full">{testHour === '' ? '—' : pad2(testHour)}</Select.Trigger>
|
||||
<Select.Content class="max-h-60">
|
||||
<Select.Item value="">—</Select.Item>
|
||||
{#each HOUR_OPTS as h}
|
||||
<Select.Item value={h}>{pad2(h)}</Select.Item>
|
||||
{/each}
|
||||
</Select.Content>
|
||||
</Select.Root>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">Minute</Label>
|
||||
<Select.Root type="single" bind:value={testMinute}>
|
||||
<Select.Trigger class="w-full"
|
||||
>{testMinute === '' ? '—' : pad2(testMinute)}</Select.Trigger
|
||||
>
|
||||
<Select.Content class="max-h-60">
|
||||
<Select.Item value="">—</Select.Item>
|
||||
{#each MINUTE_OPTS as mi}
|
||||
<Select.Item value={mi}>{pad2(mi)}</Select.Item>
|
||||
{/each}
|
||||
</Select.Content>
|
||||
</Select.Root>
|
||||
</div>
|
||||
</div>
|
||||
<label class="flex w-fit items-center gap-2 text-sm">
|
||||
<Checkbox bind:checked={testEnabled} />
|
||||
Enable test mode <code class="font-mono text-xs">(Var TestMode = 1)</code>
|
||||
</label>
|
||||
<div class="flex flex-wrap items-center gap-2">
|
||||
<Button
|
||||
onclick={() => applyTestMode(false)}
|
||||
disabled={applyingTest || !isAdbConnected || (!hasTestValues && !testEnabled)}
|
||||
>
|
||||
{#if applyingTest}
|
||||
<Spinner class="mr-2 h-4 w-4" />Applying...
|
||||
{:else}
|
||||
<MonitorPlay class="mr-2 h-4 w-4" />Apply to machine
|
||||
{/if}
|
||||
</Button>
|
||||
<Button
|
||||
variant="outline"
|
||||
onclick={() => applyTestMode(true)}
|
||||
disabled={applyingTest || !isAdbConnected}
|
||||
>
|
||||
Clear override
|
||||
</Button>
|
||||
{#if !isAdbConnected}
|
||||
<span class="text-xs text-muted-foreground">Connect a machine to apply.</span>
|
||||
{/if}
|
||||
</div>
|
||||
</Card.Content>
|
||||
</Card.Root>
|
||||
|
||||
<!-- Existing -->
|
||||
<div class="space-y-3">
|
||||
<div class="flex items-center justify-between">
|
||||
|
|
|
|||
32
src/routes/api/video-mainpage/testmode/+server.ts
Normal file
32
src/routes/api/video-mainpage/testmode/+server.ts
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
import { json, error } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { env } from '$env/dynamic/public';
|
||||
|
||||
const API_BASE = env.PUBLIC_POST_IMAGE;
|
||||
|
||||
// Return the country's web video scripts with a TestMode date/time override
|
||||
// injected (or removed). The caller pushes the result to a machine over ADB —
|
||||
// nothing is committed or synced. POST because the Kong route is POST-only.
|
||||
export const POST: RequestHandler = async ({ url, request }) => {
|
||||
try {
|
||||
const country = (url.searchParams.get('country') || 'tha').toLowerCase();
|
||||
const body = await request.json().catch(() => ({}));
|
||||
const response = await fetch(
|
||||
`${API_BASE}/video/mainpage/testmode/${encodeURIComponent(country)}`,
|
||||
{
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body)
|
||||
}
|
||||
);
|
||||
if (!response.ok) {
|
||||
const e = await response.json().catch(() => ({ detail: response.statusText }));
|
||||
throw error(response.status, e.detail || 'Test-mode apply failed');
|
||||
}
|
||||
return json(await response.json());
|
||||
} catch (err) {
|
||||
console.error('[Video MainPage TestMode Proxy] Error:', err);
|
||||
if (err && typeof err === 'object' && 'status' in err) throw err;
|
||||
throw error(500, err instanceof Error ? err.message : 'Internal server error');
|
||||
}
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue