A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: code smells
aminnausinfa86fc12ede0
diff --git a/app/Jobs/IndexFiles.php b/app/Jobs/IndexFiles.phpindex c622143b..c20226b5 100755--- a/app/Jobs/IndexFiles.php+++ b/app/Jobs/IndexFiles.php@@ -501,7 +501,8 @@ class IndexFiles implements ShouldBeUnique, ShouldQueue {$mtime = filemtime($rawFile);$ctime = filectime($rawFile);- $duration = isset($fileMetaData['format']['duration']) ? floor($fileMetaData['format']['duration']) : (isset($fileMetaData['streams'][0]['duration']) ? floor($fileMetaData['streams'][0]['duration']) : null);+ $rawDuration = $fileMetaData['format']['duration'] ?? $fileMetaData['streams'][0]['duration'] ?? null;+ $duration = is_numeric($rawDuration) ? floor($rawDuration) : null;$generated = ['id' => $currentID, 'uuid' => $embeddingUuid ? null : $uuid, 'name' => $cleanName, 'path' => $key, 'folder_id' => $folderStructure[$folder]['id'], 'date' => date('Y-m-d h:i A', $mtime < $ctime ? $mtime : $ctime), 'action' => 'INSERT'];$metadata = ['video_id' => $currentID, 'composite_id' => "$folder/$name", 'uuid' => $uuid, 'file_size' => filesize($rawFile), 'duration' => $duration, 'mime_type' => $mime_type ?? null, 'date_scanned' => date('Y-m-d h:i:s A'), 'date_uploaded' => date('Y-m-d h:i A', $mtime < $ctime ? $mtime : $ctime)];@@ -611,4 +612,5 @@ class IndexFiles implements ShouldBeUnique, ShouldQueue {return 'Generated ' . $count . ' ' . $type . ' Changes';}}-class BatchCancelledException extends \Exception {}+class BatchCancelledException extends \Exception {+}diff --git a/resources/js/components/cards/SidebarCard.vue b/resources/js/components/cards/SidebarCard.vueindex af9311a5..c50c8552 100644--- a/resources/js/components/cards/SidebarCard.vue+++ b/resources/js/components/cards/SidebarCard.vue@@ -52,16 +52,16 @@ const props = defineProps<{</div></slot></section>- <section class="flex flex-col sm:flex-row sm:justify-between w-full flex-wrap gap-2 text-sm">+ <!-- Extra information if required<section class="flex flex-col sm:flex-row sm:justify-between w-full flex-wrap gap-2 text-sm"><slot name="body">- <!--+<h3 class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap flex-1" :title="`${2} Episode${2 > 1 ? 's' : ''}`">{{ 2 }} Episode{{ 2 > 1 ? 's' : '' }}</h3><h3 class="truncate text-nowrap sm:text-right text-neutral-500 w-fit lg:hidden xl:block">some other folder statistic or data like number of seasons or if its popular or something{{ '20gb' }}</h3>- --></slot></section>+ --></RouterLink></template>diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vueindex 59bbbdfa..036d3677 100755--- a/resources/js/components/panels/NavBar.vue+++ b/resources/js/components/panels/NavBar.vue@@ -44,13 +44,16 @@ watch(userData, handleAuthEvent, { immediate: false });<nav id="navbar" class="flex py-1 gap-2 flex-wrap justify-between z-20"><span class="flex items-end sm:items-center gap-2 justify-between w-full flex-1"><h1 id="title" class="text-2xl truncate capitalize">{{ pageTitle }}</h1>- <section id="user-options" class="group inline-block relative shrink-0" data-dropdown-toggle="user-dropdown" role="menu" aria-haspopup="menu">+ <section id="user-options" class="group inline-block relative shrink-0" data-dropdown-toggle="user-dropdown"><DropdownMenu :dropdownOpen="showDropdown" @toggleDropdown="showDropdown = false"><template #trigger><buttonid="user-header"class="flex gap-2 text-2xl text-slate-900 dark:text-white hover:text-violet-600 items-center justify-center capitalize h-8"@click="toggleDropdown"+ aria-haspopup="menu"+ :aria-expanded="showDropdown"+ aria-controls="user-dropdown"><span id="user-name" class="hidden sm:block truncate" v-if="username">{{ username }}</span><span id="user-name-unauth" v-else class="text-right hidden sm:block">Guest</span>diff --git a/resources/js/components/pinesUI/DropdownItem.vue b/resources/js/components/pinesUI/DropdownItem.vueindex 989b329f..86424646 100755--- a/resources/js/components/pinesUI/DropdownItem.vue+++ b/resources/js/components/pinesUI/DropdownItem.vue@@ -1,14 +1,49 @@-<script setup>+<script setup lang="ts">+import { computed } from 'vue';import { RouterLink } from 'vue-router';-const props = defineProps(['linkData', 'selected', 'external', 'disabled']);+const props = defineProps<{+ linkData: { url?: string; text: string; shortcut?: string };+ selected: boolean | undefined;+ external: boolean | undefined;+ disabled?: boolean;+}>();++const baseClasses =+ 'cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors';+const disabledClasses = 'pointer-events-none opacity-50';+const selectedClass = 'font-bold text-violet-500';+const Tag = computed(() => {+ if (props.external) return 'a';+ if (props.linkData.url) return RouterLink;+ return 'button';+});</script><template>+ <component+ :is="'router-link'"+ :class="[baseClasses, selected && selectedClass, disabled && disabledClasses]"+ :href="external ? linkData.url : undefined"+ :to="!external && linkData.url ? (disabled ? '' : linkData.url) : 'undefined'"+ :target="external ? '_blank' : undefined"+ :disabled="!linkData.url ? disabled : undefined"+ :data-disabled="linkData.url ? disabled : undefined"+ role="menuitem"+ >+ <slot name="icon">+ <span class="w-4 h-4 mr-2"></span>+ </slot>+ <span class="text-nowrap">{{ linkData.text }}</span>+ <span class="ml-auto text-xs tracking-widest opacity-60">{{ linkData.shortcut ?? '' }}</span>+ </component>+</template>+<!-- OLD CODE<av-if="external":class="{ 'font-bold text-violet-500': selected }":href="linkData.url"target="_blank"class="cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50"+ role="menuitem"><slot name="icon"><span width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="w-4 h-4 mr-2">@@ -22,7 +57,8 @@ const props = defineProps(['linkData', 'selected', 'external', 'disabled']);:class="{ 'font-bold text-violet-500': selected }":to="disabled ? '' : linkData.url":data-disabled="disabled"- class="cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50"+ class="cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors"+ role="menuitem"><slot name="icon"><span width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="w-4 h-4 mr-2">@@ -36,6 +72,7 @@ const props = defineProps(['linkData', 'selected', 'external', 'disabled']);:class="{ 'font-bold text-violet-500': selected }":disabled="disabled"class="cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50"+ role="menuitem"><slot name="icon"><span width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="w-4 h-4 mr-2">@@ -44,4 +81,4 @@ const props = defineProps(['linkData', 'selected', 'external', 'disabled']);<span class="text-nowrap">{{ linkData.text }}</span><span class="ml-auto text-xs tracking-widest opacity-60">{{ linkData.shortcut ?? '' }}</span></button>-</template>+-->diff --git a/resources/js/components/pinesUI/DropdownMenu.vue b/resources/js/components/pinesUI/DropdownMenu.vueindex ec3281f1..f0ed6b4f 100755--- a/resources/js/components/pinesUI/DropdownMenu.vue+++ b/resources/js/components/pinesUI/DropdownMenu.vue@@ -150,7 +150,8 @@ onUnmounted(() => {v-show="props.dropdownOpen":class="`absolute top-0 z-50 mt-12 ${manualPosition ? '' : '-right-[0.25rem]'} `"v-cloak- id="userDropdown"+ id="user-dropdown"+ role="menu":style="manualPosition ? `left: ${manualPosition}px;` : ''"ref="dropdown">@@ -167,8 +168,8 @@ onUnmounted(() => {v-for="(item, index) in dropDownItemsAuth[groupIndex].filter((item) => !item.hidden)":key="index":linkData="item"- :selected="item?.url && ($route.path === item.name || $route.path === item.url)"- :external="item?.external"+ :selected="item?.url && ($route.path === item.name || $route.path === item.url) ? true : false"+ :external="item?.external ? true : false":disabled="item?.disabled ?? false"@click="() => {diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vueindex 5d28bce2..b3c2ba54 100644--- a/resources/js/components/pinesUI/InputMultiChip.vue+++ b/resources/js/components/pinesUI/InputMultiChip.vue@@ -223,7 +223,7 @@ watch(:options="{ allowOutsideClick: true, initialFocus: selectInput?.$el, returnFocusOnDeactivate: false }"><OnClickOutside- @trigger.stop="select.toggleSelect(false)"+ @trigger="select.toggleSelect(false)"@keydown.esc.stop="(event: Event) => {if (select.selectOpen) {@@ -255,32 +255,37 @@ watch(@keydown="select.selectKeydown($event)"v-cloak>- <ul ref="selectableItemsList" class="max-h-56 last:rounded-b-md" @focusin="handleListFocus">- <li class="p-2 flex gap-2 w-full" @focusin="lastActiveItemId = -1">- <TextInput- :placeholder="'Search for a tag'"- v-model="newValue"- :maxlength="props.max"- @keydown.enter.stop="handleCreate"- @keydown.space.stop="() => {}"- ref="selectInput"- class="scroll-m-4"- @change="selectInput?.$el.scrollIntoView({ behavior: 'smooth', block: 'center' })"- @focus="selectButton?.scrollIntoView({ behavior: 'smooth', block: 'center' })"- />- <ButtonIcon :type="'button'" :disabled="!newValue" @click="handleCreate" class="ring-inset" title="Add a new tag">- <template #icon>- <MdiLightPlus class="w-6 h-6" />- </template>- </ButtonIcon>- </li>- <li- v-show="filteredItemsList.length == 0"- class="text-gray-700 dark:text-neutral-300 relative flex items-center h-full py-2 pl-8 select-none"- @focusin="lastActiveItemId = -1"- >- <span class="block truncate">No Results... Add New?</span>- </li>+ <section class="p-2 flex gap-2 w-full" @focusin="lastActiveItemId = -1">+ <TextInput+ :placeholder="'Search for a tag'"+ v-model="newValue"+ :maxlength="props.max"+ ref="selectInput"+ role="combobox"+ aria-autocomplete="list"+ aria-controls="selectableItemsList"+ :aria-expanded="select.selectOpen"+ :aria-activedescendant="lastActiveItemId ? `${lastActiveItemId}-${select.selectId}` : null"+ class="scroll-m-4"+ @keydown.enter.stop="handleCreate"+ @keydown.space.stop=""+ @change="selectInput?.$el.scrollIntoView({ behavior: 'smooth', block: 'center' })"+ @focus="selectButton?.scrollIntoView({ behavior: 'smooth', block: 'center' })"+ />+ <ButtonIcon :type="'button'" :disabled="!newValue" @click="handleCreate" class="ring-inset" title="Add a new tag">+ <template #icon>+ <MdiLightPlus class="w-6 h-6" />+ </template>+ </ButtonIcon>+ </section>+ <section+ v-show="filteredItemsList.length == 0"+ class="text-gray-700 dark:text-neutral-300 relative flex items-center h-full py-2 pl-8 select-none"+ @focusin="lastActiveItemId = -1"+ >+ <span class="block truncate">No Results... Add New?</span>+ </section>+ <ul class="max-h-56 last:rounded-b-md" id="selectableItemsList" ref="selectableItemsList" role="listbox" @focusin="handleListFocus"><template v-for="item in filteredItemsList" :key="item.value"><li@keydown.enter.prevent.stop="handleItemClick(select.selectableItemActive)"@@ -296,6 +301,8 @@ watch(}":tabindex="'0'"class="relative flex items-center focus:rounded-md h-full py-2 pl-8 cursor-pointer select-none data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"+ role="option"+ :aria-selected="select.selectableItemActive === item"><span class="block truncate">{{ item.name }}</span></li>diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components/pinesUI/InputSelect.vueindex 751b14d9..6010e94f 100755--- a/resources/js/components/pinesUI/InputSelect.vue+++ b/resources/js/components/pinesUI/InputSelect.vue@@ -1,9 +1,8 @@<script setup lang="ts">import useSelect from '@/composables/useSelect';-import { onMounted, useTemplateRef, watch } from 'vue';+import { onMounted, ref, useTemplateRef, watch } from 'vue';import { OnClickOutside } from '@vueuse/components';-import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';interface SelectItem {title: string;@@ -60,8 +59,11 @@ const props = withDefaults(const emit = defineEmits(['selectItem']);const selectButton = useTemplateRef('selectButton');const selectableItemsList = useTemplateRef('selectableItemsList');+const selectableItemsRoot = useTemplateRef('selectableItemsRoot');const select = useSelect(props.options, { selectableItemsList, selectButton });+const closeFocusOutTimeout = ref<number | null>(null);+const handleItemClick = (item: any, setFocus = true) => {select.selectedItem = item;select.toggleSelect(false);@@ -72,13 +74,28 @@ const handleItemClick = (item: any, setFocus = true) => {const handleItemHover = (item: any) => {select.selectableItemActive = item;select.selectScrollToActiveItem();- (document.activeElement as HTMLElement)?.blur();};const handleItemFocus = (item: any) => {select.selectableItemActive = item;};+const handleFocusOut = () => {+ if (closeFocusOutTimeout.value) {+ clearTimeout(closeFocusOutTimeout.value);+ }++ closeFocusOutTimeout.value = setTimeout(() => {+ if (!selectableItemsRoot.value) return;++ const active = document.activeElement;++ if (!selectableItemsRoot.value.contains(active)) {+ select.toggleSelect(false);+ }+ }, 0);+};+onMounted(() => {if (props.disabled) return;@@ -105,7 +122,7 @@ watch();</script><template>- <section :class="`relative ${rootClass}`">+ <section :class="`relative ${rootClass}`" @focusout="handleFocusOut" ref="selectableItemsRoot"><button:id="name ?? 'Select'"ref="selectButton"@@ -137,95 +154,91 @@ watch(</button><Transition enter-active-class="transition ease-out duration-50" enter-from-class="opacity-0 -translate-y-1" enter-to-class="opacity-100">- <UseFocusTrap+ <OnClickOutside+ v-cloakv-if="select.selectOpen":class="{'bottom-0 mb-11': select.selectDropdownPosition == 'top','top-0 mt-11': select.selectDropdownPosition == 'bottom',}"class="z-30 absolute w-full mt-1 overflow-clip text-sm rounded-md shadow-md max-h-56 ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"- :options="{ allowOutsideClick: true, returnFocusOnDeactivate: false }"- >- <OnClickOutside- @trigger.stop="select.toggleSelect(false)"- @keydown.esc.stop="- (event: Event) => {- if (select.selectOpen) {- select.toggleSelect(false);- event.stopPropagation();- }+ @trigger="select.toggleSelect(false)"+ @keydown.esc.stop="+ (event: Event) => {+ if (select.selectOpen) {+ select.toggleSelect(false);+ event.stopPropagation();}- "- @keydown.down.stop.prevent="- (event: Event) => {- if (select.selectOpen) {- select.selectableItemActiveNext();- } else {- select.toggleSelect(true);- }- event.preventDefault();+ }+ "+ @keydown.down.stop.prevent="+ (event: Event) => {+ if (select.selectOpen) {+ select.selectableItemActiveNext();+ } else {+ select.toggleSelect(true);}- "- @keydown.up.stop.prevent="- (event: Event) => {- if (select.selectOpen) {- select.selectableItemActivePrevious();- } else {- select.toggleSelect(true);- }- event.preventDefault();+ event.preventDefault();+ }+ "+ @keydown.up.stop.prevent="+ (event: Event) => {+ if (select.selectOpen) {+ select.selectableItemActivePrevious();+ } else {+ select.toggleSelect(true);}- "- @keydown.enter.stop="- //@ts-ignore- select.selectedItem = select.selectableItemActive;- select.toggleSelect(false);- "- @keydown.stop="select.selectKeydown($event)"- v-cloak- >- <ul ref="selectableItemsList" class="w-full overflow-auto max-h-56 scrollbar-thin focus:outline-none" tabindex="-1" role="listbox">- <template v-for="item in select.selectableItems" :key="item.value">- <li- @click="handleItemClick(item)"- @keydown.enter="handleItemClick(item)"- @keydown.space="handleItemClick(item)"- @focus="handleItemFocus(item)"- @mousemove="handleItemHover(item)"- :id="item.value + '-' + select.selectId"- :data-disabled="item.disabled ? item.disabled : ''"- :class="{- 'bg-neutral-100 dark:bg-neutral-900/70 text-gray-900 dark:text-neutral-100': select.selectableItemIsActive(item),- 'text-gray-700 dark:text-neutral-300': !select.selectableItemIsActive(item),- }"- class="focus:rounded-md relative flex items-center h-full py-2 pl-8 cursor-pointer data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"- :title="item.title"- role="option"- tabindex="0"+ event.preventDefault();+ }+ "+ @keydown.enter.stop="+ //@ts-ignore+ select.selectedItem = select.selectableItemActive;+ select.toggleSelect(false);+ "+ @keydown.stop="select.selectKeydown($event)"+ >+ <ul ref="selectableItemsList" class="w-full overflow-auto max-h-56 scrollbar-thin focus:outline-none" tabindex="-1" role="listbox">+ <template v-for="item in select.selectableItems" :key="item.value">+ <li+ @click="handleItemClick(item)"+ @keydown.enter="handleItemClick(item)"+ @keydown.space="handleItemClick(item)"+ @focus="handleItemFocus(item)"+ @mousemove="handleItemHover(item)"+ :id="item.value + '-' + select.selectId"+ :title="item.title"+ :data-disabled="item.disabled ? item.disabled : ''"+ :tabindex="select.selectableItemIsActive(item) ? 0 : -1"+ :class="{+ 'bg-neutral-100 dark:bg-neutral-900/70 text-gray-900 dark:text-neutral-100': select.selectableItemIsActive(item),+ 'text-gray-700 dark:text-neutral-300': !select.selectableItemIsActive(item),+ }"+ class="focus:rounded-md relative flex items-center h-full py-2 pl-8 cursor-pointer data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"+ role="option"+ :aria-selected="select.selectableItemIsActive(item) ?? false"+ >+ <svg+ v-if="+ //@ts-ignore+ select.selectedItem.value == item.value+ "+ class="absolute left-0 w-4 h-4 ml-2 stroke-current text-neutral-400"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ stroke-linecap="round"+ stroke-linejoin="round">- <svg- v-if="- //@ts-ignore- select.selectedItem.value == item.value- "- class="absolute left-0 w-4 h-4 ml-2 stroke-current text-neutral-400"- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- stroke-width="2"- stroke-linecap="round"- stroke-linejoin="round"- :tabindex="0"- >- <polyline points="20 6 9 17 4 12"></polyline>- </svg>- <span class="block font-medium truncate">{{ item.title }}</span>- </li>- </template>- </ul>- </OnClickOutside>- </UseFocusTrap>+ <polyline points="20 6 9 17 4 12"></polyline>+ </svg>+ <span class="block font-medium truncate">{{ item.title }}</span>+ </li>+ </template>+ </ul>+ </OnClickOutside></Transition></section></template>diff --git a/resources/js/components/video/VideoHeatmap.vue b/resources/js/components/video/VideoHeatmap.vueindex 86e1e334..86545a94 100644--- a/resources/js/components/video/VideoHeatmap.vue+++ b/resources/js/components/video/VideoHeatmap.vue@@ -11,17 +11,14 @@ const heatMap = computed(() => {const start = 'M 0.0,100.0 ';function catmullRomFitting(data: string | any[], alpha: number | undefined) {- if (!data?.length || data.length < 5) return '';- if (alpha == 0 || alpha === undefined) {- return '';- }+ if (!data?.length || data.length < 5 || alpha == 0 || alpha === undefined) return '';let p0, p1, p2, p3, bp1, bp2, d1, d2, d3, A, B, N, M;let d3powA, d2powA, d3pow2A, d2pow2A, d1pow2A, d1powA;let d = Math.round(data[0].x) + ',' + Math.round(data[0].y) + ' ';let length = data.length;for (let i = 0; i < length - 1; i++) {- p0 = i == 0 ? data[0] : data[i - 1];+ p0 = data[Math.max(i - 1, 0)];p1 = data[i];p2 = data[i + 1];p3 = i + 2 < length ? data[i + 2] : p2;