diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | src/bin/git-sugapply.rs | 25 | ||||
| -rw-r--r-- | src/lib.rs | 7 | ||||
| -rw-r--r-- | src/url.rs | 45 | 
5 files changed, 78 insertions, 1 deletions
| @@ -249,6 +249,7 @@ dependencies = [   "tempfile",   "thiserror",   "unidiff", + "url",  ]  [[package]] @@ -12,3 +12,4 @@ serde_json = "1.0.56"  tempfile = "3.1.0"  thiserror = "1.0.20"  unidiff = "0.3.3" +url = "2.1.1" diff --git a/src/bin/git-sugapply.rs b/src/bin/git-sugapply.rs new file mode 100644 index 0000000..d569147 --- /dev/null +++ b/src/bin/git-sugapply.rs @@ -0,0 +1,25 @@ +use std::env; +use std::process; + +use git_suggested_patch::{Client, SuggestionUrl}; + + +fn main() { +    let args: Vec<_> = env::args().collect(); + +    if args.len() < 2 { +        process::exit(111); +    } + +    let url: SuggestionUrl = args[1].parse().unwrap(); + +    let client = Client::new( +        env!("GITHUB_TOKEN"), +        &url.owner, +        &url.repo, +    ); + +    let suggestion = client.fetch(&url.comment_id).unwrap(); + +    suggestion.apply().unwrap(); +} @@ -1,6 +1,11 @@  #![warn(rust_2018_idioms)] +mod url; + +pub use crate::url::SuggestionUrl; + +  use std::fs;  use std::fs::{File, OpenOptions};  use std::io::{BufRead, BufReader, Write}; @@ -109,7 +114,7 @@ impl Suggestion {          s.replace("```", "")      } -    fn apply(&self) -> Result<(), Error> { +    pub fn apply(&self) -> Result<(), Error> {          let repo = Repository::open(".").unwrap();          let repo_root = repo.workdir().unwrap(); diff --git a/src/url.rs b/src/url.rs new file mode 100644 index 0000000..d635d6f --- /dev/null +++ b/src/url.rs @@ -0,0 +1,45 @@ +use std::str::FromStr; + +use thiserror::Error; + +use url; +use url::Url; + + +#[derive(Debug, Error)] +pub enum Error { +    #[error("Unable to parse URL")] +    Url(#[from] url::ParseError), + +    #[error("URL has no path")] +    NoPath, + +    #[error("URL has no fragment")] +    NoFragment, +} + +#[derive(Debug)] +pub struct SuggestionUrl { +    pub owner: String, +    pub repo: String, +    pub comment_id: String, +} + +impl FromStr for SuggestionUrl { +    type Err = Error; + +    fn from_str(s: &str) -> Result<Self, Self::Err> { +        let url = Url::parse(s)?; +        let path = url.path_segments() +            .ok_or(Error::NoPath)? +            .collect::<Vec<_>>(); + +        Ok(SuggestionUrl { +            owner: path[0].to_owned(), +            repo: path[1].to_owned(), +            comment_id: url.fragment() +                .ok_or(Error::NoFragment)? +                .replacen("discussion_r", "", 1), +        }) +    } +} | 
