Skip to content

A self-hosted media server and file management system

fix: optimise video search and use the right values

aminnausin3cbdbb63f207
diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vue
index 8d54b839..68f69518 100755
--- a/resources/js/components/table/TableBase.vue
+++ b/resources/js/components/table/TableBase.vue
@@ -63,10 +63,8 @@ const handleSortChange = (sortKey?: { title?: string; value?: string; disabled?:
props.sortAction(lastSortKey.value, sortAscending.value ? 1 : -1);
};
-const handleSearch = (event: Event) => {
- const target = event.target as HTMLInputElement | null;
-
- if (!target) return;
+const handleSearch = (event: InputEvent) => {
+ const target = event.target as HTMLInputElement;
const value = target.value;
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index fe1ec459..6b22915a 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -27,37 +27,36 @@ export const useContentStore = defineStore('Content', () => {
const stateVideo = ref({});
const stateFilteredPlaylist = computed(() => {
- let list = stateFolder.value.videos;
-
- let searchedList = searchQuery.value
- ? list.filter((video) => {
- try {
- let strRepresentation = [
- video.name,
- video.title,
- toFormattedDate(new Date(video?.date_uploaded ?? video.date + ' GMT')),
- video.description,
- video.episode ?? '',
- video.season ?? '',
- video.views,
- toFormattedDuration(video.duration) ?? 'N/A',
- video.video_tags?.length ? video.video_tags.reduce((tags, tag) => `${tags} ${tag?.name ?? ''}`, '') : '',
- formatFileSize(video.file_size),
- ]
- .join(' ')
- .toLowerCase();
-
- return strRepresentation.includes(searchQuery.value.toLowerCase());
- } catch (error) {
- console.log(error);
- return false;
- }
- })
- : list;
-
- let sortedList = searchedList.sort(sortObject(videoSort.value.column, videoSort.value.dir));
-
- return sortedList;
+ 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();
+
+ return stateFolder.value.videos
+ .filter((video) => {
+ try {
+ let strRepresentation = [
+ video.name,
+ video.title,
+ 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));
}); // use a computed ref?
const nextVideoURL = computed(() => {