TagSpaces is an offline, open source, document manager with tagging support
fix upload issues
Stanimir23d904665efd
diff --git a/package.json b/package.jsonindex abbe788bb..732cb30a6 100644--- a/package.json+++ b/package.json@@ -121,7 +121,7 @@"copy-web-extensions": "shx mkdir -p web/modules/@tagspaces/extensions/arithmetic-player && shx cp -rL web/third-party/extensions/@tagspacesarithmetic-player_1.0.0/* web/modules/@tagspaces/extensions/arithmetic-player/","gen-third-party-extensions": "node -r ts-node/register scripts/generateExtensionsConfig.ts ./web/third-party/extensions","run-web-aws": "npm run prepare-web-pro && node scripts/webserver.js",- "run-web-dev": "npm run prepare-web-pro-dev && shx cp scripts/extconfig-extensions.js web/extconfig.js && node scripts/webserver.js",+ "run-web-dev": "npm run prepare-web-pro-dev && node scripts/webserver.js","run-web-server": "node scripts/webserver.js","setup-tests": "node scripts/setup-tests.js","skip:husky:pre-commit": "node -e \"require('fs').rename('./.git/hooks/pre-commit', './.git/hooks/pre-commit.disabled', function(err) { if (err) console.log(err); console.log('File successfully renamed!') })\"",diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsxindex 5027a62cd..77e582768 100644--- a/src/renderer/hooks/IOActionsContextProvider.tsx+++ b/src/renderer/hooks/IOActionsContextProvider.tsx@@ -1017,13 +1017,15 @@ export const IOActionsContextProvider = ({targetLocationId: string = undefined,sourceLocationId: string = undefined,): Promise<TS.FileSystemEntry[]> {- if (AppConfig.isElectron || AppConfig.isCordovaiOS) {- const arrFiles = [];+ if (onUploadProgress) {for (let i = 0; i < files.length; i += 1) {- arrFiles.push(files[i].path);+ const key = cleanTrailingDirSeparator(targetPath) + '/' + files[i].name;+ onUploadProgress({ key: key, loaded: 0, total: 0 }, undefined);}+ }+ if (AppConfig.isElectron || AppConfig.isCordovaiOS) {return uploadFiles(- arrFiles,+ files.map((f) => f.path),targetPath,onUploadProgress,uploadMeta,@@ -1321,13 +1323,6 @@ export const IOActionsContextProvider = ({targetLocationId: string = undefined,sourceLocationId: string = undefined,): Promise<TS.FileSystemEntry[]> {- if (onUploadProgress) {- paths.forEach((path) => {- const key =- targetPath + '/' + extractFileName(path, AppConfig.dirSeparator);- onUploadProgress({ key: key, loaded: 0, total: 0 }, undefined);- });- }const uploadJobs: job[] = [];paths.map((path) => {let target = joinPaths(