make zip generic instead of dyn

Author: Heliozoa

tmc-langs-core/src/tmc_core.rs

@@ -479,8 +479,16 @@ impl TmcCore {
     }
 
     pub fn reset(&self, exercise_id: usize, exercise_path: &Path) -> Result<()> {
-        fs::remove_dir_all(exercise_path)
-            .map_err(|e| CoreError::DirRemove(exercise_path.to_path_buf(), e))?;
+        // windows sometimes fails due to files being in use, retry a few times
+        // todo: handle properly
+        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));
+            }
+            thread::sleep(Duration::from_secs(1));
+        }
         self.download_or_update_exercises(vec![(exercise_id, exercise_path)])
     }
 

tmc-langs-framework/src/io/tmc_zip.rs

@@ -12,7 +12,7 @@ pub use zip::result::ZipError;
 use zip::{write::FileOptions, ZipArchive, ZipWriter};
 
 /// Zips the given directory, only including student files according to the given policy.
-pub fn zip(policy: Box<dyn StudentFilePolicy>, root_directory: &Path) -> Result<Vec<u8>> {
+pub fn zip<P: StudentFilePolicy>(policy: P, root_directory: &Path) -> Result<Vec<u8>> {
     let mut writer = ZipWriter::new(Cursor::new(vec![]));
     let tmc_project_yml = policy.get_tmc_project_yml()?;
 

tmc-langs-framework/src/plugin.rs

@@ -149,7 +149,7 @@ pub trait LanguagePlugin {
     /// Compress a given project so that it can be sent to the TestMyCode server.
     fn compress_project(&self, path: &Path) -> Result<Vec<u8>> {
         let policy = Self::get_student_file_policy(path);
-        Ok(tmc_zip::zip(Box::new(policy), path)?)
+        Ok(tmc_zip::zip(policy, path)?)
     }
 
     fn get_student_file_policy(project_path: &Path) -> Self::StudentFilePolicy;