Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add local namespace searching.

Browse Source
This commit is contained in:
NerdNumber9 2017-02-28 16:56:29 -05:00
parent 8fa798cf63
commit 8a05fc8966
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/exh/search/SearchEngine.kt
View File

@ -49,13 +49,25 @@ class SearchEngine {
return false return false
} }
} else { } else {
//Match namespace if(component.tag!!.components.size > 0) {
val ns = metadata.tags.entries.asSequence().filter { //Match namespace
it.key == component.namespace val ns = metadata.tags.entries.asSequence().filter {
}.flatMap { it.value.asSequence() } it.key == component.namespace
//Match tags }.flatMap { it.value.asSequence() }
if (!matchTagList(ns, component.tag!!)) //Match tags
return false if (!matchTagList(ns, component.tag!!))
return false
} else {
//Perform namespace search
val hasNs = metadata.tags.entries.find {
it.key == component.namespace
} != null
if(hasNs && component.excluded)
return false
else if(!hasNs && !component.excluded)
return false
}
} }
} }
} }
@ -87,9 +99,10 @@ class SearchEngine {
fun flushAll() { fun flushAll() {
flushText() flushText()
if (queuedText.isNotEmpty()) { if (queuedText.isNotEmpty() || namespace != null) {
val component = namespace?.apply { val component = namespace?.apply {
tag = flushToText() tag = flushToText()
namespace = null
} ?: flushToText() } ?: flushToText()
component.excluded = nextIsExcluded component.excluded = nextIsExcluded
component.exact = nextIsExact component.exact = nextIsExact