fix git repo deletion

src/filesystem/folder.rs

@@ -1,36 +1,7 @@
-use core::fmt;
 use std::fs::DirEntry;
 
 use regex::Regex;
 
-#[derive(Debug, Clone)]
-pub struct ListDirError
-{
-    pub why: String
-}
-
-impl fmt::Display for ListDirError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.why)
-    }
-}
-
-/// List all files in path
-pub fn list_dir(path: String) -> Result<std::fs::ReadDir, ListDirError>
-{
-    match std::fs::read_dir(path)
-    {
-        Ok(files) => 
-        {
-            Ok(files)
-        },
-        Err(why) => 
-        {
-            Err(ListDirError { why: format!("{}", why)})
-        }
-    }
-}
-
 /// Return parsed [std::ffi::OsString] from [DirEntry]
 pub fn dir_entry_to_path(d: DirEntry) -> Option<String>
 {

src/filesystem/mod.rs

@@ -1,2 +1,25 @@
 pub mod file;
-pub mod folder;
+pub mod folder;
+
+/// Set all entries in a dir to permissions().set_readonly(readonly)
+pub fn set_dir_readonly(dir: &str, readonly: bool) -> Result<(), std::io::Error>
+{
+    let paths = std::fs::read_dir(dir.to_owned())?;
+
+    for path in paths
+    {
+        if path.is_err()
+        {
+            return Err(path.err().unwrap())
+        }
+
+        let path = path.unwrap();
+
+        match path.metadata()
+        {
+            Ok(p) => p.permissions().set_readonly(readonly),
+            Err(e) => return Err(e)
+        }
+    }
+    Ok(())
+}

src/integrations/git/mod.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 
 use git2::{Cred, RemoteCallbacks, Repository};
 
-use crate::config::GitConfig;
+use crate::{config::GitConfig, filesystem::{folder::list_sub_dirs, set_dir_readonly}};
 
 pub mod refresh;
 
@@ -30,6 +30,17 @@ impl From<git2::Error> for GitError
     }
 }
 
+impl From<std::io::Error> for GitError
+{
+    fn from(value: std::io::Error) -> Self
+    {
+        GitError
+        {
+            why: format!("std::io::Error {}", value)
+        }
+    }
+}
+
 /// Attempt to clone a remote repo from a [crate::config::GitConfig]
 pub fn from_clone(path: &str, config: &GitConfig) -> Result<Repository, GitError>
 {
@@ -95,31 +106,24 @@ pub fn from_clone(path: &str, config: &GitConfig) -> Result<Repository, GitError
     }
 }
 
+pub fn remove_repository(dir: &str) -> Result<(), std::io::Error>
+{
+    for dir in list_sub_dirs(dir.to_owned())
+    {
+        set_dir_readonly(&dir, false)?;
+    }
+    set_dir_readonly(dir, false)?;
+
+    std::fs::remove_dir_all(dir)?;
+
+    Ok(())
+}
+
 /// Make a fresh clone if [crate::config::Config::git] is present
 ///  deleting any file/dir called [crate::config::ContentConfig::path]
 pub fn clean_and_clone(dir: &str, config: GitConfig) -> Result<Repository, GitError>
 {
-    let path = Path::new(dir);
-    let result = if path.is_file()
-    {
-        std::fs::remove_file(path)
-    }
-    else if path.is_dir()
-    {
-        std::fs::remove_dir_all(path)
-    }
-    else
-    {
-        Ok(())
-    };
-    match result
-    {
-        Ok(_) => (),
-        Err(e) =>
-        {
-            return Err(GitError{why: format!("Could not clone, could not remove, {}", e)})
-        }
-    }
+    remove_repository(dir)?;
     match from_clone(dir, &config)
     {
         Ok(repo) =>