diff --git a/app/build.gradle b/app/build.gradle index b2f4b9aa..ec998b34 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "xyz.quaver.pupil" minSdkVersion 16 targetSdkVersion 28 - versionCode 11 - versionName "2.5.2" + versionCode 12 + versionName "2.5.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt index a579865e..7fe99463 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt @@ -1,5 +1,6 @@ package xyz.quaver.pupil.adapters +import android.graphics.Bitmap import android.graphics.BitmapFactory import android.view.LayoutInflater import android.view.View diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/results.kt b/libpupil/src/main/java/xyz/quaver/hitomi/results.kt index 2e3084ea..0142dd2d 100644 --- a/libpupil/src/main/java/xyz/quaver/hitomi/results.kt +++ b/libpupil/src/main/java/xyz/quaver/hitomi/results.kt @@ -11,9 +11,11 @@ fun doSearch(query: String) : List { val terms = query .trim() .replace(Regex("""^\?"""), "") - .replace('_', ' ') .toLowerCase() .split(Regex("\\s+")) + .map { + it.replace('_', ' ') + } val positiveTerms = LinkedList() val negativeTerms = LinkedList() @@ -42,7 +44,8 @@ fun doSearch(query: String) : List { //positive results positiveTerms.map { launch(searchDispatcher) { - filterPositive(getGalleryIDsForQuery(it).sorted()) + val newResults = getGalleryIDsForQuery(it) + filterPositive(newResults.sorted()) } }.forEach { it.join() diff --git a/libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt b/libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt index 38cecc11..fe648e59 100644 --- a/libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt +++ b/libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt @@ -7,7 +7,9 @@ import java.net.URL class UnitTest { @Test fun test() { - print(File("C:\\asdf").list()?.size ?: 0) + val galleries = getGalleryIDsForQuery("series:touhou_project") + + println(galleries.size) } @Test