draft...

Cargo.toml

@@ -3,7 +3,10 @@ name = "archdiff"
 version = "2024.3.12"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[profile.release]
+strip = "symbols"
+panic = "abort"
 
 [dependencies]
 git2 = "0.18.3"
+similar = "2.5.0"

README.md

@@ -1,4 +1,4 @@
-# archiff
+# archdiff
 
 The utility calculates the difference of _architecture_ changes between two git branches. This is especially useful when
 analyzing large merge requests. These languages are supported:

src/arch_hunk.rs

@@ -0,0 +1,5 @@
+pub struct ArchHunk {
+    pub filename: String,
+    pub old_arch: String,
+    pub new_arch: String,
+}

src/git.rs

@@ -1,4 +1,6 @@
+use std::collections::hash_set::Difference;
 use std::fmt::Debug;
+use std::path::Path;
 use std::str;
 
 use git2::{Diff, DiffDelta, DiffFindOptions, DiffHunk, DiffLine, Object, ObjectType, Repository};
@@ -27,6 +29,7 @@ pub fn diff_branches<'a>(repo: &'a Repository, old_branch: &str, new_branch: &st
 
 pub fn print_diff_line(delta: DiffDelta, hunk: Option<DiffHunk>, line: DiffLine) -> bool {
     println!();
+    println!("{:?} {:?}", delta.old_file().path(), delta.new_file().path());
     println!("{:?}", delta.status());
     println!("{:?} {:?}", line.old_lineno(), line.new_lineno());
     println!("{:?}", line.origin_value());
@@ -36,6 +39,11 @@ pub fn print_diff_line(delta: DiffDelta, hunk: Option<DiffHunk>, line: DiffLine)
     true
 }
 
+fn extract_path<'a>(diff_delta: &'a DiffDelta) -> &'a Path {
+    let new_file = diff_delta.new_file().path();
+    let old_file = diff_delta.old_file().path();
+    new_file.or(old_file).unwrap()
+}
 
 fn make_tree_object<'a>(repo: &'a Repository, arg: &str) -> Object<'a> {
     let obj = repo.revparse_single(arg).unwrap();
@@ -52,7 +60,7 @@ mod tests {
     #[test]
     fn it_works() {
         let repo = open_current_repo();
-        let diff = diff_branches(&repo, "main", "test_branch");
+        let diff = diff_branches(&repo,  "test_branch", "main");
         let diff_format = DiffFormat::Patch;
         diff.print(DiffFormat::Patch, print_diff_line).unwrap();
     }

src/languages/arch_diff.rs

@@ -0,0 +1,7 @@
+use std::fmt::Display;
+
+use git2::DiffLine;
+
+pub trait ArchDiff: Display {
+    fn arch_diff(&mut self, filename: &str, diff: &DiffLine);
+}

src/languages/java_arch_diff.rs

@@ -0,0 +1,50 @@
+use std::fmt::Display;
+use std::ops::Add;
+
+use diffy::create_patch;
+use git2::DiffLine;
+
+use crate::languages::arch_diff::ArchDiff;
+
+struct JavaArchDiff {
+    filename: String,
+    old_arch: String,
+    new_arch: String,
+    diff: String,
+}
+
+impl JavaArchDiff {
+    fn flush(&mut self) {
+        let old = &self.old_arch;
+        let new = &self.new_arch;
+        let diff = create_patch(old, new);
+        let diff = diff.to_string();
+        self.diff += &diff
+    }
+}
+
+impl Display for JavaArchDiff {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.diff)
+    }
+}
+
+impl ArchDiff for JavaArchDiff {
+    fn arch_diff(&mut self, filename: &str, diff: &DiffLine) {
+        todo!()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use diffy::{create_patch, DiffOptions};
+
+    #[test]
+    fn it_works() {
+        let old = "ool\nkek\njey trek\n";
+        let new = "lol\nkek\njey trep";
+        let diff = create_patch(old, new);
+        println!("{}", diff);
+    }
+}
+

src/languages/mod.rs

@@ -0,0 +1,3 @@
+mod arch_diff;
+
+mod java_arch_diff;

src/main.rs

@@ -1,4 +1,7 @@
 mod git;
-mod arch;
+mod arch_hunk;
+
+mod languages;
+
 
 fn main() {}