TagSpaces is an offline, open source, document manager with tagging support
Copy or move file to a full drive should show appropriate error message (#2264)
Stanimirf269cd4c9216
diff --git a/package-lock.json b/package-lock.jsonindex 988c0652e..67327ebb5 100644--- a/package-lock.json+++ b/package-lock.json@@ -22,10 +22,10 @@"@mui/lab": "6.0.0-beta.27","@mui/material": "^6.4.4","@mui/x-date-pickers": "^7.26.0",- "@tagspaces/tagspaces-common": "4.5.51",- "@tagspaces/tagspaces-common-aws3": "4.5.51",- "@tagspaces/tagspaces-common-cordova": "4.5.51",- "@tagspaces/tagspaces-indexer": "4.5.51",+ "@tagspaces/tagspaces-common": "4.5.54",+ "@tagspaces/tagspaces-common-aws3": "4.5.54",+ "@tagspaces/tagspaces-common-cordova": "4.5.54",+ "@tagspaces/tagspaces-indexer": "4.5.54","aws-amplify": "^4.3.8","clone": "^2.1.2","coordinate-parser": "^1.0.7",@@ -19577,9 +19577,9 @@}},"node_modules/@tagspaces/tagspaces-common": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.51.tgz",- "integrity": "sha512-Hw/Q0iaGh7xJ5j9NWaTw0er4OQ5rVpgGRNZeH8aSkiwnZui85bEuNruTgvPNT5qLinpj56kWryrXSWm5BKyCZA==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.54.tgz",+ "integrity": "sha512-bSD9R3b2EQmGBjT3VlxSYXO5f2WvnMN0WPFKihUENMlTUuv5Ys/uEr9Q4BvfL4bCCqWn0BlPTqGqicgEAsdI2A==","license": "MIT","dependencies": {"dompurify": "^3.2.3",@@ -19591,25 +19591,25 @@}},"node_modules/@tagspaces/tagspaces-common-aws3": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.51.tgz",- "integrity": "sha512-/UDOB5eao/oMhNFKBDFp5ox5qVmHRZ+liuuPifPRQ2M8sWsuTE4kFxeLKJObJuupsz4pPyADNc1tgcaNVTYDcA==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.5.54.tgz",+ "integrity": "sha512-B3OIWUXtY2Jox4m3VVHN5/1YYwl2UHjR0PuBO4XfHRawLyqCuciv/1onu20+iGnbKfExMDAOtPOtz8JEIwoWcg==","license": "MIT","dependencies": {"@aws-sdk/client-s3": "^3.665.0","@aws-sdk/lib-storage": "^3.665.0","@aws-sdk/s3-request-presigner": "^3.665.0",- "@tagspaces/tagspaces-common": "^4.5.51",+ "@tagspaces/tagspaces-common": "^4.5.54","crypto-js": "^4.2.0"}},"node_modules/@tagspaces/tagspaces-common-cordova": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.51.tgz",- "integrity": "sha512-S8bak9fCiEPuZ4/dQTeziYPP535ipAakoV0pkTtjcoA6iIo+5lCOE78QUTr+q9ko/cs9boSgv9a6hSfBKF1Gog==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.5.54.tgz",+ "integrity": "sha512-EnZ4ugyJRp66VEa+d+YXbyNwyZ9mlvccZZWrHhUqJXHnJ8C3tg+nxNvncv3Ekgjaq2qQmc5BMUvDqIkztIu0Rw==","license": "MIT","dependencies": {- "@tagspaces/tagspaces-common": "^4.5.51"+ "@tagspaces/tagspaces-common": "^4.5.54"}},"node_modules/@tagspaces/tagspaces-common/node_modules/cssstyle": {@@ -19816,12 +19816,12 @@}},"node_modules/@tagspaces/tagspaces-indexer": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.51.tgz",- "integrity": "sha512-t8wUKbpFrYHHImAf39AwCzheRIfTV8gV4RXhFKbQ+0jAPNMztb+kUkwGN8cQKOA6rYAJYYyyC8UlR74RDYux4g==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.54.tgz",+ "integrity": "sha512-wfjfclcfe34m0YZkVl+M/N789z0LwTMHh+7dzzCpV5nQ7av3TwKy598qvw+wt2d/a+StQf/wQz/oZOX1hdEsKw==","license": "MIT","dependencies": {- "@tagspaces/tagspaces-common": "^4.5.51"+ "@tagspaces/tagspaces-common": "^4.5.54"}},"node_modules/@tagspacespro/tagspacespro": {diff --git a/package.json b/package.jsonindex d6c1e1ca0..77e2475a0 100644--- a/package.json+++ b/package.json@@ -172,10 +172,10 @@"@milkdown/crepe": "^7.6.3","@milkdown/kit": "^7.6.3","@milkdown/react": "^7.6.3",- "@tagspaces/tagspaces-common": "4.5.51",- "@tagspaces/tagspaces-common-aws3": "4.5.51",- "@tagspaces/tagspaces-common-cordova": "4.5.51",- "@tagspaces/tagspaces-indexer": "4.5.51",+ "@tagspaces/tagspaces-common": "4.5.54",+ "@tagspaces/tagspaces-common-aws3": "4.5.54",+ "@tagspaces/tagspaces-common-cordova": "4.5.54",+ "@tagspaces/tagspaces-indexer": "4.5.54","aws-amplify": "^4.3.8","clone": "^2.1.2","coordinate-parser": "^1.0.7",diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex 706d23552..e247cad8f 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.168",- "@tagspaces/tagspaces-common-node": "4.5.51",- "@tagspaces/tagspaces-ws": "4.5.51",+ "@tagspaces/tagspaces-common-node": "4.5.54",+ "@tagspaces/tagspaces-ws": "4.5.54","sharp": "0.32.6","ws": "8.18.1"},@@ -160,9 +160,9 @@}},"node_modules/@tagspaces/tagspaces-common": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.52.tgz",- "integrity": "sha512-+TSUk8fhyKe3J0HNO4BKFKsNLzJ9sDwFdK71m43Cmzmx9qfoDpz6ph4lfhXua1tpTPJ2sYQxVHLRWC0OOYmQvQ==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.54.tgz",+ "integrity": "sha512-bSD9R3b2EQmGBjT3VlxSYXO5f2WvnMN0WPFKihUENMlTUuv5Ys/uEr9Q4BvfL4bCCqWn0BlPTqGqicgEAsdI2A==","dependencies": {"dompurify": "^3.2.3","dotenv": "^16.0.2",@@ -173,28 +173,28 @@}},"node_modules/@tagspaces/tagspaces-common-node": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.51.tgz",- "integrity": "sha512-bk/7F6O9aD10dxa1Q5Qt/J9BDy9UMvjBAcauayUWyDYCfa24Lm9UA3ys4nOElJxx33CpyyZXaydQTfqoVtwgMA==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.54.tgz",+ "integrity": "sha512-kzRq7qCMPkfmKP8+ZdKAt7LdqexlgGVKatNVpst3ORUn0iTFozzVlaDMhhpPila9p7nAfkQYJsYIgb/6pqH0og==","dependencies": {- "@tagspaces/tagspaces-common": "^4.5.51",+ "@tagspaces/tagspaces-common": "^4.5.54","adm-zip": "0.5.10","fs-extra": "^10.0.0","klaw": "^4.1.0"}},"node_modules/@tagspaces/tagspaces-indexer": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.52.tgz",- "integrity": "sha512-4iImdFI/e4RXZrMJdTPRoK0XVt/1b6YHcaOzeiNqPCnhH2DvBbS1gd5oitkkRAiXAGUFdHYz/coF9Ycmh20gZg==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.54.tgz",+ "integrity": "sha512-wfjfclcfe34m0YZkVl+M/N789z0LwTMHh+7dzzCpV5nQ7av3TwKy598qvw+wt2d/a+StQf/wQz/oZOX1hdEsKw==","dependencies": {- "@tagspaces/tagspaces-common": "^4.5.52"+ "@tagspaces/tagspaces-common": "^4.5.54"}},"node_modules/@tagspaces/tagspaces-pdf-extraction": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-pdf-extraction/-/tagspaces-pdf-extraction-4.5.52.tgz",- "integrity": "sha512-YH8NOyaJgnD86tZoUD2cytUluIMhYjFCSKy4W67KhOGBffUXgaX+tdXtbSmpbc+lhclnIq2uQpkUgC9sn3nNBw==",+ "version": "4.5.53",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-pdf-extraction/-/tagspaces-pdf-extraction-4.5.53.tgz",+ "integrity": "sha512-MHOReGZUlRQmZIliyrmj0r0f9bdviQwlFgRkfDE1Erol0j+uuWjhLU506AytKQX0UE4LkPJenuUjKmENLONXtg==","dependencies": {"pdf2json": "^3.1.4"}@@ -209,36 +209,25 @@}},"node_modules/@tagspaces/tagspaces-workers": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.52.tgz",- "integrity": "sha512-UKZJTKdeGA3xm+OROa7jNLbavDsJ/6bcaUHHtmysmYpAGvPTN1ckekKIyH6k1E/RTe5QjrcExkvdkxI9z5X94A==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.54.tgz",+ "integrity": "sha512-K0O87swbqEjGeGh/FVTeXlGMQKvGSMpb/8Rsyc2f3DhXURTytv/Q1/g3nTLxjUIUWdV1m5UbBRThIvdFzvyTZA==","dependencies": {- "@tagspaces/tagspaces-common": "^4.5.52",- "@tagspaces/tagspaces-common-node": "^4.5.52",- "@tagspaces/tagspaces-pdf-extraction": "^4.5.52",+ "@tagspaces/tagspaces-common": "^4.5.54",+ "@tagspaces/tagspaces-common-node": "^4.5.54",+ "@tagspaces/tagspaces-pdf-extraction": "^4.5.53","@tagspaces/tagspaces-thumbgen-image": "^4.2.3","fswin": "^3.24.829"}},- "node_modules/@tagspaces/tagspaces-workers/node_modules/@tagspaces/tagspaces-common-node": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.52.tgz",- "integrity": "sha512-VbLtevCfmgvx+pTHgFn/LO/xlnYIyyUdJnc9huzjC8f1XR1S7o9GcXJxVs7xwiwkpUMMN1INP3GrVdlG3SjalA==",- "dependencies": {- "@tagspaces/tagspaces-common": "^4.5.52",- "adm-zip": "0.5.10",- "fs-extra": "^10.0.0",- "klaw": "^4.1.0"- }- },"node_modules/@tagspaces/tagspaces-ws": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.51.tgz",- "integrity": "sha512-E4h2np/ZlpH4qygnbRZm4JuABFPvCH59Q8tCNvXhvwi4YJjxtEbCkN/lCfjLIGn017PG2vWGf+40SlJHi7Xh6A==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.54.tgz",+ "integrity": "sha512-8j5W8oPNGsha5nKqvH8aq0uzwigea1hdobjrplZCwu2hJ1JBc9oa43LRpd/VJlM3lOgLXx+PfX44glt191ozpg==","dependencies": {- "@tagspaces/tagspaces-indexer": "^4.5.51",- "@tagspaces/tagspaces-pdf-extraction": "^4.5.27",- "@tagspaces/tagspaces-workers": "^4.5.51",+ "@tagspaces/tagspaces-indexer": "^4.5.54",+ "@tagspaces/tagspaces-pdf-extraction": "^4.5.53",+ "@tagspaces/tagspaces-workers": "^4.5.54","find-free-ports": "^3.1.1","jsonwebtoken": "^8.5.1","ws": "^8.15.1"@@ -1239,9 +1228,9 @@"integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="},"node_modules/nwsapi": {- "version": "2.2.18",- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.18.tgz",- "integrity": "sha512-p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA=="+ "version": "2.2.19",+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.19.tgz",+ "integrity": "sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA=="},"node_modules/once": {"version": "1.4.0",@@ -1714,9 +1703,9 @@}},"node_modules/tr46": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",- "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",+ "version": "5.1.0",+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz",+ "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==","dependencies": {"punycode": "^2.3.1"},@@ -1795,11 +1784,11 @@}},"node_modules/whatwg-url": {- "version": "14.1.1",- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz",- "integrity": "sha512-mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==",+ "version": "14.2.0",+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",+ "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==","dependencies": {- "tr46": "^5.0.0",+ "tr46": "^5.1.0","webidl-conversions": "^7.0.0"},"engines": {@@ -1907,9 +1896,9 @@}},"@tagspaces/tagspaces-common": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.52.tgz",- "integrity": "sha512-+TSUk8fhyKe3J0HNO4BKFKsNLzJ9sDwFdK71m43Cmzmx9qfoDpz6ph4lfhXua1tpTPJ2sYQxVHLRWC0OOYmQvQ==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.5.54.tgz",+ "integrity": "sha512-bSD9R3b2EQmGBjT3VlxSYXO5f2WvnMN0WPFKihUENMlTUuv5Ys/uEr9Q4BvfL4bCCqWn0BlPTqGqicgEAsdI2A==","requires": {"dompurify": "^3.2.3","dotenv": "^16.0.2",@@ -1920,28 +1909,28 @@}},"@tagspaces/tagspaces-common-node": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.51.tgz",- "integrity": "sha512-bk/7F6O9aD10dxa1Q5Qt/J9BDy9UMvjBAcauayUWyDYCfa24Lm9UA3ys4nOElJxx33CpyyZXaydQTfqoVtwgMA==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.54.tgz",+ "integrity": "sha512-kzRq7qCMPkfmKP8+ZdKAt7LdqexlgGVKatNVpst3ORUn0iTFozzVlaDMhhpPila9p7nAfkQYJsYIgb/6pqH0og==","requires": {- "@tagspaces/tagspaces-common": "^4.5.51",+ "@tagspaces/tagspaces-common": "^4.5.54","adm-zip": "0.5.10","fs-extra": "^10.0.0","klaw": "^4.1.0"}},"@tagspaces/tagspaces-indexer": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.52.tgz",- "integrity": "sha512-4iImdFI/e4RXZrMJdTPRoK0XVt/1b6YHcaOzeiNqPCnhH2DvBbS1gd5oitkkRAiXAGUFdHYz/coF9Ycmh20gZg==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.5.54.tgz",+ "integrity": "sha512-wfjfclcfe34m0YZkVl+M/N789z0LwTMHh+7dzzCpV5nQ7av3TwKy598qvw+wt2d/a+StQf/wQz/oZOX1hdEsKw==","requires": {- "@tagspaces/tagspaces-common": "^4.5.52"+ "@tagspaces/tagspaces-common": "^4.5.54"}},"@tagspaces/tagspaces-pdf-extraction": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-pdf-extraction/-/tagspaces-pdf-extraction-4.5.52.tgz",- "integrity": "sha512-YH8NOyaJgnD86tZoUD2cytUluIMhYjFCSKy4W67KhOGBffUXgaX+tdXtbSmpbc+lhclnIq2uQpkUgC9sn3nNBw==",+ "version": "4.5.53",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-pdf-extraction/-/tagspaces-pdf-extraction-4.5.53.tgz",+ "integrity": "sha512-MHOReGZUlRQmZIliyrmj0r0f9bdviQwlFgRkfDE1Erol0j+uuWjhLU506AytKQX0UE4LkPJenuUjKmENLONXtg==","requires": {"pdf2json": "^3.1.4"}@@ -1956,38 +1945,25 @@}},"@tagspaces/tagspaces-workers": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.52.tgz",- "integrity": "sha512-UKZJTKdeGA3xm+OROa7jNLbavDsJ/6bcaUHHtmysmYpAGvPTN1ckekKIyH6k1E/RTe5QjrcExkvdkxI9z5X94A==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.5.54.tgz",+ "integrity": "sha512-K0O87swbqEjGeGh/FVTeXlGMQKvGSMpb/8Rsyc2f3DhXURTytv/Q1/g3nTLxjUIUWdV1m5UbBRThIvdFzvyTZA==","requires": {- "@tagspaces/tagspaces-common": "^4.5.52",- "@tagspaces/tagspaces-common-node": "^4.5.52",- "@tagspaces/tagspaces-pdf-extraction": "^4.5.52",+ "@tagspaces/tagspaces-common": "^4.5.54",+ "@tagspaces/tagspaces-common-node": "^4.5.54",+ "@tagspaces/tagspaces-pdf-extraction": "^4.5.53","@tagspaces/tagspaces-thumbgen-image": "^4.2.3","fswin": "^3.24.829"- },- "dependencies": {- "@tagspaces/tagspaces-common-node": {- "version": "4.5.52",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.5.52.tgz",- "integrity": "sha512-VbLtevCfmgvx+pTHgFn/LO/xlnYIyyUdJnc9huzjC8f1XR1S7o9GcXJxVs7xwiwkpUMMN1INP3GrVdlG3SjalA==",- "requires": {- "@tagspaces/tagspaces-common": "^4.5.52",- "adm-zip": "0.5.10",- "fs-extra": "^10.0.0",- "klaw": "^4.1.0"- }- }}},"@tagspaces/tagspaces-ws": {- "version": "4.5.51",- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.51.tgz",- "integrity": "sha512-E4h2np/ZlpH4qygnbRZm4JuABFPvCH59Q8tCNvXhvwi4YJjxtEbCkN/lCfjLIGn017PG2vWGf+40SlJHi7Xh6A==",+ "version": "4.5.54",+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.5.54.tgz",+ "integrity": "sha512-8j5W8oPNGsha5nKqvH8aq0uzwigea1hdobjrplZCwu2hJ1JBc9oa43LRpd/VJlM3lOgLXx+PfX44glt191ozpg==","requires": {- "@tagspaces/tagspaces-indexer": "^4.5.51",- "@tagspaces/tagspaces-pdf-extraction": "^4.5.27",- "@tagspaces/tagspaces-workers": "^4.5.51",+ "@tagspaces/tagspaces-indexer": "^4.5.54",+ "@tagspaces/tagspaces-pdf-extraction": "^4.5.53",+ "@tagspaces/tagspaces-workers": "^4.5.54","find-free-ports": "^3.1.1","jsonwebtoken": "^8.5.1","ws": "^8.15.1"@@ -2718,9 +2694,9 @@"integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="},"nwsapi": {- "version": "2.2.18",- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.18.tgz",- "integrity": "sha512-p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA=="+ "version": "2.2.19",+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.19.tgz",+ "integrity": "sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA=="},"once": {"version": "1.4.0",@@ -3048,9 +3024,9 @@}},"tr46": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",- "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",+ "version": "5.1.0",+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz",+ "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==","requires": {"punycode": "^2.3.1"}@@ -3105,11 +3081,11 @@"integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg=="},"whatwg-url": {- "version": "14.1.1",- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz",- "integrity": "sha512-mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==",+ "version": "14.2.0",+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",+ "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==","requires": {- "tr46": "^5.0.0",+ "tr46": "^5.1.0","webidl-conversions": "^7.0.0"}},diff --git a/release/app/package.json b/release/app/package.jsonindex 8198ad394..87131c28c 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.168",- "@tagspaces/tagspaces-common-node": "4.5.51",- "@tagspaces/tagspaces-ws": "4.5.51",+ "@tagspaces/tagspaces-common-node": "4.5.54",+ "@tagspaces/tagspaces-ws": "4.5.54","sharp": "0.32.6","ws": "8.18.1"},diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsxindex d71004e4a..80fac772c 100644--- a/src/renderer/hooks/IOActionsContextProvider.tsx+++ b/src/renderer/hooks/IOActionsContextProvider.tsx@@ -605,90 +605,101 @@ export const IOActionsContextProvider = ({force,).then((moveArray) => {- if (moveArray !== undefined) {- showNotification(t('core:filesMovedSuccessful'));- const moveMetaJobs = [];- moveJobs.map((job) => {- // Move revisions- location- .loadFileMetaDataPromise(job[0])- .then((fsEntryMeta: TS.FileSystemEntryMeta) => {- if (fsEntryMeta.id) {- const backupDir = getBackupFileDir(- job[0],- fsEntryMeta.id,- location.getDirSeparator(),- );- const newBackupDir = getBackupFileDir(- job[1],- fsEntryMeta.id,- location.getDirSeparator(),- );- return moveDirectoryPromise({ path: backupDir }, newBackupDir)- .then(() => {- console.log(- 'Moving revisions successful from ' +- backupDir +- ' to ' +- newBackupDir,- );- return true;- })- .catch((err) => {- console.log('Moving revisions failed ', err);- });- }+ if (moveArray !== undefined && moveArray.length > 0) {+ const moveError = moveArray.find((err) => err instanceof Error);+ if (!moveError) {+ showNotification(t('core:filesMovedSuccessful'));+ const moveMetaJobs = [];+ moveJobs.map((job) => {+ // Move revisions+ location+ .loadFileMetaDataPromise(job[0])+ .then((fsEntryMeta: TS.FileSystemEntryMeta) => {+ if (fsEntryMeta.id) {+ const backupDir = getBackupFileDir(+ job[0],+ fsEntryMeta.id,+ location.getDirSeparator(),+ );+ const newBackupDir = getBackupFileDir(+ job[1],+ fsEntryMeta.id,+ location.getDirSeparator(),+ );+ return moveDirectoryPromise(+ { path: backupDir },+ newBackupDir,+ )+ .then(() => {+ console.log(+ 'Moving revisions successful from ' ++ backupDir ++ ' to ' ++ newBackupDir,+ );+ return true;+ })+ .catch((err) => {+ console.log('Moving revisions failed ', err);+ });+ }+ })+ .catch((err) => {+ console.log('loadFileMetaDataPromise', err);+ });++ // move meta+ moveMetaJobs.push([+ getMetaFileLocationForFile(job[0], location.getDirSeparator()),+ getMetaFileLocationForFile(job[1], location.getDirSeparator()),+ ]);+ // move thumb+ moveMetaJobs.push([+ getThumbFileLocationForFile(+ job[0],+ location.getDirSeparator(),+ false,+ ),+ getThumbFileLocationForFile(+ job[1],+ location.getDirSeparator(),+ false,+ ),+ ]);+ // move pdf.txt+ moveMetaJobs.push([+ getMetaContentFileLocation(+ job[0],+ currentLocation?.getDirSeparator(),+ ),+ getMetaContentFileLocation(+ job[1],+ currentLocation?.getDirSeparator(),+ ),+ ]);+ return true;+ });+ return moveFilesPromise(+ moveMetaJobs,+ location.uuid,+ undefined,+ false,+ true,+ )+ .then(() => {+ console.log('Moving meta and thumbs successful');+ return reflect && reflectMoveFiles(moveJobs);}).catch((err) => {- console.log('loadFileMetaDataPromise', err);+ console.log('At least one meta or thumb was not moved ', err);+ return reflect && reflectMoveFiles(moveJobs);});-- // move meta- moveMetaJobs.push([- getMetaFileLocationForFile(job[0], location.getDirSeparator()),- getMetaFileLocationForFile(job[1], location.getDirSeparator()),- ]);- // move thumb- moveMetaJobs.push([- getThumbFileLocationForFile(- job[0],- location.getDirSeparator(),- false,- ),- getThumbFileLocationForFile(- job[1],- location.getDirSeparator(),- false,- ),- ]);- // move pdf.txt- moveMetaJobs.push([- getMetaContentFileLocation(- job[0],- currentLocation?.getDirSeparator(),- ),- getMetaContentFileLocation(- job[1],- currentLocation?.getDirSeparator(),- ),- ]);- return true;- });- return moveFilesPromise(- moveMetaJobs,- location.uuid,- undefined,- false,- true,- )- .then(() => {- console.log('Moving meta and thumbs successful');- return reflect && reflectMoveFiles(moveJobs);- })- .catch((err) => {- console.log('At least one meta or thumb was not moved ', err);- return reflect && reflectMoveFiles(moveJobs);- });+ } else {+ showNotification(+ t('core:copyingFilesFailed') + ' ' + moveError.message,+ );+ return false;+ }} else {showNotification(t('core:copyingFilesFailed'));return false;@@ -821,7 +832,7 @@ export const IOActionsContextProvider = ({}).catch((err) => {console.log('Copy files failed', err);- showNotification(t('core:copyingFilesFailed'));+ showNotification(t('core:copyingFilesFailed') + ' ' + err.message);return false;});}@@ -1594,7 +1605,7 @@ export const IOActionsContextProvider = ({return openDirectory(dirPath);})*/.catch((error) => {- showNotification('Error creating duplicate: ', error);+ showNotification('Error creating duplicate: ' + error.message);});} else {showNotification('Unable to duplicate, no file selected');diff --git a/src/renderer/hooks/PlatformFacadeContextProvider.tsx b/src/renderer/hooks/PlatformFacadeContextProvider.tsxindex 4e8030f7e..354060672 100644--- a/src/renderer/hooks/PlatformFacadeContextProvider.tsx+++ b/src/renderer/hooks/PlatformFacadeContextProvider.tsx@@ -85,7 +85,7 @@ type PlatformFacadeContextData = {locationID: string,onProgress?,reflect?,- ) => Promise<any>;+ ) => Promise<any[]>;moveFilePromise: (param: PlatformParms,newFilePath: string,@@ -98,7 +98,7 @@ type PlatformFacadeContextData = {onProgress?,reflect?,force?,- ) => Promise<any>;+ ) => Promise<any[]>;reflectMoveFiles: (moveJobs: Array<Array<string>>) => Promise<boolean>;renameDirectoryPromise: (param: PlatformParms,@@ -349,6 +349,7 @@ export const PlatformFacadeContextProvider = ({progress(completed, path);}console.log('Promise ' + path + ' error:', err);+ throw err; //return err;}),);@@ -426,7 +427,7 @@ export const PlatformFacadeContextProvider = ({locationID: string = undefined,onProgress = undefined,reflect = true,- ): Promise<any> {+ ): Promise<any[]> {const flatArray = renameJobs.flat();ignoreByWatcher(...flatArray);const location = getLocation({ locationID });@@ -440,7 +441,7 @@ export const PlatformFacadeContextProvider = ({);} catch (err) {console.log('Error rename file:', err);- return false;+ return err; //false;}}),).then((ret) => {@@ -481,7 +482,7 @@ export const PlatformFacadeContextProvider = ({onProgress = undefined,reflect = true,force = false,- ): Promise<any> {+ ): Promise<any[]> {const flatArray = renameJobs.flat();ignoreByWatcher(...flatArray);return executePromisesInBatches(@@ -495,7 +496,7 @@ export const PlatformFacadeContextProvider = ({);} catch (err) {console.log('Error rename file:', err);- return undefined;+ return err; //undefined;}}),).then((ret) => {