Improved extracting to an empty dir

Author: Heliozoa

crates/tmc-langs-framework/src/archive.rs

@@ -124,6 +124,15 @@ impl<T: Read + Seek> Archive<T> {
         }
     }
 
+    pub fn into_inner(self) -> T {
+        match self {
+            Self(ArchiveInner::Tar(archive)) => archive.into_inner(),
+            Self(ArchiveInner::TarZstd(archive)) => archive.into_inner().finish().into_inner(),
+            Self(ArchiveInner::Zip(archive)) => archive.into_inner(),
+            Self(ArchiveInner::Empty) => unreachable!("This is a bug."),
+        }
+    }
+
     /// tar's entries functions require the archive's position to be at 0,
     /// but resetting the position is awkward, hence this helper function
     fn reset(&mut self) -> Result<(), TmcError> {

crates/tmc-langs/src/lib.rs

@@ -824,11 +824,17 @@ pub fn extract_project(
         let mut archive = Archive::new(compressed_project, compression)?;
         plugin.extract_project(&mut archive, target_location, clean)?;
     } else {
-        log::debug!(
-            "no matching language plugin found for {}, overwriting",
-            target_location.display()
-        );
-        extract_project_overwrite(compressed_project, target_location, compression)?;
+        let mut archive = Archive::new(compressed_project, compression)?;
+        if let Ok(plugin) = PluginType::from_archive(&mut archive) {
+            plugin.extract_project(&mut archive, target_location, clean)?;
+        } else {
+            log::debug!(
+                "no matching language plugin found for {}, extracting naively",
+                target_location.display()
+            );
+            let compressed_project = archive.into_inner();
+            extract_project_overwrite(compressed_project, target_location, compression)?;
+        }
     }
     Ok(())
 }
@@ -919,11 +925,17 @@ pub fn extract_student_files(
     if let Ok(plugin) = PluginType::from_exercise(target_location) {
         plugin.extract_student_files(compressed_project, compression, target_location)?;
     } else {
-        log::debug!(
-            "no matching language plugin found for {}, overwriting",
-            target_location.display()
-        );
-        extract_project_overwrite(compressed_project, target_location, Compression::Zip)?;
+        let mut archive = Archive::new(compressed_project, compression)?;
+        if let Ok(plugin) = PluginType::from_archive(&mut archive) {
+            let compressed_project = archive.into_inner();
+            plugin.extract_student_files(compressed_project, compression, target_location)?;
+        } else {
+            log::debug!(
+                "no matching language plugin found for {}, extracting naively",
+                target_location.display()
+            );
+            archive.extract(target_location)?;
+        }
     }
     Ok(())
 }