From c82d7db570d53099bb3fad96029ce1d438b04d8c Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 9 Aug 2020 11:58:50 -0400
Subject: [PATCH] Bubble up sources with results in global search (closes
 #3598)

(cherry picked from commit 9376b223bb88c4923b4a8b9d2e00c50f2ce276d6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
---
 .../globalsearch/GlobalSearchPresenter.kt     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
index 409e4adde..fa5e2330f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
@@ -106,16 +106,10 @@ open class GlobalSearchPresenter(
         val disabledSourceIds = preferences.disabledSources().get()
         val pinnedSourceIds = preferences.pinnedSources().get()
 
-        val list = sourceManager.getVisibleCatalogueSources()
+        return sourceManager.getVisibleCatalogueSources()
             .filter { it.lang in languages }
             .filterNot { it.id.toString() in disabledSourceIds }
-            .sortedBy { "(${it.lang}) ${it.name}" }
-
-        return if (preferences.searchPinnedSourcesOnly()) {
-            list.filter { it.id.toString() in pinnedSourceIds }
-        } else {
-            list.sortedBy { it.id.toString() !in pinnedSourceIds }
-        }
+            .sortedWith(compareBy({ it.id.toString() !in pinnedSourceIds }, { "${it.name} (${it.lang})" }))
     }
 
     private fun getSourcesToQuery(): List<CatalogueSource> {
@@ -169,6 +163,8 @@ open class GlobalSearchPresenter(
         val initialItems = sources.map { createCatalogueSearchItem(it, null) }
         var items = initialItems
 
+        val pinnedSourceIds = preferences.pinnedSources().get()
+
         fetchSourcesSubscription?.unsubscribe()
         fetchSourcesSubscription = Observable.from(sources)
             .flatMap(
@@ -186,7 +182,15 @@ open class GlobalSearchPresenter(
             .observeOn(AndroidSchedulers.mainThread())
             // Update matching source with the obtained results
             .map { result ->
-                items.map { item -> if (item.source == result.source) result else item }
+                items
+                    .map { item -> if (item.source == result.source) result else item }
+                    .sortedWith(compareBy(
+                        // Bubble up sources that actually have results
+                        { it.results.isNullOrEmpty() },
+                        // Same as initial sort, i.e. pinned first then alphabetically
+                        { it.source.id.toString() !in pinnedSourceIds },
+                        { "${it.source.name} (${it.source.lang})" }
+                    ))
             }
             // Update current state
             .doOnNext { items = it }