added method lookup to struct MmdbReader

src/mmdb/asn.rs

@@ -1,18 +1,12 @@
 use crate::mmdb::types::mmdb_asn_entry::MmdbAsnEntry;
-use maxminddb::MaxMindDBError;
-
 use crate::mmdb::types::mmdb_reader::MmdbReader;
 use crate::networking::types::asn::Asn;
 
 pub const ASN_MMDB: &[u8] = include_bytes!("../../resources/DB/GeoLite2-ASN.mmdb");
 
 #[allow(clippy::module_name_repetitions)]
-pub fn get_asn(address_to_lookup: &str, asn_db_reader: &MmdbReader) -> Asn {
-    let asn_result: Result<MmdbAsnEntry, MaxMindDBError> = match asn_db_reader {
-        MmdbReader::Default(reader) => reader.lookup(address_to_lookup.parse().unwrap()),
-        MmdbReader::Custom(reader) => reader.lookup(address_to_lookup.parse().unwrap()),
-    };
-    if let Ok(res) = asn_result {
+pub fn get_asn(address: &str, asn_db_reader: &MmdbReader) -> Asn {
+    if let Ok(res) = asn_db_reader.lookup::<MmdbAsnEntry>(address.parse().unwrap()) {
         return res.get_asn();
     }
     Asn::default()

src/mmdb/country.rs

@@ -1,18 +1,12 @@
-use maxminddb::MaxMindDBError;
-
 use crate::countries::types::country::Country;
 use crate::mmdb::types::mmdb_country_entry::MmdbCountryEntry;
 use crate::mmdb::types::mmdb_reader::MmdbReader;
 
 pub const COUNTRY_MMDB: &[u8] = include_bytes!("../../resources/DB/GeoLite2-Country.mmdb");
 
 #[allow(clippy::module_name_repetitions)]
-pub fn get_country(address_to_lookup: &str, country_db_reader: &MmdbReader) -> Country {
-    let country_result: Result<MmdbCountryEntry, MaxMindDBError> = match country_db_reader {
-        MmdbReader::Default(reader) => reader.lookup(address_to_lookup.parse().unwrap()),
-        MmdbReader::Custom(reader) => reader.lookup(address_to_lookup.parse().unwrap()),
-    };
-    if let Ok(res) = country_result {
+pub fn get_country(address: &str, country_db_reader: &MmdbReader) -> Country {
+    if let Ok(res) = country_db_reader.lookup::<MmdbCountryEntry>(address.parse().unwrap()) {
         return res.get_country();
     }
     Country::ZZ // unknown

src/mmdb/types/mmdb_reader.rs

@@ -1,4 +1,6 @@
-use maxminddb::Reader;
+use maxminddb::{MaxMindDBError, Reader};
+use serde::Deserialize;
+use std::net::IpAddr;
 
 pub enum MmdbReader {
     Default(Reader<&'static [u8]>),
@@ -18,4 +20,11 @@ impl MmdbReader {
             MmdbReader::Default(default_reader)
         }
     }
+
+    pub fn lookup<'a, T: Deserialize<'a>>(&'a self, ip: IpAddr) -> Result<T, MaxMindDBError> {
+        match self {
+            MmdbReader::Default(reader) => reader.lookup(ip),
+            MmdbReader::Custom(reader) => reader.lookup(ip),
+        }
+    }
 }