Extract git preparation to a function

Author: Coi-l

src/cmd/shelf.rs

@@ -112,72 +112,23 @@ pub fn execute(_args: &ArgMatches) -> Result<()> {
     writeln!(summary, "- [Index](./{INDEX_MD_FILE})")?;
 
     for sb in &shelf_config.books {
-        if let Some(url) = &sb.git_url {
-            println!("{:?}", sb);
-            let path = sb.path.clone().unwrap_or("root".to_owned());
-            let repo_raw_name = url.split('/').last().unwrap_or(&path);
-            let repo_name = format!("{repo_raw_name}-{path}");
-            let mut checkout_path = PathBuf::from(REPOS_DIR);
-            checkout_path.push(repo_name);
-
-            let book_path = if let Some(path) = &sb.path {
-                let mut bp = checkout_path.clone();
-                bp.push(path);
-                bp
-            } else {
-                checkout_path.clone()
-            };
-
-            let repo = match git2::Repository::open(&checkout_path) {
-                Ok(repo) => repo,
-                Err(_) => match git2::Repository::clone(&url, &checkout_path) {
-                    Ok(repo) => repo,
-                    Err(e) => panic!("failed to clone: {}", e),
-                },
-            };
-
-            if let Some(refname) = &sb.git_ref {
-                // branch or a tag (v0.1.1) or a commit (8e8128)
-                let (object, reference) =
-                    if let Ok((object, reference)) = repo.revparse_ext(refname) {
-                        (object, reference)
-                    } else if let Ok((object, reference)) =
-                        repo.revparse_ext(&format!("origin/{refname}"))
-                    {
-                        (object, reference)
-                    } else {
-                        panic!("Could not checkout {refname}");
-                    };
-
-                repo.checkout_tree(&object, None)
-                    .expect("Failed to checkout");
-
-                match reference {
-                    // gref is an actual reference like branches or tags
-                    Some(gref) => repo.set_head(gref.name().unwrap()),
-                    // this is a commit, not a reference
-                    None => repo.set_head_detached(object.id()),
-                }
-                .expect("Failed to set HEAD");
-            }
-
-            process_book(
-                &book_path.to_str().unwrap(),
-                &mut index_file,
-                &mut summary,
-                &shelf_source,
-                &shelf_url,
-            )?
+        let book_path = if let Some(url) = &sb.git_url {
+            prepare_git(sb, url)
         } else if let Some(path) = &sb.path {
+            Some(path.to_owned())
+        } else {
+            warn!("Neither path or git specified. Invalid book");
+            None
+        };
+
+        if let Some(path) = book_path {
             process_book(
-                path,
+                &path,
                 &mut index_file,
                 &mut summary,
                 &shelf_source,
                 &shelf_url,
             )?
-        } else {
-            warn!("Neither path or git specified. Invalid book");
         }
     }
 
@@ -187,6 +138,57 @@ pub fn execute(_args: &ArgMatches) -> Result<()> {
     Ok(())
 }
 
+fn prepare_git(sb: &mdbook::config::ShelfBook, url: &String) -> Option<String> {
+    println!("{:?}", sb);
+
+    // Prepare checkout directory name
+    let path = sb.path.clone().unwrap_or("root".to_owned());
+    let repo_raw_name = url.split('/').last().unwrap_or(&path);
+    let repo_name = format!("{repo_raw_name}-{path}");
+    let mut checkout_path = PathBuf::from(REPOS_DIR);
+    checkout_path.push(repo_name);
+
+    let book_path = if let Some(path) = &sb.path {
+        let mut bp = checkout_path.clone();
+        bp.push(path);
+        bp
+    } else {
+        checkout_path.clone()
+    };
+
+    let repo = match git2::Repository::open(&checkout_path) {
+        Ok(repo) => repo,
+        Err(_) => match git2::Repository::clone(&url, &checkout_path) {
+            Ok(repo) => repo,
+            Err(e) => panic!("failed to clone: {}", e),
+        },
+    };
+
+    if let Some(refname) = &sb.git_ref {
+        // branch or a tag (v0.1.1) or a commit (8e8128)
+        let (object, reference) = if let Ok((object, reference)) = repo.revparse_ext(refname) {
+            (object, reference)
+        } else if let Ok((object, reference)) = repo.revparse_ext(&format!("origin/{refname}")) {
+            (object, reference)
+        } else {
+            panic!("Could not checkout {refname}");
+        };
+
+        repo.checkout_tree(&object, None)
+            .expect("Failed to checkout");
+
+        match reference {
+            // gref is an actual reference like branches or tags
+            Some(gref) => repo.set_head(gref.name().unwrap()),
+            // this is a commit, not a reference
+            None => repo.set_head_detached(object.id()),
+        }
+        .expect("Failed to set HEAD");
+    }
+
+    Some(book_path.to_str().unwrap().to_owned())
+}
+
 #[test]
 fn test_parse_toml() {
     let toml = r#"