Merge pull request #19 from rage/work

Heliozoa · web-flow · commit 5ff0a06e4a01 · 2022-03-16T01:20:24.000+02:00
Work
diff --git a/src/commands/courses.rs b/src/commands/courses.rs
@@ -23,14 +23,10 @@ mod tests {
     use super::*;
     use isolang::Language;
     use reqwest::Url;
-    use std::path::Path;
-    use std::slice::Iter;
-    use tmc_langs::ClientError;
-    use tmc_langs::DownloadOrUpdateCourseExercisesResult;
-    use tmc_langs::DownloadResult;
-    use tmc_langs::LangsError;
+    use std::{path::Path, slice::Iter};
     use tmc_langs::{
-        CourseDetails, CourseExercise, ExercisesDetails, NewSubmission, Organization,
+        ClientError, CourseDetails, CourseExercise, DownloadOrUpdateCourseExercisesResult,
+        DownloadResult, ExercisesDetails, LangsError, NewSubmission, Organization,
         SubmissionFinished, SubmissionStatus,
     };
     pub struct IoTest<'a> {
@@ -131,7 +127,7 @@ mod tests {
             &mut self,
             _path: &Path,
         ) -> Result<DownloadOrUpdateCourseExercisesResult, LangsError> {
-            todo!()
+            unimplemented!()
         }
         fn submit(
             &self,
@@ -184,7 +180,7 @@ mod tests {
             &mut self,
             _exercise_ids: Vec<u32>,
         ) -> Result<Vec<ExercisesDetails>, ClientError> {
-            todo!()
+            unimplemented!()
         }
 
         fn download_or_update_exercises(
@@ -199,10 +195,10 @@ mod tests {
         }
 
         fn get_course_details(&self, _: u32) -> std::result::Result<CourseDetails, ClientError> {
-            todo!()
+            unimplemented!()
         }
         fn get_organization(&self, _: &str) -> std::result::Result<Organization, ClientError> {
-            todo!()
+            unimplemented!()
         }
     }
 
diff --git a/src/commands/download.rs b/src/commands/download.rs
@@ -1,15 +1,16 @@
-use super::util;
-use super::util::{get_organization, get_projects_dir, Client};
-use crate::interactive;
-use crate::io::{Io, PrintColor};
-use crate::progress_reporting;
-use crate::progress_reporting::ProgressBarManager;
+use super::{
+    util,
+    util::{get_organization, get_projects_dir, Client},
+};
+use crate::{
+    interactive,
+    io::{Io, PrintColor},
+    progress_reporting,
+    progress_reporting::ProgressBarManager,
+};
 use anyhow::Context;
-use std::path::Path;
-use std::process::Command;
-use tmc_langs::ClientUpdateData;
-use tmc_langs::Course;
-use tmc_langs::DownloadResult;
+use std::{path::Path, process::Command};
+use tmc_langs::{ClientUpdateData, Course, DownloadResult};
 
 // Downloads course exercises
 // course_name as None will trigger interactive menu for selecting a course
@@ -234,8 +235,7 @@ pub fn elevated_download(io: &mut dyn Io, client: &mut dyn Client) -> anyhow::Re
 }
 
 fn pause() -> anyhow::Result<()> {
-    use std::io;
-    use std::io::prelude::*;
+    use std::{io, io::prelude::*};
     let stdin = io::stdin();
     let mut stdout = io::stdout();
     write!(stdout, "Press any enter to continue...")?;
diff --git a/src/commands/exercises.rs b/src/commands/exercises.rs
@@ -88,20 +88,15 @@ fn print_exercises(
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use isolang::Language;
     use reqwest::Url;
-    use std::path::Path;
-    use tmc_langs::ClientError;
-    use tmc_langs::DownloadOrUpdateCourseExercisesResult;
-    use tmc_langs::DownloadResult;
-    use tmc_langs::LangsError;
+    use std::{path::Path, slice::Iter};
     use tmc_langs::{
-        Course, CourseDetails, CourseExercise, ExercisesDetails, NewSubmission, Organization,
+        ClientError, Course, CourseDetails, CourseExercise, DownloadOrUpdateCourseExercisesResult,
+        DownloadResult, ExercisesDetails, LangsError, NewSubmission, Organization,
         SubmissionFinished, SubmissionStatus,
     };
-
-    use super::*;
-    use std::slice::Iter;
     pub struct IoTest<'a> {
         list: &'a mut Vec<String>,
         input: &'a mut Iter<'a, &'a str>,
@@ -315,13 +310,13 @@ mod tests {
             &mut self,
             _exercise_ids: Vec<u32>,
         ) -> Result<Vec<ExercisesDetails>, ClientError> {
-            todo!()
+            unimplemented!()
         }
         fn update_exercises(
             &mut self,
             _path: &Path,
         ) -> Result<DownloadOrUpdateCourseExercisesResult, LangsError> {
-            todo!()
+            unimplemented!()
         }
         fn download_or_update_exercises(
             &mut self,
@@ -335,10 +330,10 @@ mod tests {
         }
 
         fn get_course_details(&self, _: u32) -> Result<CourseDetails, ClientError> {
-            todo!()
+            unimplemented!()
         }
         fn get_organization(&self, _: &str) -> Result<Organization, ClientError> {
-            todo!()
+            unimplemented!()
         }
     }
 
diff --git a/src/commands/login.rs b/src/commands/login.rs
@@ -1,8 +1,6 @@
-use anyhow::Context;
-
-use super::util::Client;
-use super::{download, organization, util};
+use super::{download, organization, util, util::Client};
 use crate::io::{Io, PrintColor};
+use anyhow::Context;
 
 pub fn login(
     io: &mut dyn Io,
@@ -98,8 +96,7 @@ pub fn download_after_login(client: &mut dyn Client, io: &mut dyn Io) -> anyhow:
 
 #[cfg(test)]
 mod tests {
-    use super::super::util::*;
-    use super::*;
+    use super::{super::util::*, *};
     use std::slice::Iter;
     use tmc_langs::Organization;
 
diff --git a/src/commands/logout.rs b/src/commands/logout.rs
@@ -9,8 +9,7 @@ pub fn logout(io: &mut dyn Io, client: &mut dyn Client) -> anyhow::Result<()> {
 
 #[cfg(test)]
 mod tests {
-    use super::super::util::*;
-    use super::*;
+    use super::{super::util::*, *};
     use std::slice::Iter;
 
     pub struct IoTest<'a> {
diff --git a/src/commands/organization.rs b/src/commands/organization.rs
@@ -1,7 +1,8 @@
-use super::util;
-use super::util::Client;
-use crate::interactive::{self, interactive_list};
-use crate::io::{Io, PrintColor};
+use super::{util, util::Client};
+use crate::{
+    interactive::{self, interactive_list},
+    io::{Io, PrintColor},
+};
 
 // Asks for organization from user and saves it into file
 pub fn set_organization_old(io: &mut dyn Io, client: &mut dyn Client) -> anyhow::Result<String> {
@@ -54,11 +55,15 @@ pub fn set_organization(io: &mut dyn Io, client: &mut dyn Client) -> anyhow::Res
 
     let prompt = String::from("Select your organization: ");
     let mut org_name = match interactive::interactive_list(&prompt, pinned)? {
-        Some(result) if result.eq(&others) => {
-            let all = orgs.iter().map(|org| org.name.clone()).collect();
-            interactive_list(&prompt, all)?
+        Some(result) => {
+            if result.eq(&others) {
+                let all = orgs.iter().map(|org| org.name.clone()).collect();
+                interactive_list(&prompt, all)?
+            } else {
+                Some(result)
+            }
         }
-        _ => todo!(),
+        None => anyhow::bail!("No organization chosen"),
     };
 
     org_name = match org_name {
diff --git a/src/commands/paste.rs b/src/commands/paste.rs
@@ -1,8 +1,9 @@
-use super::util;
-use super::util::Client;
-use crate::io::{Io, PrintColor};
-use crate::progress_reporting;
-use crate::progress_reporting::ProgressBarManager;
+use super::{util, util::Client};
+use crate::{
+    io::{Io, PrintColor},
+    progress_reporting,
+    progress_reporting::ProgressBarManager,
+};
 use anyhow::Context;
 use isolang::Language;
 use tmc_langs::ClientUpdateData;
diff --git a/src/commands/submit.rs b/src/commands/submit.rs
@@ -1,13 +1,12 @@
-use super::util;
-use super::util::Client;
-use crate::io::{Io, PrintColor};
-use crate::progress_reporting;
-use crate::progress_reporting::ProgressBarManager;
+use super::{util, util::Client};
+use crate::{
+    io::{Io, PrintColor},
+    progress_reporting,
+    progress_reporting::ProgressBarManager,
+};
 use anyhow::{Context, Result};
 use reqwest::Url;
-use tmc_langs::ClientUpdateData;
-use tmc_langs::Language;
-use tmc_langs::SubmissionFinished;
+use tmc_langs::{ClientUpdateData, Language, SubmissionFinished};
 
 /// Sends the course exercise submission to the server.
 /// Path to the exercise can be given as a parameter or
@@ -17,7 +16,7 @@ use tmc_langs::SubmissionFinished;
 /// Returns an error if no exercise was found on given path or current folder.
 /// Returns an error if user is not logged in.
 pub fn submit(io: &mut dyn Io, client: &mut dyn Client, path: Option<&str>) -> anyhow::Result<()> {
-    let locale = into_locale("fin").expect("fin is a valid locale");
+    let locale = into_locale("fin").expect("The locale should always be valid.");
 
     // todo: use context
     let exercise_path = util::exercise_pathfinder(path).context("Error finding exercise")?;
diff --git a/src/commands/test.rs b/src/commands/test.rs
@@ -1,5 +1,7 @@
-use crate::commands::util;
-use crate::io::{Io, PrintColor};
+use crate::{
+    commands::util,
+    io::{Io, PrintColor},
+};
 use anyhow::Context;
 use std::path::Path;
 use tmc_langs::RunResult;
@@ -129,8 +131,7 @@ mod tests {
     mod tests {
         use super::*;
         use std::collections::HashMap;
-        use tmc_langs::RunStatus;
-        use tmc_langs::TestResult;
+        use tmc_langs::{RunStatus, TestResult};
 
         #[test]
         fn generate_progress_string_empty_test() {
diff --git a/src/commands/update.rs b/src/commands/update.rs
@@ -1,9 +1,10 @@
-use anyhow::Context;
-
 use super::util::{get_projects_dir, Client};
 use crate::io::{Io, PrintColor};
-use std::path::{Path, PathBuf};
-use std::process::Command;
+use anyhow::Context;
+use std::{
+    path::{Path, PathBuf},
+    process::Command,
+};
 
 /// Updates exercises from project dir or current directory.
 /// Update is ran only if local exercise checksums differ from
@@ -88,8 +89,7 @@ pub fn elevated_update(io: &mut dyn Io, client: &mut dyn Client) -> anyhow::Resu
     Ok(())
 }
 fn pause() -> anyhow::Result<()> {
-    use std::io;
-    use std::io::prelude::*;
+    use std::{io, io::prelude::*};
     let mut stdin = io::stdin();
     let mut stdout = io::stdout();
     write!(stdout, "Press any enter to continue...")?;
diff --git a/src/commands/util.rs b/src/commands/util.rs
@@ -2,18 +2,14 @@ use crate::interactive::interactive_list;
 use anyhow::Context;
 use isolang::Language;
 use reqwest::Url;
-use std::env;
-use std::path::Path;
-use std::path::PathBuf;
-use tmc_langs::Credentials;
-use tmc_langs::DownloadOrUpdateCourseExercisesResult;
-use tmc_langs::DownloadResult;
-use tmc_langs::LangsError;
-use tmc_langs::{ClientError, TmcClient, Token};
-use tmc_langs::{ConfigValue, ProjectsConfig, TmcConfig};
+use std::{
+    env,
+    path::{Path, PathBuf},
+};
 use tmc_langs::{
-    Course, CourseDetails, CourseExercise, ExercisesDetails, NewSubmission, Organization,
-    SubmissionFinished,
+    ClientError, ConfigValue, Course, CourseDetails, CourseExercise, Credentials,
+    DownloadOrUpdateCourseExercisesResult, DownloadResult, ExercisesDetails, LangsError,
+    NewSubmission, Organization, ProjectsConfig, SubmissionFinished, TmcClient, TmcConfig, Token,
 };
 
 pub const PLUGIN: &str = "tmc_cli_rust";
@@ -67,12 +63,10 @@ pub trait Client {
     ) -> Result<NewSubmission, String>;
 }
 
-static SERVER_ADDRESS: &str = "https://tmc.mooc.fi";
-
 impl ClientProduction {
     pub fn new(test_mode: bool) -> anyhow::Result<Self> {
         let (tmc_client, _credentials) = tmc_langs::init_tmc_client_with_credentials(
-            Url::parse(SERVER_ADDRESS).expect("Server address should always be correct."),
+            Url::parse("https://tmc.mooc.fi").expect("Server address should always be correct."),
             PLUGIN,
             PLUGIN_VERSION,
         )?;
@@ -561,7 +555,10 @@ pub fn choose_exercise() -> anyhow::Result<PathBuf> {
         None => anyhow::bail!("Course selection interrupted."),
     };
 
-    let course_config = projects_config.courses.get(&chosen_course).unwrap();
+    let course_config = projects_config
+        .courses
+        .get(&chosen_course)
+        .context("Failed to find selected course")?;
 
     let mut exercise_list: Vec<String> = Vec::new();
 
diff --git a/src/interactive.rs b/src/interactive.rs
@@ -1,5 +1,4 @@
 pub mod prompt;
 pub mod state;
 
-pub use self::prompt::*;
-pub use self::state::*;
+pub use self::{prompt::*, state::*};
diff --git a/src/interactive/prompt.rs b/src/interactive/prompt.rs
@@ -10,8 +10,7 @@ use tui::{
     layout::{Constraint, Direction, Layout},
     style::{Modifier, Style},
     text::{Span, Spans},
-    widgets::Wrap,
-    widgets::{Block, Borders, List, ListItem, Paragraph},
+    widgets::{Block, Borders, List, ListItem, Paragraph, Wrap},
     Terminal,
 };
 
diff --git a/src/io.rs b/src/io.rs
@@ -66,8 +66,8 @@ impl Io for IoProduction<'_> {
     fn print(&mut self, text_to_output: &str, font_color: PrintColor) -> anyhow::Result<()> {
         match self.test_mode {
             true => {
-                self.output.write_all(text_to_output.as_bytes()).expect("");
-                self.output.flush().expect("Something went wrong");
+                self.output.write_all(text_to_output.as_bytes())?;
+                self.output.flush()?;
             }
             false => match font_color {
                 PrintColor::Success => {
@@ -76,15 +76,15 @@ impl Io for IoProduction<'_> {
                     colorspec.set_bold(true);
                     self.buffer.set_color(&colorspec)?;
 
-                    self.buffer.write_all(text_to_output.as_bytes()).expect("");
+                    self.buffer.write_all(text_to_output.as_bytes())?;
                     self.bufferwriter.print(self.buffer)?;
                     self.buffer.clear();
 
                     colorspec.clear();
                     self.buffer.set_color(&colorspec)?;
                 }
                 PrintColor::Normal => {
-                    self.buffer.write_all(text_to_output.as_bytes()).expect("");
+                    self.buffer.write_all(text_to_output.as_bytes())?;
                     self.bufferwriter.print(self.buffer)?;
                     self.buffer.clear();
                 }
diff --git a/src/main.rs b/src/main.rs
@@ -1,4 +1,4 @@
-#![deny(clippy::unwrap_used, clippy::panic)]
+#![deny(clippy::unwrap_used, clippy::panic, clippy::todo)]
 
 mod cli;
 mod commands;
diff --git a/src/progress_reporting.rs b/src/progress_reporting.rs
diff --git a/src/updater.rs b/src/updater.rs
diff --git a/tests/command_line_test.rs b/tests/command_line_test.rs
