Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 06:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

web: use same logic for uploading attachment on desktop & web

Browse Source
This commit is contained in:
Abdullah Atta
2024-04-26 13:58:50 +05:00
parent d6cc899d95
commit d18b775d06
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/web/src/interfaces/fs.ts
View File

@@ -260,6 +260,7 @@ async function uploadFile(
return uploaded; return uploaded;
} catch (e) { } catch (e) {
console.error(e);
reportProgress(undefined, { type: "upload", hash: filename }); reportProgress(undefined, { type: "upload", hash: filename });
const error = toS3Error(e); const error = toS3Error(e);
if ( if (
@@ -301,9 +302,7 @@ async function singlePartUploadFile(
headers: { headers: {
"Content-Type": "" "Content-Type": ""
}, },
data: IS_DESKTOP_APP data: await fileHandle.toBlob(),
? await (await fileHandle.toBlob()).arrayBuffer()
: await fileHandle.toBlob(),
signal, signal,
onUploadProgress: (ev) => onUploadProgress: (ev) =>
reportProgress( reportProgress(
@@ -376,14 +375,13 @@ async function multiPartUploadFile(
UPLOAD_PART_REQUIRED_CHUNKS UPLOAD_PART_REQUIRED_CHUNKS
); );
const url = parts[i]; const url = parts[i];
const data = await blob.arrayBuffer();
const response = await axios const response = await axios
.request({ .request({
url, url,
method: "PUT", method: "PUT",
headers: { "Content-Type": "", "X-Content-Length": data.byteLength }, headers: { "Content-Type": "" },
signal, signal,
data, data: blob,
onUploadProgress onUploadProgress
}) })
.catch((e) => { .catch((e) => {
@@ -603,10 +601,13 @@ export async function saveFile(filename: string, fileMetadata: FileMetadata) {
async function deleteFile( async function deleteFile(
filename: string, filename: string,
requestOptions: RequestOptionsWithSignal requestOptions?: RequestOptionsWithSignal
) { ) {
if (!requestOptions) return await streamablefs.deleteFile(filename); if (!requestOptions)
if (!requestOptions && !(await streamablefs.exists(filename))) return true; return (
!(await streamablefs.exists(filename)) ||
(await streamablefs.deleteFile(filename))
);
try { try {
const { url, headers } = requestOptions; const { url, headers } = requestOptions;