From c1b4225b34e1fa845f757359d8a2c6c1f3aa3593 Mon Sep 17 00:00:00 2001
From: Djeeberjr <djeeberjr@gmail.com>
Date: Fri, 13 May 2022 11:53:55 +0200
Subject: [PATCH] refactored HEAD fetch

---
 web/App.svelte | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/web/App.svelte b/web/App.svelte
index e1f9b1c..61c5b7b 100644
--- a/web/App.svelte
+++ b/web/App.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
 	import { onMount } from "svelte";
 	import getComponentForShare from "./contentType";
+
+	const regex = /filename="(.*)"/gm;
 	const slug = window.location.pathname.split("/").pop();
 
 	let component = null;
 	let contentType: string;
 	let filename: string;
 
-	onMount(async () => {
-		const regex = /filename="(.*)"/gm;
+	async function getFileHeadAndComponent() {
 		const res = await fetch(`/s/${slug}`,{method:"HEAD"});
-
 		contentType = res.headers.get("Content-Type");
-		
+
 		let match;
 		while ((match = regex.exec(res.headers.get("Content-Disposition"))) !== null) {
 			// This is necessary to avoid infinite loops with zero-width matches
@@ -21,26 +21,20 @@
 			}
 			filename = match[1];
 		}
-
-		document.title = filename;
-
-		component = getComponentForShare(contentType,filename);
-	});
+		
+		return getComponentForShare(contentType,filename);
+	}
 </script>
 
 <div class="dl">
 	<a href="/s/{slug}">Download</a>
 </div>
 <main>
-	{#if component === null}
+	{#await getFileHeadAndComponent()}
 		Loading data...
-	{:else}
-		{#await component}
-			Loading data...
-		{:then v } 
-			<svelte:component this={v.default} slug={slug} contentType={contentType} filename={filename} />
-		{/await}
-	{/if}
+	{:then v } 
+		<svelte:component this={v.default} slug={slug} contentType={contentType} filename={filename} />
+	{/await}
 </main>
 
 <style>