Bump version number

Bump ructe from 0.6.2 to 0.6.4

.drone.yml

@@ -1,3 +1,4 @@
+---
 kind: pipeline
 name: build
 
@@ -14,3 +15,8 @@ steps:
     ref:
       - refs/heads/master
       - refs/tags/v*
+---
+kind: signature
+hmac: 36c14cd35c5abe274025760c9ca34f198d392be0c31435ad58cb9ecaa0abef2a
+
+...

.gitignore

@@ -2,3 +2,4 @@
 **/*.rs.bk
 repos
 cache
+hoc.log

Cargo.toml

@@ -1,27 +1,27 @@
 [package]
 name = "hoc"
-version = "0.2.3"
+version = "0.9.3"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-actix-web = "1.0.0-beta.2"
+actix-web = "1.0.2"
 badge = "0.2.0"
 bytes = "0.4.12"
-futures = "0.1.26"
+futures = "0.1.27"
-git2 = "0.8.0"
+git2 = "0.9.1"
 lazy_static = "1.3.0"
 log = "0.4.6"
+log4rs = "0.8.3"
 number_prefix = "0.3.0"
 openssl-probe = "0.1.2"
-pretty_env_logger = "0.3.0"
+reqwest = "0.9.17"
-reqwest = "0.9.16"
+serde = "1.0.93"
-serde = "1.0.90"
+serde_derive = "1.0.93"
-serde_derive = "1.0.90"
 serde_json = "1.0.39"
-structopt = "0.2.15"
+structopt = "0.2.16"
 
 [build-dependencies]
-ructe = "0.6.2"
+ructe = "0.6.4"
 vergen = "3.0.4"

Dockerfile

@@ -29,10 +29,14 @@ FROM alpine:latest
 
 RUN apk --no-cache add --update git
 
+RUN adduser -D hoc
+WORKDIR /home/hoc
+USER hoc
+
 # once we don't need a git binary anymore, this should be enough
 # FROM scratch
 # COPY --from=linuxkit/ca-certificates:v0.7 / /
 
-COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc /hoc
+COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
 
-ENTRYPOINT ["/hoc"]
+ENTRYPOINT ["/home/hoc/hoc"]

README.md

@@ -4,6 +4,7 @@
 [![Drone build](https://drone.vbrandl.net/api/badges/vbrandl/hoc/status.svg)](https://drone.vbrandl.net/vbrandl/hoc)
 [![Gitlab build](https://gitlab.com/vbrandl/hoc/badges/master/pipeline.svg)](https://gitlab.com/vbrandl/hoc/pipelines)
 [![Travis build](https://travis-ci.org/vbrandl/hoc.svg?branch=master)](https://travis-ci.org/vbrandl/hoc)
+[![dependency status](https://deps.rs/repo/github/vbrandl/hoc/status.svg)](https://deps.rs/repo/github/vbrandl/hoc)
 
 Small webservice, that returns a badge of the Hits-of-Code of a git repository, as described by [Yegor
 Bugayenko](https://www.yegor256.com/2014/11/14/hits-of-code.html). It is implemented in
@@ -19,8 +20,14 @@ The API is as simple as
 https://<host>/<service>/<user>/<repo>
 ```
 
-where `<service>` is one of `gitub`, `gitlab` or `bitbucket`.
+where `<service>` is one of `gitub`, `gitlab` or `bitbucket`. The HoC data can also be received as JSON by appending
+`/json` to the reuqest path:
 
+```
+https://<host>/<service>/<user>/<repo>/json
+```
+
+There is also an overview page available via `https://<host>/view/<service>/<user>/<repo>`
 
 ## Building
 

docker-compose.yml

@@ -2,11 +2,10 @@ version: "2"
 
 services:
   hoc:
-    # build: .
+    image: vbrandl/hits-of-code:latest
-    # image: local/hoc:latest
-    image: registry.gitlab.com/vbrandl/hoc:latest
     volumes:
-      - ./repos:/repos
+      - ./repos:/home/hoc/repos
-      - ./cache:/cache
+      - ./cache:/home/hoc/cache
-    ports:
+    # ports:
-      - "127.0.0.1:8080:8080"
+    #   - "127.0.0.1:8080:8080"
+    restart: always

scripts/list.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+set -e
+
+DIR=${1:-repos}
+
+find "$DIR" -mindepth 3 -maxdepth 3 -type d \
+    | sed -e "s/$DIR/https:\//g" \
+    | sort

src/cache.rs

@@ -1,4 +1,4 @@
-use crate::Error;
+use crate::error::{Error, Result};
 use std::{
     borrow::Cow,
     fs::{create_dir_all, File, OpenOptions},
@@ -17,7 +17,7 @@ pub(crate) enum CacheState<'a> {
 }
 
 impl<'a> CacheState<'a> {
-    pub(crate) fn read_from_file(path: impl AsRef<Path>, head: &str) -> Result<CacheState, Error> {
+    pub(crate) fn read_from_file(path: impl AsRef<Path>, head: &str) -> Result<CacheState> {
         if path.as_ref().exists() {
             let cache: Cache = serde_json::from_reader(BufReader::new(File::open(path)?))?;
             if cache.head == head {
@@ -49,7 +49,7 @@ pub(crate) struct Cache<'a> {
 }
 
 impl<'a> Cache<'a> {
-    pub(crate) fn write_to_file(&self, path: impl AsRef<Path>) -> Result<(), Error> {
+    pub(crate) fn write_to_file(&self, path: impl AsRef<Path>) -> Result<()> {
         create_dir_all(path.as_ref().parent().ok_or(Error::Internal)?)?;
         serde_json::to_writer(
             OpenOptions::new()

src/config.rs

@@ -0,0 +1,71 @@
+use crate::{error::Result, statics::OPT};
+use log::LevelFilter;
+use log4rs::{
+    append::{console::ConsoleAppender, file::FileAppender},
+    config::{Appender, Config, Root},
+    encode::pattern::PatternEncoder,
+};
+use std::path::PathBuf;
+use structopt::StructOpt;
+
+#[derive(StructOpt, Debug)]
+pub(crate) struct Opt {
+    #[structopt(
+        short = "o",
+        long = "outdir",
+        parse(from_os_str),
+        default_value = "./repos"
+    )]
+    /// Path to store cloned repositories
+    pub(crate) outdir: PathBuf,
+    #[structopt(
+        short = "c",
+        long = "cachedir",
+        parse(from_os_str),
+        default_value = "./cache"
+    )]
+    /// Path to store cache
+    pub(crate) cachedir: PathBuf,
+    #[structopt(short = "p", long = "port", default_value = "8080")]
+    /// Port to listen on
+    pub(crate) port: u16,
+    #[structopt(short = "h", long = "host", default_value = "0.0.0.0")]
+    /// Interface to listen on
+    pub(crate) host: String,
+    #[structopt(short = "d", long = "domain", default_value = "hitsofcode.com")]
+    /// Interface to listen on
+    pub(crate) domain: String,
+    #[structopt(short = "w", long = "workers", default_value = "4")]
+    /// Number of worker threads
+    pub(crate) workers: usize,
+    #[structopt(
+        short = "l",
+        long = "logfile",
+        parse(from_os_str),
+        default_value = "./hoc.log"
+    )]
+    /// The logfile
+    pub(crate) logfile: PathBuf,
+}
+
+pub(crate) fn init() -> Result<()> {
+    std::env::set_var("RUST_LOG", "actix_web=info,hoc=info");
+    // pretty_env_logger::init();
+    openssl_probe::init_ssl_cert_env_vars();
+    let stdout = ConsoleAppender::builder().build();
+    let file = FileAppender::builder()
+        .encoder(Box::new(PatternEncoder::new("{d} - {m}{n}")))
+        .build(&OPT.logfile)
+        .unwrap();
+    let config = Config::builder()
+        .appender(Appender::builder().build("stdout", Box::new(stdout)))
+        .appender(Appender::builder().build("file", Box::new(file)))
+        .build(
+            Root::builder()
+                .appender("stdout")
+                .appender("file")
+                .build(LevelFilter::Info),
+        )?;
+    log4rs::init_config(config)?;
+    Ok(())
+}

src/count.rs

@@ -0,0 +1,24 @@
+use crate::error::Result;
+use std::{fs::read_dir, path::Path, result::Result as StdResult};
+
+pub(crate) fn count_repositories<P>(repo_path: P) -> Result<usize>
+where
+    P: AsRef<Path>,
+{
+    Ok(read_dir(repo_path)?
+        .filter_map(StdResult::ok)
+        .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
+        .map(|entry| read_dir(entry.path()))
+        .filter_map(StdResult::ok)
+        .flat_map(|dir| {
+            dir.filter_map(StdResult::ok)
+                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
+        })
+        .map(|entry| read_dir(entry.path()))
+        .filter_map(StdResult::ok)
+        .flat_map(|dir| {
+            dir.filter_map(StdResult::ok)
+                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
+        })
+        .count())
+}

src/error.rs

@@ -1,6 +1,11 @@
-use crate::P500;
+use crate::{
+    statics::{REPO_COUNT, VERSION_INFO},
+    templates,
+};
 use actix_web::{HttpResponse, ResponseError};
-use std::fmt;
+use std::{fmt, sync::atomic::Ordering};
+
+pub(crate) type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug)]
 pub(crate) enum Error {
@@ -9,6 +14,8 @@ pub(crate) enum Error {
     Git(git2::Error),
     Internal,
     Io(std::io::Error),
+    Log(log::SetLoggerError),
+    LogBuilder(log4rs::config::Errors),
     Serial(serde_json::Error),
 }
 
@@ -20,6 +27,8 @@ impl fmt::Display for Error {
             Error::Git(e) => write!(fmt, "Git({})", e),
             Error::Internal => write!(fmt, "Internal Error"),
             Error::Io(e) => write!(fmt, "Io({})", e),
+            Error::Log(e) => write!(fmt, "Log({})", e),
+            Error::LogBuilder(e) => write!(fmt, "LogBuilder({})", e),
             Error::Serial(e) => write!(fmt, "Serial({})", e),
         }
     }
@@ -27,15 +36,15 @@ impl fmt::Display for Error {
 
 impl ResponseError for Error {
     fn error_response(&self) -> HttpResponse {
+        let mut buf = Vec::new();
+        templates::p500(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed)).unwrap();
         HttpResponse::InternalServerError()
             .content_type("text/html")
-            .body(P500.as_slice())
+            .body(buf)
     }
 
     fn render_response(&self) -> HttpResponse {
-        HttpResponse::InternalServerError()
+        self.error_response()
-            .content_type("text/html")
-            .body(P500.as_slice())
     }
 }
 
@@ -53,6 +62,12 @@ impl From<git2::Error> for Error {
     }
 }
 
+impl From<log::SetLoggerError> for Error {
+    fn from(err: log::SetLoggerError) -> Self {
+        Error::Log(err)
+    }
+}
+
 impl From<std::io::Error> for Error {
     fn from(err: std::io::Error) -> Self {
         Error::Io(err)
@@ -70,3 +85,9 @@ impl From<reqwest::Error> for Error {
         Error::Client(err)
     }
 }
+
+impl From<log4rs::config::Errors> for Error {
+    fn from(err: log4rs::config::Errors) -> Self {
+        Error::LogBuilder(err)
+    }
+}

src/main.rs

@@ -1,3 +1,5 @@
+#![type_length_limit = "2257138"]
+
 #[macro_use]
 extern crate actix_web;
 #[macro_use]
@@ -8,13 +10,17 @@ extern crate log;
 extern crate serde_derive;
 
 mod cache;
+mod config;
+mod count;
 mod error;
 mod service;
+mod statics;
 
 use crate::{
     cache::CacheState,
-    error::Error,
+    error::{Error, Result},
-    service::{Bitbucket, GitHub, Gitlab, Service},
+    service::{Bitbucket, FormService, GitHub, Gitlab, Service},
+    statics::{CLIENT, CSS, FAVICON, OPT, REPO_COUNT, VERSION_INFO},
 };
 use actix_web::{
     error::ErrorBadRequest,
@@ -23,48 +29,26 @@ use actix_web::{
 };
 use badge::{Badge, BadgeOptions};
 use bytes::Bytes;
-use futures::{unsync::mpsc, Stream};
+use futures::{unsync::mpsc, Future, Stream};
 use git2::Repository;
 use number_prefix::{NumberPrefix, Prefixed, Standalone};
 use std::{
+    borrow::Cow,
     fs::create_dir_all,
-    path::{Path, PathBuf},
+    path::Path,
     process::Command,
+    sync::atomic::Ordering,
     sync::Arc,
     time::{Duration, SystemTime},
 };
-use structopt::StructOpt;
 
 include!(concat!(env!("OUT_DIR"), "/templates.rs"));
 
-pub struct VersionInfo<'a> {
+#[derive(Deserialize, Serialize)]
-    pub commit: &'a str,
+struct GeneratorForm<'a> {
-    pub version: &'a str,
+    service: FormService,
-}
+    user: Cow<'a, str>,
-
+    repo: Cow<'a, str>,
-const VERSION_INFO: VersionInfo = VersionInfo {
-    commit: env!("VERGEN_SHA_SHORT"),
-    version: env!("CARGO_PKG_VERSION"),
-};
-
-lazy_static! {
-    static ref CLIENT: reqwest::Client = reqwest::Client::new();
-    static ref OPT: Opt = Opt::from_args();
-    static ref INDEX: Vec<u8> = {
-        let mut buf = Vec::new();
-        templates::index(&mut buf, VERSION_INFO, &OPT.domain).unwrap();
-        buf
-    };
-    static ref P404: Vec<u8> = {
-        let mut buf = Vec::new();
-        templates::p404(&mut buf, VERSION_INFO).unwrap();
-        buf
-    };
-    static ref P500: Vec<u8> = {
-        let mut buf = Vec::new();
-        templates::p500(&mut buf, VERSION_INFO).unwrap();
-        buf
-    };
 }
 
 struct State {
@@ -72,48 +56,20 @@ struct State {
     cache: String,
 }
 
-const CSS: &str = include_str!("../static/tacit-css.min.css");
+#[derive(Serialize)]
-
+struct JsonResponse<'a> {
-#[derive(StructOpt, Debug)]
+    head: &'a str,
-struct Opt {
+    count: u64,
-    #[structopt(
-        short = "o",
-        long = "outdir",
-        parse(from_os_str),
-        default_value = "./repos"
-    )]
-    /// Path to store cloned repositories
-    outdir: PathBuf,
-    #[structopt(
-        short = "c",
-        long = "cachedir",
-        parse(from_os_str),
-        default_value = "./cache"
-    )]
-    /// Path to store cache
-    cachedir: PathBuf,
-    #[structopt(short = "p", long = "port", default_value = "8080")]
-    /// Port to listen on
-    port: u16,
-    #[structopt(short = "h", long = "host", default_value = "0.0.0.0")]
-    /// Interface to listen on
-    host: String,
-    #[structopt(short = "d", long = "domain", default_value = "hitsofcode.com")]
-    /// Interface to listen on
-    domain: String,
-    #[structopt(short = "w", long = "workers", default_value = "4")]
-    /// Number of worker threads
-    workers: usize,
 }
 
-fn pull(path: impl AsRef<Path>) -> Result<(), Error> {
+fn pull(path: impl AsRef<Path>) -> Result<()> {
     let repo = Repository::open_bare(path)?;
     let mut origin = repo.find_remote("origin")?;
     origin.fetch(&["refs/heads/*:refs/heads/*"], None, None)?;
     Ok(())
 }
 
-fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String), Error> {
+fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String)> {
     let repo_dir = format!("{}/{}", repo_dir, repo);
     let cache_dir = format!("{}/{}.json", cache_dir, repo);
     let cache_dir = Path::new(&cache_dir);
@@ -164,7 +120,7 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String), Err
             s.split_whitespace()
                 .take(2)
                 .map(str::parse::<u64>)
-                .filter_map(Result::ok)
+                .filter_map(std::result::Result::ok)
                 .sum::<u64>()
         })
         .sum();
@@ -175,7 +131,7 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String), Err
     Ok((cache.count, head))
 }
 
-fn remote_exists(url: &str) -> Result<bool, Error> {
+fn remote_exists(url: &str) -> Result<bool> {
     Ok(CLIENT.head(url).send()?.status() == reqwest::StatusCode::OK)
 }
 
@@ -195,56 +151,68 @@ fn handle_hoc_request<T, F>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
     mapper: F,
-) -> Result<HttpResponse, Error>
+) -> impl Future<Item = HttpResponse, Error = Error>
 where
     T: Service,
-    F: Fn(HocResult) -> Result<HttpResponse, Error>,
+    F: Fn(HocResult) -> Result<HttpResponse>,
 {
-    hoc_request::<T>(state, data).and_then(mapper)
+    futures::future::result(Ok(()))
+        .and_then(move |_| {
+            let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
+            let service_path = format!("{}/{}", T::domain(), repo);
+            let path = format!("{}/{}", state.repos, service_path);
+            let file = Path::new(&path);
+            let url = format!("https://{}", service_path);
+            if !file.exists() {
+                if !remote_exists(&url)? {
+                    warn!("Repository does not exist: {}", url);
+                    return Ok(HocResult::NotFound);
+                }
+                info!("Cloning {} for the first time", url);
+                create_dir_all(file)?;
+                let repo = Repository::init_bare(file)?;
+                repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?;
+                repo.remote_set_url("origin", &url)?;
+                REPO_COUNT.fetch_add(1, Ordering::Relaxed);
+            }
+            pull(&path)?;
+            let (hoc, head) = hoc(&service_path, &state.repos, &state.cache)?;
+            let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
+                Standalone(hoc) => hoc.to_string(),
+                Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
+            };
+            Ok(HocResult::Hoc {
+                hoc,
+                hoc_pretty,
+                head,
+                url,
+                repo,
+                service_path,
+            })
+        })
+        .and_then(mapper)
 }
 
-fn hoc_request<T: Service>(
+fn json_hoc<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HocResult, Error> {
+) -> impl Future<Item = HttpResponse, Error = Error> {
-    let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
+    let mapper = |r| match r {
-    let service_path = format!("{}/{}", T::domain(), repo);
+        HocResult::NotFound => p404(),
-    let path = format!("{}/{}", state.repos, service_path);
+        HocResult::Hoc { hoc, head, .. } => Ok(HttpResponse::Ok().json(JsonResponse {
-    let file = Path::new(&path);
+            head: &head,
-    let url = format!("https://{}", service_path);
+            count: hoc,
-    if !file.exists() {
+        })),
-        if !remote_exists(&url)? {
-            warn!("Repository does not exist: {}", url);
-            return Ok(HocResult::NotFound);
-        }
-        info!("Cloning {} for the first time", url);
-        create_dir_all(file)?;
-        let repo = Repository::init_bare(file)?;
-        repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?;
-        repo.remote_set_url("origin", &url)?;
-    }
-    pull(&path)?;
-    let (hoc, head) = hoc(&service_path, &state.repos, &state.cache)?;
-    let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
-        Standalone(hoc) => hoc.to_string(),
-        Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
     };
-    Ok(HocResult::Hoc {
+    handle_hoc_request::<T, _>(state, data, mapper)
-        hoc,
-        hoc_pretty,
-        head,
-        url,
-        repo,
-        service_path,
-    })
 }
 
 fn calculate_hoc<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HttpResponse, Error> {
+) -> impl Future<Item = HttpResponse, Error = Error> {
     let mapper = |r| match r {
-        HocResult::NotFound => Ok(p404()),
+        HocResult::NotFound => p404(),
         HocResult::Hoc { hoc_pretty, .. } => {
             let badge_opt = BadgeOptions {
                 subject: "Hits-of-Code".to_string(),
@@ -275,9 +243,9 @@ fn calculate_hoc<T: Service>(
 fn overview<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HttpResponse, Error> {
+) -> impl Future<Item = HttpResponse, Error = Error> {
     let mapper = |r| match r {
-        HocResult::NotFound => Ok(p404()),
+        HocResult::NotFound => p404(),
         HocResult::Hoc {
             hoc,
             hoc_pretty,
@@ -290,6 +258,7 @@ fn overview<T: Service>(
             templates::overview(
                 &mut buf,
                 VERSION_INFO,
+                REPO_COUNT.load(Ordering::Relaxed),
                 &OPT.domain,
                 &service_path,
                 &url,
@@ -311,16 +280,42 @@ fn overview<T: Service>(
 }
 
 #[get("/")]
-fn index() -> HttpResponse {
+fn index() -> Result<HttpResponse> {
-    HttpResponse::Ok()
+    let mut buf = Vec::new();
-        .content_type("text/html")
+    templates::index(
-        .body(INDEX.as_slice())
+        &mut buf,
+        VERSION_INFO,
+        REPO_COUNT.load(Ordering::Relaxed),
+        &OPT.domain,
+    )?;
+    Ok(HttpResponse::Ok().content_type("text/html").body(buf))
 }
 
-fn p404() -> HttpResponse {
+#[post("/generate")]
-    HttpResponse::NotFound()
+fn generate(params: web::Form<GeneratorForm>) -> Result<HttpResponse> {
+    let repo = format!("{}/{}", params.user, params.repo);
+    let mut buf = Vec::new();
+    templates::generate(
+        &mut buf,
+        VERSION_INFO,
+        REPO_COUNT.load(Ordering::Relaxed),
+        &OPT.domain,
+        params.service.url(),
+        params.service.service(),
+        &repo,
+    )?;
+    let (tx, rx_body) = mpsc::unbounded();
+    let _ = tx.unbounded_send(Bytes::from(buf));
+
+    Ok(HttpResponse::Ok()
         .content_type("text/html")
-        .body(P404.as_slice())
+        .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request"))))
+}
+
+fn p404() -> Result<HttpResponse> {
+    let mut buf = Vec::new();
+    templates::p404(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed))?;
+    Ok(HttpResponse::NotFound().content_type("text/html").body(buf))
 }
 
 #[get("/tacit-css.min.css")]
@@ -328,30 +323,38 @@ fn css() -> HttpResponse {
     HttpResponse::Ok().content_type("text/css").body(CSS)
 }
 
-fn main() -> std::io::Result<()> {
+#[get("/favicon.ico")]
-    std::env::set_var("RUST_LOG", "actix_web=info,hoc=info");
+fn favicon32() -> HttpResponse {
-    pretty_env_logger::init();
+    HttpResponse::Ok().content_type("image/png").body(FAVICON)
-    openssl_probe::init_ssl_cert_env_vars();
+}
+
+fn main() -> Result<()> {
+    config::init()?;
     let interface = format!("{}:{}", OPT.host, OPT.port);
     let state = Arc::new(State {
         repos: OPT.outdir.display().to_string(),
         cache: OPT.cachedir.display().to_string(),
     });
-    HttpServer::new(move || {
+    Ok(HttpServer::new(move || {
         App::new()
             .data(state.clone())
             .wrap(middleware::Logger::default())
             .service(index)
             .service(css)
-            .service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>))
+            .service(favicon32)
-            .service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>))
+            .service(generate)
-            .service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>))
+            .service(web::resource("/github/{user}/{repo}").to_async(calculate_hoc::<GitHub>))
-            .service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>))
+            .service(web::resource("/gitlab/{user}/{repo}").to_async(calculate_hoc::<Gitlab>))
-            .service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>))
+            .service(web::resource("/bitbucket/{user}/{repo}").to_async(calculate_hoc::<Bitbucket>))
-            .service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>))
+            .service(web::resource("/github/{user}/{repo}/json").to_async(json_hoc::<GitHub>))
-            .default_service(web::resource("").route(web::get().to(p404)))
+            .service(web::resource("/gitlab/{user}/{repo}/json").to_async(json_hoc::<Gitlab>))
+            .service(web::resource("/bitbucket/{user}/{repo}/json").to_async(json_hoc::<Bitbucket>))
+            .service(web::resource("/view/github/{user}/{repo}").to_async(overview::<GitHub>))
+            .service(web::resource("/view/gitlab/{user}/{repo}").to_async(overview::<Gitlab>))
+            .service(web::resource("/view/bitbucket/{user}/{repo}").to_async(overview::<Bitbucket>))
+            .default_service(web::resource("").route(web::get().to_async(p404)))
     })
     .workers(OPT.workers)
     .bind(interface)?
-    .run()
+    .run()?)
 }

src/service.rs

@@ -4,6 +4,34 @@ pub(crate) trait Service {
     fn commit_url(repo: &str, commit_ref: &str) -> String;
 }
 
+#[derive(Deserialize, Serialize)]
+pub(crate) enum FormService {
+    #[serde(rename = "github")]
+    GitHub,
+    #[serde(rename = "gitlab")]
+    Gitlab,
+    #[serde(rename = "bitbucket")]
+    Bitbucket,
+}
+
+impl FormService {
+    pub(crate) fn url(&self) -> &str {
+        match self {
+            FormService::GitHub => "github.com",
+            FormService::Gitlab => "gitlab.com",
+            FormService::Bitbucket => "bitbucket.org",
+        }
+    }
+
+    pub(crate) fn service(&self) -> &str {
+        match self {
+            FormService::GitHub => "github",
+            FormService::Gitlab => "gitlab",
+            FormService::Bitbucket => "bitbucket",
+        }
+    }
+}
+
 pub(crate) struct GitHub;
 
 impl Service for GitHub {

src/statics.rs

@@ -0,0 +1,22 @@
+use crate::{config::Opt, count::count_repositories};
+use std::sync::atomic::AtomicUsize;
+use structopt::StructOpt;
+
+pub struct VersionInfo<'a> {
+    pub commit: &'a str,
+    pub version: &'a str,
+}
+
+pub(crate) const VERSION_INFO: VersionInfo = VersionInfo {
+    commit: env!("VERGEN_SHA_SHORT"),
+    version: env!("CARGO_PKG_VERSION"),
+};
+pub(crate) const CSS: &str = include_str!("../static/tacit-css.min.css");
+pub(crate) const FAVICON: &[u8] = include_bytes!("../static/favicon32.png");
+
+lazy_static! {
+    pub(crate) static ref CLIENT: reqwest::Client = reqwest::Client::new();
+    pub(crate) static ref OPT: Opt = Opt::from_args();
+    pub(crate) static ref REPO_COUNT: AtomicUsize =
+        AtomicUsize::new(count_repositories(&OPT.outdir).unwrap());
+}

templates/base.rs.html

@@ -1,6 +1,6 @@
-@use crate::VersionInfo;
+@use crate::statics::VersionInfo;
 
-@(title: &str, header: &str, content: Content, version_info: VersionInfo)
+@(title: &str, header: &str, content: Content, version_info: VersionInfo, repo_count: usize)
 
 <!DOCTYPE html>
 <html lang="en">
@@ -38,6 +38,13 @@
         </li>
     </ul>
 </nav>
+<nav>
+    <ul>
+        <li>
+            <small>Currently serving @repo_count repositories</small>
+        </li>
+    </ul>
+</nav>
 <nav>
     <ul>
         <li><small><a href="https://github.com/vbrandl/hoc">GitHub</a></small></li>

templates/generate.rs.html

@@ -0,0 +1,23 @@
+@use super::base;
+@use crate::statics::VersionInfo;
+
+@(version_info: VersionInfo, repo_count: usize, domain: &str, url: &str, service: &str, path: &str)
+
+@:base("Hits-of-Code Badges", "Badge Generator", {
+
+<p>
+Here is the markdown for the badge for <a href="https://@url/@path">@url/@path</a>
+</p>
+
+<pre>
+[![Hits-of-Code](https://@domain/@service/@path)](https://@domain/view/@service/@path)
+</pre>
+
+<p>
+It will be rendered like this
+</p>
+
+<pre>
+<a href="https://@domain/view/@service/@path"><img src="https://@domain/@service/@path" alt="example badge" /></a>
+</pre>
+}, version_info, repo_count)

templates/index.rs.html

@@ -1,7 +1,7 @@
 @use super::base;
-@use crate::VersionInfo;
+@use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo, domain: &str)
+@(version_info: VersionInfo, repo_count: usize, domain: &str)
 
 @:base("Hits-of-Code Badges", "Hits-of-Code Badges", {
 
@@ -45,6 +45,36 @@ would render this badge:
 alt="example badge" /></a>
 </pre>
 
+<p>
+You can also request the HoC as JSON by appending <code>/json</code> to the request path. This will return a JSON
+object with two fields: <code>count</code> and <code>head</code> with count being the HoC value and head being the
+commit ref of <code>HEAD</code>. Requesting
+<a href="https://@domain/github/vbrandl/hoc/json">https://@domain/github/vbrandl/hoc/json</a> might return something
+along the lines of
+</p>
+
+<pre>
+&#123;
+    "head" : "05736ee3ba256ec9a7227c436aef2bf43db109ab",
+    "count": 7582
+&#125;
+</pre>
+
+<h2>Badge Generator</h2>
+
+<form method="post" action="/generate">
+    <select name="service" id="service">
+        <option value="github">GitHub</option>
+        <option value="gitlab">Gitlab</option>
+        <option value="bitbucket">Bitbucket</option>
+    </select>
+    <label>/</label>
+    <input name="user" id="user" type="text" placeholder="user" />
+    <label>/</label>
+    <input name="repo" id="repo" type="text" placeholder="repository" />
+    <button type="submit">Generate</button>
+</form>
+
 <h2>Source Code</h2>
 
 <p>
@@ -61,4 +91,4 @@ my <a href="https://mirror.oldsql.cc/key.asc">GPG key</a>
 (<a href="http://pool.sks-keyservers.net/pks/lookup?op=get&amp;search=0x1FFE431282F4B8CC0A7579167FB009175885FC76">from a
     keyserver</a>), or by using any other UID from my key.
 </p>
-}, version_info)
+}, version_info, repo_count)

templates/overview.rs.html

@@ -1,7 +1,7 @@
 @use super::base;
-@use crate::VersionInfo;
+@use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo, domain: &str, path: &str, url: &str, hoc: u64, hoc_pretty: &str, head: &str, commit_url: &str)
+@(version_info: VersionInfo, repo_count: usize, domain: &str, path: &str, url: &str, hoc: u64, hoc_pretty: &str, head: &str, commit_url: &str)
 
 @:base("Hits-of-Code Badges", "Overview", {
 
@@ -16,4 +16,4 @@ To include the badge in your readme, use the following markdown:
 <pre>
 [![Hits-of-Code](https://@domain/@path)](https://@domain/view/@path)
 </pre>
-}, version_info)
+}, version_info, repo_count)

templates/p404.rs.html

@@ -1,7 +1,7 @@
 @use super::base;
-@use crate::VersionInfo;
+@use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo)
+@(version_info: VersionInfo, repo_count: usize)
 
 @:base("Page not Found - Hits-of-Code Badges", "404 - Page not Found", {
 <p>
@@ -11,4 +11,4 @@
 <p>
 If you think, this is a mistake on my side, please <a href="mailto:mail+hoc@@vbrandl.net">drop me a mail</a>.
 </p>
-}, version_info)
+}, version_info, repo_count)

templates/p500.rs.html

@@ -1,7 +1,7 @@
 @use super::base;
-@use crate::VersionInfo;
+@use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo)
+@(version_info: VersionInfo, repo_count: usize)
 
 @:base("Internal Server Error - Hits-of-Code Badges", "500 - Internal Server Error", {
 <p>
@@ -11,4 +11,4 @@
 <p>
 If you think, this is a bug, please <a href="mailto:mail+hoc@@vbrandl.net">drop me a mail</a>.
 </p>
-}, version_info)
+}, version_info, repo_count)