diff --git a/src/lib.rs b/src/lib.rs index 4376e97..1651da7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -24,7 +24,7 @@ use crate::{ error::{Error, Result}, service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut}, statics::{CLIENT, VERSION_INFO}, - template::RepoInfo, + template::{RepoGeneratorInfo, RepoInfo}, }; use actix_web::{ dev::Server, @@ -56,6 +56,7 @@ struct GeneratorForm<'a> { service: FormService, user: Cow<'a, str>, repo: Cow<'a, str>, + branch: Option>, } #[derive(Debug)] @@ -438,16 +439,23 @@ async fn generate( state: web::Data, repo_count: web::Data, ) -> Result { - let repo = format!("{}/{}", params.user, params.repo); let mut buf = Vec::new(); + let repo_info = RepoGeneratorInfo { + service: params.service, + user: ¶ms.user, + repo: ¶ms.repo, + branch: params + .branch + .as_deref() + .filter(|s| !s.is_empty()) + .unwrap_or("master"), + }; templates::generate( &mut buf, VERSION_INFO, repo_count.load(Ordering::Relaxed), &state.settings.base_url, - params.service.url(), - params.service.service(), - &repo, + &repo_info, )?; Ok(HttpResponse::Ok().content_type("text/html").body(buf)) diff --git a/src/service.rs b/src/service.rs index ce95c97..531bd9b 100644 --- a/src/service.rs +++ b/src/service.rs @@ -28,8 +28,8 @@ pub(crate) trait Service: Sized + 'static { } } -#[derive(Deserialize, Serialize)] -pub(crate) enum FormService { +#[derive(Deserialize, Serialize, Clone, Copy)] +pub enum FormService { #[serde(rename = "github")] GitHub, #[serde(rename = "gitlab")] diff --git a/src/template.rs b/src/template.rs index ceae682..d90b05d 100644 --- a/src/template.rs +++ b/src/template.rs @@ -1,3 +1,5 @@ +use crate::service::FormService; + pub struct RepoInfo<'a> { pub commit_url: &'a str, pub commits: u64, @@ -9,3 +11,10 @@ pub struct RepoInfo<'a> { pub url: &'a str, pub branch: &'a str, } + +pub struct RepoGeneratorInfo<'a> { + pub service: FormService, + pub user: &'a str, + pub repo: &'a str, + pub branch: &'a str, +} diff --git a/templates/generate.rs.html b/templates/generate.rs.html index f4ad6dc..2ce62cc 100644 --- a/templates/generate.rs.html +++ b/templates/generate.rs.html @@ -1,16 +1,16 @@ @use super::base; -@use crate::statics::VersionInfo; +@use crate::{statics::VersionInfo, template::RepoGeneratorInfo}; -@(version_info: VersionInfo, repo_count: usize, base_url: &str, url: &str, service: &str, path: &str) +@(version_info: VersionInfo, repo_count: usize, base_url: &str, repo_info: &RepoGeneratorInfo) @:base("Hits-of-Code Badges", "Badge Generator", {

-Here is the markdown for the badge for @url/@path +Here is the markdown for the badge for @repo_info.user/@repo_info.repo

-[![Hits-of-Code](@base_url/@service/@path)](@base_url/@service/@path/view)
+[![Hits-of-Code](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo?branch=@repo_info.branch)](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo/view?branch=@repo_info.branch)
 

@@ -18,6 +18,6 @@ It will be rendered like this

-example badge
+example badge
 
}, version_info, repo_count) diff --git a/templates/index.rs.html b/templates/index.rs.html index 9dd2520..aebc661 100644 --- a/templates/index.rs.html +++ b/templates/index.rs.html @@ -80,6 +80,8 @@ the lines of + +