Merge branch 'master' into feature/ocr

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "omnisearch",
 	"name": "Omnisearch",
-	"version": "1.7.8",
+	"version": "1.7.10",
 	"minAppVersion": "1.0.0",
 	"description": "A search engine that just works",
 	"author": "Simon Cambier",

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "omnisearch",
 	"name": "Omnisearch",
-	"version": "1.7.8",
+	"version": "1.7.10",
 	"minAppVersion": "1.0.0",
 	"description": "A search engine that just works",
 	"author": "Simon Cambier",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scambier.obsidian-search",
-  "version": "1.7.8",
+  "version": "1.7.10",
   "description": "A search engine for Obsidian",
   "main": "dist/main.js",
   "scripts": {

src/search/search-engine.ts

@@ -48,8 +48,8 @@ export const minisearchOptions: Options<IndexedDocument> = {
 }
 
 export class SearchEngine {
-  private static engine: SearchEngine
+  private static engine?: SearchEngine
-  private static tmpEngine: SearchEngine
+  private static tmpEngine?: SearchEngine
   public static isIndexing = writable(true)
 
   /**
@@ -92,12 +92,12 @@ export class SearchEngine {
    * Loads the freshest indexed data into the main instance.
    */
   public static loadTmpDataIntoMain(): void {
-    const tmpData = this.tmpEngine.minisearch.toJSON()
+    const tmpData = this.getTmpEngine().minisearch.toJSON()
-    this.engine.minisearch = MiniSearch.loadJS(tmpData, minisearchOptions)
+    this.getEngine().minisearch = MiniSearch.loadJS(tmpData, minisearchOptions)
   }
 
   public static clearTmp(): void {
-    this.tmpEngine.minisearch = new MiniSearch(minisearchOptions)
+    this.getTmpEngine().minisearch = new MiniSearch(minisearchOptions)
   }
 
   private minisearch: MiniSearch

src/settings.ts

@@ -134,7 +134,7 @@ export class SettingsTab extends PluginSettingTab {
     new Setting(containerEl)
       .setName('Retry queries that return zero result')
       .setDesc(
-        `When a query returns zero result, Omnisearch will try again (but harder). Enabling this may incur some freezes.`
+        `When a query returns zero result, Omnisearch will try again (but harder). Disabling this can improve search reactivity.`
       )
       .addToggle(toggle =>
         toggle.setValue(settings.retryWhenZeroResult).onChange(async v => {
@@ -143,27 +143,29 @@ export class SettingsTab extends PluginSettingTab {
         })
       )
 
-    // PDF Indexing
+    // PDF Indexing - disabled on iOS
-    const indexPDFsDesc = new DocumentFragment()
+    if (!Platform.isIosApp) {
-    indexPDFsDesc.createSpan({}, span => {
+      const indexPDFsDesc = new DocumentFragment()
-      span.innerHTML = `Omnisearch will include PDFs in search results.
+      indexPDFsDesc.createSpan({}, span => {
-      <ul>
+        span.innerHTML = `Omnisearch will include PDFs in search results.
-        <li>⚠️ Depending on their size, PDFs can take anywhere from a few seconds to 2 minutes to be processed.</li>
+        <ul>
-        <li>⚠️ Texts extracted from PDFs may contain errors such as missing spaces, or spaces in the middle of words.</li>
+          <li>⚠️ Depending on their size, PDFs can take anywhere from a few seconds to 2 minutes to be processed.</li>
-        <li>⚠️ Some PDFs can't be processed correctly and will return an empty text.</li>
+          <li>⚠️ Texts extracted from PDFs may contain errors such as missing spaces, or spaces in the middle of words.</li>
-        <li>This feature is currently a work-in-progress, please report issues that you might experience.</li>
+          <li>⚠️ Some PDFs can't be processed correctly and will return an empty text.</li>
-      </ul>
+          <li>This feature is currently a work-in-progress, please report issues that you might experience.</li>
-       <strong style="color: var(--text-accent)">Needs a restart to fully take effect.</strong>`
+        </ul>
-    })
+        <strong style="color: var(--text-accent)">Needs a restart to fully take effect.</strong>`
-    new Setting(containerEl)
+      })
-      .setName('BETA - PDF Indexing')
+      new Setting(containerEl)
-      .setDesc(indexPDFsDesc)
+        .setName('BETA - PDF Indexing')
-      .addToggle(toggle =>
+        .setDesc(indexPDFsDesc)
-        toggle.setValue(settings.PDFIndexing).onChange(async v => {
+        .addToggle(toggle =>
-          settings.PDFIndexing = v
+          toggle.setValue(settings.PDFIndexing).onChange(async v => {
-          await saveSettings(this.plugin)
+            settings.PDFIndexing = v
-        })
+            await saveSettings(this.plugin)
-      )
+          })
+        )
+    }
     // #endregion Behavior
 
     // #region User Interface
@@ -308,7 +310,7 @@ export const DEFAULT_SETTINGS: OmnisearchSettings = {
   showExcerpt: true,
   showCreateButton: false,
   showPreviousQueryResults: true,
-  retryWhenZeroResult: false,
+  retryWhenZeroResult: true,
 
   weightBasename: 2,
   weightH1: 1.5,
@@ -324,6 +326,12 @@ export let settings = Object.assign({}, DEFAULT_SETTINGS) as OmnisearchSettings
 
 export async function loadSettings(plugin: Plugin): Promise<void> {
   settings = Object.assign({}, DEFAULT_SETTINGS, await plugin.loadData())
+
+  // Make sure that PDF indexing is disabled on iOS
+  if (Platform.isIosApp) {
+    settings.PDFIndexing = false
+  }
+
   showExcerpt.set(settings.showExcerpt)
 }
 

versions.json

@@ -66,5 +66,7 @@
 	"1.7.5": "1.0.0",
 	"1.7.6": "1.0.0",
 	"1.7.7": "1.0.0",
-	"1.7.8": "1.0.0"
+	"1.7.8": "1.0.0",
+	"1.7.9": "1.0.0",
+	"1.7.10": "1.0.0"
 }