Bump version number

Bump git2 from 0.9.1 to 0.11.0

.github/workflows/audit.yml

@@ -0,0 +1,31 @@
+name: Security audit
+on:
+  schedule:
+    - cron: '0 1 * * *'
+  push:
+    paths:
+      - 'Cargo.toml'
+      - 'Cargo.lock'
+  pull_request:
+
+jobs:
+  security_audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: /usr/share/rust/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry
+
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: /usr/share/rust/.cargo/git
+          key: ${{ runner.os }}-cargo-index
+
+      - uses: actions-rs/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rust.yml

@@ -0,0 +1,94 @@
+name: Rust
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    name: Linting and Formatting Checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v1
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: Install rustfmt
+        run: rustup component add rustfmt
+
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo build
+        uses: actions/cache@v1
+        with:
+          path: target
+          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Check Formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - name: Install clippy
+        run: rustup component add clippy
+
+      - name: Clippy Linting
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
+
+  test:
+    name: Run Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # add windows-latest when it is clear why tests are failing
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v1
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo build
+        uses: actions/cache@v1
+        with:
+          path: target
+          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Run Tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test

.gitignore

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

.gitlab-ci.yml

@@ -1,6 +1,6 @@
-image: docker:stable
+image: docker:19.03
 services:
-  - docker:dind
+  - docker:19.03-dind
 
 stages:
   - build
@@ -9,6 +9,8 @@ stages:
 variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
+  # DOCKER_TLS_CERTDIR: "/certs"
+  DOCKER_TLS_CERTDIR: ""
   CONTAINER_BUILDER_IMAGE: $CI_REGISTRY_IMAGE:builder-latest
   CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest

Cargo.toml

@@ -1,27 +1,28 @@
 [package]
 name = "hoc"
-version = "0.3.0"
+version = "0.11.5"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-actix-web = "1.0.0-beta.2"
+actix-web = "2.0.0"
 badge = "0.2.0"
-bytes = "0.4.12"
+bytes = "0.5.4"
-futures = "0.1.26"
+futures = "0.3.1"
-git2 = "0.8.0"
+git2 = "0.11.0"
-lazy_static = "1.3.0"
+lazy_static = "1.4.0"
-log = "0.4.6"
+log = "0.4.8"
+log4rs = "0.10.0"
 number_prefix = "0.3.0"
 openssl-probe = "0.1.2"
-pretty_env_logger = "0.3.0"
+reqwest = "0.10.1"
-reqwest = "0.9.16"
+serde = "1.0.104"
-serde = "1.0.90"
+serde_derive = "1.0.103"
-serde_derive = "1.0.90"
+serde_json = "1.0.47"
-serde_json = "1.0.39"
+structopt = "0.3.9"
-structopt = "0.2.15"
+actix-rt = "1.0.0"
 
 [build-dependencies]
-ructe = "0.6.2"
+ructe = "0.9.2"
 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

@@ -20,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/find-active.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+set -e
+
+DIR=${1:-repos}
+
+for url in $(./scripts/list.sh "${DIR}")
+do
+    (curl "${url}" --silent | grep -q hitsofcode) && echo "${url}" &
+done

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

scripts/load-active.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+
+set -e
+
+ACTIVE=${1}
+
+if [ -z "${ACTIVE}" ]
+then
+    echo "Usage: $0 <list of active repos>"
+    exit 1
+fi
+
+while IFS= read -r url
+do
+    imgs=$(curl "${url}" --silent | grep hitsofcode | grep -o -P 'https://camo.githubusercontent.com/[a-z0-9]+/[a-z0-9]+')
+    [ -z "${imgs}" ] || echo "${url}"
+    for img in ${imgs}
+    do
+        curl "$img" --silent > /dev/null &
+    done
+done < "${ACTIVE}"

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},
@@ -9,7 +9,7 @@ use std::{
 /// Enum to indicate the state of the cache
 pub(crate) enum CacheState<'a> {
     /// Current head and cached head are the same
-    Current(u64),
+    Current { count: u64, commits: u64 },
     /// Cached head is older than current head
     Old(Cache<'a>),
     /// No cache was found
@@ -17,11 +17,14 @@ 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 {
-                Ok(CacheState::Current(cache.count))
+                Ok(CacheState::Current {
+                    count: cache.count,
+                    commits: cache.commits,
+                })
             } else {
                 Ok(CacheState::Old(cache))
             }
@@ -30,26 +33,35 @@ impl<'a> CacheState<'a> {
         }
     }
 
-    pub(crate) fn calculate_new_cache(self, count: u64, head: Cow<'a, str>) -> Cache {
+    pub(crate) fn calculate_new_cache(self, count: u64, commits: u64, head: Cow<'a, str>) -> Cache {
         match self {
             CacheState::Old(mut cache) => {
                 cache.head = head;
                 cache.count += count;
+                cache.commits += commits;
                 cache
             }
-            CacheState::No | CacheState::Current(_) => Cache { head, count },
+            CacheState::No | CacheState::Current { .. } => Cache {
+                head,
+                count,
+                commits,
+            },
         }
     }
 }
 
 #[derive(Serialize, Deserialize)]
 pub(crate) struct Cache<'a> {
+    /// HEAD commit ref
     pub head: Cow<'a, str>,
+    /// HoC value
     pub count: u64,
+    /// Number of commits
+    pub commits: u64,
 }
 
 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) async 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,9 @@
-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>;
 
@@ -11,7 +14,11 @@ pub(crate) enum Error {
     Git(git2::Error),
     Internal,
     Io(std::io::Error),
+    Log(log::SetLoggerError),
+    LogBuilder(log4rs::config::Errors),
+    Parse(std::num::ParseIntError),
     Serial(serde_json::Error),
+    GitNoMaster,
 }
 
 impl fmt::Display for Error {
@@ -22,22 +29,32 @@ 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::Parse(e) => write!(fmt, "Parse({})", e),
             Error::Serial(e) => write!(fmt, "Serial({})", e),
+            Error::GitNoMaster => write!(fmt, "Repo doesn't have master branch"),
         }
     }
 }
 
 impl ResponseError for Error {
     fn error_response(&self) -> HttpResponse {
-        HttpResponse::InternalServerError()
+        let mut buf = Vec::new();
-            .content_type("text/html")
+        match self {
-            .body(P500.as_slice())
+            Error::GitNoMaster => {
-    }
+                templates::p404_no_master(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed)).unwrap();
-
+                HttpResponse::NotFound()
-    fn render_response(&self) -> HttpResponse {
+                    .content_type("text/html")
-        HttpResponse::InternalServerError()
+                    .body(buf)
-            .content_type("text/html")
+            },
-            .body(P500.as_slice())
+            _ => {
+                templates::p500(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed)).unwrap();
+                HttpResponse::InternalServerError()
+                    .content_type("text/html")
+                    .body(buf)
+            }
+        }
     }
 }
 
@@ -55,6 +72,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)
@@ -72,3 +95,15 @@ 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)
+    }
+}
+
+impl From<std::num::ParseIntError> for Error {
+    fn from(err: std::num::ParseIntError) -> Self {
+        Error::Parse(err)
+    }
+}

src/main.rs

@@ -1,3 +1,5 @@
+#![type_length_limit = "2257138"]
+
 #[macro_use]
 extern crate actix_web;
 #[macro_use]
@@ -8,41 +10,40 @@ extern crate log;
 extern crate serde_derive;
 
 mod cache;
+mod config;
+mod count;
 mod error;
 mod service;
+mod statics;
+mod template;
 
 use crate::{
     cache::CacheState,
     error::{Error, Result},
     service::{Bitbucket, FormService, GitHub, Gitlab, Service},
+    statics::{CLIENT, CSS, FAVICON, OPT, REPO_COUNT, VERSION_INFO},
+    template::RepoInfo,
 };
 use actix_web::{
-    error::ErrorBadRequest,
     http::header::{CacheControl, CacheDirective, Expires},
     middleware, web, App, HttpResponse, HttpServer,
 };
 use badge::{Badge, BadgeOptions};
-use bytes::Bytes;
+use futures::future::Future;
-use futures::{unsync::mpsc, 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> {
-    pub commit: &'a str,
-    pub version: &'a str,
-}
-
 #[derive(Deserialize, Serialize)]
 struct GeneratorForm<'a> {
     service: FormService,
@@ -50,68 +51,16 @@ struct GeneratorForm<'a> {
     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 {
     repos: String,
     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(
+    commits: u64,
-        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<()> {
@@ -121,17 +70,18 @@ fn pull(path: impl AsRef<Path>) -> Result<()> {
     Ok(())
 }
 
-fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String)> {
+fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String, u64)> {
     let repo_dir = format!("{}/{}", repo_dir, repo);
     let cache_dir = format!("{}/{}.json", cache_dir, repo);
     let cache_dir = Path::new(&cache_dir);
-    let head = format!(
+    let repo = Repository::open_bare(&repo_dir)?;
-        "{}",
+    // TODO: do better...
-        Repository::open_bare(&repo_dir)?
+    let head = match repo.head() {
-            .head()?
+        Ok(v) => v,
-            .target()
+        Err(_) => return Err(Error::GitNoMaster),
-            .ok_or(Error::Internal)?
+    };
-    );
+    let head = format!("{}", head.target().ok_or(Error::Internal)?);
+    let mut arg_commit_count = vec!["rev-list".to_string(), "--count".to_string()];
     let mut arg = vec![
         "log".to_string(),
         "--pretty=tformat:".to_string(),
@@ -146,16 +96,18 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String)> {
     ];
     let cache = CacheState::read_from_file(&cache_dir, &head)?;
     match &cache {
-        CacheState::Current(res) => {
+        CacheState::Current { count, commits } => {
             info!("Using cache for {}", repo_dir);
-            return Ok((*res, head));
+            return Ok((*count, head, *commits));
         }
         CacheState::Old(cache) => {
             info!("Updating cache for {}", repo_dir);
             arg.push(format!("{}..HEAD", cache.head));
+            arg_commit_count.push(format!("{}..HEAD", cache.head));
         }
         CacheState::No => {
             info!("Creating cache for {}", repo_dir);
+            arg_commit_count.push("HEAD".to_string());
         }
     };
     arg.push("--".to_string());
@@ -166,6 +118,13 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String)> {
         .output()?
         .stdout;
     let output = String::from_utf8_lossy(&output);
+    let output_commits = Command::new("git")
+        .args(&arg_commit_count)
+        .current_dir(&repo_dir)
+        .output()?
+        .stdout;
+    let output_commits = String::from_utf8_lossy(&output_commits);
+    let commits: u64 = output_commits.trim().parse()?;
     let count: u64 = output
         .lines()
         .map(|s| {
@@ -177,19 +136,24 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String)> {
         })
         .sum();
 
-    let cache = cache.calculate_new_cache(count, (&head).into());
+    let cache = cache.calculate_new_cache(count, commits, (&head).into());
     cache.write_to_file(cache_dir)?;
 
-    Ok((cache.count, head))
+    Ok((cache.count, head, commits))
 }
 
-fn remote_exists(url: &str) -> Result<bool> {
+async fn remote_exists(url: &str) -> Result<bool> {
-    Ok(CLIENT.head(url).send()?.status() == reqwest::StatusCode::OK)
+    let resp = CLIENT.head(url).send().await?;
+    Ok(resp.status() == reqwest::StatusCode::OK)
+
+    // .map(|resp| resp.status() == reqwest::StatusCode::OK)
+    // .from_err()
 }
 
 enum HocResult {
     Hoc {
         hoc: u64,
+        commits: u64,
         hoc_pretty: String,
         head: String,
         url: String,
@@ -199,7 +163,7 @@ enum HocResult {
     NotFound,
 }
 
-fn handle_hoc_request<T, F>(
+async fn handle_hoc_request<T, F>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
     mapper: F,
@@ -208,51 +172,65 @@ where
     T: Service,
     F: Fn(HocResult) -> Result<HttpResponse>,
 {
-    hoc_request::<T>(state, data).and_then(mapper)
-}
-
-fn hoc_request<T: Service>(
-    state: web::Data<Arc<State>>,
-    data: web::Path<(String, String)>,
-) -> Result<HocResult> {
     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);
+    let remote_exists = remote_exists(&url).await?;
+    let file = Path::new(&path);
     if !file.exists() {
-        if !remote_exists(&url)? {
+        if !remote_exists {
             warn!("Repository does not exist: {}", url);
-            return Ok(HocResult::NotFound);
+            return mapper(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, head, commits) = 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 {
+    let res = HocResult::Hoc {
         hoc,
+        commits,
         hoc_pretty,
         head,
         url,
         repo,
         service_path,
-    })
+    };
+    mapper(res)
+}
+
+fn json_hoc<T: Service>(
+    state: web::Data<Arc<State>>,
+    data: web::Path<(String, String)>,
+) -> impl Future<Output = Result<HttpResponse>> {
+    let mapper = |r| match r {
+        HocResult::NotFound => p404(),
+        HocResult::Hoc {
+            hoc, head, commits, ..
+        } => Ok(HttpResponse::Ok().json(JsonResponse {
+            head: &head,
+            count: hoc,
+            commits,
+        })),
+    };
+    handle_hoc_request::<T, _>(state, data, mapper)
 }
 
 fn calculate_hoc<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HttpResponse> {
+) -> impl Future<Output = Result<HttpResponse>> {
-    let mapper = |r| match r {
+    let mapper = move |r| match r {
-        HocResult::NotFound => Ok(p404()),
+        HocResult::NotFound => p404(),
         HocResult::Hoc { hoc_pretty, .. } => {
             let badge_opt = BadgeOptions {
                 subject: "Hits-of-Code".to_string(),
@@ -260,9 +238,8 @@ fn calculate_hoc<T: Service>(
                 status: hoc_pretty,
             };
             let badge = Badge::new(badge_opt)?;
-
+            // TODO: remove clone
-            let (tx, rx_body) = mpsc::unbounded();
+            let body = badge.to_svg().as_bytes().to_vec();
-            let _ = tx.unbounded_send(Bytes::from(badge.to_svg().as_bytes()));
 
             let expiration = SystemTime::now() + Duration::from_secs(30);
             Ok(HttpResponse::Ok()
@@ -274,7 +251,7 @@ fn calculate_hoc<T: Service>(
                     CacheDirective::NoCache,
                     CacheDirective::NoStore,
                 ]))
-                .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request"))))
+                .body(body))
         }
     };
     handle_hoc_request::<T, _>(state, data, mapper)
@@ -283,11 +260,12 @@ fn calculate_hoc<T: Service>(
 fn overview<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HttpResponse> {
+) -> impl Future<Output = Result<HttpResponse>> {
     let mapper = |r| match r {
-        HocResult::NotFound => Ok(p404()),
+        HocResult::NotFound => p404(),
         HocResult::Hoc {
             hoc,
+            commits,
             hoc_pretty,
             url,
             head,
@@ -295,60 +273,66 @@ fn overview<T: Service>(
             service_path,
         } => {
             let mut buf = Vec::new();
+            let repo_info = RepoInfo {
+                commit_url: &T::commit_url(&repo, &head),
+                commits,
+                domain: &OPT.domain,
+                head: &head,
+                hoc,
+                hoc_pretty: &hoc_pretty,
+                path: &service_path,
+                url: &url,
+            };
             templates::overview(
                 &mut buf,
                 VERSION_INFO,
-                &OPT.domain,
+                REPO_COUNT.load(Ordering::Relaxed),
-                &service_path,
+                repo_info,
-                &url,
-                hoc,
-                &hoc_pretty,
-                &head,
-                &T::commit_url(&repo, &head),
             )?;
 
-            let (tx, rx_body) = mpsc::unbounded();
+            Ok(HttpResponse::Ok().content_type("text/html").body(buf))
-            let _ = tx.unbounded_send(Bytes::from(buf));
-
-            Ok(HttpResponse::Ok()
-                .content_type("text/html")
-                .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request"))))
         }
     };
     handle_hoc_request::<T, _>(state, data, mapper)
 }
 
 #[get("/")]
-fn index() -> HttpResponse {
+async 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))
 }
 
 #[post("/generate")]
-fn generate(params: web::Form<GeneratorForm>) -> Result<HttpResponse> {
+async 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()
+    Ok(HttpResponse::Ok().content_type("text/html").body(buf))
-        .content_type("text/html")
-        .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request"))))
 }
 
-fn p404() -> HttpResponse {
+fn p404() -> Result<HttpResponse> {
-    HttpResponse::NotFound()
+    let mut buf = Vec::new();
-        .content_type("text/html")
+    templates::p404(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed))?;
-        .body(P404.as_slice())
+    Ok(HttpResponse::NotFound().content_type("text/html").body(buf))
+}
+
+async fn async_p404() -> Result<HttpResponse> {
+    p404()
 }
 
 #[get("/tacit-css.min.css")]
@@ -356,10 +340,12 @@ 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();
+}
+
+async fn start_server() -> std::io::Result<()> {
     let interface = format!("{}:{}", OPT.host, OPT.port);
     let state = Arc::new(State {
         repos: OPT.outdir.display().to_string(),
@@ -369,18 +355,30 @@ fn main() -> std::io::Result<()> {
         App::new()
             .data(state.clone())
             .wrap(middleware::Logger::default())
+            .wrap(middleware::NormalizePath)
             .service(index)
             .service(css)
+            .service(favicon32)
             .service(generate)
             .service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>))
             .service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>))
             .service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>))
+            .service(web::resource("/github/{user}/{repo}/json").to(json_hoc::<GitHub>))
+            .service(web::resource("/gitlab/{user}/{repo}/json").to(json_hoc::<Gitlab>))
+            .service(web::resource("/bitbucket/{user}/{repo}/json").to(json_hoc::<Bitbucket>))
             .service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>))
             .service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>))
             .service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>))
-            .default_service(web::resource("").route(web::get().to(p404)))
+            .default_service(web::resource("").route(web::get().to(async_p404)))
     })
     .workers(OPT.workers)
     .bind(interface)?
     .run()
+    .await
+}
+
+#[actix_rt::main]
+async fn main() -> std::io::Result<()> {
+    config::init().await.unwrap();
+    start_server().await
 }

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());
+}

src/template.rs

@@ -0,0 +1,10 @@
+pub struct RepoInfo<'a> {
+    pub commit_url: &'a str,
+    pub commits: u64,
+    pub domain: &'a str,
+    pub head: &'a str,
+    pub hoc: u64,
+    pub hoc_pretty: &'a str,
+    pub path: &'a str,
+    pub url: &'a str,
+}

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

@@ -1,7 +1,7 @@
 @use super::base;
-@use crate::VersionInfo;
+@use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo, domain: &str, url: &str, service: &str, path: &str)
+@(version_info: VersionInfo, repo_count: usize, domain: &str, url: &str, service: &str, path: &str)
 
 @:base("Hits-of-Code Badges", "Badge Generator", {
 
@@ -20,4 +20,4 @@ It will be rendered like this
 <pre>
 <a href="https://@domain/view/@service/@path"><img src="https://@domain/@service/@path" alt="example badge" /></a>
 </pre>
-}, version_info)
+}, 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,22 @@ 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 three fields: <code>count</code> (the HoC value), <code>commits</code> (the number of commits) and
+<code>head</code> (the commit ref of HEAD). 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": "1f01c3b964b018fb0c0c2c5b572bf4ace2968546",
+    "count": 8324,
+    "commits": 223
+&#125;
+</pre>
+
 <h2>Badge Generator</h2>
 
 <form method="post" action="/generate">
@@ -76,4 +92,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,12 +1,16 @@
 @use super::base;
-@use crate::VersionInfo;
+@use crate::statics::VersionInfo;
+@use crate::template::RepoInfo;
 
-@(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, repo_info: RepoInfo)
 
 @:base("Hits-of-Code Badges", "Overview", {
 
 <p>
-The project <a href="@url">@url</a> has <strong>@hoc_pretty</strong> (exactly @hoc) hits of code at <a href="@commit_url">@head</a>.
+The project <a href="@repo_info.url">@repo_info.url</a> has
+<strong>@repo_info.hoc_pretty</strong> (exactly @repo_info.hoc) hits of code at
+<a href="@repo_info.commit_url">@repo_info.head</a>. The repository contains
+<strong>@repo_info.commits</strong> commits.
 </p>
 
 <p>
@@ -14,6 +18,6 @@ To include the badge in your readme, use the following markdown:
 </p>
 
 <pre>
-[![Hits-of-Code](https://@domain/@path)](https://@domain/view/@path)
+[![Hits-of-Code](https://@repo_info.domain/@repo_info.path)](https://@repo_info.domain/view/@repo_info.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/p404_no_master.rs.html

@@ -0,0 +1,16 @@
+@use super::base;
+@use crate::statics::VersionInfo;
+
+@(version_info: VersionInfo, repo_count: usize)
+
+@:base("Master Branch not Found - Hits-of-Code Badges", "404 - Master Branch not Found", {
+<p>
+<big>Sorry</big>. I couldn't find the master branch of your repositroy.
+Currently this service depends on the existence of a master branch. Please go
+<a href="/">back to the homepage</a>.
+</p>
+
+<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, 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)