Merge branch 'master' into refresh-sandbox

Author: Heliozoa

plugins/python3/src/plugin.rs

@@ -74,25 +74,25 @@ impl Python3Plugin {
         }
     }
 
-    fn get_local_python_ver() -> Result<(usize, usize, usize), PythonError> {
+    fn get_local_python_ver() -> Result<(u32, u32, u32), PythonError> {
         let output = Self::get_local_python_command()
         .with(|e| e.args(&["-c", "import sys; print(sys.version_info.major); print(sys.version_info.minor); print(sys.version_info.micro);"]))
         .output_checked()?;
         let stdout = String::from_utf8_lossy(&output.stdout);
         let mut lines = stdout.lines();
-        let major: usize = lines
+        let major: u32 = lines
             .next()
             .ok_or_else(|| PythonError::VersionPrintError(stdout.clone().into_owned()))?
             .trim()
             .parse()
             .map_err(|e| PythonError::VersionParseError(stdout.clone().into_owned(), e))?;
-        let minor: usize = lines
+        let minor: u32 = lines
             .next()
             .ok_or_else(|| PythonError::VersionPrintError(stdout.clone().into_owned()))?
             .trim()
             .parse()
             .map_err(|e| PythonError::VersionParseError(stdout.clone().into_owned(), e))?;
-        let patch: usize = lines
+        let patch: u32 = lines
             .next()
             .ok_or_else(|| PythonError::VersionPrintError(stdout.clone().into_owned()))?
             .trim()

tmc-client/Cargo.toml

@@ -13,7 +13,7 @@ chrono = { version = "0.4", features = ["serde"] }
 dirs = "3"
 http = "0.2"
 log = "0.4"
-oauth2 = { version = "4.0.0-beta.1", features = ["reqwest"] }
+oauth2 = { version = "4", features = ["reqwest"] }
 once_cell = "1"
 percent-encoding = "2"
 regex = "1"

tmc-client/src/error.rs

@@ -13,15 +13,6 @@ type TokenError = oauth2::RequestTokenError<
 /// The main error type for tmc-client.
 #[derive(Debug, Error)]
 pub enum ClientError {
-    // Arc
-    #[error("Tried to mutate client while it was borrowed")]
-    ArcBorrowed,
-
-    // file IO
-    #[error("Failed to create temporary file")]
-    TempFile(#[source] std::io::Error),
-
-    // network
     #[error("HTTP error {status} for {url}: {error}. Obsolete client: {obsolete_client}")]
     HttpError {
         url: Url,
@@ -33,37 +24,23 @@ pub enum ClientError {
     ConnectionError(Method, Url, #[source] reqwest::Error),
     #[error("OAuth2 password exchange error")]
     Token(#[source] Box<TokenError>),
-    #[error("OAuth2 unexpected token response: {0}")]
-    TokenParse(String, #[source] serde_json::error::Error),
     #[error("Failed to parse as URL: {0}")]
     UrlParse(String, #[source] url::ParseError),
     #[error("Failed to write response")]
     HttpWriteResponse(#[source] reqwest::Error),
     #[error("Failed to deserialize response from {0} as JSON")]
     HttpJsonResponse(Url, #[source] reqwest::Error),
 
-    #[error("Failed to download some exercises")]
-    IncompleteDownloadResult {
-        downloaded: Vec<usize>,
-        failed: Vec<(usize, Box<ClientError>)>,
-    },
-
     #[error("Already authenticated")]
     AlreadyAuthenticated,
     #[error("Authentication required")]
-    NotLoggedIn,
-    #[error("Failed to find cache directory")]
-    CacheDir,
-    #[error("No values found in exercise details map returned by server")]
-    MissingDetailsValue,
-    #[error("List of exercises given was empty")]
-    NoExercisesGiven,
+    NotAuthenticated,
 
     #[error(transparent)]
     SystemTime(#[from] std::time::SystemTimeError),
     #[error(transparent)]
     WalkDir(#[from] walkdir::Error),
-    #[error("File IO error")]
+    #[error(transparent)]
     FileError(#[from] FileError),
     #[error(transparent)]
     Plugin(#[from] tmc_langs_plugins::PluginError),

tmc-client/src/lib.rs

@@ -5,25 +5,20 @@
 //! ```rust,no_run
 //! use tmc_client::TmcClient;
 //!
-//! let mut client = TmcClient::new_in_config("https://tmc.mooc.fi".to_string(), "some_client".to_string(), "some_version".to_string()).unwrap();
+//! let mut client = TmcClient::new("https://tmc.mooc.fi".parse().unwrap(), "some_client".to_string(), "some_version".to_string());
 //! client.authenticate("client_name", "email".to_string(), "password".to_string());
 //! let organizations = client.get_organizations();
 //! ```
 //!
 
 mod error;
-mod request;
-mod response;
+pub mod request;
+pub mod response;
 mod tmc_client;
 
 pub use self::error::ClientError;
-pub use self::request::FeedbackAnswer;
-pub use self::response::{
-    Course, CourseData, CourseDataExercise, CourseDataExercisePoint, CourseDetails, CourseExercise,
-    Exercise, ExerciseDetails, ExercisesDetails, NewSubmission, Organization, Review, Submission,
-    SubmissionFeedbackResponse, SubmissionFinished, SubmissionProcessingStatus, SubmissionStatus,
-    UpdateResult, User,
-};
-pub use self::tmc_client::{ClientUpdateData, TmcClient, Token};
+pub use self::tmc_client::{api_v8, ClientUpdateData, TmcClient, Token, UpdateResult};
+
+// these types are part of tmc-client's API and thus re-exported
 pub use oauth2;
-pub use tmc_langs_plugins::{Language, RunResult, StyleValidationResult, StyleValidationStrategy};
+pub use tmc_langs_plugins::Language;

tmc-client/src/request.rs

@@ -2,6 +2,6 @@
 
 /// Used to respond to feedback questions. See TmcClient::send_feedback.
 pub struct FeedbackAnswer {
-    pub question_id: usize,
+    pub question_id: u32,
     pub answer: String,
 }