A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: auto subtitle and seek button settings
aminnausinb875d5173796
diff --git a/resources/js/components/settings/SettingsToggleRow.vue b/resources/js/components/settings/SettingsToggleRow.vuenew file mode 100644index 00000000..06f6dd76--- /dev/null+++ b/resources/js/components/settings/SettingsToggleRow.vue@@ -0,0 +1,32 @@+<script setup lang="ts">+import { FormLabel } from '@/components/cedar-ui/form';++import ToggleBase from '@/components/inputs/ToggleBase.vue';++defineProps<{+ id: string;+ label: string;+ description?: string;+ disabled?: boolean;+}>();++const model = defineModel<boolean>();+</script>++<template>+ <div class="flex items-start justify-between" :class="{ 'input-disabled': disabled, '-mb-1': description }">+ <FormLabel :for="id" :text="label" class="flex h-fit flex-col gap-1">+ <template #subtext v-if="description">+ <p class="text-foreground-2 text-xs font-normal tracking-normal normal-case">+ {{ description }}+ </p>+ </template>+ </FormLabel>+ <div :class="['flex shrink-0 items-center gap-2', { 'pt-0.5': description }]">+ <ToggleBase v-model="model" :name="id" class="h-6 w-12 shrink-0 rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700" />+ <p :class="['w-8 shrink-0 text-end font-medium uppercase', { 'text-foreground-1': !model }]">+ {{ model ? 'On' : 'Off' }}+ </p>+ </div>+ </div>+</template>diff --git a/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vueindex f5914a4c..5877bd33 100644--- a/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue+++ b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue@@ -1,13 +1,12 @@<script setup lang="ts">import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';-import { FormLabel } from '@/components/cedar-ui/form';+import SettingsToggleRow from '@/components/settings/SettingsToggleRow.vue';import SettingsHeader from '@/components/settings/SettingsHeader.vue';import SettingsCard from '@/components/cards/layout/SettingsCard.vue';-import ToggleBase from '@/components/inputs/ToggleBase.vue';-const { ambientMode, playbackHeatmap, usingPlayerModernUI } = storeToRefs(useAppStore());+const { ambientMode, playbackHeatmap, usingPlayerModernUI, lightMode, useAutoSubtitles, useSeekButtons } = storeToRefs(useAppStore());</script><template>@@ -18,39 +17,17 @@ const { ambientMode, playbackHeatmap, usingPlayerModernUI } = storeToRefs(useApp<p class="text-foreground-1">Also available directly in the player.</p></SettingsHeader><div class="flex w-full flex-col gap-4 sm:max-w-xs">- <span class="flex items-center justify-between">- <FormLabel for="settings-player-ambient" text="Ambient Mode" class="line-clamp-1 cursor-pointer" />- <div class="flex items-center gap-2">- <ToggleBase- v-model="ambientMode"- :name="'settings-player-ambient'"- class="h-6 w-12 rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700"- />- <p class="w-8 text-end font-medium uppercase">{{ ambientMode ? 'On' : 'Off' }}</p>- </div>- </span>- <span class="flex items-center justify-between">- <FormLabel for="settings-player-heatmap" text="Playback Heatmap" class="line-clamp-1 cursor-pointer" />- <div class="flex items-center gap-2">- <ToggleBase- v-model="playbackHeatmap"- :name="'settings-player-heatmap'"- class="h-6 w-12 rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700"- />- <p class="w-8 text-end font-medium uppercase">{{ playbackHeatmap ? 'On' : 'Off' }}</p>- </div>- </span>- <span class="flex items-center justify-between">- <FormLabel for="settings-player-modern-ui" text="Modern UI" class="line-clamp-1 cursor-pointer" />- <div class="flex items-center gap-2">- <ToggleBase- v-model="usingPlayerModernUI"- :name="'settings-player-modern-ui'"- class="h-6 w-12 rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700"- />- <p class="w-8 text-end font-medium uppercase">{{ usingPlayerModernUI ? 'On' : 'Off' }}</p>- </div>- </span>+ <SettingsToggleRow+ id="settings-player-ambient"+ label="Ambient Mode"+ :description="lightMode ? 'Only active in dark mode.' : ''"+ v-model="ambientMode"+ :disabled="lightMode"+ />+ <SettingsToggleRow id="settings-player-heatmap" label="Playback Heatmap" v-model="playbackHeatmap" />+ <SettingsToggleRow id="settings-player-modern-ui" label="Modern UI" v-model="usingPlayerModernUI" />+ <SettingsToggleRow id="settings-player-auto-subtitles" label="Auto Subtitles" v-model="useAutoSubtitles" />+ <SettingsToggleRow id="settings-player-seek-buttons" label="Seek Buttons" v-model="useSeekButtons" /></div></template></SettingsCard>diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.tsindex 2e231cbc..19f2985b 100644--- a/resources/js/stores/AppStore.ts+++ b/resources/js/stores/AppStore.ts@@ -13,6 +13,22 @@ function booleanToString(val: undefined | boolean) {return val ? 'true' : 'false';}+function usePersisted<T extends boolean>(key: string, defaultValue: T) {+ const state = ref<boolean>(defaultValue);++ function init() {+ const cached = localStorage.getItem(key);+ state.value = cached !== null ? cached === 'true' : defaultValue;+ localStorage.setItem(key, String(state.value));+ }++ function persist(value: boolean | undefined) {+ localStorage.setItem(key, String(value ?? defaultValue));+ }++ return { state, init, persist };+}+export const useAppStore = defineStore('App', () => {const { data: rawWaitTimes, isLoading: isLoadingWaitTimes } = useGetTaskWaitTimes();const { data: rawAppManifest } = useGetManifest();@@ -42,6 +58,12 @@ export const useAppStore = defineStore('App', () => {const taskWaitTimes = ref<WaitTimesResponse>({ scan: 0, verify_files: 0, verify_folders: 0 });const appManifest = ref<AppManifest>({ version: 'Unversioned', commit: null });+ const autoSubtitles = usePersisted('useAutoSubtitles', true);+ const seekButtons = usePersisted('useSeekButtons', false);++ const useAutoSubtitles = autoSubtitles.state;+ const useSeekButtons = seekButtons.state;+function toggleDarkMode() {const rootHTML = document.querySelector('html');if (!rootHTML) return;@@ -184,6 +206,8 @@ export const useAppStore = defineStore('App', () => {initIsPlaylist();initPlayerModernUI();initAudioGraph();+ autoSubtitles.init();+ seekButtons.init();};watch(rawAppManifest, (v: any) => {@@ -200,6 +224,8 @@ export const useAppStore = defineStore('App', () => {watch(isPlaylist, setIsPlaylist, { immediate: false });watch(usingPlayerModernUI, setPlayerModernUI, { immediate: false });watch(isAudioGraphEnabled, setAudioGraph, { immediate: false });+ watch(useAutoSubtitles, autoSubtitles.persist);+ watch(useSeekButtons, seekButtons.persist);return {// Browser State@@ -209,6 +235,8 @@ export const useAppStore = defineStore('App', () => {isPlaylist,usingPlayerModernUI, // should be usePlayerModernUiisAudioGraphEnabled,+ useAutoSubtitles,+ useSeekButtons,initBrowserState,// Local State