From 423ec7b03a25e90a8a980b27ca765c39fb309f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= Date: Mon, 5 Sep 2022 23:28:02 +0200 Subject: [PATCH] fix: .avi previews as video --- webui/src/components/display/BlobPreview.svelte | 12 ++++++------ webui/src/components/display/BlobViewer.svelte | 12 ++++++------ .../src/components/display/blobs/VideoViewer.svelte | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/webui/src/components/display/BlobPreview.svelte b/webui/src/components/display/BlobPreview.svelte index 543e92e..a3e10cf 100644 --- a/webui/src/components/display/BlobPreview.svelte +++ b/webui/src/components/display/BlobPreview.svelte @@ -12,12 +12,12 @@ $: mimeType = String($entity?.get("FILE_MIME")); - $: audio = ["audio", "application/x-riff"].some((p) => - mimeType.startsWith(p) - ); - $: video = ["video", "application/x-matroska"].some((p) => - mimeType.startsWith(p) - ); + $: audio = + ["audio", "application/x-riff"].some((p) => mimeType.startsWith(p)) && + !video; + $: video = + ["video", "application/x-matroska"].some((p) => mimeType.startsWith(p)) || + $entity?.identify().some((l) => l.endsWith(".avi")); $: image = mimeType.startsWith("image"); $: text = mimeType.startsWith("text"); $: pdf = mimeType.startsWith("application/pdf"); diff --git a/webui/src/components/display/BlobViewer.svelte b/webui/src/components/display/BlobViewer.svelte index 5368c77..53fb5e4 100644 --- a/webui/src/components/display/BlobViewer.svelte +++ b/webui/src/components/display/BlobViewer.svelte @@ -19,12 +19,12 @@ $: mimeType = String($entity?.get("FILE_MIME")); - $: audio = ["audio", "application/x-riff"].some((p) => - mimeType.startsWith(p) - ); - $: video = ["video", "application/x-matroska"].some((p) => - mimeType.startsWith(p) - ); + $: audio = + ["audio", "application/x-riff"].some((p) => mimeType.startsWith(p)) && + !video; + $: video = + ["video", "application/x-matroska"].some((p) => mimeType.startsWith(p)) || + $entity?.identify().some((l) => l.endsWith(".avi")); $: image = mimeType.startsWith("image"); $: text = mimeType.startsWith("text"); $: pdf = mimeType.startsWith("application/pdf"); diff --git a/webui/src/components/display/blobs/VideoViewer.svelte b/webui/src/components/display/blobs/VideoViewer.svelte index 2225dbc..9ea6b1b 100644 --- a/webui/src/components/display/blobs/VideoViewer.svelte +++ b/webui/src/components/display/blobs/VideoViewer.svelte @@ -53,7 +53,7 @@ Preview for {address} (state = State.PREVIEW)} on:error={() => (state = State.ERRORED)} @@ -63,7 +63,7 @@