extract tldr and include it

Author: Niko Matsakis

crates/rust-project-goals-cli-llm/src/updates.rs

@@ -1,7 +1,7 @@
 use anyhow::Context;
 use chrono::{Datelike, NaiveDate};
 use rust_project_goals::markwaydown;
-use rust_project_goals::re::HELP_WANTED;
+use rust_project_goals::re::{HELP_WANTED, TLDR};
 use rust_project_goals::util::comma;
 use rust_project_goals_json::GithubIssueState;
 use std::io::Write;
@@ -114,11 +114,19 @@ async fn prepare_goals(
         comments.sort_by_key(|c| c.created_at.clone());
         comments.retain(|c| !c.is_automated_comment() && filter.matches(c));
 
+        let tldr = tldr(&issue_id, &mut comments)?;
 
-        let help_wanted = help_wanted(&issue_id, issue)?;
+        let help_wanted = help_wanted(&issue_id, &comments)?;
 
         let why_this_goal = why_this_goal(&issue_id, issue)?;
 
+        progress_bar::print_progress_bar_info(
+            &format!("Issue #{number}", number = issue.number),
+            &format!("tldr={}, c={}", tldr.is_some(), comments.len()),
+            progress_bar::Color::Green,
+            progress_bar::Style::Bold,
+        );
+
         result.push(UpdatesGoal {
             title: title.clone(),
             issue_number: issue.number,
@@ -129,7 +137,7 @@ async fn prepare_goals(
             is_closed: issue.state == GithubIssueState::Closed,
             num_comments: comments.len(),
             comments,
-            tldr: None, // FIXME
+            tldr,
             why_this_goal,
         });
 
@@ -138,15 +146,29 @@ async fn prepare_goals(
     Ok(result)
 }
 
+/// Search for a TL;DR comment. If one is found, remove it and return the text.
+fn tldr(
+    _issue_id: &IssueId,
+    comments: &mut Vec<ExistingGithubComment>,
+) -> anyhow::Result<Option<String>> {
+    let Some(index) = comments.iter().position(|c| c.body.starts_with(TLDR)) else {
+        return Ok(None);
+    };
+
+    let comment = comments.remove(index);
+    Ok(Some(comment.body[TLDR.len()..].trim().to_string()))
+}
+
+/// Search for comments that talk about help being wanted and extract that
 fn help_wanted(
-    issue_id: &IssueId,
-    issue: &ExistingGithubIssue,
+    _issue_id: &IssueId,
+    comments: &[ExistingGithubComment],
 ) -> anyhow::Result<Vec<HelpWanted>> {
     use std::fmt::Write;
 
     let mut help_wanted = vec![];
 
-    for comment in &issue.comments {
+    for comment in comments {
         let mut lines = comment.body.split('\n').peekable();
 
         // Look for a line that says "Help wanted" at the front.

crates/rust-project-goals/src/re.rs

@@ -108,9 +108,5 @@ lazy_static! {
             .unwrap();
 }
 
-lazy_static! {
-    /// If a comment begins with this text, it will be considered a summary.
-    pub static ref TLDR: Regex =
-        Regex::new(r"^TLDR")
-            .unwrap();
-}
+/// If a comment begins with this text, it will be considered a summary.
+pub const TLDR: &str = "TL;DR:";

templates/updates.hbs

@@ -9,9 +9,7 @@ The Rust project is currently working towards a [slate of 26 project goals](http
 
 **Why this goal?** {{why_this_goal}}
 
-{{#if tldr}}
-**What has happened?** {{tldr}}
-{{/if}}
+**What has happened?** {{{tldr}}}
 
 <!-- markdown separator --> 
 
@@ -24,6 +22,10 @@ The Rust project is currently working towards a [slate of 26 project goals](http
 {{#if help_wanted}}
 {{>introduce_goal}}
 
+<!-- markdown separator --> 
+{{{tldr}}}
+<!-- markdown separator --> 
+
 {{#each help_wanted}}
 
 <!-- markdown separator --> 
@@ -32,10 +34,6 @@ The Rust project is currently working towards a [slate of 26 project goals](http
 
 {{/each}}
 
-{{#if tldr}}
-{{tldr}}
-{{/if}}
-
 <!-- markdown separator --> 
 
 {{>goal_comments}}
@@ -48,11 +46,13 @@ The Rust project is currently working towards a [slate of 26 project goals](http
 {{#if help_wanted}}
 {{else}}
 {{>introduce_goal}}
+
 <!-- markdown separator --> 
-{{#if tldr}}
-{{tldr}}
-{{/if}}
+
+{{{tldr}}}
+
 <!-- markdown separator --> 
+
 {{>goal_comments}}
 {{/if}}
 {{/each}}