Merge pull request #32 from yaahc/exclude-labels

Add exclude_labels method to GithubQuery

Author: yaahc

tools/agenda-generator/Cargo.toml

@@ -5,10 +5,10 @@ authors = ["Mara Bos <m-ou.se@m-ou.se>"]
 edition = "2018"
 
 [dependencies]
-anyhow = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 reqwest = { version = "0.10", features = ["blocking", "json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 itertools = "0.10.1"
 structopt = "0.3.21"
+color-eyre = "0.5.11"

tools/agenda-generator/src/generator.rs

@@ -1,5 +1,8 @@
-use anyhow::Result;
 use chrono::{Duration, NaiveDateTime};
+use color_eyre::{
+    eyre::{Result, WrapErr},
+    Section, SectionExt,
+};
 use itertools::Itertools;
 use reqwest::header::{AUTHORIZATION, USER_AGENT};
 use serde::de::{DeserializeOwned, Deserializer};
@@ -124,6 +127,7 @@ impl Generator {
             .labels(&["T-libs-api", "stable-nominated"])
             .labels(&["T-libs", "beta-nominated"])
             .labels(&["T-libs-api", "beta-nominated"])
+            .exclude_labels(&["beta-accepted"])
             .state(State::Any)
             .repo("rust-lang/rust")
             .repo("rust-lang/rfcs")
@@ -410,6 +414,7 @@ impl Sort {
 struct GithubQuery {
     name: &'static str,
     labels: Vec<&'static [&'static str]>,
+    excluded_labels: Vec<&'static [&'static str]>,
     repos: Vec<&'static str>,
     sort: Option<Sort>,
     count: Option<usize>,
@@ -446,6 +451,7 @@ impl GithubQuery {
         Self {
             name,
             labels: vec![],
+            excluded_labels: vec![],
             repos: vec![],
             sort: None,
             count: None,
@@ -458,6 +464,11 @@ impl GithubQuery {
         self
     }
 
+    fn exclude_labels(&mut self, labels: &'static [&'static str]) -> &mut Self {
+        self.excluded_labels.push(labels);
+        self
+    }
+
     fn repo(&mut self, repo: &'static str) -> &mut Self {
         self.repos.push(repo);
         self
@@ -497,6 +508,15 @@ impl GithubQuery {
 
                 let issues = github_api(&endpoint)?;
                 let issues = generator.dedup(issues);
+
+                let issues = issues.filter(|issue| {
+                    !self.excluded_labels.iter().any(|labels| {
+                        labels
+                            .iter()
+                            .all(|&label| issue.labels.iter().any(|x| x == label))
+                    })
+                });
+
                 let issues: Vec<_> = if let Some(count) = self.count {
                     issues.take(count).collect()
                 } else {
@@ -585,7 +605,10 @@ fn github_api<T: DeserializeOwned>(endpoint: &str) -> Result<T> {
         client = client.header(AUTHORIZATION, format!("token {}", token));
     }
     let response = client.send()?;
-    Ok(response.json()?)
+    let response = response.text()?;
+    Ok(serde_json::from_str(&response)
+        .wrap_err("response body cannot be deserialized")
+        .with_section(|| response.header("Response:"))?)
 }
 
 fn deserialize_labels<'de, D: Deserializer<'de>>(d: D) -> Result<Vec<String>, D::Error> {

tools/agenda-generator/src/main.rs

@@ -1,11 +1,12 @@
-use anyhow::Result;
 use cli::AgendaKind;
+use color_eyre::eyre;
 use generator::Generator;
 
 mod cli;
 mod generator;
 
-fn main() -> Result<()> {
+fn main() -> eyre::Result<()> {
+    color_eyre::install()?;
     let args = cli::Args::from_args();
     let generator = Generator::default();
     let agenda = match args.agenda {