normalize zip paths properly

Author: Heliozoa

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

@@ -29,11 +29,12 @@ pub fn zip<P: StudentFilePolicy>(policy: P, root_directory: &Path) -> Result<Vec
                 .unwrap_or_else(|| entry.path());
             if entry.path().is_dir() {
                 log::trace!("adding directory {}", path.display());
-                writer.add_directory(path.to_string_lossy(), FileOptions::default())?;
+                writer
+                    .add_directory(path_to_zip_compatible_string(path), FileOptions::default())?;
             } else {
                 let bytes = file_util::read_file(entry.path())?;
                 log::trace!("writing file {}", path.display());
-                writer.start_file(path.to_string_lossy(), FileOptions::default())?;
+                writer.start_file(path_to_zip_compatible_string(path), FileOptions::default())?;
                 writer
                     .write_all(&bytes)
                     .map_err(|e| TmcError::ZipWrite(path.to_path_buf(), e))?;
@@ -44,6 +45,18 @@ pub fn zip<P: StudentFilePolicy>(policy: P, root_directory: &Path) -> Result<Vec
     Ok(cursor.into_inner())
 }
 
+// ensures the / separator is used
+fn path_to_zip_compatible_string(path: &Path) -> String {
+    let mut string = String::new();
+    for component in path.components() {
+        if !string.is_empty() {
+            string.push('/');
+        }
+        string.push_str(&*component.as_os_str().to_string_lossy());
+    }
+    string
+}
+
 // todo: remove
 /// Finds a project directory in the given zip and unzips it according to the given student policy. Also cleans unnecessary non-student files.
 ///

tmc-langs-util/tests/data/course_refresher/valid_exercises/ex1/test/test.py

@@ -1,2 +1,2 @@
 @points("test_point")
-@points("ex_and_test_point")
+@points("ex_and_test_point")