Use new CLI settings

Heliozoa · Heliozoa · commit ad1f28aa8693 · 2022-09-13T05:35:46.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/tmc-langs-node/src/de.rs b/bindings/tmc-langs-node/src/de.rs
@@ -200,7 +200,7 @@ struct JsObjectAccess<'a, 'j, C: Context<'j> + 'a> {
 }
 
 #[doc(hidden)]
-impl<'x, 'a, 'j, C: Context<'j>> JsObjectAccess<'a, 'j, C> {
+impl<'a, 'j, C: Context<'j>> JsObjectAccess<'a, 'j, C> {
     fn new(cx: &'a mut C, input: Handle<'j, JsObject>) -> LibResult<Self> {
         let prop_names = input.get_own_property_names(cx)?;
         let len = prop_names.len(cx);
diff --git a/bindings/tmc-langs-node/src/helpers.rs b/bindings/tmc-langs-node/src/helpers.rs
@@ -7,8 +7,8 @@ macro_rules! lock {
     ( $cx: ident, $( $path: expr ),+ ) => {
         $(
             let path_buf: PathBuf = (&$path).into();
-            let mut fl = $crate::file_util::FileLock::new(path_buf).map_err(|e| crate::helpers::convert_err(&mut $cx, e))?;
-            let _lock = fl.lock().map_err(|e| crate::helpers::convert_err(&mut $cx, e))?;
+            let mut fl = $crate::file_util::FileLock::new(path_buf).map_err(|e| $crate::helpers::convert_err(&mut $cx, e))?;
+            let _lock = fl.lock().map_err(|e| $crate::helpers::convert_err(&mut $cx, e))?;
         )*
     };
 }
@@ -17,7 +17,7 @@ macro_rules! lock {
 macro_rules! parse_arg {
     ($cx: ident, $ty: path, $i: expr) => {{
         let arg = $cx.argument::<JsValue>($i)?;
-        crate::de::from_value::<_, $ty>(&mut $cx, arg).expect("failed to parse argument")
+        $crate::de::from_value::<_, $ty>(&mut $cx, arg).expect("failed to parse argument")
     }};
 }
 
@@ -86,6 +86,19 @@ macro_rules! parse_args {
             parse_arg!($cx, $ty7, 7),
         );
     };
+    ($cx: ident, $id0: ident : $ty0: path, $id1: ident : $ty1: path, $id2: ident : $ty2: path, $id3: ident : $ty3: path, $id4: ident : $ty4: path, $id5: ident : $ty5: path, $id6: ident : $ty6: path, $id7: ident : $ty7: path, $id8: ident : $ty8: path) => {
+        let ($id0, $id1, $id2, $id3, $id4, $id5, $id6, $id7, $id8) = (
+            parse_arg!($cx, $ty0, 0),
+            parse_arg!($cx, $ty1, 1),
+            parse_arg!($cx, $ty2, 2),
+            parse_arg!($cx, $ty3, 3),
+            parse_arg!($cx, $ty4, 4),
+            parse_arg!($cx, $ty5, 5),
+            parse_arg!($cx, $ty6, 6),
+            parse_arg!($cx, $ty7, 7),
+            parse_arg!($cx, $ty8, 8),
+        );
+    };
 }
 
 pub fn convert_err<E: Error>(cx: &mut FunctionContext, e: E) -> Throw {
diff --git a/bindings/tmc-langs-node/src/lib.rs b/bindings/tmc-langs-node/src/lib.rs
@@ -123,7 +123,8 @@ fn extract_project(mut cx: FunctionContext) -> JsResult<JsValue> {
     let mut data = vec![];
     guard.read_to_end(&mut data).expect("failed to read data");
 
-    let res = tmc_langs::extract_project(Cursor::new(data), &output_path, compression, false);
+    let res =
+        tmc_langs::extract_project(Cursor::new(data), &output_path, compression, false, false);
     convert_res(&mut cx, res)
 }
 
@@ -180,8 +181,10 @@ fn prepare_submission(mut cx: FunctionContext) -> JsResult<JsValue> {
         output_format: String,
         clone_path: PathBuf,
         output_path: PathBuf,
-        stub_zip_path: Option<PathBuf>,
+        stub_archive_path: Option<PathBuf>,
+        stub_compression: Compression,
         submission_path: PathBuf,
+        submission_compression: Compression,
         tmc_param: Vec<(String, Vec<String>)>,
         top_level_dir_name: Option<String>
     );
@@ -207,12 +210,12 @@ fn prepare_submission(mut cx: FunctionContext) -> JsResult<JsValue> {
     };
 
     let res = tmc_langs::prepare_submission(
-        &submission_path,
+        (&submission_path, submission_compression),
         &output_path,
         top_level_dir_name,
         tmc_params,
         &clone_path,
-        stub_zip_path.as_deref(),
+        stub_archive_path.as_deref().map(|p| (p, stub_compression)),
         compression,
     );
     convert_res(&mut cx, res)
diff --git a/bindings/tmc-langs-node/ts/functions.d.ts b/bindings/tmc-langs-node/ts/functions.d.ts
@@ -34,8 +34,10 @@ export function prepareSubmission(
   outputFormat: types.Compression,
   clonePath: string,
   outputPath: string,
-  stubZipPath: string | null,
+  stubArchivePath: string | null,
+  stubCompression: Compression,
   submissionPath: string,
+  submissionCompression: Compression,
   tmcParam: Array<[string, Array<string>]>,
   topLevelDirName: string | null
 ): void;
diff --git a/plugins/make/src/plugin.rs b/plugins/make/src/plugin.rs
@@ -179,7 +179,7 @@ impl LanguagePlugin for MakePlugin {
                             if io_error.kind() == io::ErrorKind::PermissionDenied =>
                         {
                             // failed due to lacking permissions, try to clean and rerun
-                            let _output = self.clean(path)?;
+                            self.clean(path)?;
                             match self.run_tests_with_valgrind(path, false) {
                                 Ok(output) => output,
                                 Err(err) => {
diff --git a/tmc-client/src/tmc_client.rs b/tmc-client/src/tmc_client.rs
@@ -265,7 +265,8 @@ impl TmcClient {
 
         // compress
         start_stage(2, "Compressing paste submission...", None);
-        let compressed = tmc_langs_plugins::compress_project(submission_path, Compression::Zip)?;
+        let compressed =
+            tmc_langs_plugins::compress_project(submission_path, Compression::Zip, false)?;
         progress_stage(
             "Compressed paste submission. Posting paste submission...",
             None,
@@ -333,7 +334,8 @@ impl TmcClient {
         self.require_authentication()?;
 
         start_stage(2, "Compressing submission...", None);
-        let compressed = tmc_langs_plugins::compress_project(submission_path, Compression::Zip)?;
+        let compressed =
+            tmc_langs_plugins::compress_project(submission_path, Compression::Zip, false)?;
         progress_stage("Compressed submission. Posting submission...", None);
 
         let result = api_v8::core::submit_exercise(
@@ -556,7 +558,8 @@ impl TmcClient {
     ) -> Result<NewSubmission, ClientError> {
         self.require_authentication()?;
 
-        let compressed = tmc_langs_plugins::compress_project(submission_path, Compression::Zip)?;
+        let compressed =
+            tmc_langs_plugins::compress_project(submission_path, Compression::Zip, false)?;
         let review = if let Some(message) = message_for_reviewer {
             ReviewData::WithMessage(message)
         } else {
diff --git a/tmc-langs-cli/Cargo.toml b/tmc-langs-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tmc-langs-cli"
-version = "0.26.0"
+version = "0.26.1"
 authors = ["University of Helsinki <mooc@cs.helsinki.fi>", "Daniel Martinez <daniel.x.martinez@helsinki.fi>"]
 edition = "2021"
 description = "CLI client for TMC"
diff --git a/tmc-langs-cli/src/lib.rs b/tmc-langs-cli/src/lib.rs
@@ -20,7 +20,7 @@ use std::{
     collections::HashMap,
     env,
     fs::File,
-    io::{self, Cursor, Read, Write, BufReader},
+    io::{self, BufReader, Cursor, Read, Write},
     ops::Deref,
     path::{Path, PathBuf},
 };
@@ -89,8 +89,7 @@ fn run_inner() -> Result<(), ()> {
                     trace: causes,
                 }),
             }));
-            print_output(&error_output, false)
-                .expect("failed to print output");
+            print_output(&error_output, false).expect("failed to print output");
             return Err(());
         }
     };
@@ -265,7 +264,7 @@ fn run_app(matches: Opt) -> Result<()> {
             let mut data = vec![];
             guard.read_to_end(&mut data)?;
 
-            tmc_langs::extract_project(Cursor::new(data), &output_path, compression, true)?;
+            tmc_langs::extract_project(Cursor::new(data), &output_path, compression, true, naive)?;
 
             OutputKind::finished(format!(
                 "extracted project from {} to {}",
@@ -419,12 +418,12 @@ fn run_app(matches: Opt) -> Result<()> {
             }
 
             tmc_langs::prepare_submission(
-                &submission_path,
+                (&submission_path, submission_compression),
                 &output_path,
                 top_level_dir_name,
                 tmc_params,
                 &clone_path,
-                stub_archive_path.as_deref(),
+                stub_archive_path.as_deref().map(|p| (p, stub_compression)),
                 output_format,
             )?;
             OutputKind::finished(format!(
@@ -813,7 +812,8 @@ fn run_core_inner(
                 // TODO: print "Please enter password" and add "quiet"  flag
                 let password = if stdin {
                     let mut stdin = BufReader::new(std::io::stdin());
-                    rpassword::read_password_from_bufread(&mut stdin).context("Failed to read password")?
+                    rpassword::read_password_from_bufread(&mut stdin)
+                        .context("Failed to read password")?
                 } else {
                     rpassword::read_password().context("Failed to read password")?
                 };
diff --git a/tmc-langs-framework/src/archive.rs b/tmc-langs-framework/src/archive.rs
@@ -1,5 +1,5 @@
 use serde::Deserialize;
-use std::io::{BufReader, Read, Seek};
+use std::io::{BufReader, Cursor, Read, Seek};
 use std::ops::ControlFlow::{self, Break};
 use std::path::{Path, PathBuf};
 use std::{fmt::Display, str::FromStr};
@@ -220,6 +220,39 @@ pub enum Compression {
     TarZstd,
 }
 
+impl Compression {
+    pub fn compress(self, path: &Path) -> Result<Vec<u8>, TmcError> {
+        let buf = Cursor::new(Vec::new());
+        let buf = match self {
+            Self::Tar => {
+                let mut builder = tar::Builder::new(buf);
+                builder
+                    .append_dir_all(".", path)
+                    .map_err(TmcError::TarWrite)?;
+                builder.into_inner().map_err(TmcError::TarWrite)?
+            }
+            Self::Zip => {
+                let mut writer = zip::ZipWriter::new(buf);
+                let path_str = path
+                    .to_str()
+                    .ok_or_else(|| TmcError::InvalidUtf8(path.to_path_buf()))?;
+                writer.add_directory(path_str, Default::default())?;
+                writer.finish()?
+            }
+            Self::TarZstd => {
+                let mut builder = tar::Builder::new(buf);
+                builder
+                    .append_dir_all(".", path)
+                    .map_err(TmcError::TarWrite)?;
+                let buf = builder.into_inner().map_err(TmcError::TarWrite)?;
+                let encoder = zstd::Encoder::new(buf, 0).map_err(TmcError::ZstdWrite)?;
+                encoder.finish().map_err(TmcError::ZstdWrite)?
+            }
+        };
+        Ok(buf.into_inner())
+    }
+}
+
 impl Display for Compression {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
diff --git a/tmc-langs-framework/src/error.rs b/tmc-langs-framework/src/error.rs
@@ -23,6 +23,9 @@ pub enum TmcError {
     #[error("Failed to write zstd archive")]
     ZstdWrite(#[source] std::io::Error),
 
+    #[error("Path {0} is not valid UTF-8")]
+    InvalidUtf8(PathBuf),
+
     #[error("Failed to read line")]
     ReadLine(#[source] std::io::Error),
     #[error("Failed to canonicalize path {0}")]
diff --git a/tmc-langs-plugins/src/lib.rs b/tmc-langs-plugins/src/lib.rs
@@ -54,7 +54,16 @@ pub fn extract_project_overwrite(
 
 /// See `LanguagePlugin::compress_project`.
 // TODO: clean up
-pub fn compress_project(path: &Path, compression: Compression) -> Result<Vec<u8>, PluginError> {
+pub fn compress_project(
+    path: &Path,
+    compression: Compression,
+    naive: bool,
+) -> Result<Vec<u8>, PluginError> {
+    if naive {
+        let compressed = compression.compress(path)?;
+        return Ok(compressed);
+    }
+
     match get_language_plugin_type(path) {
         Some(PluginType::CSharp) => Ok(compression::compress_student_files(
             <CSharpPlugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
diff --git a/tmc-langs-util/src/progress_reporter.rs b/tmc-langs-util/src/progress_reporter.rs
@@ -116,7 +116,7 @@ pub fn progress_stage<T: 'static + Send + Sync>(message: String, data: Option<T>
                     time: reporter.start_time.elapsed().as_millis(),
                     data,
                 };
-                let _r = progress_reporter.progress_report.as_ref()(status_update);
+                progress_reporter.progress_report.as_ref()(status_update);
             }
         }
     }
@@ -150,7 +150,7 @@ pub fn finish_stage<T: 'static + Send + Sync>(message: String, data: Option<T>)
                     time: reporter.start_time.elapsed().as_millis(),
                     data,
                 };
-                let _r = progress_reporter.progress_report.as_ref()(status_update);
+                progress_reporter.progress_report.as_ref()(status_update);
             }
         }
 
diff --git a/tmc-langs/Cargo.toml b/tmc-langs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tmc-langs"
-version = "0.26.0"
+version = "0.26.1"
 authors = ["University of Helsinki <mooc@cs.helsinki.fi>", "Daniel Martinez <daniel.x.martinez@helsinki.fi>"]
 edition = "2021"
 description = "Library for TMC"
diff --git a/tmc-langs/src/lib.rs b/tmc-langs/src/lib.rs
@@ -373,6 +373,7 @@ pub fn download_or_update_course_exercises(
                                 &download_target.target.path,
                                 Compression::Zip,
                                 false,
+                                false,
                             )?;
                         }
                         DownloadTargetKind::Submission { submission_id } => {
@@ -383,6 +384,7 @@ pub fn download_or_update_course_exercises(
                                 &download_target.target.path,
                                 Compression::Zip,
                                 false,
+                                false,
                             )?;
 
                             let plugin = get_language_plugin(&download_target.target.path)?;
@@ -649,7 +651,13 @@ pub fn update_exercises(
             for exercise in &exercises_to_update {
                 let mut buf = vec![];
                 client.download_exercise(exercise.id, &mut buf)?;
-                extract_project(Cursor::new(buf), &exercise.path, Compression::Zip, false)?;
+                extract_project(
+                    Cursor::new(buf),
+                    &exercise.path,
+                    Compression::Zip,
+                    false,
+                    false,
+                )?;
             }
             for (course_name, exercise_names) in course_data {
                 let mut exercises = BTreeMap::new();
@@ -761,7 +769,7 @@ pub fn compress_project_to(
         compression
     );
 
-    let data = tmc_langs_plugins::compress_project(source, compression)?;
+    let data = tmc_langs_plugins::compress_project(source, compression, naive)?;
     if let Some(parent) = target.parent() {
         file_util::create_dir_all(parent)?;
     }
@@ -789,7 +797,13 @@ pub fn reset(client: &TmcClient, exercise_id: u32, exercise_path: &Path) -> Resu
     }
     let mut buf = vec![];
     client.download_exercise(exercise_id, &mut buf)?;
-    extract_project(Cursor::new(buf), exercise_path, Compression::Zip, false)?;
+    extract_project(
+        Cursor::new(buf),
+        exercise_path,
+        Compression::Zip,
+        false,
+        false,
+    )?;
     Ok(())
 }
 
@@ -799,13 +813,16 @@ pub fn extract_project(
     target_location: &Path,
     compression: Compression,
     clean: bool,
+    naive: bool,
 ) -> Result<(), LangsError> {
     log::debug!(
         "extracting compressed project to {}",
         target_location.display()
     );
 
-    if let Ok(plugin) = tmc_langs_plugins::get_language_plugin(target_location) {
+    if naive {
+        extract_project_overwrite(compressed_project, target_location, compression)?;
+    } else if let Ok(plugin) = tmc_langs_plugins::get_language_plugin(target_location) {
         plugin.extract_project(compressed_project, target_location, compression, clean)?;
     } else {
         log::debug!(
diff --git a/tmc-langs/src/submission_packaging.rs b/tmc-langs/src/submission_packaging.rs

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ struct JsObjectAccess<'a, 'j, C: Context<'j> + 'a> {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`#[doc(hidden)]`
`203`		`-impl<'x, 'a, 'j, C: Context<'j>> JsObjectAccess<'a, 'j, C> {`
	`203`	`+impl<'a, 'j, C: Context<'j>> JsObjectAccess<'a, 'j, C> {`
`204`	`204`	`fn new(cx: &'a mut C, input: Handle<'j, JsObject>) -> LibResult<Self> {`
`205`	`205`	`let prop_names = input.get_own_property_names(cx)?;`
`206`	`206`	`let len = prop_names.len(cx);`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ impl LanguagePlugin for MakePlugin {`
`179`	`179`	`if io_error.kind() == io::ErrorKind::PermissionDenied =>`
`180`	`180`	`{`
`181`	`181`	`// failed due to lacking permissions, try to clean and rerun`
`182`		`- let _output = self.clean(path)?;`
	`182`	`+ self.clean(path)?;`
`183`	`183`	`match self.run_tests_with_valgrind(path, false) {`
`184`	`184`	`Ok(output) => output,`
`185`	`185`	`Err(err) => {`