Skip to content

A self-hosted media server and file management system

feat: make majority audio folders sort by track number by default

aminnausin3898afd2499c
diff --git a/resources/js/components/cedar-ui/select/InputSelect.vue b/resources/js/components/cedar-ui/select/InputSelect.vue
index a2a5c672..c1ed4386 100644
--- a/resources/js/components/cedar-ui/select/InputSelect.vue
+++ b/resources/js/components/cedar-ui/select/InputSelect.vue
@@ -96,6 +96,24 @@ watch(
},
{ immediate: true },
);
+
+watch(
+ () => props.defaultItem,
+ (index, previous) => {
+ if (index == null || index < 0 || (props.disabled && !props.loadDefaultOnDisabled)) return;
+
+ const next = props.options[index];
+ if (!next) return;
+
+ const current = select.selectedItem as { value?: unknown } | null | undefined;
+ const prev = previous == null ? undefined : props.options[previous];
+
+ // only reset if nothing is selected or the the previous default is still selected => so if not dirty
+ if (current?.value !== undefined && (prev === undefined || current.value !== prev.value)) return;
+
+ handleItemClick(next, false);
+ },
+);
</script>
<template>
<section :class="[`group relative w-full text-sm`, rootClass]" @focusout="handleFocusOut" ref="selectableItemsRoot">
diff --git a/resources/js/components/cedar-ui/table/TableBase.vue b/resources/js/components/cedar-ui/table/TableBase.vue
index 500390b2..1c1c92da 100644
--- a/resources/js/components/cedar-ui/table/TableBase.vue
+++ b/resources/js/components/cedar-ui/table/TableBase.vue
@@ -22,6 +22,7 @@ const props = withDefaults(
loadingPlaceholder?: Component;
selectedID?: number | null;
currentIndex?: number;
+ defaultSortIndex?: number;
}
>(),
{
@@ -35,6 +36,7 @@ const props = withDefaults(
noResultsMessage: 'No Results',
loadingPlaceholder: TableLoadingSpinner,
currentIndex: -1,
+ defaultSortIndex: 0,
},
);
@@ -139,7 +141,7 @@ onMounted(() => {
:disabled="loading"
:placeholder="'Sort by...'"
:load-default-on-disabled="true"
- :defaultItem="0"
+ :defaultItem="defaultSortIndex"
:class="cn('h-(--table-input-height) w-full')"
:menu-margin="{ bottom: 'mb-10', top: 'mt-10' }"
@selectItem="handleSortChange"
diff --git a/resources/js/components/folders/FolderMedia.vue b/resources/js/components/folders/FolderMedia.vue
index f4780e4a..91e338d1 100644
--- a/resources/js/components/folders/FolderMedia.vue
+++ b/resources/js/components/folders/FolderMedia.vue
@@ -24,6 +24,7 @@ const { playlistSort } = useContentStore();
const modal = useModalStore();
const sortingOptions = computed(() => mediaSortingOptions(stateFolder.value)) satisfies ComputedRef<GenericSortOption<VideoResource>[]>; // Idk what the point of using satisfies is
+const defaultSortIndex = computed(() => Math.max(sortingOptions.value.findIndex((option) => option.value === (stateFolder.value.is_majority_audio ? 'episode' : 'title'), 0)));
const mediaTypeDescription = computed(() => {
return stateVideo.value?.metadata?.media_type === MediaType.AUDIO || stateFolder.value?.is_majority_audio ? 'Track' : 'Video';
@@ -79,6 +80,7 @@ const handleVideoAction = (e: Event, id: number, action: 'edit' | 'share' | 'dow
:selectedID="stateVideo?.id"
:startAscending="true"
:currentIndex="currentMediaIndex"
+ :default-sort-index="defaultSortIndex"
v-model="searchQuery"
/>
</FolderTab>
diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.ts
index 5e6f4803..f7a35838 100644
--- a/resources/js/stores/ContentStore.ts
+++ b/resources/js/stores/ContentStore.ts
@@ -230,6 +230,7 @@ export const useContentStore = defineStore('Content', () => {
}
searchQuery.value = '';
+ setDefaultSortKey();
if (play) playlistFind(toParamNumber(route.query.video));
return true;
@@ -283,6 +284,8 @@ export const useContentStore = defineStore('Content', () => {
} else {
stateFolder.value = { ...targetFolder };
}
+
+ setDefaultSortKey();
} catch (error: any) {
const message = error?.response?.data?.message || error?.message || 'Failed to load folder';
toast.add('Error loading folder', { type: 'danger', description: message });
@@ -299,6 +302,12 @@ export const useContentStore = defineStore('Content', () => {
if (stateVideo.value.metadata?.id === metadataId) return stateVideo.value.metadata;
return stateFolder.value.videos?.find((v) => v.metadata?.id === metadataId)?.metadata;
}
+
+ function setDefaultSortKey() {
+ if ((videoSort.value.column === 'title' && stateFolder.value.is_majority_audio) || (videoSort.value.column === 'episode' && !stateFolder.value.is_majority_audio)) {
+ videoSort.value.column = stateFolder.value.is_majority_audio ? 'episode' : 'title';
+ }
+ }
//#endregion
//#region DATA UPDATES