more search work

DatL4g · Nov 13, 2023 · 16c87c0 · 16c87c0
1 parent 3a6a1e7
commit 16c87c0
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 4 deletions.
diff --git a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/module/PlatformModule.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/module/PlatformModule.android.kt
@@ -4,6 +4,7 @@ import io.ktor.client.*
 import io.ktor.client.engine.okhttp.*
 import org.kodein.di.DI
 import org.kodein.di.bindSingleton
+import java.util.concurrent.TimeUnit
 
 actual object PlatformModule {
 
@@ -15,6 +16,9 @@ actual object PlatformModule {
                 engine {
                     config {
                         followRedirects(true)
+                        connectTimeout(3, TimeUnit.MINUTES)
+                        readTimeout(3, TimeUnit.MINUTES)
+                        writeTimeout(3, TimeUnit.MINUTES)
                     }
                 }
             }

diff --git a/...rc/commonMain/kotlin/dev/datlag/burningseries/ui/screen/initial/search/SearchComponent.kt b/...rc/commonMain/kotlin/dev/datlag/burningseries/ui/screen/initial/search/SearchComponent.kt
@@ -7,4 +7,6 @@ import kotlinx.coroutines.flow.StateFlow
 interface SearchComponent : Component {
 
     val searchState: StateFlow<SearchState>
+
+    fun retryLoadingSearch(): Any?
 }
diff --git a/...d/src/commonMain/kotlin/dev/datlag/burningseries/ui/screen/initial/search/SearchScreen.kt b/...d/src/commonMain/kotlin/dev/datlag/burningseries/ui/screen/initial/search/SearchScreen.kt
@@ -1,8 +1,52 @@
 package dev.datlag.burningseries.ui.screen.initial.search
 
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import dev.datlag.burningseries.common.lifecycle.collectAsStateWithLifecycle
+import dev.datlag.burningseries.model.state.SearchState
+import dev.datlag.burningseries.shared.SharedRes
+import dev.datlag.burningseries.ui.custom.state.ErrorState
+import dev.datlag.burningseries.ui.custom.state.LoadingState
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun SearchScreen(component: SearchComponent) {
+    val state by component.searchState.collectAsStateWithLifecycle()
 
+    when (val current = state) {
+        is SearchState.Loading -> {
+            LoadingState(SharedRes.strings.loading_search)
+        }
+        is SearchState.Error -> {
+            ErrorState(SharedRes.strings.error_loading_search) {
+                component.retryLoadingSearch()
+            }
+        }
+        is SearchState.Success -> {
+            val selectedGenre = current.genres.first()
+
+            LazyColumn(
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                stickyHeader {
+                    Text(
+                        text = selectedGenre.title,
+                        style = MaterialTheme.typography.titleLarge,
+                        fontWeight = FontWeight.Bold
+                    )
+                }
+                items(selectedGenre.items) {
+                    Text(text = it.title)
+                }
+            }
+        }
+    }
 }
diff --git a/...monMain/kotlin/dev/datlag/burningseries/ui/screen/initial/search/SearchScreenComponent.kt b/...monMain/kotlin/dev/datlag/burningseries/ui/screen/initial/search/SearchScreenComponent.kt
@@ -4,6 +4,8 @@ import androidx.compose.runtime.Composable
 import com.arkivanov.decompose.ComponentContext
 import dev.datlag.burningseries.common.ioDispatcher
 import dev.datlag.burningseries.common.ioScope
+import dev.datlag.burningseries.common.launchIO
+import dev.datlag.burningseries.model.state.SearchAction
 import dev.datlag.burningseries.model.state.SearchState
 import dev.datlag.burningseries.network.state.SearchStateMachine
 import kotlinx.coroutines.flow.SharingStarted
@@ -18,11 +20,15 @@ class SearchScreenComponent(
     override val di: DI
 ) : SearchComponent, ComponentContext by componentContext {
 
-    private val homeStateMachine: SearchStateMachine by di.instance()
-    override val searchState: StateFlow<SearchState> = homeStateMachine.state.flowOn(ioDispatcher()).stateIn(ioScope(), SharingStarted.Lazily, SearchState.Loading)
+    private val searchStateMachine: SearchStateMachine by di.instance()
+    override val searchState: StateFlow<SearchState> = searchStateMachine.state.flowOn(ioDispatcher()).stateIn(ioScope(), SharingStarted.Lazily, SearchState.Loading)
 
     @Composable
     override fun render() {
         SearchScreen(this)
     }
+
+    override fun retryLoadingSearch(): Any? = ioScope().launchIO {
+        searchStateMachine.dispatch(SearchAction.Retry)
+    }
 }
diff --git a/app/shared/src/commonMain/resources/MR/base/strings.xml b/app/shared/src/commonMain/resources/MR/base/strings.xml
@@ -20,4 +20,6 @@
     <string name="restart">Restart</string>
     <string name="downloading">Downloading</string>
     <string name="downloading_text">Downloading required packages for your platform, please wait</string>
+    <string name="loading_search">Loading search information, please wait</string>
+    <string name="error_loading_search">Error while loading search information</string>
 </resources>
diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/module/PlatformModule.desktop.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/module/PlatformModule.desktop.kt
@@ -4,6 +4,7 @@ import io.ktor.client.*
 import io.ktor.client.engine.okhttp.*
 import org.kodein.di.DI
 import org.kodein.di.bindSingleton
+import java.util.concurrent.TimeUnit
 
 actual object PlatformModule {
 
@@ -15,6 +16,9 @@ actual object PlatformModule {
                 engine {
                     config {
                         followRedirects(true)
+                        connectTimeout(3, TimeUnit.MINUTES)
+                        readTimeout(3, TimeUnit.MINUTES)
+                        writeTimeout(3, TimeUnit.MINUTES)
                     }
                 }
             }

diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/BurningSeries.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/BurningSeries.kt
@@ -225,8 +225,8 @@ data object BurningSeries {
 
     suspend fun getSearch(client: HttpClient): List<Genre> {
         val doc = getDocument(client, BSUtil.SEARCH) ?: return emptyList()
-        return doc.querySelector("#seriesContainer")?.querySelectorAll(".genre")?.mapNotNull { element ->
-            val genre = element.querySelector("string")?.textContent()?.trim() ?: String()
+        return doc.getElementById("seriesContainer")?.querySelectorAll(".genre")?.mapNotNull { element ->
+            val genre = element.querySelector("strong")?.textContent()?.trim() ?: String()
 
             if (genre.isNotBlank()) {
                 Genre(