Skip to content

A self-hosted media server and file management system

feat: frontend realtime reset storyboard

aminnausinc3c06b706b8f
diff --git a/app/Http/Resources/Metadata/StoryboardResource.php b/app/Http/Resources/Metadata/StoryboardResource.php
index 4bbd197f..c2324742 100644
--- a/app/Http/Resources/Metadata/StoryboardResource.php
+++ b/app/Http/Resources/Metadata/StoryboardResource.php
@@ -6,6 +6,8 @@ use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class StoryboardResource extends JsonResource {
+ public static $wrap = null;
+
/**
* Transform the resource into an array.
*
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 20de70a2..d0d5bdf2 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -2,8 +2,8 @@
import { computed, onMounted, ref, useTemplateRef, watch, nextTick } from 'vue';
import { handleStorageURL, toTimeSpan, formatFileSize } from '@/service/util';
import { getMediaDateDescription } from '@/service/media/mediaFormatter';
+import { runRegenerateStoryboard } from '@/service/media/storyboard';
import { ButtonIcon, ButtonText } from '@/components/cedar-ui/button';
-import { regenerateStoryboard } from '@/service/media/storyboard';
import { getUserViewCount } from '@/service/mediaAPI';
import { ContextMenuItem } from '@/components/cedar-ui/context-menu';
import { useContentStore } from '@/stores/ContentStore';
@@ -145,17 +145,7 @@ const handleResetStoryboard = () => {
return;
}
- toast
- .promise(regenerateStoryboard(stateVideo.value.metadata.id), {
- loading: 'Resetting Storyboard',
- loadingDescription: `Deleting storyboard cache`,
- success: 'Storyboard Reset!',
- successDescription: 'Storyboard reset and regeneration job queued',
- error: 'Failed to reset storyboard',
- })
- .then(() => {
- stateVideo.value.storyboard = undefined;
- });
+ runRegenerateStoryboard(stateVideo.value.id, stateVideo.value.metadata.id);
};
function handleSeek(seconds: number) {
diff --git a/resources/js/service/media/storyboard.ts b/resources/js/service/media/storyboard.ts
index ad31d5a9..f8182b2d 100644
--- a/resources/js/service/media/storyboard.ts
+++ b/resources/js/service/media/storyboard.ts
@@ -1,5 +1,55 @@
+import type { StoryboardResource } from '@/contracts/media';
+import type { AxiosResponse } from 'axios';
+
+import { subscribeToTask } from '../wsService';
+import { useContentStore } from '@/stores/ContentStore';
+import { useAppStore } from '@/stores/AppStore';
+import { toast } from '@aminnausin/cedar-ui';
import { API } from '../api';
-export const regenerateStoryboard = (metadataId: number) => {
+export const regenerateStoryboard = (metadataId: number): Promise<AxiosResponse<{ task_id: number; message?: string }>> => {
return API.post(`/metadata/${metadataId}/storyboard`, { headers: { 'X-Skip-Toast': 'true' } });
};
+export const getStoryboard = (metadataId: number): Promise<AxiosResponse<StoryboardResource>> => {
+ return API.get(`/metadata/${metadataId}/storyboard`);
+};
+
+export const runRegenerateStoryboard = async (videoId: number, metadataId: number) => {
+ const contentStore = useContentStore();
+
+ useAppStore().createEcho();
+
+ const onComplete = async () => {
+ try {
+ const { data: storyboard } = await getStoryboard(metadataId);
+
+ contentStore.updateVideoData({ id: videoId, storyboard });
+ } catch (error) {
+ toast.error('Failed to load storyboard', { description: 'Refresh to see updated storyboard' });
+ console.error(error);
+ }
+ };
+
+ try {
+ const result = await toast.promise(regenerateStoryboard(metadataId), {
+ loading: 'Resetting Storyboard',
+ loadingDescription: `Deleting storyboard cache`,
+ success: 'Storyboard Reset!',
+ successDescription: 'Storyboard reset and regeneration job queued',
+ error: 'Failed to reset storyboard',
+ });
+
+ contentStore.updateVideoData({ id: videoId, storyboard: undefined });
+ subscribeToTask(result.data.task_id, { onComplete });
+ } catch (error: any) {
+ const taskId = error?.response?.data?.task_id;
+
+ if (error?.response?.status === 409 && taskId) {
+ toast.info('Already in progress', { description: 'Subscribing to existing job' });
+ subscribeToTask(taskId, { onComplete });
+ return;
+ }
+
+ console.error(error);
+ }
+};
diff --git a/resources/js/service/wsService.ts b/resources/js/service/wsService.ts
index f6453dbf..47097ffb 100644
--- a/resources/js/service/wsService.ts
+++ b/resources/js/service/wsService.ts
@@ -1,25 +1,34 @@
+import type { ToastOptions } from '@aminnausin/cedar-ui';
+
import { useDashboardStore } from '@/stores/DashboardStore';
-import { toast } from '@aminnausin/cedar-ui';
import { useAppStore } from '@/stores/AppStore';
+import { toast } from '@aminnausin/cedar-ui';
/**
* Subscribes to a specific task ID and shows a notification once it ends.
*
* @param taskId The specific Task ID
*/
-export function subscribeToTask(taskId: number) {
+export function subscribeToTask(taskId: number, options?: { onComplete?: (event: any) => void; toastOptions?: ToastOptions }) {
if (isNaN(taskId) || taskId <= 0 || window.Echo == null) return;
+ const channelName = `tasks.${taskId}`;
+
+ // already subscribed
+ if (window.Echo.connector?.channels?.[`private-${channelName}`]) return;
+
window.Echo.private(`tasks.${taskId}`).listen('TaskEnded', async (event: any) => {
if (!window.Echo || window.Echo?.connector?.pusher?.connection?.state !== 'connected') return;
if (event?.task) {
- toast.add(`Task ${event.task.status}.`, { type: event.task.status_key > 0 ? 'success' : 'danger', description: `${event.task.name}` });
+ toast.add(`Task ${event.task.status}`, { type: event.task.status_key > 0 ? 'success' : 'danger', description: `${event.task.name}`, ...options?.toastOptions });
const { updateSingleTask } = useDashboardStore();
updateSingleTask(event.task);
}
window.Echo.leave(`tasks.${taskId}`);
+ await Promise.resolve(options?.onComplete?.(event));
+
window.setTimeout(() => {
if (Object.keys(window.Echo?.connector?.channels).length === 0) {
const { disconnectEcho } = useAppStore();