A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: table sort is unstable
aminnausinf26695e7af8a
diff --git a/resources/js/service/sort/baseSort.ts b/resources/js/service/sort/baseSort.tsindex 6b152d99..d6eec83b 100644--- a/resources/js/service/sort/baseSort.ts+++ b/resources/js/service/sort/baseSort.ts@@ -23,7 +23,7 @@ export function sortObject<T>(column: keyof T, direction: SortDir = 1, dateColum};}-export function sortObjectNew<T>(keys: SortKey<T>[], direction: SortDir = 1) {+export function sortObjectNew<T extends { id?: any }>(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) {@@ -40,7 +40,7 @@ export function sortObjectNew<T>(keys: SortKey<T>[], direction: SortDir = 1) {if (result !== 0) return result * direction;}- return 0;+ return (a.id ?? 0) > (b.id ?? 0) ? 1 : -1;};}diff --git a/resources/js/service/sort/strategies.ts b/resources/js/service/sort/strategies.tsindex 054b7056..85f5914a 100644--- a/resources/js/service/sort/strategies.ts+++ b/resources/js/service/sort/strategies.ts@@ -1,25 +1,46 @@import type { VideoResource } from '@/types/resources';-export const CompareStrategies = {- stringInsensitive: (a: any, b: any) => normalizeString(a).localeCompare(normalizeString(b)),+export const CompareStrategies: { [key: string]: (a: any, b: any) => number } = {+ stringInsensitive: (a: any, b: any) => {+ const strA = normalizeString(a);+ const strB = normalizeString(b);+ const result = strA.localeCompare(strB, 'en', { sensitivity: 'base' });+ if (result !== 0) return result;+ // tiebreaker+ return strA < strB ? -1 : strA > strB ? 1 : 0;+ },- date: (a: any, b: any) => new Date(a).getTime() - new Date(b).getTime(),+ date: (a: any, b: any) => {+ return parseDate(a) - parseDate(b);+ },- number: (a: any, b: any) => parseFloat(a) - parseFloat(b),+ number: (a: any, b: any) => {+ const numA = parseFloat(a);+ const numB = parseFloat(b);+ if (Number.isNaN(numA) && Number.isNaN(numB)) return 0;+ if (Number.isNaN(numA)) return 1;+ if (Number.isNaN(numB)) return -1;+ return numA - numB;+ },episode: (a: VideoResource, b: VideoResource) => {- const seasonA = parseFloat(`${a.season ?? 0}`);- const seasonB = parseFloat(`${b.season ?? 0}`);+ const seasonA = a.season ?? 0;+ const seasonB = b.season ?? 0;if (seasonA !== seasonB) return seasonA - seasonB;- const episodeA = parseFloat(`${a.episode ?? 0}`);- const episodeB = parseFloat(`${b.episode ?? 0}`);+ const episodeA = a.episode ?? 0;+ const episodeB = b.episode ?? 0;return episodeA - episodeB;},};+function parseDate(value: any) {+ const time = new Date(value).getTime();+ return Number.isNaN(time) ? Infinity : time;+}+function normalizeString(value: any): string {return String(value ?? '').toLowerCase()diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.tsindex a0462bde..1c45bd48 100644--- a/resources/js/stores/ContentStore.ts+++ b/resources/js/stores/ContentStore.ts@@ -98,7 +98,7 @@ export const useContentStore = defineStore('Content', () => {}// old sorting function: return filteredResult.sort(sortObject(videoSort.value.column, videoSort.value.dir));- return filteredResult.sort(sortObjectNew(sortCriteria, videoSort.value.dir));+ return [...filteredResult].sort(sortObjectNew(sortCriteria, videoSort.value.dir));});// Relative media tracking