Merge pull request #171 from rage/download-old-submission-fix

Download old submission fix

Author: Heliozoa

tmc-client/src/error.rs

@@ -1,7 +1,6 @@
 //! The client error type.
 
 use reqwest::{Method, StatusCode};
-use std::path::PathBuf;
 use thiserror::Error;
 use tmc_langs_util::FileError;
 use url::Url;
@@ -38,8 +37,8 @@ pub enum ClientError {
     TokenParse(String, #[source] serde_json::error::Error),
     #[error("Failed to parse as URL: {0}")]
     UrlParse(String, #[source] url::ParseError),
-    #[error("Failed to write response to {0}")]
-    HttpWriteResponse(PathBuf, #[source] reqwest::Error),
+    #[error("Failed to write response")]
+    HttpWriteResponse(#[source] reqwest::Error),
     #[error("Failed to deserialize response from {0} as JSON")]
     HttpJsonResponse(Url, #[source] reqwest::Error),
 

tmc-client/src/tmc_client.rs

@@ -11,12 +11,12 @@ use oauth2::{
 };
 use reqwest::{blocking::Client, Url};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
+use std::{collections::HashMap, io::Cursor};
 use tempfile::NamedTempFile;
 use tmc_langs_util::{progress_reporter, FileError};
 
@@ -404,9 +404,10 @@ impl TmcClient {
     pub fn download_old_submission(
         &self,
         submission_id: usize,
-        target: &Path,
+        mut target: impl Write,
     ) -> Result<(), ClientError> {
-        self.download_submission(submission_id, target)
+        log::info!("downloading old submission {}", submission_id);
+        self.download_submission(submission_id, &mut target)
     }
 
     pub fn get_exercise_submissions_for_current_user(
@@ -584,9 +585,9 @@ impl TmcClient {
         solution_download_url: Url,
         target: &Path,
     ) -> Result<(), ClientError> {
-        let zip_file = NamedTempFile::new().map_err(ClientError::TempFile)?;
-        self.download_from(solution_download_url, zip_file.path())?;
-        tmc_langs_plugins::extract_project(zip_file, target, false)?;
+        let mut buf = vec![];
+        self.download_from(solution_download_url, &mut buf)?;
+        tmc_langs_plugins::extract_project(Cursor::new(buf), target, false)?;
         Ok(())
     }
 

tmc-client/src/tmc_client/api.rs

@@ -14,11 +14,11 @@ use reqwest::{
 };
 use serde::de::DeserializeOwned;
 use serde_json::Value;
-use std::collections::HashMap;
 use std::path::Path;
 use std::time::SystemTime;
+use std::{collections::HashMap, io::Write};
 use tmc_langs_plugins::Language;
-use tmc_langs_util::{file_util, FileError};
+use tmc_langs_util::FileError;
 use url::Url;
 
 /// Provides a wrapper for reqwest Response's json that deserializes into Response<T> and converts it into a result
@@ -121,15 +121,14 @@ impl TmcClient {
             .json_res()
     }
 
-    fn download(&self, url_tail: &str, target: &Path) -> Result<(), ClientError> {
+    fn download(&self, url_tail: &str, mut target: impl Write) -> Result<(), ClientError> {
         let url = self
             .0
             .api_url
             .join(url_tail)
             .map_err(|e| ClientError::UrlParse(url_tail.to_string(), e))?;
 
         // download zip
-        let mut target_file = file_util::create_file(target)?;
         log::debug!("downloading {}", url);
         let mut response = self
             .0
@@ -168,24 +167,26 @@ impl TmcClient {
             }
         } else {
             response
-                .copy_to(&mut target_file)
-                .map_err(|e| ClientError::HttpWriteResponse(target.to_path_buf(), e))?;
+                .copy_to(&mut target)
+                .map_err(ClientError::HttpWriteResponse)?;
             Ok(())
         }
     }
 
-    pub(crate) fn download_from(&self, url: Url, target: &Path) -> Result<(), ClientError> {
-        // download zip
-        let mut target_file = file_util::create_file(target)?;
+    pub(crate) fn download_from(
+        &self,
+        url: Url,
+        mut target: impl Write,
+    ) -> Result<(), ClientError> {
         log::debug!("downloading {}", url);
         self.0
             .client
             .get(url.clone())
             .tmc_headers(self)
             .send()
             .map_err(|e| ClientError::ConnectionError(Method::GET, url, e))?
-            .copy_to(&mut target_file)
-            .map_err(|e| ClientError::HttpWriteResponse(target.to_path_buf(), e))?;
+            .copy_to(&mut target)
+            .map_err(ClientError::HttpWriteResponse)?;
         Ok(())
     }
 
@@ -578,7 +579,7 @@ impl TmcClient {
         organization_slug: &str,
         course_name: &str,
         exercise_name: &str,
-        target: &Path,
+        target: impl Write,
     ) -> Result<(), ClientError> {
         if self.0.token.is_none() {
             return Err(ClientError::NotLoggedIn);
@@ -639,7 +640,11 @@ impl TmcClient {
         todo!("needs admin?");
     }
 
-    pub fn download_exercise(&self, exercise_id: usize, target: &Path) -> Result<(), ClientError> {
+    pub fn download_exercise(
+        &self,
+        exercise_id: usize,
+        target: impl Write,
+    ) -> Result<(), ClientError> {
         let url_tail = format!("core/exercises/{}/download", exercise_id);
         self.download(&url_tail, target)
     }
@@ -686,7 +691,7 @@ impl TmcClient {
     pub(super) fn download_solution(
         &self,
         exercise_id: usize,
-        target: &Path,
+        target: impl Write,
     ) -> Result<(), ClientError> {
         if self.0.token.is_none() {
             return Err(ClientError::NotLoggedIn);
@@ -800,7 +805,7 @@ impl TmcClient {
     pub(super) fn download_submission(
         &self,
         submission_id: usize,
-        target: &Path,
+        target: impl Write,
     ) -> Result<(), ClientError> {
         if self.0.token.is_none() {
             return Err(ClientError::NotLoggedIn);

tmc-langs-cli/src/lib.rs

@@ -598,7 +598,7 @@ fn run_core_inner(
             tmc_langs::download_old_submission(
                 &client,
                 exercise_id,
-                output_path,
+                &output_path,
                 submission_id,
                 submission_url,
             )?;
@@ -854,7 +854,7 @@ fn run_core_inner(
                     None,
                 )?;
             }
-            tmc_langs::reset(&client, exercise_id, exercise_path)?;
+            tmc_langs::reset(&client, exercise_id, &exercise_path)?;
             Output::finished("reset exercise")
         }