hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

working

Browse source
This commit is contained in:
Jade (Rose) Rowland 2024-05-16 16:49:28 -04:00
parent 27d8bae671
commit 803b5e56fc
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
website/src/repl/idbutils.mjs
View file

@ -40,8 +40,10 @@ export const registerSamplesFromDB = (config = userSamplesDBConfig, onComplete =
if (!isAudioFile(title)) { if (!isAudioFile(title)) {
return; return;
} }
const splitRelativePath = soundFile.id?.split('/'); const splitRelativePath = soundFile.id.split('/');
const parentDirectory = splitRelativePath[splitRelativePath.length - 2]; const parentDirectory =
//fallback to file name before period and seperator if no parent directory
splitRelativePath[splitRelativePath.length - 2] ?? soundFile.id.split(/\W+/)[0] ?? 'user';
const soundPath = soundFile.blob; const soundPath = soundFile.blob;
const soundPaths = sounds.get(parentDirectory) ?? new Set(); const soundPaths = sounds.get(parentDirectory) ?? new Set();
soundPaths.add(soundPath); soundPaths.add(soundPath);
@ -114,6 +116,7 @@ const processFilesForIDB = async (files) => {
Array.from(files) Array.from(files)
.map(async (s) => { .map(async (s) => {
const title = s.name; const title = s.name;
if (!isAudioFile(title)) { if (!isAudioFile(title)) {
return; return;
} }
@ -121,12 +124,14 @@ const processFilesForIDB = async (files) => {
const sUrl = URL.createObjectURL(s); const sUrl = URL.createObjectURL(s);
//fetch the sound and turn it into a buffer array //fetch the sound and turn it into a buffer array
const buf = await fetch(sUrl).then((res) => res.arrayBuffer()); const buf = await fetch(sUrl).then((res) => res.arrayBuffer());
//create a url blob containing all of the buffer data //create a url base64 containing all of the buffer data
const base64 = await bufferToDataUrl(buf); const base64 = await bufferToDataUrl(buf);
const path = s.webkitRelativePath;
const id = path?.length ? path : title;
return { return {
title, title,
blob: base64, blob: base64,
id: s.webkitRelativePath, id,
}; };
}) })
.filter(Boolean), .filter(Boolean),

3
website/src/repl/panel/ImportSoundsButton.jsx
View file

@ -10,6 +10,7 @@ export default function ImportSoundsButton({ onComplete }) {
return; return;
} }
setIsUploading(true); setIsUploading(true);
await uploadSamplesToDB(userSamplesDBConfig, fileUploadRef.current.files).then(() => { await uploadSamplesToDB(userSamplesDBConfig, fileUploadRef.current.files).then(() => {
registerSamplesFromDB(userSamplesDBConfig, () => { registerSamplesFromDB(userSamplesDBConfig, () => {
onComplete(); onComplete();
@ -32,7 +33,7 @@ export default function ImportSoundsButton({ onComplete }) {
directory="" directory=""
webkitdirectory="" webkitdirectory=""
multiple multiple
accept="audio/*" accept="audio/*, .wav, .mp3, .m4a, .flac"
onChange={() => { onChange={() => {
onChange(); onChange();
}} }}