From c617997017ec941df33702c70149845dcdc2973f Mon Sep 17 00:00:00 2001
From: Fornax <wim@fornaxian.tech>
Date: Tue, 13 Jun 2023 14:26:09 +0200
Subject: [PATCH] Better handle download errors

---
 svelte/src/file_viewer/Downloader.svelte | 18 +++++++++++++++++-
 svelte/src/file_viewer/FileViewer.svelte |  3 ++-
 svelte/src/user_home/APIKeys.svelte      |  9 +++++----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/svelte/src/file_viewer/Downloader.svelte b/svelte/src/file_viewer/Downloader.svelte
index e4776bd..e33ae6f 100644
--- a/svelte/src/file_viewer/Downloader.svelte
+++ b/svelte/src/file_viewer/Downloader.svelte
@@ -18,6 +18,10 @@ let download_captcha_window
 let captcha_type = "" // rate_limit or malware
 let captcha_window_title = ""
 let captcha_container
+
+let error_window = null
+let error_code = ""
+let error_message = ""
 export const download_file = () => {
 	if (!window.viewer_data.captcha_key) {
 		console.debug("Server doesn't support captcha, starting download")
@@ -30,7 +34,10 @@ export const download_file = () => {
 		return
 	}
 	if (!file.availability.endsWith("_captcha_required")) {
-		console.debug("File is unavailable, ignoring download request")
+		error_code = file.availability
+		error_message = file.availability_message
+		error_window.show()
+		console.debug("File is unavailable, showing error message")
 		return
 	}
 
@@ -115,6 +122,15 @@ export const download_list = () => {
 	<div bind:this={captcha_container} class="captcha_container"></div>
 </Modal>
 
+<Modal bind:this={error_window} title="Download error" width="500px" padding>
+	<p>
+		Can't download file: {error_code}
+	</p>
+	<p>
+		{error_message}
+	</p>
+</Modal>
+
 <style>
 .download_frame {
 	position: absolute;
diff --git a/svelte/src/file_viewer/FileViewer.svelte b/svelte/src/file_viewer/FileViewer.svelte
index f848082..2a2a1f8 100644
--- a/svelte/src/file_viewer/FileViewer.svelte
+++ b/svelte/src/file_viewer/FileViewer.svelte
@@ -448,10 +448,11 @@ const keyboard_event = evt => {
 
 			<div class="separator"></div>
 
-			{#if view === "file" && file.can_download && !disable_download_button}
+			{#if view === "file" && !disable_download_button}
 				<button
 					on:click={downloader.download_file}
 					class="toolbar_button"
+					class:button_red={file.can_download === false}
 					title="Save this file to your computer">
 					<i class="icon">download</i>
 					<span>Download</span>
diff --git a/svelte/src/user_home/APIKeys.svelte b/svelte/src/user_home/APIKeys.svelte
index 058e3d8..2759dff 100644
--- a/svelte/src/user_home/APIKeys.svelte
+++ b/svelte/src/user_home/APIKeys.svelte
@@ -108,10 +108,11 @@ const logout = async (key) => {
 
 	<p>
 		If you delete the API key that you are currently using you will be
-		logged out of your account. API keys expire 30 days after the last
-		time they're used. If you think someone is using your account
-		without your authorization it's probably a good idea to delete all
-		your keys.
+		logged out of your account. Keys are sorted based on how recently they
+		were used, so your session usually the top one. API keys expire 30 days
+		after the last time they're used. If you think someone is using your
+		account without your authorization it's probably a good idea to delete
+		all your keys.
 	</p>
 </section>
 <div class="table_scroll">