From 09322396f692cbb4bc53d0237c64819d2b5f8ec4 Mon Sep 17 00:00:00 2001 From: Simon Cambier Date: Sat, 17 Jun 2023 19:26:51 +0200 Subject: [PATCH 1/4] 1.15.0-beta.1 manifest --- manifest-beta.json | 2 +- versions.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifest-beta.json b/manifest-beta.json index 72ef329..7aa2cd1 100644 --- a/manifest-beta.json +++ b/manifest-beta.json @@ -1,7 +1,7 @@ { "id": "omnisearch", "name": "Omnisearch", - "version": "1.14.2", + "version": "1.15.0-beta.1", "minAppVersion": "1.0.0", "description": "A search engine that just works", "author": "Simon Cambier", diff --git a/versions.json b/versions.json index 29feac9..24ae378 100644 --- a/versions.json +++ b/versions.json @@ -109,5 +109,6 @@ "1.14.1-beta.1": "1.0.0", "1.14.1-beta.2": "1.0.0", "1.14.1": "1.0.0", - "1.14.2": "1.0.0" + "1.14.2": "1.0.0", + "1.15.0-beta.1": "1.0.0" } \ No newline at end of file From a7c3826a1d02e1e078dcd1dfeb2c4d59c471ea0f Mon Sep 17 00:00:00 2001 From: Simon Cambier Date: Tue, 18 Jul 2023 07:47:22 +0200 Subject: [PATCH 2/4] 1.15.0-beta.2 manifest --- manifest-beta.json | 2 +- versions.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifest-beta.json b/manifest-beta.json index 7aa2cd1..19d8268 100644 --- a/manifest-beta.json +++ b/manifest-beta.json @@ -1,7 +1,7 @@ { "id": "omnisearch", "name": "Omnisearch", - "version": "1.15.0-beta.1", + "version": "1.15.0-beta.2", "minAppVersion": "1.0.0", "description": "A search engine that just works", "author": "Simon Cambier", diff --git a/versions.json b/versions.json index 24ae378..9898fa6 100644 --- a/versions.json +++ b/versions.json @@ -110,5 +110,6 @@ "1.14.1-beta.2": "1.0.0", "1.14.1": "1.0.0", "1.14.2": "1.0.0", - "1.15.0-beta.1": "1.0.0" + "1.15.0-beta.1": "1.0.0", + "1.15.0-beta.2": "1.0.0" } \ No newline at end of file From 3ac85e7aa8612177af05b46b58db0b5c9559db32 Mon Sep 17 00:00:00 2001 From: Simon Cambier Date: Sat, 22 Jul 2023 23:04:30 +0200 Subject: [PATCH 3/4] #74 - boost unmarked tags --- src/cache-manager.ts | 4 +++- src/components/ResultItemContainer.svelte | 1 + src/globals.ts | 1 + src/search/omnisearch.ts | 2 +- src/settings.ts | 14 ++++++++++++-- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/cache-manager.ts b/src/cache-manager.ts index e2a7ca5..7b5502a 100644 --- a/src/cache-manager.ts +++ b/src/cache-manager.ts @@ -96,13 +96,15 @@ async function getAndMapIndexedDocument( } } + const tags = getTagsFromMetadata(metadata) return { basename: removeDiacritics(file.basename), content, path: file.path, mtime: file.stat.mtime, - tags: getTagsFromMetadata(metadata), + tags: tags, + unmarkedTags: tags.map(t => t.replace('#', '')), aliases: getAliasesFromMetadata(metadata).join(''), headings1: metadata ? extractHeadingsFromCache(metadata, 1).join(' ') : '', headings2: metadata ? extractHeadingsFromCache(metadata, 2).join(' ') : '', diff --git a/src/components/ResultItemContainer.svelte b/src/components/ResultItemContainer.svelte index b5c2449..230b396 100644 --- a/src/components/ResultItemContainer.svelte +++ b/src/components/ResultItemContainer.svelte @@ -12,6 +12,7 @@ class:is-selected={selected} on:mousemove on:click + on:keypress on:auxclick> {#if glyph} diff --git a/src/globals.ts b/src/globals.ts index db14f9b..fbc6ff6 100644 --- a/src/globals.ts +++ b/src/globals.ts @@ -42,6 +42,7 @@ export type IndexedDocument = { content: string aliases: string tags: string[] + unmarkedTags: string[] headings1: string headings2: string headings3: string diff --git a/src/search/omnisearch.ts b/src/search/omnisearch.ts index 3094682..113152e 100644 --- a/src/search/omnisearch.ts +++ b/src/search/omnisearch.ts @@ -196,6 +196,7 @@ export class Omnisearch { headings1: settings.weightH1, headings2: settings.weightH2, headings3: settings.weightH3, + unmarkedTags: settings.weightUnmarkedTags }, }) @@ -210,7 +211,6 @@ export class Omnisearch { ext.startsWith(e.startsWith('.') ? e : '.' + e) ) }) - console.log(query.query.ext, results.length) } // Filter query results that match the path diff --git a/src/settings.ts b/src/settings.ts index 32d2485..f523d4b 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -7,7 +7,11 @@ import { } from 'obsidian' import { writable } from 'svelte/store' import { database } from './database' -import { K_DISABLE_OMNISEARCH, getTextExtractor, isCacheEnabled } from './globals' +import { + K_DISABLE_OMNISEARCH, + getTextExtractor, + isCacheEnabled, +} from './globals' import type OmnisearchPlugin from './main' interface WeightingSettings { @@ -16,6 +20,7 @@ interface WeightingSettings { weightH1: number weightH2: number weightH3: number + weightUnmarkedTags: number } export interface OmnisearchSettings extends WeightingSettings { @@ -376,6 +381,10 @@ export class SettingsTab extends PluginSettingTab { .setName(`Headings level 3 (default: ${DEFAULT_SETTINGS.weightH3})`) .addSlider(cb => this.weightSlider(cb, 'weightH3')) + new Setting(containerEl) + .setName(`Tags without the # (default: ${DEFAULT_SETTINGS.weightUnmarkedTags})`) + .addSlider(cb => this.weightSlider(cb, 'weightUnmarkedTags')) + //#endregion Results Weighting //#region Debugging @@ -473,6 +482,7 @@ export const DEFAULT_SETTINGS: OmnisearchSettings = { weightH1: 1.5, weightH2: 1.3, weightH3: 1.1, + weightUnmarkedTags: 1.1, welcomeMessage: '', verboseLogging: false, @@ -491,4 +501,4 @@ export async function saveSettings(plugin: Plugin): Promise { export function isPluginDisabled(): boolean { return app.loadLocalStorage(K_DISABLE_OMNISEARCH) == '1' -} \ No newline at end of file +} From 5a574cb7d99e196cc78c2d6848054dc087488d15 Mon Sep 17 00:00:00 2001 From: Simon Cambier Date: Sat, 22 Jul 2023 23:18:36 +0200 Subject: [PATCH 4/4] 1.15.0 --- manifest-beta.json | 2 +- manifest.json | 2 +- package.json | 2 +- versions.json | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manifest-beta.json b/manifest-beta.json index 19d8268..f59113d 100644 --- a/manifest-beta.json +++ b/manifest-beta.json @@ -1,7 +1,7 @@ { "id": "omnisearch", "name": "Omnisearch", - "version": "1.15.0-beta.2", + "version": "1.15.0", "minAppVersion": "1.0.0", "description": "A search engine that just works", "author": "Simon Cambier", diff --git a/manifest.json b/manifest.json index 6708391..b2d112f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "omnisearch", "name": "Omnisearch", - "version": "1.14.2", + "version": "1.15.0", "minAppVersion": "1.0.0", "description": "A search engine that just works", "author": "Simon Cambier", diff --git a/package.json b/package.json index 60f2f13..4ea1874 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scambier.obsidian-search", - "version": "1.15.0-beta.2", + "version": "1.15.0", "description": "A search engine for Obsidian", "main": "dist/main.js", "scripts": { diff --git a/versions.json b/versions.json index 9898fa6..f3cd249 100644 --- a/versions.json +++ b/versions.json @@ -111,5 +111,6 @@ "1.14.1": "1.0.0", "1.14.2": "1.0.0", "1.15.0-beta.1": "1.0.0", - "1.15.0-beta.2": "1.0.0" + "1.15.0-beta.2": "1.0.0", + "1.15.0": "1.0.0" } \ No newline at end of file