From 7bc35e912c57b2a6d7af417b0ec3f17282ce1382 Mon Sep 17 00:00:00 2001 From: Fornax Date: Wed, 8 May 2024 18:29:59 +0200 Subject: [PATCH] Add bulk download button for filesystem --- svelte/src/file_viewer/BottomBanner.svelte | 11 ++++------- svelte/src/file_viewer/FileViewer.svelte | 3 +-- svelte/src/filesystem/Filesystem.svelte | 6 +++++- svelte/src/filesystem/Toolbar.svelte | 10 ++++------ 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/svelte/src/file_viewer/BottomBanner.svelte b/svelte/src/file_viewer/BottomBanner.svelte index 03fcd44..c32a11d 100644 --- a/svelte/src/file_viewer/BottomBanner.svelte +++ b/svelte/src/file_viewer/BottomBanner.svelte @@ -4,18 +4,15 @@ import { onMount } from "svelte" let ad_type = "" onMount(() => { - // 30% pixeldrain socials - // 20% reviews - // 10% ad block promo - // 40% patreon + // 40% pixeldrain socials + // 10% reviews + // 50% patreon let rand = Math.random() - if (rand < 0.3) { + if (rand < 0.4) { ad_type = "socials" } else if (rand < 0.5) { ad_type = "reviews" - } else if (rand < 0.6) { - ad_type = "ad_block" } else { ad_type = "patreon_support" } diff --git a/svelte/src/file_viewer/FileViewer.svelte b/svelte/src/file_viewer/FileViewer.svelte index 70f00c5..d288193 100644 --- a/svelte/src/file_viewer/FileViewer.svelte +++ b/svelte/src/file_viewer/FileViewer.svelte @@ -637,8 +637,7 @@ const keyboard_event = evt => { .headerbar > * { flex-grow: 0; flex-shrink: 0; - margin-left: 4px; - margin-right: 4px; + margin: 3px; } .headerbar > .file_viewer_headerbar_title { flex-grow: 1; diff --git a/svelte/src/filesystem/Filesystem.svelte b/svelte/src/filesystem/Filesystem.svelte index c62ea55..8d3ec64 100644 --- a/svelte/src/filesystem/Filesystem.svelte +++ b/svelte/src/filesystem/Filesystem.svelte @@ -94,7 +94,11 @@ const keydown = e => { }; const download = () => { - download_frame.src = fs_path_url(state.base.path) + "?attach" + if (state.base.type === "file") { + download_frame.src = fs_path_url(state.base.path) + "?attach" + } else if (state.base.type === "dir") { + download_frame.src = fs_path_url(state.base.path) + "?bulk_download" + } } const search = async () => { diff --git a/svelte/src/filesystem/Toolbar.svelte b/svelte/src/filesystem/Toolbar.svelte index 59b3d3c..f13ec06 100644 --- a/svelte/src/filesystem/Toolbar.svelte +++ b/svelte/src/filesystem/Toolbar.svelte @@ -112,12 +112,10 @@ let expand = e => {
- {#if state.base.type === "file"} - - {/if} + {#if share_url !== ""}