From 4238bc510e516a439e33948a40df63c34eee460a Mon Sep 17 00:00:00 2001
From: Simon Cambier <simon.cambier@protonmail.com>
Date: Thu, 21 Apr 2022 19:42:54 +0200
Subject: [PATCH] Removed duplicated code

---
 src/CmpResultInFile.svelte | 19 +++----------------
 src/CmpResultNote.svelte   | 19 +++----------------
 src/utils.ts               | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/CmpResultInFile.svelte b/src/CmpResultInFile.svelte
index 4b37567..ac4afe9 100644
--- a/src/CmpResultInFile.svelte
+++ b/src/CmpResultInFile.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { createEventDispatcher } from "svelte"
-import { excerptAfter, excerptBefore, type ResultNote } from "./globals"
-import { escapeHTML, highlighter, stringsToRegex } from "./utils"
+import type { ResultNote } from "./globals"
+import { highlighter, makeExcerpt, stringsToRegex } from "./utils"
 
 const dispatch = createEventDispatcher()
 export let offset: number
@@ -10,19 +10,6 @@ export let index = 0
 export let selected = false
 
 $: reg = stringsToRegex(note.foundWords)
-
-function cleanContent(content: string): string {
-  const pos = offset ?? -1
-  if (pos > -1) {
-    const from = Math.max(0, pos - excerptBefore)
-    const to = Math.min(content.length - 1, pos + excerptAfter)
-    content =
-      (from > 0 ? "…" : "") +
-      content.slice(from, to).trim() +
-      (to < content.length - 1 ? "…" : "")
-  }
-  return escapeHTML(content)
-}
 </script>
 
 <div
@@ -33,6 +20,6 @@ function cleanContent(content: string): string {
   on:click={(e) => dispatch("click")}
 >
   <div class="omnisearch-result__body">
-    {@html cleanContent(note?.content ?? "").replace(reg, highlighter)}
+    {@html makeExcerpt(note?.content ?? "", offset).replace(reg, highlighter)}
   </div>
 </div>
diff --git a/src/CmpResultNote.svelte b/src/CmpResultNote.svelte
index abf9da1..08ddba4 100644
--- a/src/CmpResultNote.svelte
+++ b/src/CmpResultNote.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { createEventDispatcher } from "svelte"
-import { excerptAfter, excerptBefore, type ResultNote } from "./globals"
+import type { ResultNote } from "./globals"
 import { getMatches } from "./search"
-import { escapeHTML, highlighter, stringsToRegex } from "./utils"
+import { highlighter, makeExcerpt, stringsToRegex } from "./utils"
 
 const dispatch = createEventDispatcher()
 export let selected = false
@@ -10,20 +10,7 @@ export let note: ResultNote
 
 $: reg = stringsToRegex(note.foundWords)
 $: matches = getMatches(note.content, reg)
-$: cleanedContent = cleanContent(note.content)
-
-function cleanContent(content: string): string {
-  const pos = note.matches[0]?.offset ?? -1
-  if (pos > -1) {
-    const from = Math.max(0, pos - excerptBefore)
-    const to = Math.min(content.length - 1, pos + excerptAfter)
-    content =
-      (from > 0 ? "…" : "") +
-      content.slice(from, to).trim() +
-      (to < content.length - 1 ? "…" : "")
-  }
-  return escapeHTML(content)
-}
+$: cleanedContent = makeExcerpt(note.content, note.matches[0]?.offset ?? -1)
 </script>
 
 <div
diff --git a/src/utils.ts b/src/utils.ts
index 500930b..73e9dcb 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,5 +1,7 @@
 import type { CachedMetadata } from 'obsidian'
 import {
+  excerptAfter,
+  excerptBefore,
   highlightClass,
   isSearchMatch,
   regexLineSplit,
@@ -82,3 +84,16 @@ export function extractHeadingsFromCache(
 export function loopIndex(index: number, nbItems: number): number {
   return (index + nbItems) % nbItems
 }
+
+export function makeExcerpt(content: string, offset: number): string {
+  const pos = offset ?? -1
+  if (pos > -1) {
+    const from = Math.max(0, pos - excerptBefore)
+    const to = Math.min(content.length - 1, pos + excerptAfter)
+    content =
+      (from > 0 ? '…' : '') +
+      content.slice(from, to).trim() +
+      (to < content.length - 1 ? '…' : '')
+  }
+  return escapeHTML(content)
+}