Adjust the upload interface a little now that we 'upload' two files in the Inform 7 template

Author: curiousdannii

src/common/file/browser.ts

@@ -152,11 +152,21 @@ export async function read_response(response: Response, progress_callback?: Prog
     return result
 }
 
-/** A helper class to handle requesting JSONP resources one at a time */
+/** Read an uploaded file and return it as a Uint8Array */
+export function read_uploaded_file(file: File): Promise<Uint8Array<ArrayBuffer>> {
+    return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.onerror = () => reject(reader.error)
+        reader.onload = () => resolve(new Uint8Array(reader.result as ArrayBuffer))
+        reader.readAsArrayBuffer(file)
+    })
+}
+
 interface QueueRequest<T> {
     path: string,
     resolve: (value: T) => void,
 }
+/** A helper class to handle requesting JSONP resources one at a time */
 class JSONPQueue {
     private options: DownloadOptions
     private pending = false

src/dialog/browser/browser.ts

@@ -12,10 +12,11 @@ https://github.com/curiousdannii/asyncglk
 import {saveAs as filesave_saveAs} from 'file-saver'
 import path from 'path-browserify-esm'
 
+import {read_uploaded_file} from '../../common/file/browser.js'
 import type {DownloadOptions, ProgressCallback} from '../../common/file/interface.js'
 import type {DialogDirectories, DialogOptions} from '../common/interface.js'
 import {show_alert} from './common.js'
-import {DownloadProvider, read_uploaded_file} from './download.js'
+import {DownloadProvider} from './download.js'
 import type {BrowseableProvider, BrowserDialog, DirEntry, FilesMetadata, Provider} from './interface.js'
 import {WebStorageProvider} from './storage.js'
 import FileDialog from './ui/FileDialog.svelte'
@@ -85,9 +86,11 @@ export class ProviderBasedBrowserDialog implements BrowserDialog {
         }
     }
 
-    async upload(file: File) {
-        const file_path = await this.downloader!.upload(file)
-        this.setup(file_path)
+    async upload(filename: string, data: Uint8Array<ArrayBuffer>, main_file = true) {
+        const file_path = await this.downloader!.upload(filename, data)
+        if (main_file) {
+            this.setup(file_path)
+        }
         return file_path
     }
 

src/dialog/browser/download.ts

@@ -36,9 +36,8 @@ export class DownloadProvider implements Provider {
         return path
     }
 
-    async upload(file: File) {
-        const data = await read_uploaded_file(file)
-        const path = '/upload/' + file.name
+    async upload(filename: string, data: Uint8Array<ArrayBuffer>) {
+        const path = '/upload/' + filename
         this.store.set(path, data)
         return path
     }
@@ -164,16 +163,6 @@ async function fetch_storyfile(options: DownloadOptions, url: string, progress_c
     return [url, data]
 }
 
-/** Read an uploaded file and return it as a Uint8Array */
-export function read_uploaded_file(file: File): Promise<Uint8Array<ArrayBuffer>> {
-    return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        reader.onerror = () => reject(reader.error)
-        reader.onload = () => resolve(new Uint8Array(reader.result as ArrayBuffer))
-        reader.readAsArrayBuffer(file)
-    })
-}
-
 function url_to_path(url: string) {
     if (url.startsWith('https:')) {
         return '/download/https/' + url.substring(8)

src/dialog/browser/interface.ts

@@ -14,7 +14,7 @@ import type {AsyncDialog} from '../common/interface.js'
 
 export interface BrowserDialog extends AsyncDialog {
     download(url: string, progress_callback?: ProgressCallback): Promise<string>
-    upload(file: File): Promise<string>
+    upload(filename: string, data: Uint8Array<ArrayBuffer>, main_file?: boolean): Promise<string>
 }
 
 /** A provider handles part of the filesystem, and can cascade down to another provider for files it doesn't handle */

src/index-browser.ts

@@ -11,7 +11,7 @@ https://github.com/curiousdannii/asyncglk
 
 export * from './index-common.js'
 
-export {fetch_resource, parse_base64, process_resource, read_response} from './common/file/browser.js'
+export {fetch_resource, parse_base64, process_resource, read_response, read_uploaded_file} from './common/file/browser.js'
 
 export {ProviderBasedBrowserDialog} from './dialog/browser/browser.js'