removed superfluous functions

Author: Heliozoa

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/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)?;