Skip to content

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

fix: searching for entry description

Ilian Sapundshiev12ffbc1b7abc
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 5408ab252..1ac73eb14 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tagspaces",
- "version": "5.8.3",
+ "version": "5.8.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "5.8.3",
+ "version": "5.8.4",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
diff --git a/src/renderer/services/search.ts b/src/renderer/services/search.ts
index fd2875732..5dd84a247 100644
--- a/src/renderer/services/search.ts
+++ b/src/renderer/services/search.ts
@@ -159,26 +159,32 @@ const fuseOptions = {
keys: [
{
name: 'name',
+ getFn: (entry) => entry.name,
weight: 0.2,
},
+ {
+ name: 'id',
+ getFn: (entry) => entry.meta?.id,
+ weight: 0.1,
+ },
{
name: 'description',
+ getFn: (entry) => entry.meta?.description,
weight: 0.2,
},
{
name: 'textContent',
+ getFn: (entry) => entry.textContent,
weight: 0.2,
},
{
name: 'tags',
+ getFn: (entry) => entry.tags?.title,
weight: 0.2,
},
{
name: 'path', // TODO ignore .ts folder, should not be in the index
- weight: 0.1,
- },
- {
- name: 'uuid',
+ getFn: (entry) => entry.path,
weight: 0.1,
},
],
@@ -406,26 +412,31 @@ export default class Search {
? searchQuery.textQuery.toLowerCase()
: searchQuery.textQuery;
// const name = ignoreCase ? entry.name && entry.name.toLowerCase() : entry.name;
- const description =
- ignoreCase && entry.description
- ? entry.description.toLowerCase()
- : entry.description;
- const textContent =
- ignoreCase && entry.textContent
- ? entry.textContent.toLowerCase()
- : entry.textContent;
- const uuid =
- ignoreCase && entry.uuid ? entry.uuid.toLowerCase() : entry.uuid;
- const path = ignoreCase
- ? entry.path && entry.path.toLowerCase()
- : entry.path;
+ let description = entry.meta?.description;
+ if (ignoreCase && description) {
+ description = description.toLowerCase();
+ }
+ let metaId = entry.meta?.id;
+ if (ignoreCase && metaId) {
+ metaId = metaId.toLowerCase();
+ }
+ let textContent = entry.textContent;
+ if (ignoreCase && textContent) {
+ textContent = textContent.toLowerCase();
+ }
+ let path = entry.path;
+ if (ignoreCase && path) {
+ path = path.toLowerCase();
+ }
// const foundInName = name && name.includes(textQuery);
const foundInDescr = description && description.includes(textQuery);
- const foundInUuid = uuid && uuid.includes(textQuery);
+ const foundInMetaId = metaId && metaId.includes(textQuery);
const foundInContent =
textContent && textContent.includes(textQuery);
const foundInPath = path && path.includes(textQuery);
- return foundInPath || foundInDescr || foundInContent || foundInUuid; // || foundInName;
+ return (
+ foundInPath || foundInDescr || foundInContent || foundInMetaId
+ ); // || foundInName;
});
} else {
const fuse = new Fuse(results, fuseOptions);