Deal with all lints

[rbdr/blog] / src / command / add.rs

diff --git a/src/command/add.rs b/src/command/add.rs
index 3e0e9876cbb5268aacace5762a202ea74de38a98..d38d077931d85717ffcceca594e75c1b5875cb74 100644 (file)
--- a/src/command/add.rs
+++ b/src/command/add.rs
@@ -1,12 +1,7 @@
-use std::fs::{create_dir_all, remove_dir_all, rename};
-use std::io::{Result, Error};
-use super::{
-    generate::Generate,
-    sync_down::SyncDown,
-    sync_up::SyncUp,
-    update::Update
-};
+use super::{generate::Generate, sync_down::SyncDown, sync_up::SyncUp, update::Update};
 use crate::configuration::Configuration;
+use std::fs::{create_dir_all, remove_dir_all, rename};
+use std::io::Result;
 
 pub struct Add;
 
@@ -14,24 +9,6 @@ impl Add {
     pub fn new() -> Self {
         Add
     }
-
-    // moves posts to their next
-    fn shift(&self, configuration: &Configuration) -> Result<()> {
-        for i in (0..configuration.max_posts).rev() {
-            let source = configuration.posts_directory.join(i.to_string());
-            let target = configuration.posts_directory.join((i + 1).to_string());
-
-            println!("Moving {} source to {}", source.display(), target.display());
-
-            if source.exists() {
-                match rename(&source, &target) {
-                    Ok(_) => continue,
-                    Err(e) => return Err(Error::new(e.kind(), format!("Could not shift post {} to {}", source.display(), target.display())))
-                }
-            }
-        }
-        Ok(())
-    }
 }
 
 impl super::Command for Add {
@@ -39,30 +16,27 @@ impl super::Command for Add {
         vec![Box::new(SyncDown::new())]
     }
 
-    fn execute(&self, _: Option<&String>, configuration: &Configuration, _: &String) -> Result<()> {
-        match create_dir_all(&configuration.posts_directory) {
-            Ok(_) => {
-                match self.shift(configuration) {
-                    Ok(_) => {
-                        let first_directory = configuration.posts_directory.join("0");
-                        let _ = remove_dir_all(&first_directory);
-                        match create_dir_all(&configuration.posts_directory) {
-                            Ok(_) => Ok(()),
-                            Err(e) => Err(Error::new(e.kind(), format!("Could not create first post directory")))
-                        }
-                    },
-                    Err(e) => Err(e)
-                }
-            },
-            Err(e) => Err(Error::new(e.kind(), format!("Could not create posts directory")))
+    fn execute(&self, _: Option<&String>, configuration: &Configuration, _: &str) -> Result<()> {
+        create_dir_all(&configuration.posts_directory)?;
+        for i in (0..configuration.max_posts - 1).rev() {
+            let source = configuration.posts_directory.join(i.to_string());
+            let target = configuration.posts_directory.join((i + 1).to_string());
+
+            if target.exists() {
+                remove_dir_all(&target)?;
+            }
+            if source.exists() {
+                rename(&source, &target)?;
+            }
         }
+        Ok(())
     }
 
     fn after_dependencies(&self) -> Vec<Box<dyn super::Command>> {
         vec![
             Box::new(Update::new()),
             Box::new(Generate::new()),
-            Box::new(SyncUp::new())
+            Box::new(SyncUp::new()),
         ]
     }