From d512e94db157a021a0c690b5a0ecb38fdb1822c1 Mon Sep 17 00:00:00 2001 From: yggverse Date: Wed, 4 Mar 2026 13:34:51 +0200 Subject: [PATCH] update crates api --- .../page/navigation/request/info/dialog.rs | 30 +++++++------------ src/profile/history/database.rs | 2 +- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/app/browser/window/tab/item/page/navigation/request/info/dialog.rs b/src/app/browser/window/tab/item/page/navigation/request/info/dialog.rs index 89ee25db..e3d56d8a 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/info/dialog.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/info/dialog.rs @@ -121,7 +121,7 @@ impl Dialog for PreferencesDialog { /// Lookup [MaxMind](https://www.maxmind.com) database fn l(profile: &Profile, socket_address: &SocketAddress) -> Option { use maxminddb::{ - MaxMindDbError, Reader, + Reader, geoip2::{/*City,*/ Country}, }; if !matches!( @@ -136,26 +136,16 @@ impl Dialog for PreferencesDialog { Reader::open_readfile(c) } .ok()?; - let lookup = { - let a: std::net::SocketAddr = socket_address.to_string().parse().unwrap(); - let lookup: std::result::Result, MaxMindDbError> = - db.lookup(a.ip()); - lookup + let a: std::net::SocketAddr = socket_address.to_string().parse().unwrap(); + let c: Country = db.lookup(a.ip()).ok()?.decode().ok()??; + let mut b = Vec::new(); + if let Some(iso_code) = c.country.iso_code { + b.push(iso_code); } - .ok()??; - lookup.country.map(|c| { - let mut b = Vec::new(); - if let Some(iso_code) = c.iso_code { - b.push(iso_code) - } - if let Some(n) = c.names - && let Some(s) = n.get("en") - { - b.push(s) - } // @TODO multi-lang - // @TODO city DB - b.join(", ") - }) + if let Some(name_en) = c.country.names.english { + b.push(name_en); + } + b.join(", ").into() } p.add(&{ let g = PreferencesGroup::builder().title("Remote").build(); diff --git a/src/profile/history/database.rs b/src/profile/history/database.rs index ec77a840..ed6fd1ea 100644 --- a/src/profile/history/database.rs +++ b/src/profile/history/database.rs @@ -151,7 +151,7 @@ pub fn select( //profile_id: row.get(1)?, opened: Event { time: DateTime::from_unix_local(row.get(2)?).unwrap(), - count: row.get(3)?, + count: row.get::<_, i64>(3)? as usize, }, closed: closed(row.get(4)?, row.get(5)?), request: row.get::<_, String>(6)?.into(),