Merge branch 'main' into fallback-dl-template-if-exam

Author: sebazai

plugins/python3/src/policy.rs

@@ -34,13 +34,15 @@ impl StudentFilePolicy for Python3StudentFilePolicy {
             None => true,
         };
         let is_py_file = path.extension() == Some(OsStr::new("py"));
+        let is_ipynb = path.extension() == Some(OsStr::new("ipynb"));
 
         // all files in non-tmc and non-test subdirectories are considered student files
         let is_in_exercise_subdir = path.starts_with("test") || path.starts_with("tmc");
 
         in_src && !is_cache_file
             || is_in_project_root && is_py_file
             || !is_in_exercise_subdir && !is_in_project_root && !is_cache_file
+            || is_ipynb && !is_cache_file
     }
 }
 

tmc-langs-plugins/src/tmc_zip.rs

@@ -37,14 +37,14 @@ pub fn zip_student_files<P: StudentFilePolicy>(
                 log::trace!("adding directory {}", path.display());
                 writer.add_directory(
                     path_to_zip_compatible_string(path),
-                    FileOptions::default().unix_permissions(0o744),
+                    FileOptions::default().unix_permissions(0o755),
                 )?;
             } else {
                 let bytes = file_util::read_file(entry.path())?;
                 log::trace!("writing file {}", path.display());
                 writer.start_file(
                     path_to_zip_compatible_string(path),
-                    FileOptions::default().unix_permissions(0o744),
+                    FileOptions::default().unix_permissions(0o755),
                 )?;
                 writer
                     .write_all(&bytes)

tmc-langs/src/course_refresher.rs

@@ -394,7 +394,7 @@ fn execute_zip(
             let tmcproject_yml = file_util::read_file(&tmcproject_yml_path)?;
             let relative_path = tmcproject_yml_path
                 .strip_prefix(&root_path)
-                .expect("relative path failed for tmcproject yml"); // safe
+                .expect("tmcproject_yml_path is inside root_path");
             writer.start_file(
                 relative_path.to_string_lossy(),
                 zip::write::FileOptions::default(),
@@ -420,15 +420,15 @@ fn execute_zip(
             if entry.path().is_file() {
                 writer.start_file(
                     relative_path.to_string_lossy(),
-                    zip::write::FileOptions::default().unix_permissions(0o744),
+                    zip::write::FileOptions::default().unix_permissions(0o755),
                 )?;
                 let bytes = file_util::read_file(entry.path())?;
                 writer.write_all(&bytes).map_err(LangsError::ZipWrite)?;
             } else {
                 // java-langs expects directories to have their own entries
                 writer.start_file(
                     relative_path.join("").to_string_lossy(), // java-langs expects directory entries to have a trailing slash
-                    zip::write::FileOptions::default().unix_permissions(0o744),
+                    zip::write::FileOptions::default().unix_permissions(0o755),
                 )?;
             }
         }

tmc-langs/src/submission_packaging.rs

@@ -296,12 +296,12 @@ pub fn prepare_submission(
                 if entry_path.is_dir() {
                     archive.add_directory(
                         stripped.to_string_lossy(),
-                        FileOptions::default().unix_permissions(0o744),
+                        FileOptions::default().unix_permissions(0o755),
                     )?;
                 } else {
                     archive.start_file(
                         stripped.to_string_lossy(),
-                        FileOptions::default().unix_permissions(0o744),
+                        FileOptions::default().unix_permissions(0o755),
                     )?;
                     let mut file = file_util::open_file(entry_path)?;
                     std::io::copy(&mut file, &mut archive)