TagSpaces is an offline, open source, document manager with tagging support
fix Issue by renaming file to the same filename
Stanimir4dc784444244
diff --git a/package-lock.json b/package-lock.jsonindex a5424dc90..09cdb1a1a 100644--- a/package-lock.json+++ b/package-lock.json@@ -19,11 +19,11 @@"@mui/lab": "5.0.0-alpha.160","@mui/material": "^5.15.4","@mui/x-date-pickers": "^5.0.20",- "@tagspaces/tagspaces-common": "4.3.3",- "@tagspaces/tagspaces-common-aws3": "4.3.3",- "@tagspaces/tagspaces-common-cordova": "4.3.3",- "@tagspaces/tagspaces-indexer": "4.3.3",- "@tagspaces/tagspaces-md": "4.3.12",+ "@tagspaces/tagspaces-common": "4.3.13",+ "@tagspaces/tagspaces-common-aws3": "4.3.13",+ "@tagspaces/tagspaces-common-cordova": "4.3.13",+ "@tagspaces/tagspaces-indexer": "4.3.13",+ "@tagspaces/tagspaces-md": "4.3.13","aws-amplify": "^4.3.8","aws-sdk": "^2.1036.0","classnames": "^2.3.1",@@ -13772,9 +13772,9 @@}},"node_modules/@tagspaces/tagspaces-common": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.3.tgz",- "integrity": "sha512-9z1LWcTY9OuyTC3OqQLgfwttMJP6qbqwDYsnyRH8faBWhoVjK+Km5cK1c8WfMBRAACkokww/LGnOZl32ayyA2g==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.13.tgz",+ "integrity": "sha512-/fDEhwU9iu6/Dnzuw75j9XRbnVfuy4OdBb+Ea3UQ7tY6GtTG0GirvloBeZVRnPj4VB2+EQm6A0LhE7Qome9ZPA==","dependencies": {"dotenv": "^16.0.2","picomatch": "^3.0.1",@@ -13782,11 +13782,11 @@}},"node_modules/@tagspaces/tagspaces-common-aws3": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.3.3.tgz",- "integrity": "sha512-0GUngRH9S304vcTkJaz3fLbLyxmwHdfyH7wRnDdPFpuA1D9b03///e7j6iOIeOE7NsdU0WGmg2/8F9HYesMQqg==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.3.13.tgz",+ "integrity": "sha512-6sD1S53c8G1Kf3eBWAgTyq3cpvDkzxJ9aVNm+XiaL3+32b/tTqBK7Bh6XVajoS5Bv5Kg00btPRc5g9CUGrK1Ng==","dependencies": {- "@tagspaces/tagspaces-common": "^4.3.3",+ "@tagspaces/tagspaces-common": "^4.3.13","aws-sdk": "2.1605.0"}},@@ -13842,11 +13842,11 @@}},"node_modules/@tagspaces/tagspaces-common-cordova": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.3.3.tgz",- "integrity": "sha512-p+aGuZkgdbEbHtlGHsGy2v5CsL7izr0ku+35+7RLqPt5TO8eT6A/C57UgBLc+ZOT/0rjYXEXSYEts07MgJc4/Q==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.3.13.tgz",+ "integrity": "sha512-+hAVK6QBVgmZgEoGOj5KYsiMFNMvYlbJeqXOvZw2kCTe5wZiWXceT7BSsmwXIhZv4J+Kx+Z658YNVUDIObgByQ==","dependencies": {- "@tagspaces/tagspaces-common": "^4.3.3"+ "@tagspaces/tagspaces-common": "^4.3.13"}},"node_modules/@tagspaces/tagspaces-common/node_modules/uuid": {@@ -13858,17 +13858,17 @@}},"node_modules/@tagspaces/tagspaces-indexer": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.3.3.tgz",- "integrity": "sha512-IGUt8dlhuKWkz9fbGFqEnzJYMqiMwBARkn2BH3DXesK83Hah+GOO2pLnYok1SzHzoX+Tz58rgLOVwD2TLsUwuA==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.3.13.tgz",+ "integrity": "sha512-Zqtk8Fi7cE4sGQeJTJbgChEihxsYqFH3yOjNQQpX7yDw+Ex2VKVcMHr61ZZ81/GOsTvlYydvX2m6nko5hTtjYQ==","dependencies": {- "@tagspaces/tagspaces-common": "^4.3.3"+ "@tagspaces/tagspaces-common": "^4.3.13"}},"node_modules/@tagspaces/tagspaces-md": {- "version": "4.3.12",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-4.3.12.tgz",- "integrity": "sha512-PfirfW9yz67K0+gmZYYnriO+mHoD4xesUd0KmYjPS5Yb5rDYQiCj70GserOX/9owZxa1+neeIDVc2xN1z/rTKg==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-4.3.13.tgz",+ "integrity": "sha512-YUTCe7XKnbeuZOqEFGl4ToCPf94ARIZXlaY8OLBzIERxkki+JvGFdLc7Hrama7v5gOY4HZ+64aCLSEyb45pi+g==","dependencies": {"@milkdown/core": "7.3.6","@milkdown/ctx": "7.3.6",diff --git a/package.json b/package.jsonindex 655a0c3e3..cadaa16ae 100644--- a/package.json+++ b/package.json@@ -159,11 +159,11 @@"@mui/lab": "5.0.0-alpha.160","@mui/material": "^5.15.4","@mui/x-date-pickers": "^5.0.20",- "@tagspaces/tagspaces-common": "4.3.3",- "@tagspaces/tagspaces-common-aws3": "4.3.3",- "@tagspaces/tagspaces-common-cordova": "4.3.3",- "@tagspaces/tagspaces-indexer": "4.3.3",- "@tagspaces/tagspaces-md": "4.3.12",+ "@tagspaces/tagspaces-common": "4.3.13",+ "@tagspaces/tagspaces-common-aws3": "4.3.13",+ "@tagspaces/tagspaces-common-cordova": "4.3.13",+ "@tagspaces/tagspaces-indexer": "4.3.13",+ "@tagspaces/tagspaces-md": "4.3.13","aws-amplify": "^4.3.8","aws-sdk": "^2.1036.0","classnames": "^2.3.1",diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex a0a9941d2..076967dca 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -12,8 +12,8 @@"dependencies": {"@elife/pm2": "3.6.1","@tagspaces/extensions": "1.0.114",- "@tagspaces/tagspaces-common-node": "4.3.3",- "@tagspaces/tagspaces-ws": "4.3.3",+ "@tagspaces/tagspaces-common-node": "4.3.13",+ "@tagspaces/tagspaces-ws": "4.3.13","sharp": "0.32.6","ws": "8.16.0"},@@ -43,9 +43,9 @@}},"node_modules/@tagspaces/tagspaces-common": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.3.tgz",- "integrity": "sha512-9z1LWcTY9OuyTC3OqQLgfwttMJP6qbqwDYsnyRH8faBWhoVjK+Km5cK1c8WfMBRAACkokww/LGnOZl32ayyA2g==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.13.tgz",+ "integrity": "sha512-/fDEhwU9iu6/Dnzuw75j9XRbnVfuy4OdBb+Ea3UQ7tY6GtTG0GirvloBeZVRnPj4VB2+EQm6A0LhE7Qome9ZPA==","dependencies": {"dotenv": "^16.0.2","picomatch": "^3.0.1",@@ -53,11 +53,11 @@}},"node_modules/@tagspaces/tagspaces-common-node": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.3.tgz",- "integrity": "sha512-kquQnIfw8ae3RAlhSFkKHy4p0HNMHGekznF07bKGWV8KWOLVVVdtQKCY00LmvZITOyx8sZ/Ri+uQVxurcIsu1Q==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.13.tgz",+ "integrity": "sha512-7PXp4laWyXxa3uAOEuNURJg2bKX35DGZSkrwyNP4c1LyLci3UHw30Gvq5Kw3iSlvzwjAlLkhqfI37rOn1ATbHA==","dependencies": {- "@tagspaces/tagspaces-common": "^4.3.3",+ "@tagspaces/tagspaces-common": "^4.3.13","adm-zip": "0.5.10","fs-extra": "^10.0.0","klaw": "^4.1.0",@@ -80,22 +80,22 @@}},"node_modules/@tagspaces/tagspaces-workers": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.3.tgz",- "integrity": "sha512-ykvXDFZ30nCl9K63Ey5XVukXqhwTWGkRErFJHsCkeI/N/voL1vIW0Wcomh8SNy/kbHFAjYobHCJu7z+hU84mUA==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.13.tgz",+ "integrity": "sha512-JwMUmRiLDo6LAU9bph7idjxiY/VGmNNcAm5+xov7CC/pv6DFIKmoweCvgUkjbKyhS6Ye1eEb0JTFD0T5cwi6jA==","dependencies": {- "@tagspaces/tagspaces-common": "^4.3.3",- "@tagspaces/tagspaces-common-node": "^4.3.3",+ "@tagspaces/tagspaces-common": "^4.3.13",+ "@tagspaces/tagspaces-common-node": "^4.3.13","@tagspaces/tagspaces-platforms": "^4.3.2","@tagspaces/tagspaces-thumbgen-image": "^4.2.3"}},"node_modules/@tagspaces/tagspaces-ws": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.3.tgz",- "integrity": "sha512-8TD6SA86h9No9Kj/hhwVYmNZDvCrPblgP+1nqoQaHP8Qvm1iojmSHlLGkPWsblHzc1Hr+G0NB0KjKs7TzUpvBw==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.13.tgz",+ "integrity": "sha512-H8ClchZ7WyjDPPmlk71Y71Bu/fy3blFPDP9lPgBWvvkxy0YsCvItP/l/wg9NY/lC8OYij9meRIGGBE3L1JfVZA==","dependencies": {- "@tagspaces/tagspaces-workers": "^4.3.3",+ "@tagspaces/tagspaces-workers": "^4.3.13","find-free-ports": "^3.1.1","jsonwebtoken": "^8.5.1","ws": "^8.15.1"@@ -1129,9 +1129,9 @@}},"@tagspaces/tagspaces-common": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.3.tgz",- "integrity": "sha512-9z1LWcTY9OuyTC3OqQLgfwttMJP6qbqwDYsnyRH8faBWhoVjK+Km5cK1c8WfMBRAACkokww/LGnOZl32ayyA2g==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.13.tgz",+ "integrity": "sha512-/fDEhwU9iu6/Dnzuw75j9XRbnVfuy4OdBb+Ea3UQ7tY6GtTG0GirvloBeZVRnPj4VB2+EQm6A0LhE7Qome9ZPA==","requires": {"dotenv": "^16.0.2","picomatch": "^3.0.1",@@ -1139,11 +1139,11 @@}},"@tagspaces/tagspaces-common-node": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.3.tgz",- "integrity": "sha512-kquQnIfw8ae3RAlhSFkKHy4p0HNMHGekznF07bKGWV8KWOLVVVdtQKCY00LmvZITOyx8sZ/Ri+uQVxurcIsu1Q==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.13.tgz",+ "integrity": "sha512-7PXp4laWyXxa3uAOEuNURJg2bKX35DGZSkrwyNP4c1LyLci3UHw30Gvq5Kw3iSlvzwjAlLkhqfI37rOn1ATbHA==","requires": {- "@tagspaces/tagspaces-common": "^4.3.3",+ "@tagspaces/tagspaces-common": "^4.3.13","adm-zip": "0.5.10","fs-extra": "^10.0.0","klaw": "^4.1.0",@@ -1165,22 +1165,22 @@}},"@tagspaces/tagspaces-workers": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.3.tgz",- "integrity": "sha512-ykvXDFZ30nCl9K63Ey5XVukXqhwTWGkRErFJHsCkeI/N/voL1vIW0Wcomh8SNy/kbHFAjYobHCJu7z+hU84mUA==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.13.tgz",+ "integrity": "sha512-JwMUmRiLDo6LAU9bph7idjxiY/VGmNNcAm5+xov7CC/pv6DFIKmoweCvgUkjbKyhS6Ye1eEb0JTFD0T5cwi6jA==","requires": {- "@tagspaces/tagspaces-common": "^4.3.3",- "@tagspaces/tagspaces-common-node": "^4.3.3",+ "@tagspaces/tagspaces-common": "^4.3.13",+ "@tagspaces/tagspaces-common-node": "^4.3.13","@tagspaces/tagspaces-platforms": "^4.3.2","@tagspaces/tagspaces-thumbgen-image": "^4.2.3"}},"@tagspaces/tagspaces-ws": {- "version": "4.3.3",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.3.tgz",- "integrity": "sha512-8TD6SA86h9No9Kj/hhwVYmNZDvCrPblgP+1nqoQaHP8Qvm1iojmSHlLGkPWsblHzc1Hr+G0NB0KjKs7TzUpvBw==",+ "version": "4.3.13",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.13.tgz",+ "integrity": "sha512-H8ClchZ7WyjDPPmlk71Y71Bu/fy3blFPDP9lPgBWvvkxy0YsCvItP/l/wg9NY/lC8OYij9meRIGGBE3L1JfVZA==","requires": {- "@tagspaces/tagspaces-workers": "^4.3.3",+ "@tagspaces/tagspaces-workers": "^4.3.13","find-free-ports": "^3.1.1","jsonwebtoken": "^8.5.1","ws": "^8.15.1"diff --git a/release/app/package.json b/release/app/package.jsonindex a1d6852ca..33093c258 100644--- a/release/app/package.json+++ b/release/app/package.json@@ -19,8 +19,8 @@"dependencies": {"@elife/pm2": "3.6.1","@tagspaces/extensions": "1.0.114",- "@tagspaces/tagspaces-common-node": "4.3.3",- "@tagspaces/tagspaces-ws": "4.3.3",+ "@tagspaces/tagspaces-common-node": "4.3.13",+ "@tagspaces/tagspaces-ws": "4.3.13","sharp": "0.32.6","ws": "8.16.0"},diff --git a/src/renderer/hooks/TaggingActionsContextProvider.tsx b/src/renderer/hooks/TaggingActionsContextProvider.tsxindex 3cd00b108..2234fd448 100644--- a/src/renderer/hooks/TaggingActionsContextProvider.tsx+++ b/src/renderer/hooks/TaggingActionsContextProvider.tsx@@ -976,7 +976,8 @@ export const TaggingActionsContextProvider = ({reflect,);if (!success) {- reject(new Error('Error renaming file'));+ resolve(undefined);+ //reject(new Error('Error renaming file'));return;}}