Skip to content

A self-hosted media server and file management system

fix: having waitTimes query in the dropdown menu causes the values to reset when navigating to a new page

aminnausin1f6ed3f7fc23
diff --git a/app/Jobs/VerifyFolders.php b/app/Jobs/VerifyFolders.php
index 3da78046..f91aac40 100644
--- a/app/Jobs/VerifyFolders.php
+++ b/app/Jobs/VerifyFolders.php
@@ -110,19 +110,19 @@ class VerifyFolders implements ShouldQueue {
$thumbnailPath = explode('/', $series->composite_id ?? 'unsorted/unsorted')[0] . '/' . basename($series->id);
$thumbnailIsInternal = strpos($series->thumbnail_url, str_replace('http://', '', str_replace('https://', '', config('api.app_url'))));
- if (isset($series->thumbnail_url) && !$thumbnailIsInternal && strlen(trim($series->thumbnail_url)) > 0) {
+ if (isset($series->thumbnail_url) && ! $thumbnailIsInternal && strlen(trim($series->thumbnail_url)) > 0) {
$thumbnailResult = $this->getThumbnailAsFile($series->thumbnail_url, $thumbnailPath);
if ($thumbnailResult) {
$changes['raw_thumbnail_url'] = $series->thumbnail_url;
$changes['thumbnail_url'] = $thumbnailResult;
dump('got thumbnail for ' . $series->id . ' at ' . $thumbnailResult . ' from ' . $changes['raw_thumbnail_url']);
}
- } else if (isset($series->thumbnail_url) && $thumbnailIsInternal && !Storage::disk('public')->exists("thumbnails/$thumbnailPath.webp")) {
+ } elseif (isset($series->thumbnail_url) && $thumbnailIsInternal && ! Storage::disk('public')->exists("thumbnails/$thumbnailPath.webp")) {
Log::warning(
"Local thumbnail is set but does not exist for $series->composite_id at " . Storage::disk('public')->path("thumbnails/$thumbnailPath.webp"),
[
- "path" => Str::after(urldecode($series->thumbnail_url), '/storage/'),
- "exists" => Storage::disk('public')->exists(Str::after(urldecode($series->thumbnail_url), '/storage/'))
+ 'path' => Str::after(urldecode($series->thumbnail_url), '/storage/'),
+ 'exists' => Storage::disk('public')->exists(Str::after(urldecode($series->thumbnail_url), '/storage/')),
]
);
}
diff --git a/resources/js/components/pinesUI/DropdownMenu.vue b/resources/js/components/pinesUI/DropdownMenu.vue
index fb11661d..ebe31778 100755
--- a/resources/js/components/pinesUI/DropdownMenu.vue
+++ b/resources/js/components/pinesUI/DropdownMenu.vue
@@ -1,13 +1,13 @@
<script setup lang="ts">
-import type { DropdownMenuItem, WaitTimesResponse } from '@/types/types';
+import type { DropdownMenuItem } from '@/types/types';
import { computed, h, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch } from 'vue';
-import { useGetTaskWaitTimes } from '@/service/queries';
import { toFormattedDuration } from '@/service/util';
import { handleStartTask } from '@/service/taskService';
import { useContentStore } from '@/stores/ContentStore';
import { OnClickOutside } from '@vueuse/components';
import { useAuthStore } from '@/stores/AuthStore';
+import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import DropdownItem from '@/components/pinesUI/DropdownItem.vue';
@@ -40,16 +40,14 @@ const dropDownItems: DropdownMenuItem[][] = [
],
];
-const { userData } = storeToRefs(useAuthStore());
const { stateDirectory } = storeToRefs(useContentStore());
+const { taskWaitTimes, isLoadingWaitTimes } = storeToRefs(useAppStore());
+const { userData } = storeToRefs(useAuthStore());
const props = defineProps<{ dropdownOpen: boolean }>();
const dropdown = useTemplateRef('dropdown');
const manualPosition = ref(0);
-const { data: rawWaitTimes, isLoading: isLoadingWaitTimes } = useGetTaskWaitTimes();
-const taskWaitTimes = ref<WaitTimesResponse>();
-
const dropDownItemsAuth = computed<DropdownMenuItem[][]>(() => {
return [
[
@@ -74,7 +72,11 @@ const dropDownItemsAuth = computed<DropdownMenuItem[][]>(() => {
...defaults,
name: 'index',
text: 'Index Media',
- shortcut: isLoadingWaitTimes.value ? h(ProiconsSpinner, { class: 'animate-spin' }) : `~${toFormattedDuration(taskWaitTimes.value?.index, false, 'analog', true)}`,
+ shortcut: isLoadingWaitTimes.value
+ ? h(ProiconsSpinner, { class: 'animate-spin' })
+ : taskWaitTimes.value?.scan
+ ? `~${toFormattedDuration(taskWaitTimes.value?.index, false, 'analog', true)}`
+ : '',
shortcutTitle: 'Estimated Time',
title: 'Search for changes in all media',
icon: LucideFolderSearch,
@@ -97,7 +99,11 @@ const dropDownItemsAuth = computed<DropdownMenuItem[][]>(() => {
...defaults,
name: 'Scan media',
text: 'Scan Media',
- shortcut: isLoadingWaitTimes.value ? h(ProiconsSpinner, { class: 'animate-spin' }) : `~${toFormattedDuration(taskWaitTimes.value?.scan, false, 'analog', true)}`,
+ shortcut: isLoadingWaitTimes.value
+ ? h(ProiconsSpinner, { class: 'animate-spin' })
+ : taskWaitTimes.value?.scan
+ ? `~${toFormattedDuration(taskWaitTimes.value?.scan, false, 'analog', true)}`
+ : '',
shortcutTitle: 'Estimated Time',
title: 'Search for changes and verify metadata for all media', // (titles, descriptions, duration, filesize, thumbnails, audio metadata, external metadata)',
icon: LucideFolderCheck,
@@ -115,7 +121,9 @@ const dropDownItemsAuth = computed<DropdownMenuItem[][]>(() => {
icon: LucideFolderSync,
shortcut: isLoadingWaitTimes.value
? h(ProiconsSpinner, { class: 'animate-spin' })
- : `~${toFormattedDuration(taskWaitTimes.value?.verify_folders, false, 'analog', true)}`,
+ : taskWaitTimes.value?.verify_folders
+ ? `~${toFormattedDuration(taskWaitTimes.value?.verify_folders, false, 'analog', true)}`
+ : '',
shortcutTitle: 'Estimated Time',
action: () => {
handleStartTask('verifyFolders');
@@ -173,12 +181,6 @@ watch(
},
);
-watch(
- () => rawWaitTimes.value,
- (value) => {
- taskWaitTimes.value = value;
- },
-);
onMounted(() => {
window.addEventListener('resize', adjustDropdownPosition);
});
diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.ts
index b8df4ac4..76857ac4 100644
--- a/resources/js/stores/AppStore.ts
+++ b/resources/js/stores/AppStore.ts
@@ -1,6 +1,7 @@
-import { type ContextMenu as ContextMenuType, type ContextMenuItem, type Broadcaster, type AppManifest } from '@/types/types';
+import type { ContextMenu as ContextMenuType, ContextMenuItem, Broadcaster, AppManifest, WaitTimesResponse } from '@/types/types';
+
import { nextTick, ref, useTemplateRef, watch } from 'vue';
-import { useGetManifest } from '@/service/queries';
+import { useGetManifest, useGetTaskWaitTimes } from '@/service/queries';
import { defineStore } from 'pinia';
import { EchoConfig } from '@/echo.ts';
@@ -8,6 +9,7 @@ import ContextMenu from '@/components/pinesUI/ContextMenu.vue';
import Echo from 'laravel-echo';
export const useAppStore = defineStore('App', () => {
+ const { data: rawWaitTimes, isLoading: isLoadingWaitTimes } = useGetTaskWaitTimes();
const { data: rawAppManifest } = useGetManifest();
const ws = ref<Echo<keyof Broadcaster> | null>(null);
@@ -29,6 +31,7 @@ export const useAppStore = defineStore('App', () => {
const contextMenuStyle = ref('');
const appManifest = ref<AppManifest>({ version: 'Unversioned', commit: null });
+ const taskWaitTimes = ref<WaitTimesResponse>({ scan: 0, verify_files: 0, verify_folders: 0 });
function toggleDarkMode() {
const rootHTML = document.querySelector('html');
@@ -143,6 +146,10 @@ export const useAppStore = defineStore('App', () => {
appManifest.value = v ?? { version: 'Unversioned', commit: 'unknown' };
});
+ watch(rawWaitTimes, (v: any, prev: WaitTimesResponse) => {
+ taskWaitTimes.value = v ?? prev;
+ });
+
return {
initDarkMode,
toggleDarkMode,
@@ -172,5 +179,7 @@ export const useAppStore = defineStore('App', () => {
isAutoPlay,
appManifest,
ws,
+ isLoadingWaitTimes,
+ taskWaitTimes,
};
});