Merge pull request #470 from Reco1I/catboy

Introduce Mino beatmap mirror

src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt

@@ -37,6 +37,7 @@ import com.reco1l.framework.net.JsonArrayRequest
 import com.reco1l.osu.*
 import com.reco1l.osu.ui.Option
 import com.reco1l.osu.ui.SelectDialog
+import com.reco1l.toolkt.android.drawableLeft
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -132,6 +133,8 @@ class BeatmapListing : BaseFragment(),
         indicator = findViewById(R.id.indicator)!!
 
         logoView = findViewById(R.id.logo)!!
+        logoView.text = mirror.description
+        logoView.drawableLeft = requireContext().getDrawable(mirror.logoResource)
         logoView.setOnClickListener {
             SelectDialog()
                 .setOptions(BeatmapMirror.entries.map { mirror ->
@@ -151,6 +154,10 @@ class BeatmapListing : BaseFragment(),
                     if (value != mirror.ordinal) {
                         Config.setInt("beatmapMirror", value)
                         mirror = BeatmapMirror.entries[Config.getInt("beatmapMirror", 0)]
+
+                        logoView.text = mirror.description
+                        logoView.drawableLeft = requireContext().getDrawable(mirror.logoResource)
+
                         search(false)
                     }
                 }
@@ -216,7 +223,8 @@ class BeatmapListing : BaseFragment(),
             JsonArrayRequest(
                 mirror.search.request(
                     query = searchBox.text.toString(),
-                    offset = offset
+                    offset = offset,
+                    limit = 50
                 )
             ).use { request ->
 

src/com/reco1l/osu/beatmaplisting/BeatmapMirror.kt

@@ -1,6 +1,10 @@
 package com.reco1l.osu.beatmaplisting
 
 import androidx.annotation.DrawableRes
+import com.reco1l.osu.beatmaplisting.mirrors.CatboyDownloadRequestModel
+import com.reco1l.osu.beatmaplisting.mirrors.CatboyPreviewRequestModel
+import com.reco1l.osu.beatmaplisting.mirrors.CatboySearchRequestModel
+import com.reco1l.osu.beatmaplisting.mirrors.CatboySearchResponseModel
 import com.reco1l.osu.beatmaplisting.mirrors.OsuDirectDownloadRequestModel
 import com.reco1l.osu.beatmaplisting.mirrors.OsuDirectPreviewRequestModel
 import com.reco1l.osu.beatmaplisting.mirrors.OsuDirectSearchRequestModel
@@ -65,6 +69,24 @@ enum class BeatmapMirror(
         ),
         download = BeatmapMirrorAction(OsuDirectDownloadRequestModel()),
         preview = BeatmapMirrorAction(OsuDirectPreviewRequestModel()),
+    ),
+
+    /**
+     * Catboy beatmap mirror.
+     *
+     * [See documentation](https://dev.catboy.best/docs)
+     */
+    CATBOY(
+        homeUrl = "https://catboy.best",
+        description = "Mino",
+        logoResource = R.drawable.catboy,
+
+        search = BeatmapMirrorActionWithResponse(
+            request = CatboySearchRequestModel(),
+            response = CatboySearchResponseModel(),
+        ),
+        download = BeatmapMirrorAction(CatboyDownloadRequestModel()),
+        preview = BeatmapMirrorAction(CatboyPreviewRequestModel()),
     )
 
 }

src/com/reco1l/osu/beatmaplisting/BeatmapMirrorModels.kt

@@ -10,7 +10,7 @@ fun interface BeatmapMirrorSearchRequestModel {
      * @param query The search query.
      * @param offset The search result offset.
      */
-    operator fun invoke(query: String, offset: Int): HttpUrl
+    operator fun invoke(query: String, offset: Int, limit: Int): HttpUrl
 }
 
 fun interface BeatmapMirrorDownloadRequestModel {

src/com/reco1l/osu/beatmaplisting/mirrors/Catboy.kt

@@ -0,0 +1,86 @@
+package com.reco1l.osu.beatmaplisting.mirrors
+
+import com.reco1l.osu.beatmaplisting.BeatmapMirrorDownloadRequestModel
+import com.reco1l.osu.beatmaplisting.BeatmapMirrorPreviewRequestModel
+import com.reco1l.osu.beatmaplisting.BeatmapMirrorSearchRequestModel
+import com.reco1l.osu.beatmaplisting.BeatmapMirrorSearchResponseModel
+import com.reco1l.osu.beatmaplisting.BeatmapModel
+import com.reco1l.osu.beatmaplisting.BeatmapSetModel
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.json.JSONArray
+import ru.nsu.ccfit.zuev.osu.RankedStatus
+
+// API reference: https://dev.catboy.best/docs
+
+
+class CatboySearchRequestModel : BeatmapMirrorSearchRequestModel {
+    override fun invoke(query: String, offset: Int, limit: Int): HttpUrl {
+        return "https://catboy.best/api/v2/search".toHttpUrl()
+            .newBuilder()
+            .addQueryParameter("mode", "0")
+            .addQueryParameter("query", query)
+            .addQueryParameter("limit", limit.toString())
+            .addQueryParameter("offset", offset.toString())
+            .build()
+    }
+}
+
+
+class CatboySearchResponseModel : BeatmapMirrorSearchResponseModel {
+    override fun invoke(response: Any): MutableList<BeatmapSetModel> {
+        response as JSONArray
+
+        return MutableList(response.length()) { i ->
+            val json = response.getJSONObject(i)
+
+            BeatmapSetModel(
+                id = json.getLong("id"),
+                title = json.getString("title"),
+                titleUnicode = json.getString("title_unicode"),
+                artist = json.getString("artist"),
+                artistUnicode = json.getString("artist_unicode"),
+                status = RankedStatus.valueOf(json.getInt("ranked")),
+                creator = json.getString("creator"),
+                thumbnail = "https://assets.ppy.sh/beatmaps/${json.getLong("id")}/covers/card.jpg",
+                beatmaps = json.getJSONArray("beatmaps").let {
+
+                    MutableList(it.length()) { i ->
+
+                        val obj = it.getJSONObject(i)
+
+                        BeatmapModel(
+                            id = obj.getLong("id"),
+                            version = obj.getString("version"),
+                            starRating = obj.getDouble("difficulty_rating"),
+                            ar = obj.getDouble("ar"),
+                            cs = obj.getDouble("cs"),
+                            hp = obj.getDouble("drain"),
+                            od = obj.getDouble("accuracy"),
+                            bpm = obj.getDouble("bpm"),
+                            lengthSec = obj.getLong("hit_length"),
+                            circleCount = obj.getInt("count_circles"),
+                            sliderCount = obj.getInt("count_sliders"),
+                            spinnerCount = obj.getInt("count_spinners")
+                        )
+
+                    }.sortedBy(BeatmapModel::starRating)
+                }
+            )
+        }
+    }
+}
+
+
+class CatboyDownloadRequestModel : BeatmapMirrorDownloadRequestModel {
+    override fun invoke(beatmapSetId: Long): HttpUrl {
+        return "https://catboy.best/d/$beatmapSetId".toHttpUrl()
+    }
+}
+
+
+class CatboyPreviewRequestModel : BeatmapMirrorPreviewRequestModel {
+    override fun invoke(beatmapSetId: Long): HttpUrl {
+        return "https://catboy.best/preview/audio/$beatmapSetId?set=1".toHttpUrl()
+    }
+}

src/com/reco1l/osu/beatmaplisting/mirrors/OsuDirect.kt

@@ -13,12 +13,13 @@ import ru.nsu.ccfit.zuev.osu.RankedStatus
 
 
 class OsuDirectSearchRequestModel : BeatmapMirrorSearchRequestModel {
-    override fun invoke(query: String, offset: Int): HttpUrl {
+    override fun invoke(query: String, offset: Int, limit: Int): HttpUrl {
         return "https://osu.direct/api/v2/search".toHttpUrl()
             .newBuilder()
             .addQueryParameter("mode", "0")
             .addQueryParameter("query", query)
             .addQueryParameter("offset", offset.toString())
+            .addQueryParameter("amount", limit.toString())
             .build()
     }
 }