More improvements

src/api.rs

@@ -41,7 +41,6 @@ pub enum OutputFormat {
     Pretty,
 }
 
-pub struct Services(Vec<Service>);
 
 impl Output {
     fn new<P: AsRef<Path>>(service_name: String, output_format: OutputFormat, dest: Option<&P>) -> Self {
@@ -54,6 +53,8 @@ impl Output {
     }
 }
 
+pub type Services = Vec<Service>;
+
 impl Service {
     fn generate_url(&self) -> String {
         let mut url = self.url.clone();
@@ -138,23 +139,21 @@ impl Service {
     }
 }
 
-impl Services {
-    pub fn new<P: AsRef<Path>>(p: P) -> Result<Self, io::Error> {
-        let parsed: toml::Value = toml::from_str(&fs::read_to_string(p)?).unwrap();
-        let mut services = vec![];
-
-        for (_, values) in parsed.as_table().unwrap() {
-            let service: Service = toml::from_str(&toml::to_string(values).unwrap()).unwrap();
-            services.push(service);
-        }
+pub fn parse<P: AsRef<Path>>(p: &P) -> Result<Services, io::Error> {
+    let parsed: toml::Value = toml::from_str(&fs::read_to_string(p)?).unwrap();
+    let mut services = vec![];
 
-        Ok(Self(services))
+    for (_, values) in parsed.as_table().unwrap() {
+        let service: Service = toml::from_str(&toml::to_string(values).unwrap()).unwrap();
+        services.push(service);
     }
 
-    pub fn statistics(self, format: OutputFormat, dest: Option<PathBuf>) {
-        for service in self.0.into_iter() {
-            println!("{}", service.execute(format, dest.as_ref()));
-        }
+    Ok(services)
+}
+
+pub fn run(services: Services, format: OutputFormat, dest: Option<PathBuf>) {
+    for service in services {
+        println!("{}", service.execute(format, dest.as_ref()));
     }
 }
 

src/main.rs

@@ -26,7 +26,7 @@ impl FromStr for Argument {
 }
 
 fn main() {
-    let default_config_file = Some("config.toml".to_string());
+    let default_config_file = "config.toml".to_string();
 
     let mut args = std::env::args().skip(1);
     let mut opts: HashMap<Argument, Option<String>> = HashMap::new();
@@ -52,14 +52,14 @@ fn main() {
     }
 
     let config_file = opts.get(&Argument::Config)
-        .unwrap_or(&default_config_file).as_ref();
+        .map_or(default_config_file, |config| config.as_ref().unwrap().to_string());
 
-    let services = api::Services::new(config_file.unwrap()).unwrap();
 
     let output_format = opts.get(&Argument::Format)
-        .map_or(api::OutputFormat::Pretty, |fmt| api::OutputFormat::from_str(fmt.as_ref().unwrap()).unwrap());
-
-    let dest = opts.get(&Argument::Dest).map(|path| path.as_ref().unwrap()).map(PathBuf::from);
+    .map_or(api::OutputFormat::Pretty, |fmt| api::OutputFormat::from_str(fmt.as_ref().unwrap()).unwrap());
 
-    services.statistics(output_format, dest);
+    let dest = opts.get(&Argument::Dest).map(|path| path.as_ref().unwrap()).map(PathBuf::from);
+
+    let services = api::parse(&config_file).unwrap();
+    api::run(services, output_format, dest)
 }