Skip to content

Commit a9ba015

Browse files
committed
Perform session stats request independently in server stats dialog
1 parent b0ee3bd commit a9ba015

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

app/src/main/kotlin/org/equeim/tremotesf/ui/torrentslistfragment/ServerStatsDialogFragment.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import kotlinx.coroutines.flow.combine
1818
import org.equeim.tremotesf.R
1919
import org.equeim.tremotesf.databinding.ServerStatsDialogBinding
2020
import org.equeim.tremotesf.rpc.GlobalRpcClient
21-
import org.equeim.tremotesf.rpc.PeriodicServerStateUpdater
2221
import org.equeim.tremotesf.torrentfile.rpc.RpcRequestError
2322
import org.equeim.tremotesf.torrentfile.rpc.RpcRequestState
2423
import org.equeim.tremotesf.torrentfile.rpc.performPeriodicRequest
2524
import org.equeim.tremotesf.torrentfile.rpc.requests.FileSize
2625
import org.equeim.tremotesf.torrentfile.rpc.requests.SessionStatsResponseArguments
2726
import org.equeim.tremotesf.torrentfile.rpc.requests.getDownloadDirFreeSpace
27+
import org.equeim.tremotesf.torrentfile.rpc.requests.getSessionStats
2828
import org.equeim.tremotesf.torrentfile.rpc.stateIn
2929
import org.equeim.tremotesf.ui.NavigationDialogFragment
3030
import org.equeim.tremotesf.ui.utils.DecimalFormats
@@ -120,10 +120,12 @@ class ServerStatsDialogFragment : NavigationDialogFragment() {
120120
}
121121

122122
class ServerStatsDialogFragmentViewModel : ViewModel() {
123+
private val sessionStats: Flow<RpcRequestState<SessionStatsResponseArguments>> =
124+
GlobalRpcClient.performPeriodicRequest { getSessionStats() }
123125
private val downloadDirFreeSpace: Flow<RpcRequestState<FileSize>> =
124126
GlobalRpcClient.performPeriodicRequest { getDownloadDirFreeSpace() }
125127
val stats: StateFlow<RpcRequestState<Pair<SessionStatsResponseArguments, FileSize>>> =
126-
combine(PeriodicServerStateUpdater.sessionStats, downloadDirFreeSpace) { stats, freeSpace ->
128+
combine(sessionStats, downloadDirFreeSpace) { stats, freeSpace ->
127129
when {
128130
stats is RpcRequestState.Loaded && freeSpace is RpcRequestState.Loaded -> RpcRequestState.Loaded(stats.response to freeSpace.response)
129131
stats is RpcRequestState.Error -> stats

0 commit comments

Comments
 (0)