Skip to content

A self-hosted media server and file management system

feat: new sorting strategy to fix episode sorting (not too sure about this)

aminnausina3831fd0f5d2
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vue
index 6d2b7f12..550b6281 100755
--- a/resources/js/components/cards/VideoCard.vue
+++ b/resources/js/components/cards/VideoCard.vue
@@ -13,6 +13,7 @@ import useMetaData from '@/composables/useMetaData';
import HoverCard from '@/components/cards/HoverCard.vue';
import ChipTag from '@/components/labels/ChipTag.vue';
+import TablerMicrophone2 from '~icons/tabler/microphone-2';
import ProiconsComment from '~icons/proicons/comment';
import CircumShare1 from '~icons/circum/share-1';
import CircumEdit from '~icons/circum/edit';
@@ -24,6 +25,10 @@ const metaData = useMetaData({ ...props.data }, true);
const { stateFolder, stateDirectory } = storeToRefs(useContentStore());
const { setContextMenu } = useAppStore();
+const isAudio = computed(() => {
+ return props.data?.metadata?.mime_type?.startsWith('audio') ?? false;
+});
+
const contextMenuItems = computed(() => {
let items: ContextMenuItem[] = [
{
@@ -66,35 +71,45 @@ watch(
}
"
>
- <section class="flex justify-between gap-4 w-full items-center overflow-hidden group">
+ <section class="flex justify-between gap-4 w-full items-center overflow-hidden">
<HoverCard class="items-end" v-if="data.description" :content="data.description" :content-title="data.title" :hover-card-delay="400" :hover-card-leave-delay="300">
<template #trigger>
- <span class="flex">
- <h3 class="line-clamp-1">
- {{ data.title }}
+ <span class="flex group">
+ <h3 class="line-clamp-1 break-all">
+ {{ `${data.episode ? `${data.episode}. ` : ''}${data.title}` }}
</h3>
<ProiconsComment class="my-auto ms-4 group-hover:opacity-20 opacity-100 transition-opacity duration-300 shrink-0 h-5 w-5" title="Description" />
</span>
</template>
</HoverCard>
<h3 v-else class="flex-1 truncate min-w-[30%]" :title="data.title">
- {{ data.title }}
+ {{ `${data.episode ? `${data.episode}: ` : ''}${data.title}` }}
</h3>
- <span class="flex gap-1 truncate text-neutral-600 dark:text-neutral-400 text-sm uppercase">
+ <HoverCard
+ class="items-end flex-1 -ms-2 hidden sm:block"
+ v-if="isAudio && data.metadata?.lyrics"
+ :content-title="'Has Lyrics'"
+ :hover-card-delay="400"
+ :hover-card-leave-delay="300"
+ >
+ <template #trigger>
+ <TablerMicrophone2
+ class="[&>*]:stroke-[1.4px] shrink-0 h-5 w-5 hover:opacity-20 opacity-100 transition-opacity duration-300"
+ title="Has Lyrics"
+ v-if="isAudio"
+ />
+ </template>
+ </HoverCard>
+
+ <span class="flex gap-1 truncate text-neutral-600 dark:text-neutral-400 text-sm uppercase min-w-fit">
<h4 class="text-nowrap text-start truncate" :title="`File Size: ${data.file_size ? formatFileSize(data.file_size) : ''}`">
{{ data.file_size ? formatFileSize(data.file_size) : '' }}
</h4>
- <h4
- v-if="
- (data.metadata?.codec && data.metadata?.mime_type?.includes('audio')) || (!data.metadata?.mime_type?.includes('audio') && data.metadata?.resolution_height)
- "
- >
- |
- </h4>
- <h4 class="text-nowrap text-start" v-if="data.metadata?.mime_type?.includes('audio') && data.metadata.codec">
+ <h4 v-if="(data.metadata?.codec && isAudio) || (!isAudio && data.metadata?.resolution_height)">|</h4>
+ <h4 class="text-nowrap text-start" v-if="isAudio && data?.metadata?.codec" title="File Codec">
{{ data.metadata.codec }}
</h4>
- <h4 class="text-nowrap text-start" v-else-if="data.metadata?.resolution_height && !data.metadata?.mime_type?.includes('audio')">
+ <h4 class="text-nowrap text-start" v-else-if="data.metadata?.resolution_height && !isAudio">
{{ data.metadata.resolution_height }}P{{ data.metadata.codec ? ` | ${data.metadata.codec}` : '' }}
</h4>
</span>
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
index 7c9f5b3a..577c33c3 100644
--- a/resources/js/components/dashboard/DashboardLibraries.vue
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -9,7 +9,7 @@ import { useContentStore } from '@/stores/ContentStore';
import { useQueryClient } from '@tanstack/vue-query';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { sortObject } from '@/service/util';
+import { sortObject } from '@/service/sort/baseSort';
import { toast } from '@/service/toaster/toastService';
import CategoryFolderCard from '@/components/cards/CategoryFolderCard.vue';
diff --git a/resources/js/components/dashboard/DashboardLibraryFolders.vue b/resources/js/components/dashboard/DashboardLibraryFolders.vue
index e32b5837..fc1c09ee 100644
--- a/resources/js/components/dashboard/DashboardLibraryFolders.vue
+++ b/resources/js/components/dashboard/DashboardLibraryFolders.vue
@@ -2,24 +2,19 @@
import type { FolderResource, SeriesResource } from '@/types/resources';
import { computed, onMounted, ref } from 'vue';
-import { startIndexFilesTask } from '@/service/siteAPI';
import { useDashboardStore } from '@/stores/DashboardStore';
import { useContentStore } from '@/stores/ContentStore';
import { useQueryClient } from '@tanstack/vue-query';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { sortObject } from '@/service/util';
-import { toast } from '@/service/toaster/toastService';
+import { sortObject } from '@/service/sort/baseSort';
import CategoryFolderCard from '@/components/cards/CategoryFolderCard.vue';
-import ButtonText from '@/components/inputs/ButtonText.vue';
import EditFolder from '@/components/forms/EditFolder.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
import TableBase from '@/components/table/TableBase.vue';
import useModal from '@/composables/useModal';
-import ProiconsArrowSync from '~icons/proicons/arrow-sync';
-
const sortingOptions = ref([
{
title: 'ID',
diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vue
index 0229fb0b..a619d295 100644
--- a/resources/js/components/dashboard/DashboardTasks.vue
+++ b/resources/js/components/dashboard/DashboardTasks.vue
@@ -9,7 +9,7 @@ import { useDashboardStore } from '@/stores/DashboardStore';
import { useQueryClient } from '@tanstack/vue-query';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { sortObject } from '@/service/util';
+import { sortObject } from '@/service/sort/baseSort';
import { toast } from '@/service/toaster/toastService';
import DashboardTaskMenu from '@/components/dashboard/DashboardTaskMenu.vue';
diff --git a/resources/js/components/dashboard/DashboardUsers.vue b/resources/js/components/dashboard/DashboardUsers.vue
index c140488e..4880efe0 100644
--- a/resources/js/components/dashboard/DashboardUsers.vue
+++ b/resources/js/components/dashboard/DashboardUsers.vue
@@ -7,7 +7,7 @@ import { useDashboardStore } from '@/stores/DashboardStore';
import { useQueryClient } from '@tanstack/vue-query';
import { storeToRefs } from 'pinia';
import { deleteUser } from '@/service/siteAPI';
-import { sortObject } from '@/service/util';
+import { sortObject } from '@/service/sort/baseSort';
import { toast } from '@/service/toaster/toastService';
import BreadCrumbs from '@/components/pinesUI/BreadCrumbs.vue';
diff --git a/resources/js/service/sort/baseSort.ts b/resources/js/service/sort/baseSort.ts
new file mode 100644
index 00000000..059a8ec6
--- /dev/null
+++ b/resources/js/service/sort/baseSort.ts
@@ -0,0 +1,65 @@
+import type { SortDir } from '@/types/types';
+
+import { CompareStrategies } from '@/service/sort/strategies';
+
+export function sortObject<T>(column: keyof T, direction: SortDir = 1, dateColumns: string[] = ['date', 'date_released']) {
+ return (a: T, b: T): number => {
+ let valueA = a[column];
+ let valueB = b[column];
+
+ if ((valueA instanceof Date && valueB instanceof Date) || dateColumns.includes(String(column))) {
+ let dateA = new Date(String(valueA));
+ let dateB = new Date(String(valueB));
+ return (dateB.getTime() - dateA.getTime()) * direction;
+ }
+
+ let numA = parseFloat(valueA as any);
+ let numB = parseFloat(valueB as any);
+
+ if (!isNaN(numA) && !isNaN(numB)) {
+ return (numA - numB) * direction;
+ }
+ return String(valueA).toLowerCase().replace(/\s+/g, ' ').localeCompare(String(valueB).toLowerCase().replace(/\s+/g, ' ')) * direction;
+ };
+}
+
+export interface SortKey<T> {
+ key?: keyof T;
+ compareFn?: (a: T, b: T) => number;
+}
+
+export function sortObjectNew<T>(keys: SortKey<T>[], direction: SortDir = 1) {
+ return (a: T, b: T): number => {
+ // Loops through keys and returns the first non 0 sort result (so same episode number will be skipped and move on to comparing seasons)
+ for (const { key, compareFn } of keys) {
+ const valueA = key ? (a[key] ?? '') : undefined;
+ const valueB = key ? (b[key] ?? '') : undefined;
+
+ let result: number = compareFn
+ ? key
+ ? (compareFn as (a: any, b: any) => number)(valueA, valueB)
+ : (compareFn as (a: T, b: T) => number)(a, b)
+ : defaultCompare(valueA, valueB);
+
+ if (result !== 0) return result * direction;
+ }
+ return 0;
+ };
+}
+
+function defaultCompare(a: any, b: any): number {
+ const numA = parseFloat(a);
+ const numB = parseFloat(b);
+
+ if (!isNaN(numA) && !isNaN(numB)) {
+ return numA - numB;
+ }
+
+ const dateA = new Date(a);
+ const dateB = new Date(b);
+ if (!isNaN(dateA.getTime()) && !isNaN(dateB.getTime())) {
+ return dateA.getTime() - dateB.getTime();
+ }
+
+ return CompareStrategies.stringInsensitive(a, b);
+}
diff --git a/resources/js/service/sort/strategies.ts b/resources/js/service/sort/strategies.ts
new file mode 100644
index 00000000..054b7056
--- /dev/null
+++ b/resources/js/service/sort/strategies.ts
@@ -0,0 +1,28 @@
+import type { VideoResource } from '@/types/resources';
+
+export const CompareStrategies = {
+ stringInsensitive: (a: any, b: any) => normalizeString(a).localeCompare(normalizeString(b)),
+
+ date: (a: any, b: any) => new Date(a).getTime() - new Date(b).getTime(),
+
+ number: (a: any, b: any) => parseFloat(a) - parseFloat(b),
+
+ episode: (a: VideoResource, b: VideoResource) => {
+ const seasonA = parseFloat(`${a.season ?? 0}`);
+ const seasonB = parseFloat(`${b.season ?? 0}`);
+
+ if (seasonA !== seasonB) return seasonA - seasonB;
+
+ const episodeA = parseFloat(`${a.episode ?? 0}`);
+ const episodeB = parseFloat(`${b.episode ?? 0}`);
+
+ return episodeA - episodeB;
+ },
+};
+
+function normalizeString(value: any): string {
+ return String(value ?? '')
+ .toLowerCase()
+ .replace(/\s+/g, ' ')
+ .trim();
+}
diff --git a/resources/js/service/util.ts b/resources/js/service/util.ts
index 35e76e94..fc296eb5 100644
--- a/resources/js/service/util.ts
+++ b/resources/js/service/util.ts
@@ -1,4 +1,3 @@
-import type { SortDir } from '@/types/types';
import type { AxiosError } from 'axios';
export function toTitleCase(str: string) {
@@ -175,28 +174,6 @@ export function isInputLikeElement(element: EventTarget | null, key: string): bo
return inputLikeTags.includes((element as HTMLElement).tagName);
}
-export function sortObject<T>(column: keyof T, direction: SortDir = 1, dateColumns: string[] = ['date', 'date_released']) {
- return (a: T, b: T): number => {
- let valueA = a[column];
- let valueB = b[column];
-
- if ((valueA instanceof Date && valueB instanceof Date) || dateColumns.includes(String(column))) {
- let dateA = new Date(String(valueA));
- let dateB = new Date(String(valueB));
- return (dateB.getTime() - dateA.getTime()) * direction;
- }
-
- let numA = parseFloat(valueA as any);
- let numB = parseFloat(valueB as any);
-
- if (!isNaN(numA) && !isNaN(numB)) {
- return (numA - numB) * direction;
- }
-
- return String(valueA).toLowerCase().replace(/\s+/g, ' ').localeCompare(String(valueB).toLowerCase().replace(/\s+/g, ' ')) * direction;
- };
-}
-
export function isAxiosError(error: unknown): error is AxiosError {
return (error as AxiosError).isAxiosError === true;
}
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index d8fdae4e..df3e9adc 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -1,7 +1,9 @@
-import { formatFileSize, sortObject, toFormattedDuration } from '@/service/util';
+import { formatFileSize, toFormattedDuration } from '@/service/util';
import { defineStore, storeToRefs } from 'pinia';
import { useRoute, useRouter } from 'vue-router';
+import { CompareStrategies } from '@/service/sort/strategies';
import { computed, ref } from 'vue';
+import { sortObjectNew } from '@/service/sort/baseSort';
import { useAuthStore } from '@/stores/AuthStore';
import { toast } from '@/service/toaster/toastService';
@@ -29,35 +31,42 @@ export const useContentStore = defineStore('Content', () => {
const stateFilteredPlaylist = computed(() => {
if (!stateFolder.value?.videos) return [];
- // Return early if no search query
- if (!searchQuery.value?.trim()) {
- return stateFolder.value.videos.sort(sortObject(videoSort.value.column, videoSort.value.dir));
+ const searchTerm = searchQuery.value.toLowerCase().trim();
+ const filteredResult = searchTerm
+ ? stateFolder.value.videos.filter((video) => {
+ try {
+ let strRepresentation = [
+ video.name,
+ video.title,
+ video.description,
+ video.date_uploaded,
+ video.episode ?? '',
+ video.season ?? '',
+ video.views,
+ toFormattedDuration(video.duration) ?? 'N/A',
+ video.video_tags?.map((tag) => tag?.name).join(' ') ?? '',
+ video.file_size ? formatFileSize(video.file_size) : '',
+ ];
+ return strRepresentation.join(' ').toLowerCase().includes(searchTerm);
+ } catch (error) {
+ console.error('Error filtering video:', video, error);
+ return false;
+ }
+ })
+ : stateFolder.value.videos;
+
+ let sortCriteria = [{ key: videoSort.value.column }];
+
+ if (videoSort.value.column === 'episode') {
+ sortCriteria = [{ compareFn: CompareStrategies.episode }];
}
- const searchTerm = searchQuery.value.toLowerCase();
-
- return stateFolder.value.videos
- .filter((video) => {
- try {
- let strRepresentation = [
- video.name,
- video.title,
- video.description,
- video.date_uploaded,
- video.episode ?? '',
- video.season ?? '',
- video.views,
- toFormattedDuration(video.duration) ?? 'N/A',
- video.video_tags?.map((tag) => tag?.name).join(' ') ?? '',
- video.file_size ? formatFileSize(video.file_size) : '',
- ];
- return strRepresentation.join(' ').toLowerCase().includes(searchTerm);
- } catch (error) {
- console.error('Error filtering video:', video, error);
- return false;
- }
- })
- .sort(sortObject(videoSort.value.column, videoSort.value.dir));
+ if (['date', 'date_released', 'date_uploaded'].includes(videoSort.value.column)) {
+ sortCriteria[0].compareFn = CompareStrategies.date;
+ }
+
+ // return filteredResult.sort(sortObject(videoSort.value.column, videoSort.value.dir));
+ return filteredResult.sort(sortObjectNew(sortCriteria, videoSort.value.dir));
}); // use a computed ref?
const nextVideoURL = computed(() => {