fixes

Author: Heliozoa

tmc-langs-util/src/error.rs

@@ -1,10 +1,11 @@
 //! Contains the crate error type
 
-#[cfg(unix)]
 use std::path::PathBuf;
 use thiserror::Error;
 use tmc_langs_framework::error::FileIo;
 
+use crate::task_executor::ModeBits;
+
 #[derive(Debug, Error)]
 pub enum UtilError {
     #[error("Failed to create temporary file")]
@@ -31,12 +32,8 @@ pub enum UtilError {
     #[error("Error while writing file to zip")]
     ZipWrite(#[source] std::io::Error),
 
-    #[error("Unsupported source backend")]
-    UnsupportedSourceBackend,
     #[error("Path {0} contained a dash '-' which is currently not allowed")]
     InvalidDirectory(PathBuf),
-    #[error("The cache path  ({0}) must be inside the rails root path ({1})")]
-    CacheNotInRailsRoot(PathBuf, PathBuf),
 
     #[error(transparent)]
     TmcError(#[from] tmc_langs_framework::TmcError),
@@ -52,7 +49,7 @@ pub enum UtilError {
     NixPermissionChange(PathBuf, #[source] nix::Error),
     #[cfg(unix)]
     #[error("Invalid chmod flag: {0}")]
-    NixFlag(u32),
+    NixFlag(ModeBits),
 
     #[error(transparent)]
     DynError(#[from] Box<dyn 'static + std::error::Error + Sync + Send>),

tmc-langs-util/src/task_executor.rs

@@ -6,7 +6,7 @@ mod submission_processing;
 mod tar_helper;
 mod tmc_zip;
 
-pub use self::course_refresher::{refresh_course, RefreshData, RefreshExercise};
+pub use self::course_refresher::{refresh_course, ModeBits, RefreshData, RefreshExercise};
 pub use self::submission_packaging::{OutputFormat, TmcParams};
 
 use crate::error::UtilError;

tmc-langs-util/src/task_executor/course_refresher.rs

@@ -13,6 +13,11 @@ use std::path::{Path, PathBuf};
 use tmc_langs_framework::{command::TmcCommand, file_util, subprocess::Redirection};
 use walkdir::WalkDir;
 
+#[cfg(unix)]
+pub type ModeBits = nix::sys::stat::mode_t;
+#[cfg(not(unix))]
+pub type ModeBits = u32;
+
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct RefreshData {
@@ -359,7 +364,7 @@ fn set_permissions(path: &Path) -> Result<(), UtilError> {
     use nix::sys::stat;
     use std::os::unix::io::AsRawFd;
 
-    let chmod = 0o555; // octal, read and execute permissions for all users
+    let chmod: ModeBits = 0o555; // octal, read and execute permissions for all users
     for entry in WalkDir::new(path) {
         let entry = entry?;
         let file = file_util::open_file(entry.path())?;