fix(move): error when target directory exists

Running `rari content move Foo/Bar Something/Else` should fail
if `$CONTENT_ROOT/files/en-us/something/else` alreday exists.

Author: fiji-flo

crates/rari-tools/src/error.rs

@@ -1,4 +1,5 @@
 use std::borrow::Cow;
+use std::path::PathBuf;
 
 use rari_doc::error::{DocError, UrlError};
 use rari_types::error::EnvError;
@@ -55,6 +56,8 @@ pub enum ToolError {
     InvalidFrontmatter(#[from] serde_yaml_ng::Error),
     #[error("Page has subpages: {0}")]
     HasSubpagesError(Cow<'static, str>),
+    #[error("Target directory ({0}) for slug ({1}) already exists")]
+    TargetDirExists(PathBuf, String),
 
     #[error("Unknown error")]
     Unknown(&'static str),

crates/rari-tools/src/move.rs

@@ -104,6 +104,19 @@ fn do_move(
         return Ok(vec![]);
     }
 
+    let old_folder_path = slug_to_repo_folder_path(real_old_slug, locale)?;
+    let new_folder_path = slug_to_repo_folder_path(new_slug, locale)?;
+
+    if root_for_locale(locale)?
+        .join(&new_folder_path)
+        .try_exists()?
+    {
+        return Err(ToolError::TargetDirExists(
+            new_folder_path,
+            new_slug.to_string(),
+        ));
+    }
+
     let pairs = [doc.clone()]
         .iter()
         .chain(&subpages)
@@ -146,16 +159,6 @@ fn do_move(
     // to a new location. This will move all children as well and
     // makes sure that we get a proper "file moved" in the git history.
 
-    let mut old_folder_path = PathBuf::from(locale.as_folder_str());
-    let url = build_url(real_old_slug, locale, PageCategory::Doc)?;
-    let UrlMeta { folder_path, .. } = url_meta_from(&url)?;
-    old_folder_path.push(folder_path);
-
-    let mut new_folder_path = PathBuf::from(locale.as_folder_str());
-    let url = build_url(new_slug, locale, PageCategory::Doc)?;
-    let UrlMeta { folder_path, .. } = url_meta_from(&url)?;
-    new_folder_path.push(folder_path);
-
     // Make sure the target parent directory exists.
     if let Some(target_parent_path) = new_folder_path.parent() {
         let absolute_target_parent_path = root_for_locale(locale)?.join(target_parent_path);
@@ -219,6 +222,14 @@ fn do_move(
     Ok(pairs)
 }
 
+fn slug_to_repo_folder_path(slug: &str, locale: Locale) -> Result<PathBuf, ToolError> {
+    let mut new_folder_path = PathBuf::from(locale.as_folder_str());
+    let url = build_url(slug, locale, PageCategory::Doc)?;
+    let UrlMeta { folder_path, .. } = url_meta_from(&url)?;
+    new_folder_path.push(folder_path);
+    Ok(new_folder_path)
+}
+
 fn validate_args(old_slug: &str, new_slug: &str) -> Result<(), ToolError> {
     if old_slug.is_empty() {
         return Err(ToolError::InvalidSlug(Cow::Borrowed(