Further classes restructuring and code cleanup

base/src/main/java/com/rtbishop/look4sat/data/DatabaseRepo.kt

@@ -19,112 +19,85 @@ package com.rtbishop.look4sat.data
 
 import com.rtbishop.look4sat.domain.IDatabaseRepo
 import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.model.DataState
+import com.rtbishop.look4sat.model.DatabaseState
 import com.rtbishop.look4sat.model.SatEntry
-import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.CoroutineScope
+import com.rtbishop.look4sat.model.SatRadio
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.async
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.InputStream
 import java.util.zip.ZipInputStream
 
 class DatabaseRepo(
+    private val dispatcher: CoroutineDispatcher,
     private val dataParser: DataParser,
-    private val localStorage: ILocalStorage,
     private val dataSource: IDataSource,
-    private val repositoryScope: CoroutineScope,
+    private val localStorage: ILocalStorage,
     private val settingsRepository: ISettingsRepo
 ) : IDatabaseRepo {
 
-    private val exceptionHandler = CoroutineExceptionHandler { _, exception ->
-        _updateState.value = DataState.Exception(exception.message)
-    }
-    private val updateStateDelay = 875L
-    private val _updateState = MutableStateFlow<DataState<Long>>(DataState.Handled)
-    override val updateState: StateFlow<DataState<Long>> = _updateState
-
-    override fun getEntriesTotal() = localStorage.getEntriesTotal()
-
-    override fun getRadiosTotal() = localStorage.getRadiosTotal()
-
-    override fun updateFromFile(uri: String) {
-        repositoryScope.launch(exceptionHandler) {
-            _updateState.value = DataState.Loading
-            dataSource.getFileStream(uri)?.let { stream ->
-                delay(updateStateDelay)
-                localStorage.insertEntries(importSatellites(stream))
-            }
-            setUpdateSuccessful()
-        }
+    override suspend fun updateFromFile(uri: String) = withContext(dispatcher) {
+        val importedSatellites = dataSource.getFileStream(uri)?.let { importSatellites(it) }
+        importedSatellites?.let { localStorage.insertEntries(it) }
+        setUpdateSuccessful(System.currentTimeMillis())
     }
 
-    override fun updateFromWeb() {
-        _updateState.value = DataState.Loading
-        repositoryScope.launch(exceptionHandler) {
-            val importedEntries = mutableListOf<SatEntry>()
-            val sourcesMap = settingsRepository.satelliteSourcesMap
-            val jobsMap = sourcesMap.mapValues { async { dataSource.getNetworkStream(it.value) } }
-            jobsMap.mapValues { job -> job.value.await() }.forEach { entry ->
-                entry.value?.let { stream ->
-                    when (val type = entry.key) {
-                        "Amsat", "R4UAB" -> {
-                            // parse tle stream
-                            val satellites = importSatellites(stream)
-                            val catnums = satellites.map { it.data.catnum }
-                            settingsRepository.saveSatType(type, catnums)
-                            importedEntries.addAll(satellites)
-                        }
+    override suspend fun updateFromWeb() = withContext(dispatcher) {
+        val sourcesMap = settingsRepository.satelliteSourcesMap
+        val importedEntries = mutableListOf<SatEntry>()
+        val importedRadios = mutableListOf<SatRadio>()
+        // fetch
+        val jobsMap = sourcesMap.mapValues { async { dataSource.getNetworkStream(it.value) } }
+        val jobRadios = async { dataSource.getNetworkStream(settingsRepository.radioSourceUrl) }
+        // parse
+        jobsMap.mapValues { job -> job.value.await() }.forEach { entry ->
+            entry.value?.let { stream ->
+                when (val type = entry.key) {
+                    "AMSAT", "R4UAB" -> {
+                        // parse tle stream
+                        val satellites = importSatellites(stream)
+                        val catnums = satellites.map { it.data.catnum }
+                        settingsRepository.saveSatType(type, catnums)
+                        importedEntries.addAll(satellites)
+                    }
 
-                        "McCants", "Classified" -> {
-                            // unzip and parse tle stream
-                            val unzipped = ZipInputStream(stream).apply { nextEntry }
-                            val satellites = importSatellites(unzipped)
-                            val catnums = satellites.map { it.data.catnum }
-                            settingsRepository.saveSatType(type, catnums)
-                            importedEntries.addAll(satellites)
-                        }
+                    "McCants", "Classified" -> {
+                        // unzip and parse tle stream
+                        val unzipped = ZipInputStream(stream).apply { nextEntry }
+                        val satellites = importSatellites(unzipped)
+                        val catnums = satellites.map { it.data.catnum }
+                        settingsRepository.saveSatType(type, catnums)
+                        importedEntries.addAll(satellites)
+                    }
 
-                        else -> {
-                            // parse csv stream
-                            val parsed = dataParser.parseCSVStream(stream)
-                            val satellites = parsed.map { data -> SatEntry(data) }
-                            val catnums = satellites.map { it.data.catnum }
-                            settingsRepository.saveSatType(type, catnums)
-                            importedEntries.addAll(satellites)
-                        }
+                    else -> {
+                        // parse csv stream
+                        val parsed = dataParser.parseCSVStream(stream)
+                        val satellites = parsed.map { data -> SatEntry(data) }
+                        val catnums = satellites.map { it.data.catnum }
+                        settingsRepository.saveSatType(type, catnums)
+                        importedEntries.addAll(satellites)
                     }
                 }
             }
-            localStorage.insertEntries(importedEntries)
-            setUpdateSuccessful()
-        }
-        repositoryScope.launch(exceptionHandler) {
-            dataSource.getNetworkStream(settingsRepository.radioSourceUrl)?.let { stream ->
-                localStorage.insertRadios(dataParser.parseJSONStream(stream))
-            }
         }
+        jobRadios.await()?.let { importedRadios.addAll(dataParser.parseJSONStream(it)) }
+        // insert
+        localStorage.insertEntries(importedEntries)
+        localStorage.insertRadios(importedRadios)
+        setUpdateSuccessful(System.currentTimeMillis())
     }
 
-    override fun setUpdateStateHandled() {
-        _updateState.value = DataState.Handled
+    override suspend fun clearAllData() = withContext(dispatcher) {
+        localStorage.deleteEntries()
+        localStorage.deleteRadios()
+        setUpdateSuccessful(0L)
     }
 
-    override fun clearAllData() {
-        repositoryScope.launch {
-            _updateState.value = DataState.Loading
-            delay(updateStateDelay)
-            localStorage.deleteEntries()
-            localStorage.deleteRadios()
-            setUpdateSuccessful(0L)
-        }
-    }
-
-    private fun setUpdateSuccessful(updateTime: Long = System.currentTimeMillis()) {
-        settingsRepository.setLastUpdateTime(updateTime)
-        _updateState.value = DataState.Success(updateTime)
+    private suspend fun setUpdateSuccessful(timestamp: Long) = withContext(dispatcher) {
+        val satellitesTotal = localStorage.getEntriesTotal()
+        val radiosTotal = localStorage.getRadiosTotal()
+        settingsRepository.saveDatabaseState(DatabaseState(satellitesTotal, radiosTotal, timestamp))
     }
 
     private suspend fun importSatellites(stream: InputStream): List<SatEntry> {

base/src/main/java/com/rtbishop/look4sat/data/ILocalStorage.kt

@@ -21,11 +21,10 @@ import com.rtbishop.look4sat.domain.Satellite
 import com.rtbishop.look4sat.model.SatEntry
 import com.rtbishop.look4sat.model.SatItem
 import com.rtbishop.look4sat.model.SatRadio
-import kotlinx.coroutines.flow.Flow
 
 interface ILocalStorage {
 
-    fun getEntriesTotal(): Flow<Int>
+    suspend fun getEntriesTotal(): Int
 
     suspend fun getEntriesList(): List<SatItem>
 
@@ -35,7 +34,7 @@ interface ILocalStorage {
 
     suspend fun deleteEntries()
 
-    fun getRadiosTotal(): Flow<Int>
+    suspend fun getRadiosTotal(): Int
 
     suspend fun getRadiosWithId(id: Int): List<SatRadio>
 

base/src/main/java/com/rtbishop/look4sat/domain/IDatabaseRepo.kt

@@ -17,23 +17,11 @@
  */
 package com.rtbishop.look4sat.domain
 
-import com.rtbishop.look4sat.model.DataState
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
 interface IDatabaseRepo {
 
-    val updateState: StateFlow<DataState<Long>>
+    suspend fun updateFromFile(uri: String)
 
-    fun getEntriesTotal(): Flow<Int>
+    suspend fun updateFromWeb()
 
-    fun getRadiosTotal(): Flow<Int>
-
-    fun updateFromFile(uri: String)
-
-    fun updateFromWeb()
-
-    fun setUpdateStateHandled()
-
-    fun clearAllData()
+    suspend fun clearAllData()
 }

base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt

@@ -17,7 +17,9 @@
  */
 package com.rtbishop.look4sat.domain
 
+import com.rtbishop.look4sat.model.DatabaseState
 import com.rtbishop.look4sat.model.GeoPos
+import com.rtbishop.look4sat.model.OtherSettings
 import kotlinx.coroutines.flow.StateFlow
 
 interface ISettingsRepo {
@@ -72,25 +74,19 @@ interface ISettingsRepo {
 
     fun setMinElevation(minElevation: Double)
 
-    fun isUtcEnabled(): Boolean
+    val databaseState: StateFlow<DatabaseState>
 
-    fun setUtcState(value: Boolean)
+    fun saveDatabaseState(state: DatabaseState)
 
-    fun getLastUpdateTime(): Long
+    val otherSettings: StateFlow<OtherSettings>
 
-    fun setLastUpdateTime(updateTime: Long)
+    fun toggleUtc(value: Boolean)
 
-    fun isUpdateEnabled(): Boolean
+    fun toggleUpdate(value: Boolean)
 
-    fun setUpdateState(value: Boolean)
+    fun toggleSweep(value: Boolean)
 
-    fun isSensorEnabled(): Boolean
-
-    fun setSensorState(value: Boolean)
-
-    fun isSweepEnabled(): Boolean
-
-    fun setSweepState(value: Boolean)
+    fun toggleSensor(value: Boolean)
 
     fun saveModesSelection(modes: List<String>)
 

base/src/main/java/com/rtbishop/look4sat/model/Settings.kt

@@ -0,0 +1,10 @@
+package com.rtbishop.look4sat.model
+
+data class OtherSettings(
+    val utcState: Boolean,
+    val updateState: Boolean,
+    val sweepState: Boolean,
+    val sensorState: Boolean
+)
+
+data class DatabaseState(val entriesTotal: Int, val radiosTotal: Int, val timestamp: Long)