@axium/storage 0.23.3 → 0.23.5

package/dist/client/api.js

@@ -1,11 +1,11 @@
-import { fetchAPI, prefix, token } from '@axium/client/requests';
+import { fetchAPI, origin, prefix, token } from '@axium/client/requests';
 import { pick } from 'utilium';
 import { prettifyError } from 'zod';
 import { StorageItemMetadata } from '../common.js';
 import '../polyfills.js';
 import { warnOnce } from 'ioium';
 function rawStorage(suffix) {
-    const raw = '/raw/storage' + (suffix ? '/' + suffix : '');
+    const raw = origin + '/raw/storage' + (suffix ? '/' + suffix : '');
     if (prefix[0] == '/')
         return raw;
     const url = new URL(prefix);

package/dist/client/frontend.d.ts

@@ -6,3 +6,4 @@ export declare function copyShortURL(item: StorageItemMetadata): Promise<void>;
 export declare function formatItemName(item?: {
     name?: string | null;
 } | null): string;
+export declare function _downloadItem(item?: StorageItemMetadata): void;

package/dist/client/frontend.js

@@ -1,6 +1,6 @@
 import { copy } from '@axium/client/gui';
 import { encodeUUID } from 'utilium';
-import { text } from '@axium/client';
+import { origin, text } from '@axium/client';
 export function copyShortURL(item) {
     const { href } = new URL('/f/' + encodeUUID(item.id).toBase64({ alphabet: 'base64url', omitPadding: true }), location.origin);
     return copy('text/plain', href);
@@ -13,3 +13,8 @@ export function formatItemName(item) {
         return text('storage.generic.no_name_in_dialog');
     return item.name.length > 23 ? item.name.slice(0, 20) + '...' : item.name;
 }
+export function _downloadItem(item) {
+    if (!item)
+        throw text('storage.generic.no_item');
+    open(new URL(item.type != 'inode/directory' ? item.dataURL : '/raw/storage/directory-zip/' + item.id, origin), '_blank');
+}

package/lib/List.svelte

@@ -9,7 +9,7 @@
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
 	import { getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
-	import { copyShortURL, formatItemName } from '@axium/storage/client/frontend';
+	import { _downloadItem, copyShortURL, formatItemName } from '@axium/storage/client/frontend';
 	import { StorageItemSorting, type StorageItemMetadata } from '@axium/storage/common';
 	import { errorText } from 'ioium';
 	import Preview from './Preview.svelte';
@@ -106,11 +106,7 @@
 					text: text('storage.List.share'),
 					action: () => ((activeId = item.id), dialogs['share:' + item.id].showModal()),
 				},
-				{
-					i: 'download',
-					text: text('storage.generic.download'),
-					action: () => ((activeId = item.id), dialogs.download.showModal()),
-				},
+				{ i: 'download', text: text('storage.generic.download'), action: () => _downloadItem(item) },
 				{ i: 'link-horizontal', text: text('storage.List.copy_link'), action: () => ((activeId = item.id), copyShortURL(item)) },
 				{ i: 'trash', text: text('storage.generic.trash'), action: trash },
 				user?.preferences?.debug && {
@@ -135,7 +131,9 @@
 			>
 				{@render action('rename', 'pencil', item.id)}
 				{@render action('share:' + item.id, 'user-group', item.id)}
-				{@render action('download', 'download', item.id)}
+				<span class="icon-text action" onclick={() => _downloadItem(item)}>
+					<Icon i="download" --size="14px" />
+				</span>
 				<span class="icon-text action" onclick={trash}>
 					<Icon i="trash" --size="14px" />
 				</span>
@@ -147,7 +145,13 @@
 	{/each}
 </div>
 
-<dialog bind:this={dialogs.preview} class="preview" onclick={e => e.stopPropagation()} {@attach closeOnBackGesture}>
+<dialog
+	bind:this={dialogs.preview}
+	class="preview"
+	onclick={e => e.stopPropagation()}
+	onclose={() => (activeId = undefined)}
+	{@attach closeOnBackGesture}
+>
 	{#if activeItem}
 		<Preview item={activeItem} previewDialog={dialogs.preview} shareDialog={dialogs['share:' + activeId]} onDelete={removeActiveItem} />
 	{/if}
@@ -167,16 +171,6 @@
 		<input name="name" type="text" required value={activeItem?.name} />
 	</div>
 </FormDialog>
-<FormDialog
-	bind:dialog={dialogs.download}
-	submitText={text('storage.generic.download')}
-	submit={async () => {
-		if (!activeId || !activeItem) throw text('storage.generic.no_item');
-		open(activeItem.type != 'inode/directory' ? activeItem.dataURL : '/raw/storage/directory-zip/' + activeId, '_blank');
-	}}
->
-	<p>{text('storage.generic.download_confirm_named', { name: activeItemName })}</p>
-</FormDialog>
 
 <style>
 	.item-actions {

package/lib/Preview.svelte

@@ -5,7 +5,7 @@
 	import type { AccessControllable } from '@axium/core';
 	import { downloadItem, downloadItemStream, getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
 	import { openers, previews } from '@axium/storage/client/3rd-party';
-	import { copyShortURL } from '@axium/storage/client/frontend';
+	import { _downloadItem, copyShortURL } from '@axium/storage/client/frontend';
 	import type { StorageItemMetadata } from '@axium/storage/common';
 	import '@axium/storage/polyfills';
 	import './Preview.css';
@@ -63,7 +63,9 @@
 					<Icon i="user-group" />
 				</span>
 			{/if}
-			{@render action('download', 'download')}
+			<span class="icon-text preview-action" onclick={() => _downloadItem(item)}>
+				<Icon i="download" />
+			</span>
 			<span class="icon-text preview-action" onclick={() => copyShortURL(item)}>
 				<Icon i="link-horizontal" />
 			</span>
@@ -102,17 +104,9 @@
 	{#if item.type.startsWith('image/')}
 		<img src={item.dataURL} alt={item.name} />
 	{:else if item.type.startsWith('audio/')}
-		{#await downloadItemStream(item.id)}
-			{@render loading()}
-		{:then stream}
-			<Audio src={item.dataURL} {...item} metadataSource={stream} cover />
-		{/await}
+		<Audio src={item.dataURL} {...item} metadataSource={downloadItemStream(item.id)} cover />
 	{:else if item.type.startsWith('video/')}
-		{#await downloadItemStream(item.id)}
-			{@render loading()}
-		{:then stream}
-			<Video src={item.dataURL} {...item} metadataSource={stream} />
-		{/await}
+		<Video src={item.dataURL} {...item} />
 	{:else if item.type == 'application/pdf'}
 		<object data={item.dataURL} type="application/pdf" width="100%" height="100%">
 			<embed src={item.dataURL} type="application/pdf" width="100%" height="100%" />
@@ -152,16 +146,3 @@
 		<input name="name" type="text" required value={item.name} />
 	</div>
 </FormDialog>
-<FormDialog
-	bind:dialog={dialogs.download}
-	submitText={text('storage.generic.download')}
-	submit={async () => {
-		if (item!.type == 'inode/directory') {
-			/** @todo ZIP support */
-			const children = await getDirectoryMetadata(item.id);
-			for (const child of children) open(child.dataURL, '_blank');
-		} else open(item!.dataURL, '_blank');
-	}}
->
-	<p>{text('storage.generic.download_confirm')}</p>
-</FormDialog>

package/lib/SidebarItem.svelte

@@ -5,7 +5,7 @@
 	import { copy } from '@axium/client/gui';
 	import * as icon from '@axium/core/icons';
 	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
-	import { formatItemName } from '@axium/storage/client/frontend';
+	import { _downloadItem, formatItemName } from '@axium/storage/client/frontend';
 	import type { StorageItemMetadata } from '@axium/storage/common';
 	import { getDirectory, selection, toggle, toggleRange } from '@axium/storage/sidebar';
 	import SidebarItem from './SidebarItem.svelte';
@@ -100,7 +100,11 @@
 	{@render action('rename', 'pen', text('storage.generic.rename'))}
 	{@render action('delete', 'trash', text('storage.SidebarItem.delete'))}
 	{#if item.type == 'cas_item'}
-		{@render action('download', 'download', text('storage.generic.download'))}
+		{@render action('download', 'download')}
+		<div onclick={() => _downloadItem(item)} class="action icon-text">
+			<Icon i="download" --size="14px" />
+			{text('storage.generic.download')}
+		</div>
 	{/if}
 	{#if page.data.session?.user.preferences.debug}
 		<div class="action icon-text" onclick={() => copy('text/plain', item.id)}>
@@ -135,18 +139,6 @@
 >
 	<p>{text('storage.generic.delete_confirm_named', { name: itemName })}</p>
 </FormDialog>
-<FormDialog
-	bind:dialog={dialogs.download}
-	submitText={text('storage.generic.download')}
-	submit={async () => {
-		open(item.dataURL, '_blank');
-	}}
->
-	<p>
-		{text('storage.SidebarItem.download_disclaimer')} <br />
-		{text('storage.generic.download_confirm_named', { name: itemName })}
-	</p>
-</FormDialog>
 
 <style>
 	.StorageSidebarItem {

package/locales/en.json

@@ -57,8 +57,6 @@
 		"generic": {
 			"copy_id": "Copy ID",
 			"download": "Download",
-			"download_confirm": "Are you sure you want to download this?",
-			"download_confirm_named": "Are you sure you want to download {name}?",
 			"name": "Name",
 			"no_name_in_dialog": "this",
 			"no_item": "No item is selected",
@@ -93,8 +91,7 @@
 			"no_files": "No files yet"
 		},
 		"SidebarItem": {
-			"delete": "Delete",
-			"download_disclaimer": "We are not responsible for the contents of this file."
+			"delete": "Delete"
 		},
 		"Usage": {
 			"error": "Couldn't load your uploads.",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.23.3",
+	"version": "0.23.5",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {

package/routes/files/[id]/+page.svelte

@@ -2,8 +2,8 @@
 	import { text } from '@axium/client';
 	import { AccessControlDialog, FormDialog, Icon } from '@axium/client/components';
 	import { toastStatus } from '@axium/client/toast';
-	import { getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
-	import { copyShortURL } from '@axium/storage/client/frontend';
+	import { updateItemMetadata } from '@axium/storage/client';
+	import { _downloadItem, copyShortURL } from '@axium/storage/client/frontend';
 	import { Add, List, Preview } from '@axium/storage/components';
 	import type { PageProps } from './$types';
 
@@ -58,7 +58,7 @@
 		{@render action('folder-arrow-up', text('page.files.back'), () => (location.href = parentHref))}
 		{@render action('pencil', text('page.files.rename'), () => dialogs.rename.showModal())}
 		{@render action('user-group', text('page.files.share'), () => shareDialog.showModal())}
-		{@render action('download', text('page.files.download'), () => dialogs.download.showModal())}
+		{@render action('download', text('page.files.download'), () => _downloadItem(item))}
 		{@render action('link-horizontal', text('page.files.copy_link'), () => copyShortURL(item))}
 		{@render action('trash', text('page.files.trash'), () =>
 			toastStatus(
@@ -88,13 +88,6 @@
 			<input name="name" type="text" required value={item.name} />
 		</div>
 	</FormDialog>
-	<FormDialog
-		bind:dialog={dialogs.download}
-		submitText={text('page.files.download')}
-		submit={async () => open(item.type != 'inode/directory' ? item.dataURL : '/raw/storage/directory-zip/' + item.id, '_blank')}
-	>
-		<p>{text('storage.generic.download_confirm_named', { name: item.name })}</p>
-	</FormDialog>
 {/if}
 
 <style>