save

src/git.rs

@@ -1,15 +1,50 @@
-use std::fmt::{Display, Formatter, Result};
+use std::fmt::{Display, Formatter};
+use git2::{Reference, Commit, Tree, ObjectType, Repository, Oid};
+use std::ops::Add;
 
-pub struct GitRepo {}
+
+pub struct GitRepo {
+    git2 : Repository,
+}
 
 impl GitRepo {
 
-    pub fn new() -> GitRepo {
+    pub fn new(path : &str) -> Result<GitRepo, git2::Error> {
-        GitRepo{}
+        Repository::open(path).map(|git2| GitRepo{git2})
     }
 
-    pub async fn browse(&self, commit : &GitCommit, dir: &GitBrowseDir) -> Vec<GitBrowseEntry> {
+    pub fn get_root_tree<'a, 'b> (&'a self, commit : &'b GitCommit) -> Result<GitBrowseDir<'a>, git2::Error> {
-        vec!(GitBrowseEntry::EGitDir(GitBrowseDir("src/".to_string())), GitBrowseEntry::EGitFile(GitBrowseFile("pom.xml".to_string())))
+        let oid = Oid::from_str(&commit.0)?;
+        let commit = self.git2.find_commit(oid)?;
+        let tree = commit.tree()?;
+        let fullname = "/".to_string();
+        Ok(GitBrowseDir{ fullname, tree })
+    }
+
+    pub async fn browse<'a>(&'a self, dir: &GitBrowseDir<'a>) -> Result<Vec<GitBrowseEntry<'a>>, git2::Error> {
+        let mut res = Vec::new();
+        for entry in dir.tree.iter() {
+            match entry.kind() {
+                None => {Err(git2::Error::from_str("each tree entry must be well defined"))?;}
+                Some(kind) => match kind {
+                    ObjectType::Any => {Err(git2::Error::from_str("tree entry cannot be of kind Any"))?;}
+                    ObjectType::Commit => {Err(git2::Error::from_str("tree entry cannot be of kind Commit"))?;}
+                    ObjectType::Tree => {
+                        let name = entry.name().ok_or(git2::Error::from_str("entry must have valid utf8 name"))?;
+                        let fullname = dir.fullname.clone().add(name);
+                        let subtree = self.git2.find_tree(entry.id())?;
+                        res.push(GitBrowseEntry::EGitDir(GitBrowseDir{fullname, tree : subtree}));
+                    }
+                    ObjectType::Blob => {
+                        let name = entry.name().ok_or(git2::Error::from_str("entry must have valid utf8 name"))?;
+                        let fullname = dir.fullname.clone().add(name);
+                        res.push(GitBrowseEntry::EGitFile(GitBrowseFile(fullname)));
+                    }
+                    ObjectType::Tag => {Err(git2::Error::from_str("tree entry cannot be of kind tag"))?;}
+                }
+            };
+        }
+        return Ok(res);
     }
 
 }
@@ -24,7 +59,7 @@ impl GitCommit {
 }
 
 impl Display for GitCommit {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", self.0)
     }
 }
@@ -32,34 +67,31 @@ impl Display for GitCommit {
 #[derive(Debug)]
 pub struct GitBrowseFile (String);
 #[derive(Debug)]
-pub struct GitBrowseDir (String);
+pub struct GitBrowseDir<'a>{
-
+    fullname: String,
-impl GitBrowseDir {
+    tree : git2::Tree<'a>,
-    pub fn new(s : String) -> GitBrowseDir {
-        GitBrowseDir(s)
-    }
 }
 
 impl Display for GitBrowseFile {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", self.0)
     }
 }
 
-impl Display for GitBrowseDir {
+impl Display for GitBrowseDir<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
+        write!(f, "{}", self.fullname)
     }
 }
 
 #[derive(Debug)]
-pub enum GitBrowseEntry {
+pub enum GitBrowseEntry<'a> {
     EGitFile(GitBrowseFile),
-    EGitDir(GitBrowseDir)
+    EGitDir(GitBrowseDir<'a>)
 }
 
-impl Display for GitBrowseEntry {
+impl Display for GitBrowseEntry<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
             GitBrowseEntry::EGitFile(file) => {write!(f, "{}", file)}
             GitBrowseEntry::EGitDir(dir) => {write!(f, "{}", dir)}

src/main.rs

@@ -35,7 +35,7 @@ use actix_web::client::PayloadError;
 use crate::reader::ToStream;
 use crate::writer::Writer;
 use crate::gitust::Gitust;
-use git2::{Reference, Commit, Tree};
+use git2::ObjectType;
 
 #[derive(Template)]
 #[template(path = "hello.html")]
@@ -130,7 +130,7 @@ async fn chunk() -> HttpResponse {
 
 #[get("/git/{owner}/{repo}.git")]
 async fn git_main(
-    web::Path((owner, reponame)): web::Path<(String, String)>,
+    web::Path((ownername, reponame)): web::Path<(String, String)>,
     web::Query(GitWebQ{commit : commitnameopt, path : pathopt}) : web::Query<GitWebQ>,
     gitust : web::Data<Gitust>
 ) -> impl Responder {
@@ -142,17 +142,15 @@ async fn git_main(
         None => {"/".to_string()}
         Some(s) => {s}
     };
-    let repo = GitRepo::new();
+    let commit = GitCommit::new(commitname);
-    let path : Vec<(String, String)> = rootname.split("/").map_accum("/git/".to_string() + &owner + "/" + &reponame + "/" + &commitname, |str_ref, b| {
+    let owner = Owner { name : ownername};
+    let repo = Repository {name : reponame, owner};
+    let user = User { name : "Hubert".to_string()};
+    let gitrepo = GitRepo::new(format!("{}/{}/{}.git", &gitust.repo_root_path, &repo.owner.name, &repo.name).as_str())?;
+    let path : Vec<(String, String)> = rootname.split("/").map_accum("/git/".to_string() + &ownername + "/" + &reponame + "/" + &commitname, |str_ref, b| {
         let href = b + "/" + str_ref;
         ((str_ref.to_string(), href.clone()), href)
     }).collect();
-    let commit = GitCommit::new(commitname);
-    let root = GitBrowseDir::new(rootname);
-    let browse = repo.browse(&commit, &root).await;
-    let owner = Owner { name : owner};
-    let repo = Repository {name : reponame, owner};
-    let user = User { name : "Hubert".to_string()};
     let repogit = match git2::Repository::open(format!("{}/{}/{}.git", &gitust.repo_root_path, &repo.owner.name, &repo.name)) {
         Ok(repo) => repo,
         Err(e) => panic!("failed to open: {}", e),
@@ -161,19 +159,26 @@ async fn git_main(
         Ok(head) => head,
         Err(e) => panic!("failed to get head: {}", e)
     };
-    let commit = match head.peel_to_commit() {
+    let commitgit = match head.peel_to_commit() {
         Ok(commit) => commit,
         Err(e) => panic!("failed to get commit: {}", e)
     };
-    let tree = match commit.tree() {
+    let tree = match commitgit.tree() {
         Ok(tree) => tree,
         Err(e) => panic!("failed to get tree: {}", e)
     };
     for entry in tree.iter() {
         println!("{:?}", entry.name());
         println!("{:?}", entry.kind());
+        if entry.kind() == Some(ObjectType::Tree) {
+            let subtree = repogit.find_tree(entry.id()).expect("this pust be a tree");
+            println!("{:?}", subtree);
         }
-    GitMainTemplate { repo, browse : browse, root : path, user_opt : Some(user)}
+    }
+    let root = gitrepo.get_root_tree(&commit)?;
+    // let root = GitBrowseDir::new(rootname);
+    let browse = gitrepo.browse(&root).await;
+    Ok(GitMainTemplate { repo, browse : browse, root : path, user_opt : Some(user)})
 }
 //#[get("/git/{owner}/{repo}.git/{path:.*}")]
 async fn git_proto(