feat(files): drag-out-to-OS download + folder drag-drop upload (#500)
Last parity gap from the VanillaJS → Svelte migration (issue #500), frontend-only — the backend endpoints already exist. - Drag-out download: onItemDragStart now also sets the DataTransfer `DownloadURL` type, so dragging a row/selection onto the OS desktop downloads it — a single file directly (GET /api/files/{id}), a folder as a zip (GET /api/folders/{id}/download?format=zip), and a multi-selection as one server-zipped archive via the GET twin GET /api/batch/download (DownloadURL can only point at a GET URL). The zip name is shared with the in-app batch download via a new batchZipName() helper. - Folder drag-drop upload: onDrop now walks dropped directory trees with webkitGetAsEntry/createReader into {file, relativePath} rows and recreates the tree server-side, instead of dropping only a folder's top-level files. The recursive-upload core is extracted into uploadTree() and shared with the folder picker (onUploadFolder), so both paths behave identically. Plain multi-file drops keep the existing flat fast-path. Stacked on #502 (shares onItemDragStart). Frontend gate green (svelte-check 0/0, eslint, stylelint, prettier) + 47 Vitest. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -310,9 +310,59 @@
|
|||||||
async function onDrop(e: DragEvent) {
|
async function onDrop(e: DragEvent) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
dragOver = false;
|
dragOver = false;
|
||||||
const dropped = e.dataTransfer?.files;
|
const dt = e.dataTransfer;
|
||||||
if (!dropped?.length) return;
|
if (!dt) return;
|
||||||
await uploadBatch(Array.from(dropped));
|
// A dropped folder isn't expanded into `.files`, so walk the dropped entry
|
||||||
|
// tree (webkitGetAsEntry) when one is present and recreate it server-side;
|
||||||
|
// otherwise fall back to the flat file list.
|
||||||
|
const tree = await collectDroppedEntries(dt);
|
||||||
|
if (tree) await uploadTree(tree);
|
||||||
|
else if (dt.files?.length) await uploadBatch(Array.from(dt.files));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Expand dropped OS entries into `{file, relativePath}` rows, walking any
|
||||||
|
* directory tree via the (non-standard but ubiquitous) `webkitGetAsEntry` /
|
||||||
|
* `createReader` API. Returns `null` when nothing dropped was a directory, so
|
||||||
|
* the caller takes the simpler flat-`FileList` path.
|
||||||
|
*/
|
||||||
|
async function collectDroppedEntries(
|
||||||
|
dt: DataTransfer
|
||||||
|
): Promise<{ file: File; relativePath: string }[] | null> {
|
||||||
|
// `webkitGetAsEntry()` must be read synchronously while the event is live.
|
||||||
|
const roots: FileSystemEntry[] = [];
|
||||||
|
let sawDir = false;
|
||||||
|
for (const item of Array.from(dt.items)) {
|
||||||
|
const entry = item.webkitGetAsEntry();
|
||||||
|
if (entry) {
|
||||||
|
roots.push(entry);
|
||||||
|
if (entry.isDirectory) sawDir = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!sawDir) return null;
|
||||||
|
|
||||||
|
const out: { file: File; relativePath: string }[] = [];
|
||||||
|
async function walk(entry: FileSystemEntry, prefix: string): Promise<void> {
|
||||||
|
if (entry.isFile) {
|
||||||
|
const file = await new Promise<File>((resolve, reject) =>
|
||||||
|
(entry as FileSystemFileEntry).file(resolve, reject)
|
||||||
|
);
|
||||||
|
out.push({ file, relativePath: prefix + entry.name });
|
||||||
|
} else if (entry.isDirectory) {
|
||||||
|
const reader = (entry as FileSystemDirectoryEntry).createReader();
|
||||||
|
const dirPrefix = `${prefix}${entry.name}/`;
|
||||||
|
// readEntries yields in batches; loop until it returns an empty one.
|
||||||
|
for (;;) {
|
||||||
|
const batch = await new Promise<FileSystemEntry[]>((resolve, reject) =>
|
||||||
|
reader.readEntries(resolve, reject)
|
||||||
|
);
|
||||||
|
if (batch.length === 0) break;
|
||||||
|
for (const child of batch) await walk(child, dirPrefix);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const root of roots) await walk(root, '');
|
||||||
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function renameItem(kind: 'file' | 'folder', id: string, current: string) {
|
async function renameItem(kind: 'file' | 'folder', id: string, current: string) {
|
||||||
@@ -464,6 +514,12 @@
|
|||||||
* folders are included (the old per-item loop silently skipped them). A lone
|
* folders are included (the old per-item loop silently skipped them). A lone
|
||||||
* file still streams directly so it keeps its original name/extension.
|
* file still streams directly so it keeps its original name/extension.
|
||||||
*/
|
*/
|
||||||
|
/** Name for a server-zipped multi-item archive (matches the legacy format). */
|
||||||
|
function batchZipName(): string {
|
||||||
|
const stamp = new Date().toISOString().replace('T', ' ').replace(/\..*/, '').replace(/:/g, '-');
|
||||||
|
return `oxicloud ${stamp}.zip`;
|
||||||
|
}
|
||||||
|
|
||||||
async function batchDownload() {
|
async function batchDownload() {
|
||||||
const fileIds: string[] = [];
|
const fileIds: string[] = [];
|
||||||
const folderIds: string[] = [];
|
const folderIds: string[] = [];
|
||||||
@@ -487,8 +543,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const stamp = new Date().toISOString().replace('T', ' ').replace(/\..*/, '').replace(/:/g, '-');
|
const zipName = batchZipName();
|
||||||
const zipName = `oxicloud ${stamp}.zip`;
|
|
||||||
try {
|
try {
|
||||||
const res = await apiFetch('/api/batch/download', {
|
const res = await apiFetch('/api/batch/download', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -619,8 +674,37 @@
|
|||||||
if (e.dataTransfer) {
|
if (e.dataTransfer) {
|
||||||
e.dataTransfer.effectAllowed = 'move';
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
if (items.length > 1) showDragGhost(e.dataTransfer, items);
|
if (items.length > 1) showDragGhost(e.dataTransfer, items);
|
||||||
|
// Drag-out-to-OS download: the OS reads `DownloadURL` (a GET URL) and
|
||||||
|
// downloads the dragged item(s) — a single file directly, a folder or a
|
||||||
|
// multi-selection as one server-zipped archive.
|
||||||
|
const dl = dragDownloadDescriptor(items);
|
||||||
|
if (dl) {
|
||||||
|
e.dataTransfer.setData(
|
||||||
|
'DownloadURL',
|
||||||
|
`application/octet-stream:${dl.name}:${location.origin}${dl.url}`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** `{ name, GET url }` for the drag-out download of the current drag set. */
|
||||||
|
function dragDownloadDescriptor(items: ActionTarget[]): { name: string; url: string } | null {
|
||||||
|
if (items.length === 0) return null;
|
||||||
|
if (items.length === 1) {
|
||||||
|
const it = items[0];
|
||||||
|
return it.kind === 'folder'
|
||||||
|
? { name: `${it.name}.zip`, url: folderZipUrl(it.id) }
|
||||||
|
: { name: it.name, url: fileDownloadUrl(it.id) };
|
||||||
|
}
|
||||||
|
// Multi-selection → one archive via the GET twin of POST /api/batch/download
|
||||||
|
// (DownloadURL can only point at a GET URL); file_ids/folder_ids are CSV.
|
||||||
|
const fileIds = items.filter((i) => i.kind === 'file').map((i) => i.id);
|
||||||
|
const folderIds = items.filter((i) => i.kind === 'folder').map((i) => i.id);
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
if (fileIds.length) params.set('file_ids', fileIds.join(','));
|
||||||
|
if (folderIds.length) params.set('folder_ids', folderIds.join(','));
|
||||||
|
return { name: batchZipName(), url: `/api/batch/download?${params.toString()}` };
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Custom drag image for a multi-item drag: a stack of the first few rows plus
|
* Custom drag image for a multi-item drag: a stack of the first few rows plus
|
||||||
@@ -823,33 +907,29 @@
|
|||||||
// ── Recursive folder upload ──────────────────────────────────────────────
|
// ── Recursive folder upload ──────────────────────────────────────────────
|
||||||
let folderInput = $state<HTMLInputElement | null>(null);
|
let folderInput = $state<HTMLInputElement | null>(null);
|
||||||
|
|
||||||
async function onUploadFolder(e: Event) {
|
/**
|
||||||
const input = e.target as HTMLInputElement;
|
* Upload files that carry a relative directory path, recreating the folder
|
||||||
const files = input.files ? Array.from(input.files) : [];
|
* tree under the current folder. Shared by the folder picker and folder drops.
|
||||||
if (files.length === 0) return;
|
*/
|
||||||
|
async function uploadTree(entries: { file: File; relativePath: string }[]) {
|
||||||
|
if (entries.length === 0) return;
|
||||||
uploading = true;
|
uploading = true;
|
||||||
try {
|
try {
|
||||||
// Map each relative directory path to its created folder id, so files
|
// Map each relative directory path to its created folder id; '' = current.
|
||||||
// land in the right place. The root maps to the current folder.
|
|
||||||
const dirIds = new Map<string, string | null>([['', currentId]]);
|
const dirIds = new Map<string, string | null>([['', currentId]]);
|
||||||
|
|
||||||
async function ensureDir(relDir: string): Promise<string | null> {
|
async function ensureDir(relDir: string): Promise<string | null> {
|
||||||
if (dirIds.has(relDir)) return dirIds.get(relDir) ?? null;
|
if (dirIds.has(relDir)) return dirIds.get(relDir) ?? null;
|
||||||
const parts = relDir.split('/');
|
const parts = relDir.split('/');
|
||||||
const name = parts.pop() as string;
|
const name = parts.pop() as string;
|
||||||
const parentRel = parts.join('/');
|
const parentId = await ensureDir(parts.join('/'));
|
||||||
const parentId = await ensureDir(parentRel);
|
|
||||||
const created = await createFolder(name, parentId);
|
const created = await createFolder(name, parentId);
|
||||||
dirIds.set(relDir, created.id);
|
dirIds.set(relDir, created.id);
|
||||||
return created.id;
|
return created.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const file of files) {
|
for (const { file, relativePath } of entries) {
|
||||||
// webkitRelativePath: "chosenDir/sub/.../file.ext" — recreate the whole
|
const segs = relativePath.split('/');
|
||||||
// tree (including the chosen folder) under the current folder.
|
|
||||||
const rel =
|
|
||||||
(file as File & { webkitRelativePath?: string }).webkitRelativePath ?? file.name;
|
|
||||||
const segs = rel.split('/');
|
|
||||||
segs.pop(); // drop the filename, keep the directory trail
|
segs.pop(); // drop the filename, keep the directory trail
|
||||||
const dirId = await ensureDir(segs.join('/'));
|
const dirId = await ensureDir(segs.join('/'));
|
||||||
await uploadFile(dirId, file);
|
await uploadFile(dirId, file);
|
||||||
@@ -860,10 +940,23 @@
|
|||||||
errorToast(err);
|
errorToast(err);
|
||||||
} finally {
|
} finally {
|
||||||
uploading = false;
|
uploading = false;
|
||||||
input.value = '';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function onUploadFolder(e: Event) {
|
||||||
|
const input = e.target as HTMLInputElement;
|
||||||
|
const files = input.files ? Array.from(input.files) : [];
|
||||||
|
// webkitRelativePath: "chosenDir/sub/.../file.ext" — recreate the whole tree.
|
||||||
|
await uploadTree(
|
||||||
|
files.map((file) => ({
|
||||||
|
file,
|
||||||
|
relativePath:
|
||||||
|
(file as File & { webkitRelativePath?: string }).webkitRelativePath ?? file.name
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
input.value = '';
|
||||||
|
}
|
||||||
|
|
||||||
const isEmpty = $derived(listing.folders.length === 0 && listing.files.length === 0);
|
const isEmpty = $derived(listing.folders.length === 0 && listing.files.length === 0);
|
||||||
const viewClass = $derived(
|
const viewClass = $derived(
|
||||||
filesStore.viewMode === 'grid' ? 'files-grid-view' : 'files-list-view'
|
filesStore.viewMode === 'grid' ? 'files-grid-view' : 'files-list-view'
|
||||||
|
|||||||
Reference in New Issue
Block a user