TagSpaces is an offline, open source, document manager with tagging support
fix onProgress
sytolkdb1322fbb2f2
diff --git a/src/main/mainEvents.ts b/src/main/mainEvents.tsindex 81c8cd9f3..aacc32d13 100644--- a/src/main/mainEvents.ts+++ b/src/main/mainEvents.ts@@ -23,10 +23,17 @@ import {import fs from 'fs-extra';import path from 'path';// import chokidar, { FSWatcher } from 'chokidar';-import { isWorkerAvailable, postRequest, readMacOSTags } from './util';-import { watchFolder } from './chokidarWatcher';+import {+ getOnProgress,+ isWorkerAvailable,+ newProgress,+ postRequest,+ readMacOSTags,+} from './util';+import { stopWatching, watchFolder } from './chokidarWatcher';//let watcher: FSWatcher;+const progress = {};export default function loadMainEvents() {ipcMain.handle('isWorkerAvailable', async () => {@@ -134,16 +141,123 @@ export default function loadMainEvents() {);ipcMain.handle('copyDirectoryPromise',- async (event, param, newDirPath, onProgress) => {- const result = await copyDirectoryPromise(param, newDirPath, onProgress);- return result;+ async (event, param, newDirPath, withProgress) => {+ if (withProgress) {+ progress['copyDirectoryPromise'] = newProgress(+ 'moveDirectoryPromise',+ param.total,+ );+ /*const promise = new Promise((resolve, reject) => {+ const controller = new AbortController();+ const signal = controller.signal;+ progress['moveDirectoryPromise'] = newProgress(+ 'moveDirectoryPromise',+ param.total,+ controller,+ );+ progress['moveDirectoryPromise'].abort = () => {+ controller.abort();+ reject(new Error('Promise aborted'));+ };+ signal.addEventListener('abort', progress['moveDirectoryPromise'].abort);+ const onProgress = (newProgress, abortFunc, fileName) => {+ signal.removeEventListener('abort', progress['moveDirectoryPromise'].abort);+ progress['moveDirectoryPromise'].abort = () => {+ if (abortFunc) {+ abortFunc();+ }+ controller.abort();+ reject(new Error('Promise aborted'));+ };+ signal.addEventListener('abort', progress['moveDirectoryPromise'].abort);+ try {+ const mainWindow = BrowserWindow.getFocusedWindow();+ mainWindow.webContents.send('progress', fileName, newProgress);+ } catch (ex) {+ console.error(ex);+ }+ };+ moveDirectoryPromise(param, newDirPath, onProgress)+ .then((result) => resolve(result))+ .catch((e) => reject(e));+ }); */+ const result = await copyDirectoryPromise(+ param,+ newDirPath,+ getOnProgress('copyDirectoryPromise', progress),+ );+ return result;+ } else {+ const result = await copyDirectoryPromise(param, newDirPath);+ return result;+ }},);+ ipcMain.handle('uploadAbort', async (event, path) => {+ if (path && progress[path] && progress[path].abort) {+ progress[path].abort();+ } else {+ // stop all+ Object.keys(progress).forEach((key) => {+ if (progress[key] && progress[key].abort) {+ progress[key].abort();+ }+ });+ }+ return true;+ });ipcMain.handle('moveDirectoryPromise',- async (event, param, newDirPath, onProgress) => {- const result = await moveDirectoryPromise(param, newDirPath, onProgress);- return result;+ async (event, param, newDirPath, withProgress) => {+ if (withProgress) {+ progress['moveDirectoryPromise'] = newProgress(+ 'moveDirectoryPromise',+ param.total,+ );+ /*const promise = new Promise((resolve, reject) => {+ const controller = new AbortController();+ const signal = controller.signal;+ progress['moveDirectoryPromise'] = newProgress(+ 'moveDirectoryPromise',+ param.total,+ controller,+ );+ progress['moveDirectoryPromise'].abort = () => {+ controller.abort();+ reject(new Error('Promise aborted'));+ };+ signal.addEventListener('abort', progress['moveDirectoryPromise'].abort);+ const onProgress = (newProgress, abortFunc, fileName) => {+ signal.removeEventListener('abort', progress['moveDirectoryPromise'].abort);+ progress['moveDirectoryPromise'].abort = () => {+ if (abortFunc) {+ abortFunc();+ }+ controller.abort();+ reject(new Error('Promise aborted'));+ };+ signal.addEventListener('abort', progress['moveDirectoryPromise'].abort);+ try {+ const mainWindow = BrowserWindow.getFocusedWindow();+ mainWindow.webContents.send('progress', fileName, newProgress);+ } catch (ex) {+ console.error(ex);+ }+ };+ moveDirectoryPromise(param, newDirPath, onProgress)+ .then((result) => resolve(result))+ .catch((e) => reject(e));+ }); */+ const result = await moveDirectoryPromise(+ param,+ newDirPath,+ getOnProgress('moveDirectoryPromise', progress),+ );+ return result;+ } else {+ const result = await moveDirectoryPromise(param, newDirPath);+ return result;+ }},);ipcMain.handle('loadTextFilePromise', async (event, path, isPreview) => {diff --git a/src/main/preload.ts b/src/main/preload.tsindex 3f87888e9..d4e0df6bf 100644--- a/src/main/preload.ts+++ b/src/main/preload.ts@@ -47,7 +47,9 @@ export type Channels =| 'folderChanged'| 'set_extensions'| 'play-pause'- | 'cmd';+ | 'cmd'+ | 'progress'+ | 'uploadAbort';const electronHandler = {ipcRenderer: {diff --git a/src/main/util.ts b/src/main/util.tsindex 5bd0cf1cd..50ab0aa3f 100644--- a/src/main/util.ts+++ b/src/main/util.ts@@ -1,6 +1,7 @@/* eslint import/prefer-default-export: off */import { URL } from 'url';import path from 'path';+import { BrowserWindow } from 'electron';import webpackPaths from '../../.erb/configs/webpack.paths';import fs from 'fs';import chalk from 'chalk';@@ -198,3 +199,39 @@ export function isWorkerAvailable(): Promise<boolean> {}return Promise.resolve(false);}++export function newProgress(key, total) {+ return {+ loaded: 0,+ total: total,+ key,+ };+}+export function getOnProgress(key, progress) {+ const controller = new AbortController();+ const signal = controller.signal;++ progress[key].abort = () => {+ controller.abort();+ //reject(new Error('Promise aborted'));+ };+ signal.addEventListener('abort', progress[key].abort);+ const onProgress = (newProgress, abortFunc, fileName) => {+ signal.removeEventListener('abort', progress[key].abort);+ progress[key].abort = () => {+ if (abortFunc) {+ abortFunc();+ }+ controller.abort();+ //reject(new Error('Promise aborted'));+ };+ signal.addEventListener('abort', progress[key].abort);+ try {+ const mainWindow = BrowserWindow.getFocusedWindow();+ mainWindow.webContents.send('progress', fileName, newProgress);+ } catch (ex) {+ console.error(ex);+ }+ };+ return onProgress;+}diff --git a/src/renderer/components/dialogs/FileUploadDialog.tsx b/src/renderer/components/dialogs/FileUploadDialog.tsxindex 2783a1c11..05b213a43 100644--- a/src/renderer/components/dialogs/FileUploadDialog.tsx+++ b/src/renderer/components/dialogs/FileUploadDialog.tsx@@ -16,7 +16,7 @@**/-import React from 'react';+import React, { useEffect } from 'react';import Button from '@mui/material/Button';import DialogActions from '@mui/material/DialogActions';import DialogContent from '@mui/material/DialogContent';@@ -64,6 +64,20 @@ function FileUploadDialog(props: Props) {const targetPath = React.useRef<string>(getTargetPath());+ useEffect(() => {+ window.electronIO.ipcRenderer.on('progress', (fileName, newProgress) => {+ /*const { path, filePath, loaded, total, key } = newProgress;+ const progressPercentage = Math.round(+ (loaded / total) * 100,+ );*/+ dispatch(AppActions.onUploadProgress(newProgress, undefined));+ });++ return () => {+ window.electronIO.ipcRenderer.removeAllListeners('progress');+ };+ }, []);+function LinearProgressWithLabel(prop) {return (<Box display="flex" alignItems="center">@@ -81,13 +95,14 @@ function FileUploadDialog(props: Props) {const stopAll = () => {if (progress) {- progress.map((fileProgress) => {+ return PlatformIO.uploadAbort();+ /*progress.map((fileProgress) => {const { abort } = fileProgress;if (abort !== undefined && typeof abort === 'function') {abort();}return true;- });+ });*/}};diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsxindex da35de131..72a5afeb8 100644--- a/src/renderer/hooks/IOActionsContextProvider.tsx+++ b/src/renderer/hooks/IOActionsContextProvider.tsx@@ -115,7 +115,7 @@ export const IOActionsContext = createContext<IOActionsContextData>({deleteEntries: undefined,deleteDirectory: undefined,deleteFile: undefined,- moveDirs: () => Promise.resolve(false),+ moveDirs: undefined,moveFiles: () => Promise.resolve(false),copyDirs: () => Promise.resolve(false),copyFiles: () => Promise.resolve(false),diff --git a/src/renderer/services/platform-facade.ts b/src/renderer/services/platform-facade.tsindex 2f051ccec..e7928799c 100644--- a/src/renderer/services/platform-facade.ts+++ b/src/renderer/services/platform-facade.ts@@ -356,6 +356,13 @@ export default class PlatformFacade {return platformRenameDirectoryPromise(dirPath, newDirName);};+ static uploadAbort = (path?: string): Promise<any> => {+ if (AppConfig.isElectron) {+ return window.electronIO.ipcRenderer.invoke('uploadAbort', path);+ }+ return Promise.resolve(false);+ };+static copyDirectoryPromise = (param: any,newDirPath: string,@@ -366,7 +373,7 @@ export default class PlatformFacade {'copyDirectoryPromise',param,newDirPath,- onProgress,+ onProgress !== undefined,);}return platformCopyDirectoryPromise(param, newDirPath, onProgress);@@ -382,7 +389,7 @@ export default class PlatformFacade {'moveDirectoryPromise',param,newDirPath,- onProgress,+ onProgress !== undefined,);}return platformMoveDirectoryPromise(param, newDirPath, onProgress);