dadada/repo-rs
dadada/repo-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clone into proper destination

Browse source
This commit is contained in:
Tim Schubert 2025-08-09 22:12:04 +02:00
parent 7024c45a04
commit 430d988f31
No known key found for this signature in database
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main.rs
View file

@ -28,17 +28,17 @@ h() {{
} }
struct SrcRoot<T: AsRef<Path> + AsRef<OsStr>> { struct SrcRoot<T: AsRef<Path> + AsRef<OsStr>> {
path: T, root_path: T,
} }
impl<T: AsRef<Path> + AsRef<OsStr>> SrcRoot<T> { impl<T: AsRef<Path> + AsRef<OsStr>> SrcRoot<T> {
fn clone_repo(&self, url: &Url) -> Result<()> { fn clone_repo(url: &Url, destination: &Path) -> Result<()> {
let url = OsString::from(url.as_ref()); let url = OsString::from(url.as_ref());
Command::new("git") Command::new("git")
.args([ .args([
OsString::from("clone").as_os_str(), OsString::from("clone").as_os_str(),
url.as_os_str(), url.as_os_str(),
self.path.as_ref(), destination.as_os_str(),
]) ])
.status()?; .status()?;
Ok(()) Ok(())
@ -46,7 +46,7 @@ impl<T: AsRef<Path> + AsRef<OsStr>> SrcRoot<T> {
fn as_repo_path(&self, url: &Url) -> PathBuf { fn as_repo_path(&self, url: &Url) -> PathBuf {
let mut dir = PathBuf::new(); let mut dir = PathBuf::new();
dir.push::<&Path>(self.path.as_ref()); dir.push::<&Path>(self.root_path.as_ref());
dir.push(url.host_str().unwrap_or("misc")); dir.push(url.host_str().unwrap_or("misc"));
url.path_segments() url.path_segments()
.into_iter() .into_iter()
@ -58,15 +58,15 @@ impl<T: AsRef<Path> + AsRef<OsStr>> SrcRoot<T> {
fn ensure_repo_checkout(&self, url: &Url) -> Result<PathBuf> { fn ensure_repo_checkout(&self, url: &Url) -> Result<PathBuf> {
let repo_path = self.as_repo_path(url); let repo_path = self.as_repo_path(url);
if !repo_path.is_dir() || repo_path.read_dir()?.next().is_none() { if !repo_path.is_dir() {
create_dir_all(&repo_path)?; create_dir_all(&repo_path)?;
self.clone_repo(url)?;
} }
Self::clone_repo(url, &repo_path)?;
Ok(repo_path) Ok(repo_path)
} }
fn search_repo<S: AsRef<OsStr>>(&self, slug: S) -> Result<Option<PathBuf>> { fn search_repo<S: AsRef<OsStr>>(&self, slug: S) -> Result<Option<PathBuf>> {
let walker = WalkDir::new(&self.path) let walker = WalkDir::new(&self.root_path)
.follow_links(false) .follow_links(false)
.max_depth(MAX_DEPTH) .max_depth(MAX_DEPTH)
.follow_root_links(false) .follow_root_links(false)
@ -91,7 +91,7 @@ impl<T: AsRef<Path> + AsRef<OsStr>> SrcRoot<T> {
} }
fn new(path: T) -> Self { fn new(path: T) -> Self {
Self { path } Self { root_path: path }
} }
} }