Merge pull request #99 from rage/refresh-fixer

Refresh fixer

Author: Heliozoa

tmc-langs-framework/Cargo.toml

@@ -18,6 +18,7 @@ zip = "0.5"
 schemars = "0.8"
 once_cell = "1"
 nom = "6"
+funty = "=1.1.0"  # temporary workaround, remove later
 subprocess = "0.2"
 tempfile = "3"
 anyhow = "1"

tmc-langs-framework/src/plugin.rs

@@ -433,7 +433,7 @@ pub trait LanguagePlugin {
             for entry in WalkDir::new(exercise_file_path) {
                 let entry = entry?;
                 if entry.path().is_file() {
-                    log::debug!("parsing points from {}", entry.path().display());
+                    log::trace!("parsing points from {}", entry.path().display());
                     let file_contents = file_util::read_file_to_string(entry.path())?;
 
                     let etc_parser = combinator::value(Parse::Other, bytes::complete::take(1usize));

tmc-langs-util/src/task_executor.rs

@@ -7,7 +7,8 @@ mod tar_helper;
 mod tmc_zip;
 
 pub use self::course_refresher::{refresh_course, ModeBits, RefreshData, RefreshExercise};
-pub use self::submission_packaging::{OutputFormat, TmcParams};
+pub use self::submission_packaging::{prepare_submission, OutputFormat, TmcParams};
+pub use self::submission_processing::prepare_solution;
 
 use crate::error::UtilError;
 use crate::{ExerciseDesc, ExercisePackagingConfiguration, RunResult, StyleValidationResult};
@@ -28,12 +29,6 @@ use tmc_langs_python3::Python3Plugin;
 use tmc_langs_r::RPlugin;
 use walkdir::WalkDir;
 
-/// See `submission_processing::prepare_solution`.
-pub fn prepare_solution(exercise_path: &Path, dest_root: &Path) -> Result<(), UtilError> {
-    submission_processing::prepare_solution(exercise_path, dest_root)?;
-    Ok(())
-}
-
 /// See `submission_processing::prepare_stub`.
 pub fn prepare_stub(exercise_path: &Path, dest_path: &Path) -> Result<(), UtilError> {
     submission_processing::prepare_stub(&exercise_path, dest_path)?;
@@ -45,28 +40,6 @@ pub fn prepare_stub(exercise_path: &Path, dest_path: &Path) -> Result<(), UtilEr
     Ok(())
 }
 
-/// Takes a submission zip and turns it into an archive suitable for
-/// further processing by among other things resetting the test files
-pub fn prepare_submission(
-    zip_path: &Path,
-    target_path: &Path,
-    toplevel_dir_name: Option<String>,
-    tmc_params: TmcParams,
-    clone_path: &Path,
-    stub_zip_path: Option<&Path>,
-    output_format: OutputFormat,
-) -> Result<(), UtilError> {
-    submission_packaging::prepare_submission(
-        zip_path,
-        target_path,
-        toplevel_dir_name,
-        tmc_params,
-        clone_path,
-        stub_zip_path,
-        output_format,
-    )
-}
-
 /// See `LanguagePlugin::check_code_style`.
 pub fn run_check_code_style(
     path: &Path,

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

@@ -8,8 +8,8 @@ use crate::{
 use md5::Context;
 use serde::{Deserialize, Serialize};
 use serde_yaml::Mapping;
-use std::io::Write;
 use std::path::{Path, PathBuf};
+use std::{io::Write, time::Duration};
 use tmc_langs_framework::{command::TmcCommand, file_util, subprocess::Redirection};
 use walkdir::WalkDir;
 
@@ -200,7 +200,10 @@ fn initialize_new_cache_clone(
     log::info!("initializing repository at {}", new_clone_path.display());
 
     if old_clone_path.join(".git").exists() {
-        log::info!("trying to copy clone from previous cache");
+        log::info!(
+            "trying to copy clone from previous cache at {}",
+            old_clone_path.display()
+        );
 
         // closure to collect any error that occurs during the process
         let copy_and_update_repository = || -> Result<(), UtilError> {
@@ -214,7 +217,7 @@ fn initialize_new_cache_clone(
                             .stdout(Redirection::Pipe)
                             .stderr(Redirection::Pipe)
                     })
-                    .output_checked()
+                    .output_with_timeout_checked(Duration::from_secs(60 * 2))
             };
 
             run_git(&["remote", "set-url", "origin", course_source_url])?;
@@ -249,7 +252,7 @@ fn initialize_new_cache_clone(
                 .stdout(Redirection::Pipe)
                 .stderr(Redirection::Pipe)
         })
-        .output_checked()?;
+        .output_with_timeout_checked(Duration::from_secs(60 * 2))?;
     Ok(())
 }
 
@@ -440,52 +443,6 @@ mod test {
         target
     }
 
-    /*
-    #[test]
-    #[ignore = "uses git"]
-    fn updates_repository() {
-        init();
-
-        let cache = tempfile::TempDir::new().unwrap();
-        file_util::create_dir_all(cache.path().join("clone")).unwrap();
-        let run_git = |args: &[&str], cwd: &Path| {
-            TmcCommand::new("git")
-                .with(|e| {
-                    e.args(args)
-                        .cwd(cwd)
-                        .stdout(Redirection::Pipe)
-                        .stderr(Redirection::Pipe)
-                })
-                .output_checked()
-                .unwrap()
-        };
-        run_git(&["init"], &cache.path().join("clone"));
-        assert!(cache.path().join("clone/.git").exists());
-
-        let clone = tempfile::TempDir::new().unwrap();
-        run_git(&["init"], &clone.path());
-        run_git(&["remote", "add", "origin", ""], &clone.path());
-
-        update_or_clone_repository(clone.path(), Path::new(GIT_REPO), "master", cache.path())
-            .unwrap();
-        assert!(clone.path().join("texts").exists());
-    }
-
-    #[test]
-    #[ignore = "uses git"]
-    fn clones_repository() {
-        init();
-
-        let clone = tempfile::TempDir::new().unwrap();
-        assert!(!clone.path().join(".git").exists());
-        let old_cache_path = Path::new("nonexistent");
-
-        update_or_clone_repository(clone.path(), Path::new(GIT_REPO), "master", old_cache_path)
-            .unwrap();
-        assert!(clone.path().join("texts").exists());
-    }
-    */
-
     #[test]
     fn checks_directory_names() {
         init();

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

@@ -366,7 +366,7 @@ pub fn prepare_submission(
     let tmc_project_yml = TmcProjectYml::from(clone_path)?;
     for extra_student_file in tmc_project_yml.extra_student_files {
         // todo secure path
-        let source = received_dir.join(&extra_student_file);
+        let source = project_root.join(&extra_student_file);
         if source.exists() {
             let target = dest.join(&extra_student_file);
             file_util::copy(source, target)?;

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

@@ -116,7 +116,7 @@ fn copy_file(
             }
         }
         // writes all lines
-        log::debug!(
+        log::trace!(
             "filtered file {} to {}",
             file.display(),
             dest_path.display()