Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* GH-56 - Drag and drop * Support uploading depths of up to 1000 folders deep * Filters out unsupported file types and extensions * Supports all major browsers: Chrome, Safari, Firefox, iOS Safari * Supports singular uploads Resolves: GH-56 * Minor fixes
- Loading branch information
1 parent
cbfa1cd
commit 78aab3a
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| import { SUPPORTED_FILES, DA_ORIGIN } from '../../../shared/constants.js'; | ||
| import { daFetch } from '../../../shared/utils.js'; | ||
|
|
||
| const MAX_DEPTH = 1000; | ||
|
|
||
| function traverseFolder(entry) { | ||
| const reader = entry.createReader(); | ||
| // Resolved when the entire directory is traversed | ||
| return new Promise((resolveDirectory) => { | ||
| const iterationAttempts = []; | ||
| const errorHandler = () => {}; | ||
| function readEntries() { | ||
| // According to the FileSystem API spec, readEntries() must be called until | ||
| // it calls the callback with an empty array. | ||
| reader.readEntries((batchEntries) => { | ||
| if (!batchEntries.length) { | ||
| // Done iterating this folder | ||
| resolveDirectory(Promise.all(iterationAttempts)); | ||
| } else { | ||
| // Add a list of promises for each directory entry. If the entry is itself | ||
| // a directory, then that promise won't resolve until it is fully traversed. | ||
| iterationAttempts.push(Promise.all(batchEntries.map((batchEntry) => { | ||
| if (batchEntry.isDirectory) { | ||
| return traverseFolder(batchEntry); | ||
| } | ||
| return Promise.resolve(batchEntry); | ||
| }))); | ||
| // Try calling readEntries() again for the same dir, according to spec | ||
| readEntries(); | ||
| } | ||
| }, errorHandler); | ||
| } | ||
| // Initial call to recursive entry reader function | ||
| readEntries(); | ||
| }); | ||
| } | ||
|
|
||
| function packageFile(file, entry) { | ||
| const { name } = file; | ||
| let { type } = file; | ||
|
|
||
| // No content type fallback | ||
| const ext = (file.name || '').split('.').pop(); | ||
| if (!type) type = SUPPORTED_FILES[ext]; | ||
|
|
||
| // Check if supported type | ||
| const isSupported = Object.keys(SUPPORTED_FILES) | ||
| .some((key) => type === SUPPORTED_FILES[key]); | ||
| if (!isSupported) return null; | ||
|
|
||
| // Sanitize path | ||
| const path = entry.fullPath.replaceAll(' ', '-').toLowerCase(); | ||
| return { data: file, name, type, ext, path }; | ||
| } | ||
|
|
||
| function getFile(entry) { | ||
| return new Promise((resolve) => { | ||
| const callback = (file) => { resolve(packageFile(file, entry)); }; | ||
| entry.file(callback); | ||
| }); | ||
| } | ||
|
|
||
| export async function getFullEntryList(entries) { | ||
| const folderEntries = []; | ||
| const fileEntries = []; | ||
|
|
||
| for (const entry of entries) { | ||
| if (entry.isDirectory) { | ||
| folderEntries.push(entry); | ||
| } else { | ||
| fileEntries.push(entry); | ||
| } | ||
| } | ||
|
|
||
| for (const entry of folderEntries) { | ||
| const traversed = await traverseFolder(entry); | ||
| fileEntries.push(...traversed.flat(MAX_DEPTH)); | ||
| } | ||
|
|
||
| const files = await Promise.all(fileEntries.map((entry) => getFile(entry))); | ||
| return files.filter((file) => file); | ||
| } | ||
|
|
||
| export async function handleUpload(list, fullpath, file) { | ||
| const { data, path } = file; | ||
| const formData = new FormData(); | ||
| formData.append('data', data); | ||
| const opts = { method: 'POST', body: formData }; | ||
| const postpath = `${fullpath}${path}`; | ||
|
|
||
| try { | ||
| await daFetch(`${DA_ORIGIN}/source${postpath}`, opts); | ||
| file.imported = true; | ||
|
|
||
| const [displayName] = path.split('/').slice(1); | ||
| const [filename, ...rest] = displayName.split('.'); | ||
| const ext = rest.pop(); | ||
| const rejoined = [filename, ...rest].join('.'); | ||
|
|
||
| const listHasName = list.some((item) => item.name === rejoined); | ||
|
|
||
| if (listHasName) return null; | ||
|
|
||
| const item = { name: rejoined, path: `${fullpath}/${displayName}` }; | ||
| if (ext) item.ext = ext; | ||
|
|
||
| return item; | ||
| } catch (e) { | ||
| console.log(e); | ||
| } | ||
| return null; | ||
| } | ||
GitHub Actions
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.