moved migration logic to function and tested

Author: Heliozoa

tmc-langs-cli/src/config.rs

@@ -10,8 +10,8 @@ pub use self::tmc_config::{ConfigValue, TmcConfig};
 use crate::output::LocalExercise;
 
 use anyhow::{Context, Error};
-use std::env;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
+use std::{collections::BTreeMap, env};
 
 // base directory for a given plugin's settings files
 fn get_tmc_dir(client_name: &str) -> Result<PathBuf, Error> {
@@ -43,3 +43,108 @@ pub fn list_local_course_exercises(
     }
     Ok(local_exercises)
 }
+
+pub fn migrate(
+    tmc_config: &TmcConfig,
+    course_slug: &str,
+    exercise_slug: &str,
+    exercise_id: usize,
+    exercise_checksum: &str,
+    exercise_path: &Path,
+) -> anyhow::Result<()> {
+    let mut projects_config = ProjectsConfig::load(&tmc_config.projects_dir)?;
+    let course_config = projects_config
+        .courses
+        .entry(course_slug.to_string())
+        .or_insert(CourseConfig {
+            course: course_slug.to_string(),
+            exercises: BTreeMap::new(),
+        });
+
+    let target_dir = ProjectsConfig::get_exercise_download_target(
+        &tmc_config.projects_dir,
+        course_slug,
+        exercise_slug,
+    );
+    if target_dir.exists() {
+        anyhow::bail!(
+            "Tried to migrate exercise to {}; however, something already exists at that path.",
+            target_dir.display()
+        );
+    }
+
+    course_config.exercises.insert(
+        exercise_slug.to_string(),
+        Exercise {
+            id: exercise_id,
+            checksum: exercise_checksum.to_string(),
+        },
+    );
+
+    super::move_dir(exercise_path, &target_dir)?;
+    course_config.save_to_projects_dir(&tmc_config.projects_dir)?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod test {
+    use toml::value::Table;
+
+    use super::*;
+
+    fn init() {
+        use log::*;
+        use simple_logger::*;
+        let _ = SimpleLogger::new().with_level(LevelFilter::Debug).init();
+    }
+
+    fn file_to(
+        target_dir: impl AsRef<std::path::Path>,
+        target_relative: impl AsRef<std::path::Path>,
+        contents: impl AsRef<[u8]>,
+    ) -> PathBuf {
+        let target = target_dir.as_ref().join(target_relative);
+        if let Some(parent) = target.parent() {
+            std::fs::create_dir_all(parent).unwrap();
+        }
+        std::fs::write(&target, contents.as_ref()).unwrap();
+        target
+    }
+
+    #[test]
+    fn migrates() {
+        init();
+
+        let projects_dir = tempfile::tempdir().unwrap();
+        let exercise_path = tempfile::tempdir().unwrap();
+
+        let tmc_config = TmcConfig {
+            projects_dir: projects_dir.path().to_path_buf(),
+            table: Table::new(),
+        };
+
+        file_to(&exercise_path, "some_file", "");
+
+        assert!(!projects_dir
+            .path()
+            .join("course/exercise/some_file")
+            .exists());
+
+        migrate(
+            &tmc_config,
+            "course",
+            "exercise",
+            0,
+            "checksum",
+            exercise_path.path(),
+        )
+        .unwrap();
+
+        assert!(projects_dir
+            .path()
+            .join("course/exercise/some_file")
+            .exists());
+
+        assert!(!exercise_path.path().exists());
+    }
+}

tmc-langs-cli/src/lib.rs

@@ -1470,34 +1470,14 @@ fn run_settings(matches: &ArgMatches, pretty: bool) -> Result<PrintToken> {
 
             file_util::lock!(exercise_path);
 
-            let mut projects_config = ProjectsConfig::load(&tmc_config.projects_dir)?;
-            let course_config = projects_config
-                .courses
-                .entry(course_slug.to_string())
-                .or_insert(CourseConfig {
-                    course: course_slug.to_string(),
-                    exercises: BTreeMap::new(),
-                });
-
-            let target_dir = ProjectsConfig::get_exercise_download_target(
-                &tmc_config.projects_dir,
+            config::migrate(
+                &tmc_config,
                 course_slug,
                 exercise_slug,
-            );
-            if target_dir.exists() {
-                anyhow::bail!("Tried to migrate exercise to {}; however, something already exists at that path.", target_dir.display());
-            }
-
-            course_config.exercises.insert(
-                exercise_slug.to_string(),
-                Exercise {
-                    id: exercise_id,
-                    checksum: exercise_checksum.to_string(),
-                },
-            );
-
-            move_dir(exercise_path, &target_dir)?;
-            course_config.save_to_projects_dir(&tmc_config.projects_dir)?;
+                exercise_id,
+                exercise_checksum,
+                exercise_path,
+            )?;
 
             let output = Output::finished_with_data("migrated exercise", None);
             print_output(&output, pretty)