Merge pull request #90 from rage/refresh-fix-3

Refresh fix 3

Author: Heliozoa

tmc-langs-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tmc-langs-cli"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["University of Helsinki <[email protected]>", "Daniel Martinez <[email protected]>"]
 edition = "2018"
 description = "CLI client for TMC"

tmc-langs-cli/src/main.rs

@@ -1558,8 +1558,6 @@ fn run_settings(
             let dir = matches.value_of("dir").unwrap();
             let target = PathBuf::from(dir);
 
-            file_util::lock!(&target);
-
             if target.is_file() {
                 anyhow::bail!("The target path points to a file.")
             }

tmc-langs-util/src/error.rs

@@ -32,6 +32,8 @@ pub enum UtilError {
     #[error("Error while writing file to zip")]
     ZipWrite(#[source] std::io::Error),
 
+    #[error("Cache path {0} was invalid. Not a valid UTF-8 string or did not contain a cache version after a dash")]
+    InvalidCachePath(PathBuf),
     #[error("Path {0} contained a dash '-' which is currently not allowed")]
     InvalidDirectory(PathBuf),
 
@@ -43,6 +45,8 @@ pub enum UtilError {
     Zip(#[from] zip::result::ZipError),
     #[error(transparent)]
     FileIo(#[from] FileIo),
+    #[error(transparent)]
+    Yaml(#[from] serde_yaml::Error),
 
     #[cfg(unix)]
     #[error("Error changing permissions of {0}")]

tmc-langs-util/src/task_executor.rs

@@ -207,14 +207,18 @@ pub fn clean(path: &Path) -> Result<(), UtilError> {
 
 /// Recursively searches for valid exercise directories in the path.
 pub fn find_exercise_directories(exercise_path: &Path) -> Result<Vec<PathBuf>, UtilError> {
+    log::info!(
+        "finding exercise directories in {}",
+        exercise_path.display()
+    );
+
     let mut paths = vec![];
     for entry in WalkDir::new(exercise_path).into_iter().filter_entry(|e| {
         !submission_processing::is_hidden_dir(e)
             && e.file_name() != "private"
             && !submission_processing::contains_tmcignore(e)
     }) {
         let entry = entry?;
-        // TODO: Java implementation doesn't scan root directories
         if is_exercise_root_directory(entry.path()) {
             paths.push(entry.into_path())
         }