Radish alpha
h
heartwood
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
tui: Add ui wrapper for patches
Erik Kundt committed 3 years ago
commit 80c1e45a9900baced069dee93dd293fe2bc072b7
parent 3ce1e1147ae634c3c0bcb01d1be303c122c8f16e
5 files changed +128 -1
modified Cargo.lock
@@ -1247,6 +1247,15 @@ dependencies = [
]



[[package]]
+ 
name = "isolang"
+ 
version = "2.2.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "b64fd6448ee8a45ce6e4365c58e4fa7d8740cba2ed70db3e9ab4879ebd93eaaa"
+ 
dependencies = [
+ 
 "phf",
+ 
]
+
+ 
[[package]]

name = "itoa"

version = "1.0.5"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1678,6 +1687,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"



[[package]]
+ 
name = "phf"
+ 
version = "0.10.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+ 
dependencies = [
+ 
 "phf_shared",
+ 
]
+
+ 
[[package]]
+ 
name = "phf_shared"
+ 
version = "0.10.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+ 
dependencies = [
+ 
 "siphasher",
+ 
]
+
+ 
[[package]]

name = "pin-project"

version = "1.0.12"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1893,7 +1920,7 @@ dependencies = [
 "similar",

 "tempfile",

 "thiserror",
- 
 "timeago",
+ 
 "timeago 0.3.1",

 "ureq",

 "zeroize",

]
@@ -2136,6 +2163,7 @@ dependencies = [
 "radicle",

 "radicle-cli",

 "radicle-term",
+ 
 "timeago 0.4.1",

 "tui-realm-stdlib",

 "tuirealm",

]
@@ -2836,6 +2864,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ec32dde57efb15c035ac074118d7f32820451395f28cb0524a01d4e94983b26"



[[package]]
+ 
name = "timeago"
+ 
version = "0.4.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "5082dc942361cdfb74eab98bf995762d6015e5bb3a20bf7c5c71213778b4fcb4"
+ 
dependencies = [
+ 
 "chrono",
+ 
 "isolang",
+ 
]
+
+ 
[[package]]

name = "tinyvec"

version = "1.6.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
modified radicle-tui/Cargo.toml
@@ -13,6 +13,7 @@ path = "src/main.rs"
[dependencies]

anyhow = { version = "1" }

lexopt = { version = "0.2" }
+ 
timeago = { version = "0.4.1" }

tuirealm = { version = "1.8.0", default-features = false, features = [ "with-termion" ] }

tui-realm-stdlib = { version = "1.2.0", default-features = false, features = [ "with-termion" ] }
added radicle-tui/src/ui/cob.rs
@@ -0,0 +1 @@
+ 
pub mod patch;
added radicle-tui/src/ui/cob/patch.rs
@@ -0,0 +1,77 @@
+ 
use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+ 
use radicle::Profile;
+ 
use timeago;
+
+ 
use radicle::cob::patch::{Patch, PatchId};
+
+ 
use tuirealm::props::{Color, TextSpan};
+
+ 
use crate::ui::components::list::List;
+ 
use crate::ui::theme::Theme;
+
+ 
fn format_status(_patch: &Patch) -> String {
+ 
    String::from(" ⏺ ")
+ 
}
+
+ 
fn format_title(patch: &Patch) -> String {
+ 
    patch.title().to_string()
+ 
}
+
+ 
fn format_author(patch: &Patch, profile: &Profile) -> String {
+ 
    let author_did = patch.author().id();
+ 
    let start = &author_did.to_human()[0..4];
+ 
    let end = &author_did.to_human()[43..47];
+
+ 
    if *author_did == profile.did() {
+ 
        format!("did:key:{}...{} (you)", start, end)
+ 
    } else {
+ 
        format!("did:key:{}...{}", start, end)
+ 
    }
+ 
}
+
+ 
fn format_tags(patch: &Patch) -> String {
+ 
    format!("{:?}", patch.tags().collect::<Vec<_>>())
+ 
}
+
+ 
fn format_timestamp(patch: &Patch) -> String {
+ 
    let fmt = timeago::Formatter::new();
+ 
    let now = SystemTime::now()
+ 
        .duration_since(UNIX_EPOCH)
+ 
        .unwrap()
+ 
        .as_secs();
+
+ 
    fmt.convert(Duration::from_secs(now - patch.timestamp().as_secs()))
+ 
}
+
+ 
fn format_comments(patch: &Patch) -> String {
+ 
    let (_, revision) = patch.latest().unwrap();
+ 
    let count = revision.discussion().len();
+ 
    format!("{}", count)
+ 
}
+
+ 
impl List for (PatchId, Patch) {
+ 
    fn row(&self, theme: &Theme, profile: &Profile) -> Vec<TextSpan> {
+ 
        let (_, patch) = self;
+
+ 
        let status = format_status(patch);
+ 
        let status = TextSpan::from(status).fg(Color::Green);
+
+ 
        let title = format_title(patch);
+ 
        let title = TextSpan::from(title).fg(theme.colors.browser_patch_list_title);
+
+ 
        let author = format_author(patch, profile);
+ 
        let author = TextSpan::from(author).fg(theme.colors.browser_patch_list_author);
+
+ 
        let tags = format_tags(patch);
+ 
        let tags = TextSpan::from(tags).fg(theme.colors.browser_patch_list_tags);
+
+ 
        let comments = format_comments(patch);
+ 
        let comments = TextSpan::from(comments).fg(theme.colors.browser_patch_list_comments);
+
+ 
        let timestamp = format_timestamp(patch);
+ 
        let timestamp = TextSpan::from(timestamp).fg(theme.colors.browser_patch_list_timestamp);
+
+ 
        vec![status, title, author, tags, comments, timestamp]
+ 
    }
+ 
}
modified radicle-tui/src/ui/theme.rs
@@ -13,6 +13,11 @@ pub struct Colors {
    pub shortcut_short_fg: Color,

    pub shortcut_long_fg: Color,

    pub shortcutbar_divider_fg: Color,
+ 
    pub browser_patch_list_title: Color,
+ 
    pub browser_patch_list_author: Color,
+ 
    pub browser_patch_list_tags: Color,
+ 
    pub browser_patch_list_comments: Color,
+ 
    pub browser_patch_list_timestamp: Color,

}



#[derive(Debug)]
@@ -59,6 +64,11 @@ pub fn default_dark() -> Theme {
            shortcut_short_fg: Color::Rgb(100, 100, 100),

            shortcut_long_fg: Color::Rgb(70, 70, 70),

            shortcutbar_divider_fg: Color::Rgb(70, 70, 70),
+ 
            browser_patch_list_title: Color::Rgb(200, 200, 200),
+ 
            browser_patch_list_author: Color::Rgb(85, 85, 255),
+ 
            browser_patch_list_tags: Color::Rgb(220, 140, 40),
+ 
            browser_patch_list_comments: Color::Rgb(150, 150, 150),
+ 
            browser_patch_list_timestamp: Color::Rgb(100, 100, 100),

        },

        icons: Icons {

            property_divider: '∙',