diff --git a/crates/radicle-tauri/src/commands/repo.rs b/crates/radicle-tauri/src/commands/repo.rs index 433c085c9..d48fa0ca9 100644 --- a/crates/radicle-tauri/src/commands/repo.rs +++ b/crates/radicle-tauri/src/commands/repo.rs @@ -41,7 +41,7 @@ pub async fn diff_stats( rid: RepoId, base: git::Oid, head: git::Oid, -) -> Result { +) -> Result { ctx.diff_stats(rid, base, head) } diff --git a/crates/radicle-types/bindings/cob/Stats.ts b/crates/radicle-types/bindings/cob/Stats.ts deleted file mode 100644 index fd2d8e6b3..000000000 --- a/crates/radicle-types/bindings/cob/Stats.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type Stats = { - files_changed: number; - insertions: number; - deletions: number; -}; diff --git a/crates/radicle-types/src/cobs.rs b/crates/radicle-types/src/cobs.rs index 0a6a2e860..653fdca82 100644 --- a/crates/radicle-types/src/cobs.rs +++ b/crates/radicle-types/src/cobs.rs @@ -96,25 +96,6 @@ pub struct PaginatedQuery { pub content: T, } -#[derive(TS, Serialize)] -#[ts(export)] -#[ts(export_to = "cob/")] -pub struct Stats { - pub files_changed: usize, - pub insertions: usize, - pub deletions: usize, -} - -impl Stats { - pub fn new(stats: &radicle_surf::diff::Stats) -> Self { - Self { - files_changed: stats.files_changed, - insertions: stats.insertions, - deletions: stats.deletions, - } - } -} - pub mod query { use serde::{Deserialize, Serialize}; diff --git a/crates/radicle-types/src/diff.rs b/crates/radicle-types/src/diff.rs index d0ca73464..e2d2686e1 100644 --- a/crates/radicle-types/src/diff.rs +++ b/crates/radicle-types/src/diff.rs @@ -14,6 +14,16 @@ pub struct Diff { pub stats: Stats, } +impl Stats { + pub fn new(stats: &radicle_surf::diff::Stats) -> Self { + Self { + files_changed: stats.files_changed, + insertions: stats.insertions, + deletions: stats.deletions, + } + } +} + impl From for Diff { fn from(value: surf::diff::Diff) -> Self { Self { diff --git a/crates/radicle-types/src/traits/repo.rs b/crates/radicle-types/src/traits/repo.rs index 448f7353b..f53cb3064 100644 --- a/crates/radicle-types/src/traits/repo.rs +++ b/crates/radicle-types/src/traits/repo.rs @@ -10,6 +10,7 @@ use radicle::storage::{ReadRepository, ReadStorage, RepositoryInfo}; use radicle::{git, identity}; use crate::cobs; +use crate::diff; use crate::diff::Diff; use crate::error::Error; use crate::repo::{self, RepoCount}; @@ -122,7 +123,7 @@ pub trait Repo: Profile { rid: identity::RepoId, base: git::Oid, head: git::Oid, - ) -> Result { + ) -> Result { let profile = self.profile(); let repo = radicle_surf::Repository::open(storage::git::paths::repository( &profile.storage, @@ -133,7 +134,7 @@ pub trait Repo: Profile { let diff = repo.diff(base.id, commit.id)?; let stats = diff.stats(); - Ok::<_, Error>(cobs::Stats::new(stats)) + Ok::<_, Error>(diff::Stats::new(stats)) } fn repo_info( diff --git a/src/components/DiffStatBadge.svelte b/src/components/DiffStatBadge.svelte index f27056176..b38f58353 100644 --- a/src/components/DiffStatBadge.svelte +++ b/src/components/DiffStatBadge.svelte @@ -1,5 +1,5 @@