A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: code smells
aminnausinf51e8edb5578
diff --git a/resources/js/components/cedar-ui/date-picker/DatePicker.vue b/resources/js/components/cedar-ui/date-picker/DatePicker.vueindex dd9b8696..a149bb1f 100644--- a/resources/js/components/cedar-ui/date-picker/DatePicker.vue+++ b/resources/js/components/cedar-ui/date-picker/DatePicker.vue@@ -71,7 +71,7 @@ watch(datePickerPanel, () => {<template><InputShell v-if="useNativeUi"><template #input="{ class: inputClass }">- <input type="date" :class="[inputClass, 'mt-1', { 'button-disabled': disabled }, $attrs.class]" v-model="model" />+ <input type="date" :id="field.name" v-model="model" :class="[inputClass, 'mt-1', { 'button-disabled': disabled }, $attrs.class]" /></template></InputShell><OnClickOutside v-else class="group relative text-sm" @trigger="toggleDatePicker(false)">diff --git a/resources/js/components/cedar-ui/date-picker/useDatePicker.ts b/resources/js/components/cedar-ui/date-picker/useDatePicker.tsindex 8929b0d5..afa8f9de 100644--- a/resources/js/components/cedar-ui/date-picker/useDatePicker.ts+++ b/resources/js/components/cedar-ui/date-picker/useDatePicker.ts@@ -10,6 +10,23 @@ interface DatePickerProps {format?: DatePickerFormat;}+function toISODate(date: Date): string {+ const y = date.getFullYear();+ const m = String(date.getMonth() + 1).padStart(2, '0');+ const d = String(date.getDate()).padStart(2, '0');+ return `${y}-${m}-${d}`;+}++function parseISODate(iso?: string | null): Date | null {+ if (!iso || iso === null) return null;++ const match = /^(\d{4})-(\d{2})-(\d{2})/.exec(iso);+ if (!match) return null;+ const [, y, m, d] = match;++ return new Date(Number(y), Number(m) - 1, Number(d));+}+export default function useDatePicker(props: DatePickerProps, datePickerInput: Ref<HTMLElement | null>, datePickerCalendar: Ref<HTMLElement | null>) {const datePickerMonth = ref(0);const datePickerYear = ref(0);@@ -76,23 +93,6 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: R}}- function toISODate(date: Date): string {- const y = date.getFullYear();- const m = String(date.getMonth() + 1).padStart(2, '0');- const d = String(date.getDate()).padStart(2, '0');- return `${y}-${m}-${d}`;- }-- function parseISODate(iso?: string | null): Date | null {- if (!iso || iso === null) return null;-- const match = /^(\d{4})-(\d{2})-(\d{2})/.exec(iso);- if (!match) return null;- const [, y, m, d] = match;-- return new Date(Number(y), Number(m) - 1, Number(d));- }-function datePickerValueClicked(value?: number) {if (!value) {datePickerValue.value = '';@@ -114,7 +114,7 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: RcalculateDays();break;- default:+ default: {datePickerDay.value = value;const selectedDate = new Date(datePickerYear.value, datePickerMonth.value, value);@@ -124,6 +124,7 @@ export default function useDatePicker(props: DatePickerProps, datePickerInput: Rif (props.model) props.model.value = toISODate(selectedDate);break;+ }}}diff --git a/resources/js/components/folders/FolderDescription.vue b/resources/js/components/folders/FolderDescription.vueindex 371defe6..1a425cf3 100644--- a/resources/js/components/folders/FolderDescription.vue+++ b/resources/js/components/folders/FolderDescription.vue@@ -17,19 +17,22 @@ const descriptionRef = useTemplateRef('folder-description');const isOverflowing = ref(false);const isExpanded = ref(false);-const avgDuration = computed(() => (data?.value.file_count ? data.value.videos.reduce((acc, vid) => (acc += vid.duration ?? 0), 0) / data.value.file_count : undefined));+const avgDuration = computed(() => (data?.value.file_count ? data.value.videos.reduce((acc, vid) => acc + (vid.duration ?? 0), 0) / data.value.file_count : undefined));const startingSeason = computed(() => (data?.value.series?.started_at ? getMediaReleaseSeason(data.value.series.started_at) : undefined));-const endingSeason = computed(() => (data?.value.series?.ended_at ? getMediaReleaseSeason(data.value.series.ended_at) : data?.value.series?.started_at ? 'Ongoing' : undefined));+const endingSeason = computed(() => {+ if (data?.value.series?.ended_at) return getMediaReleaseSeason(data.value.series.ended_at);+ return data?.value.series?.started_at ? 'Ongoing' : undefined;+});const folderDates = computed(() => toFormattedDate(data?.value.series?.created_at, false, { year: 'numeric', month: '2-digit', day: '2-digit' }));const stats = computed(() =>[- ...(data?.value.series?.episodes !== null- ? [+ ...(data?.value.series?.episodes == null+ ? [{ label: isAudio?.value ? 'Tracks' : 'Files', value: data?.value.file_count }]+ : [{ label: isAudio?.value ? 'Discs' : 'Seasons', value: data?.value.series?.seasons },{ label: isAudio?.value ? 'Tracks' : 'Episodes', value: data?.value.series?.episodes },- ]- : [{ label: isAudio?.value ? 'Tracks' : 'Files', value: data?.value.file_count }]),+ ]),!isAudio?.value && data?.value.series?.films && { label: 'Films', value: data?.value.series?.films },!isAudio?.value &&!data?.value.series?.films &&diff --git a/resources/js/components/folders/FolderMetadata.vue b/resources/js/components/folders/FolderMetadata.vueindex 33292dfc..d707e3df 100644--- a/resources/js/components/folders/FolderMetadata.vue+++ b/resources/js/components/folders/FolderMetadata.vue@@ -21,7 +21,7 @@ const metadataItems = computed<{ label: string; items: { label: string; value: alabel: 'Series',items: [{ label: 'Title', value: data.value.title },- ...(data.value.title !== data.value.name ? [{ label: 'Name', value: data.value.name }] : []),+ ...(data.value.title === data.value.name ? [] : [{ label: 'Name', value: data.value.name }]),{ label: 'Studio', value: data.value.series.studio },{ label: 'Score', value: data.value.series.rating ? data.value.series.rating + '%' : undefined },...(isAudio?.value@@ -56,9 +56,9 @@ const metadataItems = computed<{ label: string; items: { label: string; value: alabel: 'Attachments',items: [{ label: 'Images', value: data.value.series.images.length },- { label: 'Media Images', value: data.value.videos.reduce((acc, vid) => (acc += vid.metadata?.images?.length ?? 0), 0) },+ { label: 'Media Images', value: data.value.videos.reduce((acc, vid) => acc + (vid.metadata?.images?.length ?? 0), 0) },{ label: 'Attachments', value: 0 },- !isAudio?.value && { label: 'Subtitles', value: data.value.videos.reduce((acc, vid) => (acc += vid.subtitles.length ?? 0), 0) },+ !isAudio?.value && { label: 'Subtitles', value: data.value.videos.reduce((acc, vid) => acc + (vid.subtitles.length ?? 0), 0) },].filter(Boolean) as { label: string; value: any; to?: string }[],},{diff --git a/resources/js/components/folders/FolderOverviewSidebar.vue b/resources/js/components/folders/FolderOverviewSidebar.vueindex fc707eb1..f8479c0f 100644--- a/resources/js/components/folders/FolderOverviewSidebar.vue+++ b/resources/js/components/folders/FolderOverviewSidebar.vue@@ -14,13 +14,13 @@ const folderInfoScrollContainer = useTemplateRef('folder-info');const { hasScrollbar: folderDatesHasScrollbar } = useScrollbarDetection(folderDatesScrollContainer, 0, 'x');const { hasScrollbar: folderInfoHasScrollbar } = useScrollbarDetection(folderInfoScrollContainer, 0, 'x');-const { stateFolder: stateFolder } = storeToRefs(useContentStore());+const { stateFolder } = storeToRefs(useContentStore());const totalViews = computed(() => stateFolder?.value.videos.reduce((acc, vid) => acc + (vid.view_count ?? 0), 0) ?? 0);const totalDuration = computed(() => stateFolder.value.videos.reduce((acc, vid) => acc + (vid.duration ?? 0), 0));const avgDuration = computed(() => totalDuration.value / (stateFolder.value.file_count || 1));-const watchProgress = computed(() => `${stateFolder.value.videos.reduce((acc, vid) => (acc += vid.completion_count ? 1 : 0), 0)}/${stateFolder.value.file_count}`);+const watchProgress = computed(() => `${stateFolder.value.videos.reduce((acc, vid) => acc + (vid.completion_count ? 1 : 0), 0)}/${stateFolder.value.file_count}`);const userInfoRows = computed(() => [{ title: 'Progress', tooltip: `You have completed ${watchProgress.value} files`, value: watchProgress.value },diff --git a/resources/js/components/folders/charts/FolderSizeChart.vue b/resources/js/components/folders/charts/FolderSizeChart.vueindex 4b564314..584e100b 100644--- a/resources/js/components/folders/charts/FolderSizeChart.vue+++ b/resources/js/components/folders/charts/FolderSizeChart.vue@@ -95,7 +95,7 @@ const chartOptions = computed<ChartOptions>(() => {color: colourFileCount,maxTicksLimit: 3,font: { size: 10 },- callback: (val) => `${Math.round((parseFloat(`${val}`) + Number.EPSILON) * 100) / 100}`,+ callback: (val) => `${Math.round((Number.parseFloat(val.toString()) + Number.EPSILON) * 100) / 100}`,},},},diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 0ce49b1c..f779a4f4 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -451,9 +451,11 @@ const isAudio = computed(() => {const aspectRatio = computed(() => {if (isAudio.value || !stateVideo.value.metadata?.resolution_width || !stateVideo.value.metadata?.resolution_height) return { isPortrait: false, isAspectVideo: false };+ const w = stateVideo.value.metadata.resolution_width;+ const h = stateVideo.value.metadata.resolution_height;return {isPortrait: stateVideo.value.metadata.resolution_width < stateVideo.value.metadata.resolution_height,- isAspectVideo: stateVideo.value.metadata.resolution_width / stateVideo.value.metadata.resolution_height == 16.0 / 9.0,+ isAspectVideo: Math.abs(w / h - 16.0 / 9.0) < 0.01,};});@@ -1221,7 +1223,7 @@ const togglePictureInPicture = async () => {if (!player.value || isLoading.value) return;try {- if (!!document.pictureInPictureElement) {+ if (document.pictureInPictureElement) {await document.exitPictureInPicture();} else {await player.value!.requestPictureInPicture();diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vueindex 130d2b02..70811bc7 100644--- a/resources/js/views/FolderView.vue+++ b/resources/js/views/FolderView.vue@@ -6,6 +6,7 @@ import { ButtonBase, ButtonIcon, ButtonText } from '@/components/cedar-ui/buttonimport { getScreenSizeRank, toTitleCase } from '@/service/util';import { handleEditFolderImages } from '@/service/folder/folderActions';import { startScanFilesTask } from '@/service/siteAPI';+import { cn, toast, drawer } from '@aminnausin/cedar-ui';import { ContextMenuItem } from '@/components/cedar-ui/context-menu';import { useContentStore } from '@/stores/ContentStore';import { useFolderTabs } from '@/components/folders/FolderTabs';@@ -13,10 +14,8 @@ import { useModalStore } from '@/stores/ModalStore';import { BasePopover } from '@/components/cedar-ui/popover';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';-import { cn, toast } from '@aminnausin/cedar-ui';import { useRoute } from 'vue-router';import { useAuth } from '@/composables/auth/useAuth';-import { drawer } from '@aminnausin/cedar-ui';import FolderDetailsNavDrawer from '@/components/drawers/FolderDetailsNavDrawer.vue';import FolderDetailsSidebar from '@/components/panels/FolderDetailsSidebar.vue';@@ -80,7 +79,7 @@ const popoverItems = computed<PopoverItem[]>(() => [{icon: CircumShare1,text: 'Share',- action: () => modal.open(ShareModal, { title: 'Share Folder', shareLink: window.location.href }),+ action: () => modal.open(ShareModal, { title: 'Share Folder', shareLink: globalThis.location.href }),},{