Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix create search index for location with relative paths https://github.com/tagspaces/tagspaces/issues/2133

sytolk899277e2658a
diff --git a/package-lock.json b/package-lock.json
index ced9b6c51..afd920629 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,10 +19,10 @@
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.3.25",
- "@tagspaces/tagspaces-common-aws3": "4.3.25",
- "@tagspaces/tagspaces-common-cordova": "4.3.25",
- "@tagspaces/tagspaces-indexer": "4.3.25",
+ "@tagspaces/tagspaces-common": "4.3.26",
+ "@tagspaces/tagspaces-common-aws3": "4.3.26",
+ "@tagspaces/tagspaces-common-cordova": "4.3.26",
+ "@tagspaces/tagspaces-indexer": "4.3.26",
"@tagspaces/tagspaces-md": "4.3.21",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
@@ -13741,9 +13741,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.25.tgz",
- "integrity": "sha512-YBfkpqjp3DUFYRlKCyh1Bu3MBy8Un8HS4j2Rd6DYsWobeJ5tMDDRjw03XDHYIdmxsU1X+atKB3r5tCbH5WIGQQ==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.26.tgz",
+ "integrity": "sha512-ml6JaMArt77T6SxrwAihB0HF2DiCYcR/zjAVXL/R83ETYzn+yx4B6etVAqMKYJ41tn4eGVR0SMFlDjpYrUsbAA==",
"dependencies": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -13751,11 +13751,11 @@
}
},
"node_modules/@tagspaces/tagspaces-common-aws3": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.3.25.tgz",
- "integrity": "sha512-+IS3EtTjHDtTYRQob1TJyCi+vuTiwvf0JhGms08fsW2gspryzkk9J9g9EOvJmv6Irb0Tqfcfig7ffuwQlYCHFg==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-aws3/-/tagspaces-common-aws3-4.3.26.tgz",
+ "integrity": "sha512-Mt96/CsjO+PlNqmnyrLh8hOqj6sQsaleMkPzsGuUiLNLyDuHgHaXb+pq2G3efPRB3PrndNO+eEW33llZgKNv4w==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.25",
+ "@tagspaces/tagspaces-common": "^4.3.26",
"aws-sdk": "2.1605.0"
}
},
@@ -13811,11 +13811,11 @@
}
},
"node_modules/@tagspaces/tagspaces-common-cordova": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.3.25.tgz",
- "integrity": "sha512-GsEPMv/ImEb+u0RSDOuYrYW2MjW6AuJPlp2RBeLdZHXRy7W+J43jqZofNRu7JAS8nbTO5e/nReLqJAn8Xv7yiw==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.3.26.tgz",
+ "integrity": "sha512-OpRIcFhnv0OTyXba2pUCi0IVaNCoxOufkiIDk5JFyKSjDP7l4G2kKkMxJDRA/sMDwyQn5xhayj9ImhpJBSrI9Q==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.25"
+ "@tagspaces/tagspaces-common": "^4.3.26"
}
},
"node_modules/@tagspaces/tagspaces-common/node_modules/uuid": {
@@ -13827,11 +13827,11 @@
}
},
"node_modules/@tagspaces/tagspaces-indexer": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.3.25.tgz",
- "integrity": "sha512-49T3d7SjxjUERrHrPQdnNbhxfQ7A4bGCRGakBZYcZfSySTS2qi+DM/AD6BZS0dQKkc44xg+d6gxJTv4Y4cbcMQ==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-indexer/-/tagspaces-indexer-4.3.26.tgz",
+ "integrity": "sha512-oRZ+3iiZNSYVY7PSQtReWSSM9Lq9xv3nW3uAP58foD3uXPmvzhT9+zD2DEV9q8uSh7C+/fGbdcGBRlSow+HUSg==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.25"
+ "@tagspaces/tagspaces-common": "^4.3.26"
}
},
"node_modules/@tagspaces/tagspaces-md": {
diff --git a/package.json b/package.json
index 10a729d95..c5a3f9bb1 100644
--- a/package.json
+++ b/package.json
@@ -160,10 +160,10 @@
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.3.25",
- "@tagspaces/tagspaces-common-aws3": "4.3.25",
- "@tagspaces/tagspaces-common-cordova": "4.3.25",
- "@tagspaces/tagspaces-indexer": "4.3.25",
+ "@tagspaces/tagspaces-common": "4.3.26",
+ "@tagspaces/tagspaces-common-aws3": "4.3.26",
+ "@tagspaces/tagspaces-common-cordova": "4.3.26",
+ "@tagspaces/tagspaces-indexer": "4.3.26",
"@tagspaces/tagspaces-md": "4.3.21",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 2b2be2064..fd51c0061 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,19 +1,19 @@
{
"name": "tagspaces",
- "version": "5.9.0",
+ "version": "5.9.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "5.9.0",
+ "version": "5.9.1",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
"@elife/pm2": "3.6.1",
"@tagspaces/extensions": "1.0.118",
- "@tagspaces/tagspaces-common-node": "4.3.25",
- "@tagspaces/tagspaces-ws": "4.3.25",
+ "@tagspaces/tagspaces-common-node": "4.3.26",
+ "@tagspaces/tagspaces-ws": "4.3.27",
"sharp": "0.32.6",
"ws": "8.16.0"
},
@@ -43,9 +43,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.25.tgz",
- "integrity": "sha512-YBfkpqjp3DUFYRlKCyh1Bu3MBy8Un8HS4j2Rd6DYsWobeJ5tMDDRjw03XDHYIdmxsU1X+atKB3r5tCbH5WIGQQ==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.26.tgz",
+ "integrity": "sha512-ml6JaMArt77T6SxrwAihB0HF2DiCYcR/zjAVXL/R83ETYzn+yx4B6etVAqMKYJ41tn4eGVR0SMFlDjpYrUsbAA==",
"dependencies": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -53,11 +53,11 @@
}
},
"node_modules/@tagspaces/tagspaces-common-node": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.25.tgz",
- "integrity": "sha512-IznvkDScMeZgNaLqJVmDGbuBZHX+dmV3cuHOzia+a+s2zSuGXTDfTKF2Kdt82CKjX7H6IAwd+L5g5mqUMfVt7w==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.26.tgz",
+ "integrity": "sha512-xsSNkFQzo2bcbHsAaAyWmLKrA3dGipnWft8eMNtiMa6lsemHjA1xTy4jxyvDviixBxwUcRwGofrqD/2xaEJxZg==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.25",
+ "@tagspaces/tagspaces-common": "^4.3.26",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0",
@@ -74,22 +74,22 @@
}
},
"node_modules/@tagspaces/tagspaces-workers": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.25.tgz",
- "integrity": "sha512-SPHY6ptKcefZV0aAAQhk0+TS25hAG2s1KCo+ZVjmyhjjpbDMf29Lg1DIx5uRK2hBFaTv/THrFes2Y4/0Nc9uRg==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.26.tgz",
+ "integrity": "sha512-hMGntLZLMaNedLqS6q5aYaeRz6VdJoz2gTSAR9CjNXKr079oYGkhmjwMCcG/vSCuBaCINN2bmHffeA5vqfrdrQ==",
"dependencies": {
- "@tagspaces/tagspaces-common": "^4.3.25",
- "@tagspaces/tagspaces-common-node": "^4.3.25",
+ "@tagspaces/tagspaces-common": "^4.3.26",
+ "@tagspaces/tagspaces-common-node": "^4.3.26",
"@tagspaces/tagspaces-thumbgen-image": "^4.2.3",
"fswin": "^3.24.524"
}
},
"node_modules/@tagspaces/tagspaces-ws": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.25.tgz",
- "integrity": "sha512-KZr5oTto1zBEki7OUC0ycv9ssslHqosN+yvmKaptn9nddjJcnlm/tFWeWkhqU9B+O7Ey/SGkjeRy6c/7SVfLgg==",
+ "version": "4.3.27",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.27.tgz",
+ "integrity": "sha512-+cSSD+noje1a87fv1lGC0U9ffxy+IBnWekqVDvHqnI3VAtzXaufpJz62CqL0coRIGCpFlso+6S15goeW7KF44w==",
"dependencies": {
- "@tagspaces/tagspaces-workers": "^4.3.25",
+ "@tagspaces/tagspaces-workers": "^4.3.26",
"find-free-ports": "^3.1.1",
"jsonwebtoken": "^8.5.1",
"ws": "^8.15.1"
@@ -1131,9 +1131,9 @@
}
},
"@tagspaces/tagspaces-common": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.25.tgz",
- "integrity": "sha512-YBfkpqjp3DUFYRlKCyh1Bu3MBy8Un8HS4j2Rd6DYsWobeJ5tMDDRjw03XDHYIdmxsU1X+atKB3r5tCbH5WIGQQ==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.3.26.tgz",
+ "integrity": "sha512-ml6JaMArt77T6SxrwAihB0HF2DiCYcR/zjAVXL/R83ETYzn+yx4B6etVAqMKYJ41tn4eGVR0SMFlDjpYrUsbAA==",
"requires": {
"dotenv": "^16.0.2",
"picomatch": "^3.0.1",
@@ -1141,11 +1141,11 @@
}
},
"@tagspaces/tagspaces-common-node": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.25.tgz",
- "integrity": "sha512-IznvkDScMeZgNaLqJVmDGbuBZHX+dmV3cuHOzia+a+s2zSuGXTDfTKF2Kdt82CKjX7H6IAwd+L5g5mqUMfVt7w==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-node/-/tagspaces-common-node-4.3.26.tgz",
+ "integrity": "sha512-xsSNkFQzo2bcbHsAaAyWmLKrA3dGipnWft8eMNtiMa6lsemHjA1xTy4jxyvDviixBxwUcRwGofrqD/2xaEJxZg==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.3.25",
+ "@tagspaces/tagspaces-common": "^4.3.26",
"adm-zip": "0.5.10",
"fs-extra": "^10.0.0",
"klaw": "^4.1.0",
@@ -1162,22 +1162,22 @@
}
},
"@tagspaces/tagspaces-workers": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.25.tgz",
- "integrity": "sha512-SPHY6ptKcefZV0aAAQhk0+TS25hAG2s1KCo+ZVjmyhjjpbDMf29Lg1DIx5uRK2hBFaTv/THrFes2Y4/0Nc9uRg==",
+ "version": "4.3.26",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-workers/-/tagspaces-workers-4.3.26.tgz",
+ "integrity": "sha512-hMGntLZLMaNedLqS6q5aYaeRz6VdJoz2gTSAR9CjNXKr079oYGkhmjwMCcG/vSCuBaCINN2bmHffeA5vqfrdrQ==",
"requires": {
- "@tagspaces/tagspaces-common": "^4.3.25",
- "@tagspaces/tagspaces-common-node": "^4.3.25",
+ "@tagspaces/tagspaces-common": "^4.3.26",
+ "@tagspaces/tagspaces-common-node": "^4.3.26",
"@tagspaces/tagspaces-thumbgen-image": "^4.2.3",
"fswin": "^3.24.524"
}
},
"@tagspaces/tagspaces-ws": {
- "version": "4.3.25",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.25.tgz",
- "integrity": "sha512-KZr5oTto1zBEki7OUC0ycv9ssslHqosN+yvmKaptn9nddjJcnlm/tFWeWkhqU9B+O7Ey/SGkjeRy6c/7SVfLgg==",
+ "version": "4.3.27",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-ws/-/tagspaces-ws-4.3.27.tgz",
+ "integrity": "sha512-+cSSD+noje1a87fv1lGC0U9ffxy+IBnWekqVDvHqnI3VAtzXaufpJz62CqL0coRIGCpFlso+6S15goeW7KF44w==",
"requires": {
- "@tagspaces/tagspaces-workers": "^4.3.25",
+ "@tagspaces/tagspaces-workers": "^4.3.26",
"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.json
index bf22945e5..c54091aa6 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.118",
- "@tagspaces/tagspaces-common-node": "4.3.25",
- "@tagspaces/tagspaces-ws": "4.3.25",
+ "@tagspaces/tagspaces-common-node": "4.3.26",
+ "@tagspaces/tagspaces-ws": "4.3.27",
"sharp": "0.32.6",
"ws": "8.16.0"
},
diff --git a/src/renderer/hooks/CurrentLocationContextProvider.tsx b/src/renderer/hooks/CurrentLocationContextProvider.tsx
index 502ba86b1..cd47d3fee 100644
--- a/src/renderer/hooks/CurrentLocationContextProvider.tsx
+++ b/src/renderer/hooks/CurrentLocationContextProvider.tsx
@@ -179,7 +179,9 @@ export const CurrentLocationContextProvider = ({
if (
locationPath &&
(locationPath.startsWith('.' + AppConfig.dirSeparator) ||
- locationPath.startsWith('./')) && // location paths are not with platform dirSeparator
+ locationPath.startsWith('./') ||
+ locationPath.startsWith('..' + AppConfig.dirSeparator) ||
+ locationPath.startsWith('../')) && // location paths are not with platform dirSeparator
AppConfig.isElectron
) {
// TODO test relative path (Directory Back) with other platforms