mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-02 19:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added RemoteSource.kt exception catch, dependencies update

Browse Source
This commit is contained in:
Arty Bishop committed 2021-11-09 11:48:29 +01:00
1 parent 5ba7ee746c
commit 04029d50db
4 files changed
+27 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/com/rtbishop/look4sat/data/DefaultRepository.kt
+18 -15
View File
@@ -65,22 +65,24 @@ class DefaultRepository(
}
launch {
val updateTimeMillis = measureTimeMillis {
val fetchesMap = mutableMapOf<String, Deferred<InputStream>>()
val streamsMap = mutableMapOf<String, InputStream>()
val jobsMap = mutableMapOf<String, Deferred<InputStream?>>()
val streamsMap = mutableMapOf<String, InputStream?>()
val streams = mutableListOf<InputStream>()
val entries = mutableListOf<SatEntry>()
sources.forEach { fetchesMap[it] = async { remoteSource.fetchFileStream(it) } }
fetchesMap.forEach { streamsMap[it.key] = it.value.await() }
sources.forEach { jobsMap[it] = async { remoteSource.fetchFileStream(it) } }
jobsMap.forEach { streamsMap[it.key] = it.value.await() }
streamsMap.forEach { stream ->
when {
stream.key.contains("=csv", true) -> {
val tles = dataParser.parseCSVStream(stream.value)
entries.addAll(tles.map { tle -> SatEntry(tle) })
stream.value?.let { inputStream ->
when {
stream.key.contains("=csv", true) -> {
val tles = dataParser.parseCSVStream(inputStream)
entries.addAll(tles.map { tle -> SatEntry(tle) })
}
stream.key.contains(".zip", true) -> {
streams.add(ZipInputStream(inputStream).apply { nextEntry })
}
else -> streams.add(inputStream)
}
stream.key.contains(".zip", true) -> {
streams.add(ZipInputStream(stream.value).apply { nextEntry })
}
else -> streams.add(stream.value)
}
}
streams.forEach { stream -> entries.addAll(importSatellites(stream)) }
@@ -89,9 +91,10 @@ class DefaultRepository(
println("Update from web took $updateTimeMillis ms")
}
launch {
val jsonStream = remoteSource.fetchFileStream(transmittersSource)
val transmitters = dataParser.parseJSONStream(jsonStream)
localSource.updateTransmitters(transmitters)
remoteSource.fetchFileStream(transmittersSource)?.let { inputStream ->
val transmitters = dataParser.parseJSONStream(inputStream)
localSource.updateTransmitters(transmitters)
}
}
}
}
core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.kt
+1 -1
View File
@@ -21,5 +21,5 @@ import java.io.InputStream
interface RemoteDataSource {
suspend fun fetchFileStream(fileUrl: String): InputStream
suspend fun fetchFileStream(url: String): InputStream?
}