diff --git a/documentation/MODULE__AE_Events_PressMgmt_Launcher.md b/documentation/MODULE__AE_Events_PressMgmt_Launcher.md index a5a9b582..75b13105 100644 --- a/documentation/MODULE__AE_Events_PressMgmt_Launcher.md +++ b/documentation/MODULE__AE_Events_PressMgmt_Launcher.md @@ -316,7 +316,6 @@ per file extension via `event_device.data_json.launch_profiles` (device-level co `event.launcher.launch_profiles` (event-level fallback). Templates use `{{path}}` as the file path placeholder; AppleScript or `shell:` prefixed commands are both supported. No Electron rebuild required to change how files open — edit config in Aether and it applies -immediately. Legacy `launch_scripts` keys are still accepted by the resolver for older data. See `PROJECT__AE_Events_Launcher_Native_integration.md` Section 8. Versioning is handled automatically: when a presenter uploads an updated file, the new diff --git a/documentation/PROJECT__AE_Events_Launcher_Native_integration.md b/documentation/PROJECT__AE_Events_Launcher_Native_integration.md index 2a32409e..8b8a8e7a 100644 --- a/documentation/PROJECT__AE_Events_Launcher_Native_integration.md +++ b/documentation/PROJECT__AE_Events_Launcher_Native_integration.md @@ -208,8 +208,6 @@ Launch profiles are resolved in priority order by `get_launch_profile()` in Launcher config UI (planned) or direct `localStorage` manipulation. If neither is set, `script_template` is `null` and Electron uses its built-in hardcoded defaults. -Legacy `launch_scripts` keys remain accepted as compatibility aliases in the resolver so older -device records continue to work while the preferred schema is `launch_profiles`. ### Key Format @@ -217,9 +215,9 @@ Keys are lowercase file extensions without the dot. A `"default"` key catches al unrecognised extensions. ```json -// event_device.data_json.launch_scripts example +// event_device.data_json.launch_profiles example { - "launch_scripts": { + "launch_profiles": { "pptx": "tell application \"Microsoft PowerPoint\"\n activate\n open (POSIX file \"{{path}}\")\n delay 3\nend tell\ntell application \"System Events\"\n keystroke return using command down\nend tell", "key": "tell application \"Keynote\"\n activate\n open (POSIX file \"{{path}}\")\n delay 1\n start (front document)\nend tell", "pdf": "shell:open \"{{path}}\"", diff --git a/src/lib/electron/electron_relay.ts b/src/lib/electron/electron_relay.ts index a74a8f0b..0f5f5d2f 100644 --- a/src/lib/electron/electron_relay.ts +++ b/src/lib/electron/electron_relay.ts @@ -81,7 +81,6 @@ export async function launch_from_cache({ * - Shell command: prefix with "shell:" → e.g. "shell:open \"{{path}}\"" * * Configure via event_device.data_json.launch_profiles or $events_loc.launcher.launch_profiles. - * Legacy launch_scripts keys are still accepted by the Svelte resolver for older records. * If null, Electron falls through to its built-in hardcoded defaults. */ script_template?: string | null; diff --git a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte index c8250d5c..e4b21710 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte @@ -119,25 +119,17 @@ let screen_saver_exts = ['jpg', 'png', 'PNG', 'webp']; * Resolves the LaunchProfile for a given file extension and optional per-file * display override. Checked in priority order: * 1. event_device.data_json.launch_profiles (API-driven, per-device) - * 2. event_device.data_json.launch_scripts (legacy alias) - * 3. $events_loc.launcher.launch_profiles (local persistent override) - * 4. $events_loc.launcher.launch_scripts (legacy alias) - * 5. DEFAULT_LAUNCH_PROFILES[ext] (Svelte built-in defaults) - * 6. DEFAULT_LAUNCH_PROFILES['default'] (catch-all) + * 2. $events_loc.launcher.launch_profiles (local persistent override) + * 3. DEFAULT_LAUNCH_PROFILES[ext] (Svelte built-in defaults) + * 4. DEFAULT_LAUNCH_PROFILES['default'] (catch-all) * Per-file display_override from event_file.cfg_json overrides display_mode only. */ function get_launch_profile( extension: string, file_obj?: any ): LaunchProfile { - const device_profiles = - ($ae_loc as any).native_device?.launch_profiles ?? - ($ae_loc as any).native_device?.launch_scripts ?? - null; - const local_profiles = - ($events_loc as any).launcher?.launch_profiles ?? - ($events_loc as any).launcher?.launch_scripts ?? - null; + const device_profiles = ($ae_loc as any).native_device?.launch_profiles ?? null; + const local_profiles = ($events_loc as any).launcher?.launch_profiles ?? null; const display_override = file_obj?.cfg_json?.display_override ?? null; return resolve_launch_profile(extension, display_override, device_profiles, local_profiles); }