A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: use cached folder if videos are already loaded when switching through folders on details page
aminnausine864a25faa00
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.phpindex 0a8be523..b08918a7 100755--- a/app/Http/Controllers/Api/V1/FolderController.php+++ b/app/Http/Controllers/Api/V1/FolderController.php@@ -61,6 +61,6 @@ class FolderController extends Controller {},]);- return new FolderResource($folder);+ return response()->json(new FolderResource($folder));}}diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.tsindex dbf9f33e..fcc89afb 100644--- a/resources/js/service/mediaAPI.ts+++ b/resources/js/service/mediaAPI.ts@@ -5,7 +5,7 @@Run and commit to database (store) -> ?? What does that mean?*/import type { MetadataStoreRequest, MetadataUpdateRequest, SeriesStoreRequest, SeriesUpdateRequest } from '@/types/requests';-import type { CategoryResource, SeriesResource, VideoResource } from '@/types/resources';+import type { CategoryResource, FolderResource, SeriesResource, VideoResource } from '@/types/resources';import type { AxiosResponse } from 'axios';import { API } from '@/service/api';@@ -29,7 +29,7 @@ export default {getCategory(query: string) {return API.get(`/${query}`, { headers: { 'X-Skip-Toast': 'true' } });},- getFolder(id: number) {+ getFolder(id: number): Promise<AxiosResponse<FolderResource>> {return API.get(`/folders/${id}?videos=true`);},getVideos(data: { folder_id: number }) {diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.tsindex f446cca2..bf92566f 100644--- a/resources/js/stores/ContentStore.ts+++ b/resources/js/stores/ContentStore.ts@@ -229,18 +229,21 @@ export const useContentStore = defineStore('Content', () => {/*** Loads a folder by name and updates the current folder state* @param nextFolderName Name or title of the folder to load+ * @param loadSelectedVideo Find the queried videoId from the folder's videos and select it+ * @param forceReload Force re-fetch folder data even if it is cached* @returns True if successful, false otherwise*/- async function getFolder(nextFolderName: string, play: boolean = true): Promise<boolean> {- if (stateFolder.value.name === nextFolderName) {+ async function getFolder(nextFolderName: string, loadSelectedVideo: boolean = true, forceReload: boolean = false): Promise<boolean> {+ const isCurrentFolder = stateFolder.value.name === nextFolderName || stateFolder.value.title === nextFolderName;++ if (isCurrentFolder) {+ if (loadSelectedVideo) playlistFind(toParamNumber(route.query.video));return true;}- const nextFolder = stateDirectory.value.folders?.find((folder) => {- return folder.name === nextFolderName || folder.title === nextFolderName;- });+ const targetFolder = stateDirectory.value.folders?.find((folder) => folder.name === nextFolderName || folder.title === nextFolderName);- if (!nextFolder?.id) {+ if (!targetFolder?.id) {toast.add('Invalid folder', { type: 'danger', description: `The folder '${nextFolderName}' does not exist.` });stateFolder.value = emptyFolder;stateVideo.value = emptyMedia;@@ -248,24 +251,27 @@ export const useContentStore = defineStore('Content', () => {}try {- const { data } = await mediaAPI.getFolder(nextFolder.id); // get videos with given folder id (list of videos organised by folder id)-- stateFolder.value = { ...data.data };searchQuery.value = '';- if (play) playlistFind(toParamNumber(route.query.video));+ if (forceReload || !targetFolder.videos?.length) {+ const { data: folder } = await mediaAPI.getFolder(targetFolder.id); // get videos with given folder id (list of videos organised by folder id)- return true;+ stateFolder.value = { ...folder };++ updateCachedFolder(folder);+ } else {+ stateFolder.value = { ...targetFolder };+ }} catch (error: any) {const message = error?.response?.data?.message || error?.message || 'Failed to load folder';-- toast.add('Error loading folder', {- type: 'danger',- description: message,- });+ toast.add('Error loading folder', { type: 'danger', description: message });console.error('Failed to load folder:', error);return false;}++ if (loadSelectedVideo) playlistFind(toParamNumber(route.query.video));++ return true;}function getMetadataById(metadataId: number): MetadataResource | undefined {@@ -327,6 +333,13 @@ export const useContentStore = defineStore('Content', () => {};}+ function updateCachedFolder(data: FolderResource) {+ if (!data?.id) return;++ const idx = stateDirectory.value.folders!.findIndex((f) => f.id === data.id);+ if (idx !== -1) stateDirectory.value.folders![idx] = { ...data };+ }+function clearState(onlyVideo = false) {if (!onlyVideo) {stateDirectory.value = emptyLibrary;