Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-08 15:17:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[F] Fix null case

Browse Source
This commit is contained in:
Azalea
2024-02-19 01:57:42 -05:00
parent 4c3aafd266
commit 0846fb94db
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/icu/samnyan/aqua/net/utils/GeoIP.kt
View File

@@ -37,6 +37,7 @@ class GeoIP(
// Download from GitHub // Download from GitHub
try { try {
log.info("Downloading GeoLite2 database to ${props.geoLitePath}")
URL("https://github.com/P3TERX/GeoLite.mmdb/raw/download/GeoLite2-Country.mmdb").openStream() URL("https://github.com/P3TERX/GeoLite.mmdb/raw/download/GeoLite2-Country.mmdb").openStream()
.use { Files.copy(it, File(props.geoLitePath).toPath()) } .use { Files.copy(it, File(props.geoLitePath).toPath()) }
} catch (e: Exception) { } catch (e: Exception) {
@@ -55,7 +56,8 @@ class GeoIP(
*/ */
fun selfTest() { fun selfTest() {
try { try {
getCountry("1.1.1.1") // Test with Google's IP
getCountry("172.217.165.14")
} catch (e: Exception) { } catch (e: Exception) {
log.error("GeoIP Service Self Test Failed", e) log.error("GeoIP Service Self Test Failed", e)
throw e throw e
@@ -74,7 +76,8 @@ class GeoIP(
fun getCountry(ip: Str): Str fun getCountry(ip: Str): Str
{ {
return try { return try {
geoLite.country(InetAddress.getByName(ip)).country.isoCode val ipa = InetAddress.getByName(ip)
geoLite.country(ipa)?.country?.isoCode ?: ""
} catch (e: Exception) { } catch (e: Exception) {
log.error("Failed to get country from IP $ip", e) log.error("Failed to get country from IP $ip", e)
"" ""