From 75adf8185aa9f5a0d37fed2ff731030af8b663dc Mon Sep 17 00:00:00 2001
From: MohitMali <futuretechnoworld.mohit@gmail.com>
Date: Mon, 24 Jul 2023 14:35:42 +0530
Subject: [PATCH] Refactored search functionality according to the new wrapper

---
 app/build.gradle.kts                          |  3 +-
 core/build.gradle.kts                         |  5 ++--
 .../kiwixmobile/core/reader/ZimFileReader.kt  |  2 +-
 .../search/viewmodel/SearchResultGenerator.kt | 29 +++----------------
 4 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c6b88b694..cbcbf8a76 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -100,9 +100,8 @@ play {
 
 dependencies {
   androidTestImplementation(Libs.leakcanary_android_instrumentation)
+  implementation(files("/home/hp-pc03/Desktop/lib-debug.aar"))
   api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
-  implementation("com.getkeepsafe.relinker:relinker:1.4.5")
-  implementation(files("C:\\Users\\aades\\OneDrive\\Documents/lib-debug.aar"))
 }
 task("generateVersionCodeAndName") {
   val file = File("VERSION_INFO")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 48f440cd0..3b528d265 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -65,10 +65,9 @@ dependencies {
   // } else {
   //   api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
   // }
-
-  api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
+  implementation(files("/home/hp-pc03/Desktop/lib-debug.aar"))
   implementation("com.getkeepsafe.relinker:relinker:1.4.5")
-  implementation(files("C:\\Users\\aades\\OneDrive\\Documents/lib-debug.aar"))
+  api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
 
   // Document File
   implementation(Libs.select_folder_document_file)
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
index bc1d2e6ce..8f2d13f1b 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
@@ -137,7 +137,7 @@ class ZimFileReader constructor(
     }
 
   fun searchSuggestions(prefix: String): Search =
-    searcher.search(Query(prefix).setQuery(prefix))
+    searcher.search(Query(prefix))
 
   fun getNextSuggestion(suggestionSearch: SuggestionSearch?): List<SearchSuggestion> {
     val suggestionList = mutableListOf<SearchSuggestion>()
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt
index b45fcc074..fdb6adc00 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt
@@ -24,7 +24,6 @@ import kotlinx.coroutines.yield
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.search.adapter.SearchListItem
 import org.kiwix.kiwixmobile.core.search.adapter.SearchListItem.ZimSearchResultListItem
-import org.kiwix.libzim.SuggestionSearch
 import javax.inject.Inject
 
 interface SearchResultGenerator {
@@ -53,32 +52,12 @@ class ZimSearchResultGenerator @Inject constructor() : SearchResultGenerator {
         val suggestionList = mutableListOf<ZimSearchResultListItem>()
         val suggestionIterator =
           this?.getResults(0, this.estimatedMatches.toInt())
-        if (suggestionIterator != null) {
-          while (suggestionIterator.hasNext()) {
-            suggestionList.add(ZimSearchResultListItem(suggestionIterator.title))
+        suggestionIterator?.let {
+          while (it.hasNext()) {
+            val entry = it.next()
+            suggestionList.add(ZimSearchResultListItem(entry.title))
           }
         }
         return@run suggestionList
       }
-
-  private suspend fun suggestionResults(
-    reader: ZimFileReader?,
-    suggestionSearch: SuggestionSearch?
-  ) = createList {
-    yield()
-    reader?.getNextSuggestion(suggestionSearch)
-      ?.let {
-        ZimSearchResultListItem(it[0].title)
-      }
-  }
-    .distinct()
-    .toList()
-
-  private suspend fun <T> createList(readSearchResult: suspend () -> T?): List<T> {
-    return mutableListOf<T>().apply {
-      while (true) {
-        readSearchResult()?.let(::add) ?: break
-      }
-    }
-  }
 }