Revert "📝 Support loading the CSV file from a buffer (#4)"

This reverts commit 35edd05.

ip2country/src/lib.rs

@@ -12,6 +12,7 @@ use std::{
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
     num::ParseIntError,
     ops::Add,
+    path::Path,
     str::FromStr,
 };
 
@@ -92,14 +93,7 @@ impl AsnDB {
     /// Will return `Err` if `file` does not exist or the user does not have
     /// permission to read it, or when the content was not in the correct format
     pub fn load_ipv4(mut self, file: &str) -> Result<Self> {
-        self.ip_db_v4 = Self::from_reader(File::open(file)?)?;
-        Ok(self)
-    }
-
-    /// loads csv file of format: ip-range-start (v4),ip-range-end,short-country-code
-    /// from a reader
-    pub fn load_ipv4_from_reader<R: std::io::Read>(mut self, reader: R) -> Result<Self> {
-        self.ip_db_v4 = Self::from_reader(reader)?;
+        self.ip_db_v4 = Self::load_file(file)?;
         Ok(self)
     }
 
@@ -110,14 +104,7 @@ impl AsnDB {
     /// Will return `Err` if `file` does not exist or the user does not have
     /// permission to read it, or when the content was not in the correct format
     pub fn load_ipv6(mut self, file: &str) -> Result<Self> {
-        self.ip_db_v6 = Self::from_reader(File::open(file)?)?;
-        Ok(self)
-    }
-
-    /// loads csv file of format: ip-range-start (v4),ip-range-end,short-country-code
-    /// from a reader
-    pub fn load_ipv6_from_reader<R: std::io::Read>(mut self, reader: R) -> Result<Self> {
-        self.ip_db_v6 = Self::from_reader(reader)?;
+        self.ip_db_v6 = Self::load_file(file)?;
         Ok(self)
     }
 
@@ -192,16 +179,16 @@ impl AsnDB {
         self.lookup(ip).and_then(code_to_str)
     }
 
-    fn read_lines<R>(reader: R) -> io::Result<io::Lines<io::BufReader<R>>>
+    fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
     where
-        R: std::io::Read,
+        P: AsRef<Path>,
     {
-        Ok(io::BufReader::new(reader).lines())
+        let file = File::open(filename)?;
+        Ok(io::BufReader::new(file).lines())
     }
 
-    fn from_reader<T, R>(reader: R) -> Result<Vec<Asn<T>>>
+    fn load_file<T>(file: &str) -> Result<Vec<Asn<T>>>
     where
-        R: std::io::Read,
         T: FromStr<Err = ParseIntError>
             + From<u32>
             + PartialEq
@@ -211,7 +198,7 @@ impl AsnDB {
     {
         let mut entries = Vec::new();
 
-        let lines = Self::read_lines(reader)?;
+        let lines = Self::read_lines(file)?;
 
         let mut last_end = None;
         for line in lines {
@@ -263,7 +250,7 @@ mod test {
 
     #[test]
     fn test_load_ipv4() {
-        let db = AsnDB::from_reader::<u32>(File::open("test/example.csv").unwrap()).unwrap();
+        let db = AsnDB::load_file::<u32>("test/example.csv").unwrap();
 
         assert_eq!(db.len(), 78);
     }