clear directory contents in reset without removing it

Author: Heliozoa

tmc-langs-core/Cargo.toml

@@ -20,6 +20,7 @@ lazy_static = "1"
 percent-encoding = "2"
 serde_json = "1"
 schemars = "0.7"
+walkdir = "2"
 
 [dev-dependencies]
 env_logger = "0.7"

tmc-langs-core/src/error.rs

@@ -57,6 +57,8 @@ pub enum CoreError {
     Response(#[from] response::ResponseError),
     #[error(transparent)]
     ResponseErrors(#[from] response::ResponseErrors),
+    #[error(transparent)]
+    WalkDir(#[from] walkdir::Error),
 }
 
 impl From<TokenError> for CoreError {

tmc-langs-core/src/tmc_core.rs

@@ -24,6 +24,7 @@ use std::thread;
 use std::time::Duration;
 use tempfile::NamedTempFile;
 use tmc_langs_util::task_executor;
+use walkdir::WalkDir;
 
 pub type Token =
     oauth2::StandardTokenResponse<oauth2::EmptyExtraTokenFields, oauth2::basic::BasicTokenType>;
@@ -493,15 +494,29 @@ impl TmcCore {
     }
 
     pub fn reset(&self, exercise_id: usize, exercise_path: &Path) -> Result<()> {
-        // windows sometimes fails due to files being in use, retry a few times
-        // todo: handle properly
+        // clear out the exercise directory
         let mut tries = 0;
-        while let Err(err) = fs::remove_dir_all(exercise_path) {
-            tries += 1;
-            if tries > 8 {
-                return Err(CoreError::DirRemove(exercise_path.to_path_buf(), err));
+        for entry in WalkDir::new(exercise_path).min_depth(1) {
+            let entry = entry?;
+            // windows sometimes fails due to files being in use, retry a few times
+            // todo: handle properly
+            if entry.path().is_dir() {
+                while let Err(err) = fs::remove_dir_all(exercise_path) {
+                    tries += 1;
+                    if tries > 8 {
+                        return Err(CoreError::DirRemove(exercise_path.to_path_buf(), err));
+                    }
+                    thread::sleep(Duration::from_secs(1));
+                }
+            } else {
+                while let Err(err) = fs::remove_file(exercise_path) {
+                    tries += 1;
+                    if tries > 8 {
+                        return Err(CoreError::DirRemove(exercise_path.to_path_buf(), err));
+                    }
+                    thread::sleep(Duration::from_secs(1));
+                }
             }
-            thread::sleep(Duration::from_secs(1));
         }
         self.download_or_update_exercises(vec![(exercise_id, exercise_path)])
     }