Compare commits

...

1 commit

Author SHA1 Message Date
8e52486e87 WIP: feat(tui): highlight branchs in log
All checks were successful
ci/woodpecker/push/cron-docker-builder Pipeline was successful
ci/woodpecker/push/push-next Pipeline was successful
ci/woodpecker/push/tag-created Pipeline was successful
2024-08-31 17:46:42 +01:00

View file

@ -1,9 +1,13 @@
// //
use git_next_core::git::graph::Log; use git_next_core::git::graph::Log;
use lazy_static::lazy_static;
use ratatui::{ use ratatui::{
text::{Line, Text}, style::{Color, Style, Styled as _},
text::{Line, Span, Text},
widgets::{Paragraph, Widget}, widgets::{Paragraph, Widget},
}; };
use regex::Regex;
use tracing::info;
use super::HeightContraintLength; use super::HeightContraintLength;
@ -39,8 +43,86 @@ impl LogLine {
Self { raw: raw.into() } Self { raw: raw.into() }
} }
} }
lazy_static::lazy_static! {
static ref RE: Regex =
#[allow(clippy::unwrap_used)]
Regex::new(
r"^(?<pre>.*)\s(?<hash>[0-9a-f]{7})\s\((?<branches>.*?)\)\s(?<message>.*)",
).unwrap();
static ref BRANCHES: Regex =
#[allow(clippy::unwrap_used)]
Regex::new(
r"origin\/(?<branch>.*?)[,$]",
).unwrap();
}
impl From<LogLine> for Line<'_> { impl From<LogLine> for Line<'_> {
fn from(value: LogLine) -> Self { fn from(value: LogLine) -> Self {
Line::from(value.raw) if let Some(caps) = RE.captures(&value.raw) {
let pre = caps["pre"].to_owned();
let hash = caps["hash"].to_owned();
let message = caps["message"].to_owned();
let mut branches = BRANCHES
.captures_iter(&caps["branches"])
.map(|captures| captures["branch"].to_owned())
.collect::<Vec<_>>();
if branches.is_empty() {
// line without branches
Line::from(vec![
pre.into(),
" ".into(),
hash.into(),
" ".into(),
message.into(),
])
} else {
// line withbranches
let mut spans = vec![pre.into(), " ".into(), hash.into(), " ".into()];
branches.sort();
branches
.into_iter()
.map(|branch| Span::from(branch).style(Style::default().fg(Color::Blue)))
.for_each(|span| {
spans.push("[".into());
spans.push(span);
spans.push("]".into());
});
spans.push(" ".into());
spans.push(message.into());
Line::from(spans)
}
} else {
// non-commit line
Line::from(value.raw.clone())
}
}
}
#[cfg(test)]
mod tests {
use tracing::info;
use super::RE;
#[test_log::test]
fn parse_log_line() -> Result<(), Box<dyn std::error::Error>> {
let line = "* 97b6853 (origin/next, origin/main, origin/dev, origin/HEAD) refactor(tui): simplify repo identity widget";
RE.captures(line).map_or_else(
|| Err("Failed to capture".into()),
|caps| {
info!(?caps, "");
assert_eq!(&caps["pre"], "*");
assert_eq!(&caps["hash"], "97b6853");
assert_eq!(&caps["branch1"], "next");
assert_eq!(&caps["branch2"], "main");
assert_eq!(&caps["branch3"], "dev");
assert_eq!(&caps["branch4"], "HEAD");
assert_eq!(
&caps["message"],
"refactor(tui): simplify repo identity widget"
);
Ok(())
},
)
} }
} }