chore: draft for using geoipdb from path
#940
Conversation
| it.assetsDir = assetsDir | ||
| // geoipDB may or may not exist in this binding; set via reflection when available | ||
| geoIpDB?.let { path -> | ||
| // it.geoipDB = path |
There was a problem hiding this comment.
No desktop support from the start?
| } | ||
| LaunchedEffect(Unit) { | ||
| // Check for GeoIP DB updates in the background | ||
| runCatching { dependencies.fetchGeoIpDbUpdates() } |
There was a problem hiding this comment.
We don't need runCatching if we're already try/catching inside the method. I think we just need to log the failures, but that should be going inside the method.
| * Perform a simple HTTP GET and return the raw response body bytes. | ||
| * Implemented per-platform to ensure binary-safe downloads. | ||
| */ | ||
| expect suspend fun httpGetBytes(url: String): ByteArray |
There was a problem hiding this comment.
You didn't trust the engine httpDo to fetch a larger file? And you preferred not to use a library like ktor?
There was a problem hiding this comment.
Also, I think this should return a Result<ByteArray, ...>.
There was a problem hiding this comment.
More like the httpDo method is configured to return strings which would be a headache especially when streaming large files
|
|
||
| actual suspend fun httpGetBytes(url: String): ByteArray = | ||
| withContext(Dispatchers.IO) { | ||
| val connection = (URL(url).openConnection() as HttpURLConnection) |
There was a problem hiding this comment.
The openConnection() may also throw an IOException
| import java.net.HttpURLConnection | ||
| import java.net.URL | ||
|
|
||
| actual suspend fun httpGetBytes(url: String): ByteArray = |
There was a problem hiding this comment.
Why is the desktop implementation slightly different from the Android one? Shouldn't they match?
| val ip: String?, | ||
| val asn: String?, | ||
| val countryCode: String?, | ||
| val geoIpdb: String?, |
There was a problem hiding this comment.
Why do we need to get the geoIpDb from the engine?
There was a problem hiding this comment.
To determine which version of geoIPDB the engine is currently working with.
| val taskLogLevel: TaskLogLevel, | ||
| val uploadResults: Boolean, | ||
| val proxy: String?, | ||
| val geoipDbVersion: String?, |
There was a problem hiding this comment.
Why do we also need to tell the engine what version of the Db?
There was a problem hiding this comment.
This is more to determine the path to themmdb file if it exists.
| private fun session(sessionConfig: OonimkallBridge.SessionConfig): OonimkallBridge.Session = bridge.newSession(sessionConfig) | ||
|
|
||
| private fun buildTaskSettings( | ||
| private suspend fun buildTaskSettings( |
There was a problem hiding this comment.
suspend should not be needed.
| null | ||
| }, | ||
| proxy = getProxyOption().first().value, | ||
| geoipDbVersion = getValueForKey(SettingsKey.MMDB_VERSION) as String?, |
There was a problem hiding this comment.
We should already be providing the DB path here, instead of having to construct it in multiple places.
| private val downloader by lazy { | ||
| DownloadFile( | ||
| fileSystem = FileSystem.SYSTEM, | ||
| fetchBytes = { url -> httpGetBytes(url) }, |
There was a problem hiding this comment.
Same as fetchBytes = ::httpGetBytes,.
aanorbel
force-pushed
the
feat/dynamic-geoipdb
branch
from
2c846f4 to
e779df5
Compare
aanorbel
force-pushed
the
feat/dynamic-geoipdb
branch
from
af697b7 to
eef3dbc
Compare
No description provided.