Update actix-web and tokio

Bumps [actix-rt](https://github.com/actix/actix-net) from 1.1.1 to 2.2.0.
- [Release notes](https://github.com/actix/actix-net/releases)
- [Commits](https://github.com/actix/actix-net/compare/rt-1.1.1...rt-v2.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

.env.example

@@ -0,0 +1,7 @@
+HOC_REPODIR='./repos'
+HOC_CACHEDIR='./cache'
+HOC_PORT=8080
+HOC_HOST='0.0.0.0'
+HOC_WORKERS=4
+
+HOC_BASE_URL='http://0.0.0.0:8080'

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: cargo
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  assignees:
+  - vbrandl

.github/workflows/audit.yml

@@ -0,0 +1,28 @@
+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@v2
+
+      - name: Cache cargo registry, index and build directory
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ./target
+          key: audit-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - uses: actions-rs/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,76 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  publish:
+    name: Publishing for ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+        rust: [stable]
+        include:
+          - os: macos-latest
+            artifact_prefix: macos
+            target: x86_64-apple-darwin
+            binary_postfix: ""
+          - os: ubuntu-latest
+            artifact_prefix: linux
+            target: x86_64-unknown-linux-gnu
+            binary_postfix: ""
+          - os: windows-latest
+            artifact_prefix: windows
+            target: x86_64-pc-windows-msvc
+            binary_postfix: ".exe"
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - name: Cache cargo registry, index and build directory
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ./target
+          key: release-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cargo build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          toolchain: ${{ matrix.rust }}
+          args: --release --target ${{ matrix.target }}
+
+      - name: Packaging final binary
+        shell: bash
+        run: |
+          cd target/${{ matrix.target }}/release
+          strip hoc${{ matrix.binary_postfix }}
+          tar czvf hoc-${{ matrix.artifact_prefix }}.tar.gz hoc${{ matrix.binary_postfix }}
+
+          if [[ ${{ runner.os }} == 'Windows' ]]; then
+            certutil -hashfile hoc-${{ matrix.artifact_prefix }}.tar.gz sha256 | grep -E [A-Fa-f0-9]{64} > hoc-${{ matrix.artifact_prefix }}.sha256
+          else
+            shasum -a 256 hoc-${{ matrix.artifact_prefix }}.tar.gz > hoc-${{ matrix.artifact_prefix }}.sha256
+          fi
+
+      - name: Releasing assets
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            target/${{ matrix.target }}/release/hoc-${{ matrix.artifact_prefix }}.tar.gz
+            target/${{ matrix.target }}/release/hoc-${{ matrix.artifact_prefix }}.sha256
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rust.yml

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

.gitignore

@@ -3,3 +3,5 @@
 repos
 cache
 hoc.log
+result
+.env

.gitlab-ci.yml

@@ -1,51 +0,0 @@
-image: docker:stable
-services:
-  - docker:dind
-
-stages:
-  - build
-  - release
-
-variables:
-  DOCKER_HOST: tcp://docker:2375
-  DOCKER_DRIVER: overlay2
-  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
-
-before_script:
-  - export CONTAINER_TAG_IMAGE="$CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:1}"
-  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
-build:
-  stage: build
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE || true
-    - docker pull $CONTAINER_RELEASE_IMAGE || true
-    - docker pull $CONTAINER_TAG_IMAGE || true
-    - docker pull $CONTAINER_BUILDER_IMAGE || true
-    - docker build --pull -t $CONTAINER_BUILDER_IMAGE --target builder .
-    - docker build --pull -t $CONTAINER_TEST_IMAGE .
-    - docker push $CONTAINER_BUILDER_IMAGE
-    - docker push $CONTAINER_TEST_IMAGE
-
-release-image:
-  stage: release
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
-    - docker push $CONTAINER_RELEASE_IMAGE
-  only:
-    - master
-
-release-tag:
-  stage: release
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TAG_IMAGE
-    - docker push $CONTAINER_TAG_IMAGE
-  only:
-    - /^v\d+\.\d+\.\d+/
-  except:
-    - branch
-

.travis.yml

@@ -1,17 +0,0 @@
-language: rust
-
-rust:
-  - stable
-  - beta
-  - nightly
-
-cache:
-  - cargo
-
-matrix:
-  allow_failures:
-    - rust: nightly
-
-notifications:
-  email:
-    on_failure: always

Cargo.toml

@@ -1,27 +1,46 @@
 [package]
 name = "hoc"
-version = "0.9.2"
+version = "0.18.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
 
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+path = "src/main.rs"
+name = "hoc"
+
 [dependencies]
-actix-web = "1.0.0"
+actix-rt = "2.2.0"
-badge = "0.2.0"
+actix-web = "4.0.0-beta.8"
-bytes = "0.4.12"
+badge = "0.3.0"
-futures = "0.1.27"
+bytes = "1.0.1"
-git2 = "0.9.1"
+config = { version = "0.11.0", features = ["toml"] }
-lazy_static = "1.3.0"
+dotenv = "0.15.0"
-log = "0.4.6"
+futures = "0.3.17"
-log4rs = "0.8.3"
+git2 = "0.13.20"
-number_prefix = "0.3.0"
+lazy_static = "1.4.0"
-openssl-probe = "0.1.2"
+number_prefix = "0.4.0"
-reqwest = "0.9.17"
+openssl-probe = "0.1.4"
-serde = "1.0.91"
+reqwest = "0.11.4"
-serde_derive = "1.0.91"
+serde = "1.0.126"
-serde_json = "1.0.39"
+serde_derive = "1.0.123"
-structopt = "0.2.16"
+serde_json = "1.0.64"
+tracing = "0.1.26"
+tracing-actix-web = "0.4.0-beta.11"
+tracing-bunyan-formatter = "0.2.4"
+tracing-futures = "0.2.5"
+tracing-log = "0.1.2"
+tracing-subscriber = { version = "0.2.19", features = ["registry", "env-filter"] }
 
 [build-dependencies]
-ructe = "0.6.2"
+ructe = "0.13.4"
-vergen = "3.0.4"
+vergen = { version = "5.1.13", default-features = false, features = ["git"] }
+
+[dev-dependencies]
+awc = "3.0.0-beta.7"
+ructe = "0.13.4"
+tempfile = "3.2.0"
+tokio = "1.11.0"

Dockerfile

@@ -1,7 +1,8 @@
 FROM ekidd/rust-musl-builder:stable as builder
 
 # create new cargo project
-RUN USER=rust cargo init --bin
+RUN USER=rust cargo init --lib
+RUN echo 'fn main() { println!("Hello, world!"); }' >> src/main.rs
 # copy build config
 COPY --chown=rust ./Cargo.lock ./Cargo.lock
 COPY ./Cargo.toml ./Cargo.toml

README.md

@@ -1,9 +1,8 @@
 # Hits-of-Code
 
-[![Hits-of-Code](https://hitsofcode.com/github/vbrandl/hoc)](https://hitsofcode.com/view/github/vbrandl/hoc)
+[![Hits-of-Code](https://hitsofcode.com/github/vbrandl/hoc)](https://hitsofcode.com/github/vbrandl/hoc/view)
 [![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
@@ -27,7 +26,11 @@ where `<service>` is one of `gitub`, `gitlab` or `bitbucket`. The HoC data can a
 https://<host>/<service>/<user>/<repo>/json
 ```
 
-There is also an overview page available via `https://<host>/view/<service>/<user>/<repo>`
+There is also an overview page available via `https://<host>/<service>/<user>/<repo>/view`
+
+To delete a repository and the cache from the server, send a `POST` request to
+`https://<host>/<service>/<user>/<repo>/delete`. On the overview page, there is a button to perform this operation. It
+will respond with a redirect to the overview page so the cache is rebuilt directly.
 
 ## Building
 
@@ -45,17 +48,29 @@ $ docker build .
 
 inside the repository.
 
+I'm currently working on migrating to [nix](https://nixos.org/nix). To get a development shell, run `nix-shell`, to
+build the package run `nix-build --attr package` and to build the Docker image, run `nix-build --attr dockerImage`.
+
 
 ## Running
 
-Run either the binary produced by cargo, the Docker container you just built (using docker-compose) or pull the image
+Rename [`hoc.toml.example`](./hoc.toml.example) to `hoc.toml` or [`.env.example`](./.env.example) to `.env` and set the
-from [Docker Hub](https://hub.docker.com/r/vbrandl/hits-of-code)
+correct value for `base_url`/`HOC_BASE_URL`. If you don't want to use a configuration or dotenv file, you can pass all
+parameters directly via environment variables. For variable names see [`.env.example`](./.env.example).
+
+To start a local instance of the service just run:
 
 ```
-$ docker run -it --rm vbrandl/hits-of-code --help
+$ HOC_BASE_URL='http://0.0.0.0:8080' ./hoc
 ```
 
-When running the binary directly, you need a git binary in your `PATH`.
+You can also use the Docker image:
+
+```
+$ docker run -p 8080:8080 --env HOC_BASE_URL='http://0.0.0.0:8080' -it --rm vbrandl/hits-of-code
+```
+
+When running the binary directly, you need a `git` binary in your `PATH`.
 
 
 ## License

build.rs

@@ -2,11 +2,12 @@ extern crate ructe;
 extern crate vergen;
 
 use ructe::Ructe;
-use vergen::{generate_cargo_keys, ConstantsFlags};
+use vergen::{vergen, Config, ShaKind};
 
 fn main() {
-    let flags = ConstantsFlags::SHA_SHORT;
+    let mut config = Config::default();
-    generate_cargo_keys(flags).expect("Unable to generate the cargo keys!");
+    *config.git_mut().sha_kind_mut() = ShaKind::Short;
+    vergen(config).expect("Unable to generate static repo info");
     Ructe::from_env()
         .expect("ructe")
         .compile_templates("templates")

crate-hashes.json

@@ -0,0 +1 @@
+{}

default.nix

@@ -0,0 +1,56 @@
+{ sources ? import ./nix/sources.nix
+, system ? builtins.currentSystem
+}:
+
+let
+  rustOverlay = import "${sources.nixpkgs-mozilla}/rust-overlay.nix";
+  cargo2nixOverlay = import "${sources.cargo2nix}/overlay";
+
+  pkgs = import sources.nixpkgs {
+  # pkgs = import <nixpkgs> {
+    inherit system;
+    overlays = [ cargo2nixOverlay rustOverlay ];
+  };
+
+  rustPkgs = pkgs.rustBuilder.makePackageSet' {
+    rustChannel = "stable";
+    packageFun = import ./Cargo.nix;
+    localPatterns =
+      [
+        ''^(src|tests)(/.*)?''
+        ''[^/]*\.(rs|toml)$''
+        # include other directory from the project repository
+        ''^templates(/.*)?''
+        ''^static(/.*)?''
+        ''^.git.*(/.*)?''
+      ];
+    # packageOverrides
+  };
+in
+rec {
+  inherit rustPkgs;
+  shell = pkgs.mkShell {
+    inputsFrom = pkgs.lib.mapAttrsToList (_: pkg: pkg { }) rustPkgs.noBuild.workspace;
+    nativeBuildInputs = with rustPkgs; [ cargo rustc ];
+  };
+  package = (rustPkgs.workspace.hoc {}).overrideAttrs (drv: {
+      buildInputs = drv.buildInputs or [ ] ++ [ pkgs.git ];
+  });
+  dockerImage =
+    pkgs.dockerTools.buildImage {
+      name = "vbrandl/hits-of-code";
+      tag = package.version;
+
+      contents =
+        [
+          package
+          pkgs.cacert
+          pkgs.gitMinimal
+        ];
+
+      config = {
+        Cmd = [ "/bin/hoc" ];
+        WorkingDir = "/home/hoc";
+      };
+    };
+}

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 
 services:
   hoc:
@@ -9,3 +9,5 @@ services:
     # ports:
     #   - "127.0.0.1:8080:8080"
     restart: always
+    env_file:
+      - ./.env

hoc.toml

@@ -0,0 +1,15 @@
+# every parameter can also be set (or overwritten) by passing an environment
+# variable namend `HOC_<PARAMETERNAME>`, e.g.
+# `HOC_BASE_URL='https://hitsofcode.com' ./hoc`
+
+# these config parameters have default values and must not explicitly be set
+repodir = "./repos"
+cachedir = "./cache"
+port = 8080
+host = "0.0.0.0"
+workers = 4
+
+# these parameters don't have default values and must be set
+
+# this should be the public base URL of the service, e.g. `https://hitsofcode.com`
+base_url = "http://0.0.0.0:8080"

hoc.toml.example

@@ -0,0 +1,15 @@
+# every parameter can also be set (or overwritten) by passing an environment
+# variable namend `HOC_<PARAMETERNAME>`, e.g.
+# `HOC_BASE_URL='https://hitsofcode.com' ./hoc`
+
+# these config parameters have default values and must not explicitly be set
+repodir = "./repos"
+cachedir = "./cache"
+port = 8080
+host = "0.0.0.0"
+workers = 4
+
+# these parameters don't have default values and must be set
+
+# this should be the public base URL of the service, e.g. `https://hitsofcode.com`
+base_url = "http://0.0.0.0:8080"

nix/sources.json

@@ -0,0 +1,50 @@
+{
+    "cargo2nix": {
+        "branch": "master",
+        "description": "Convert a Cargo.lock to mkRustCrate statements for import in Nix",
+        "homepage": "",
+        "owner": "tenx-tech",
+        "repo": "cargo2nix",
+        "rev": "7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15",
+        "sha256": "1z7xwk1hbp26aydsk3y07riy0ivwqss06n1470mvdl7allfcd1w5",
+        "type": "tarball",
+        "url": "https://github.com/tenx-tech/cargo2nix/archive/7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "niv": {
+        "branch": "master",
+        "description": "Easy dependency management for Nix projects",
+        "homepage": "https://github.com/nmattia/niv",
+        "owner": "nmattia",
+        "repo": "niv",
+        "rev": "98c74a80934123cb4c3bf3314567f67311eb711a",
+        "sha256": "1w8n54hapd4x9f1am33icvngkqns7m3hl9yair38yqq08ffwg0kn",
+        "type": "tarball",
+        "url": "https://github.com/nmattia/niv/archive/98c74a80934123cb4c3bf3314567f67311eb711a.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs": {
+        "branch": "nixpkgs-unstable",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs-channels",
+        "rev": "f6bfb371cba2b5a02f200c2747c1fe2c72bd782f",
+        "sha256": "0y3hlbyvznrpr1d2vxj2511hkjg733wdnxfaib3fgy9i9jr8ivzn",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/f6bfb371cba2b5a02f200c2747c1fe2c72bd782f.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs-mozilla": {
+        "branch": "master",
+        "description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
+        "homepage": null,
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "e912ed483e980dfb4666ae0ed17845c4220e5e7c",
+        "sha256": "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3",
+        "type": "tarball",
+        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed483e980dfb4666ae0ed17845c4220e5e7c.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}

nix/sources.nix

@@ -0,0 +1,134 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: spec:
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; };
+
+  fetch_tarball = pkgs: spec:
+    if spec.builtin or true then
+      builtins_fetchTarball { inherit (spec) url sha256; }
+    else
+      pkgs.fetchzip { inherit (spec) url sha256; };
+
+  fetch_git = spec:
+    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
+
+  fetch_builtin-tarball = spec:
+    builtins.trace
+      ''
+        WARNING:
+          The niv type "builtin-tarball" will soon be deprecated. You should
+          instead use `builtin = true`.
+
+          $ niv modify <package> -a type=tarball -a builtin=true
+      ''
+      builtins_fetchTarball { inherit (spec) url sha256; };
+
+  fetch_builtin-url = spec:
+    builtins.trace
+      ''
+        WARNING:
+          The niv type "builtin-url" will soon be deprecated. You should
+          instead use `builtin = true`.
+
+          $ niv modify <package> -a type=file -a builtin=true
+      ''
+      (builtins_fetchurl { inherit (spec) url sha256; });
+
+  #
+  # Various helpers
+  #
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+      if builtins.hasAttr "nixpkgs" sources
+      then sourcesNixpkgs
+      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+        import <nixpkgs> {}
+      else
+        abort
+          ''
+            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+            add a package called "nixpkgs" to your sources.json.
+          '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs spec
+    else if spec.type == "tarball" then fetch_tarball pkgs spec
+    else if spec.type == "git" then fetch_git spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
+    else if spec.type == "builtin-url" then fetch_builtin-url spec
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchTarball { inherit url; }
+      else
+        fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchurl { inherit url; }
+      else
+        fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs (
+      name: spec:
+        if builtins.hasAttr "outPath" spec
+        then abort
+          "The values in sources.json should not have an 'outPath' attribute"
+        else
+          spec // { outPath = fetch config.pkgs name spec; }
+    ) config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? ./sources.json
+    , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
+    , pkgs ? mkPkgs sources
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+in
+mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

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/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}"

shell.nix

@@ -0,0 +1 @@
+with import ./. { }; shell

src/cache.rs

@@ -1,55 +1,136 @@
-use crate::Error;
+use crate::error::{Error, Result};
 use std::{
     borrow::Cow,
+    collections::HashMap,
     fs::{create_dir_all, File, OpenOptions},
     io::BufReader,
     path::Path,
 };
 
 /// Enum to indicate the state of the cache
+#[derive(Debug)]
 pub(crate) enum CacheState<'a> {
     /// Current head and cached head are the same
-    Current(u64),
+    Current {
+        count: u64,
+        commits: u64,
+        cache: Cache<'a>,
+    },
     /// Cached head is older than current head
-    Old(Cache<'a>),
+    Old {
+        head: String,
+        cache: Cache<'a>,
+    },
+    NoneForBranch(Cache<'a>),
     /// No cache was found
     No,
 }
 
 impl<'a> CacheState<'a> {
-    pub(crate) fn read_from_file(path: impl AsRef<Path>, head: &str) -> Result<CacheState, Error> {
+    #[instrument]
+    pub(crate) fn read_from_file(
+        path: impl AsRef<Path> + std::fmt::Debug,
+        branch: &str,
+        head: &str,
+    ) -> Result<CacheState<'a>> {
+        trace!("Reading cache");
         if path.as_ref().exists() {
             let cache: Cache = serde_json::from_reader(BufReader::new(File::open(path)?))?;
-            if cache.head == head {
+            Ok(cache
-                Ok(CacheState::Current(cache.count))
+                .entries
-            } else {
+                .get(branch)
-                Ok(CacheState::Old(cache))
+                .map(|c| {
-            }
+                    if c.head == head {
+                        trace!("Cache is up to date");
+                        CacheState::Current {
+                            count: c.count,
+                            commits: c.commits,
+                            // TODO: get rid of clone
+                            cache: cache.clone(),
+                        }
+                    } else {
+                        trace!("Cache is out of date");
+                        CacheState::Old {
+                            head: c.head.to_string(),
+                            // TODO: get rid of clone
+                            cache: cache.clone(),
+                        }
+                    }
+                })
+                // TODO: get rid of clone
+                .unwrap_or_else(|| CacheState::NoneForBranch(cache.clone())))
         } else {
             Ok(CacheState::No)
         }
     }
 
-    pub(crate) fn calculate_new_cache(self, count: u64, head: Cow<'a, str>) -> Cache {
+    #[instrument]
+    pub(crate) fn calculate_new_cache(
+        self,
+        count: u64,
+        commits: u64,
+        head: Cow<'a, str>,
+        branch: &'a str,
+    ) -> Cache<'a> {
+        trace!("Calculating new cache");
         match self {
-            CacheState::Old(mut cache) => {
+            CacheState::Old { mut cache, .. } => {
-                cache.head = head;
+                if let Some(mut cache) = cache.entries.get_mut(branch) {
-                cache.count += count;
+                    cache.head = head;
+                    cache.count += count;
+                    cache.commits += commits;
+                }
                 cache
             }
-            CacheState::No | CacheState::Current(_) => Cache { head, count },
+            CacheState::Current { cache, .. } => cache,
+            CacheState::NoneForBranch(mut cache) => {
+                trace!("Creating new cache for branch");
+                cache.entries.insert(
+                    branch.into(),
+                    CacheEntry {
+                        head,
+                        count,
+                        commits,
+                    },
+                );
+                cache
+            }
+            CacheState::No => {
+                trace!("Creating new cache file");
+                let mut entries = HashMap::with_capacity(1);
+                entries.insert(
+                    branch.into(),
+                    CacheEntry {
+                        head,
+                        count,
+                        commits,
+                    },
+                );
+                Cache { entries }
+            }
         }
     }
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub(crate) struct Cache<'a> {
+    pub entries: HashMap<Cow<'a, str>, CacheEntry<'a>>,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub(crate) struct CacheEntry<'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> {
+    #[instrument]
+    pub(crate) fn write_to_file(&self, path: impl AsRef<Path> + std::fmt::Debug) -> Result<()> {
+        trace!("Persisting cache to disk");
         create_dir_all(path.as_ref().parent().ok_or(Error::Internal)?)?;
         serde_json::to_writer(
             OpenOptions::new()

src/config.rs

@@ -1,71 +1,38 @@
-use crate::{error::Result, statics::OPT};
+use config::{Config, ConfigError, Environment, File};
-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)]
+#[derive(Debug, Deserialize)]
-pub(crate) struct Opt {
+pub struct Settings {
-    #[structopt(
-        short = "o",
-        long = "outdir",
-        parse(from_os_str),
-        default_value = "./repos"
-    )]
     /// Path to store cloned repositories
-    pub(crate) outdir: PathBuf,
+    pub repodir: PathBuf,
-    #[structopt(
-        short = "c",
-        long = "cachedir",
-        parse(from_os_str),
-        default_value = "./cache"
-    )]
     /// Path to store cache
-    pub(crate) cachedir: PathBuf,
+    pub cachedir: PathBuf,
-    #[structopt(short = "p", long = "port", default_value = "8080")]
     /// Port to listen on
-    pub(crate) port: u16,
+    pub port: u16,
-    #[structopt(short = "h", long = "host", default_value = "0.0.0.0")]
     /// Interface to listen on
-    pub(crate) host: String,
+    pub host: String,
-    #[structopt(short = "d", long = "domain", default_value = "hitsofcode.com")]
+    /// Base URL
-    /// Interface to listen on
+    pub base_url: String,
-    pub(crate) domain: String,
-    #[structopt(short = "w", long = "workers", default_value = "4")]
     /// Number of worker threads
-    pub(crate) workers: usize,
+    pub 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<()> {
+impl Settings {
-    std::env::set_var("RUST_LOG", "actix_web=info,hoc=info");
+    #[deprecated]
-    // pretty_env_logger::init();
+    pub fn new() -> Result<Self, ConfigError> {
-    openssl_probe::init_ssl_cert_env_vars();
+        Self::load()
-    let stdout = ConsoleAppender::builder().build();
+    }
-    let file = FileAppender::builder()
+
-        .encoder(Box::new(PatternEncoder::new("{d} - {m}{n}")))
+    pub fn load() -> Result<Self, ConfigError> {
-        .build(&OPT.logfile)
+        let mut config = Config::new();
-        .unwrap();
+        config
-    let config = Config::builder()
+            .merge(File::with_name("hoc.toml").required(false))?
-        .appender(Appender::builder().build("stdout", Box::new(stdout)))
+            .merge(Environment::with_prefix("hoc"))?
-        .appender(Appender::builder().build("file", Box::new(file)))
+            .set_default("repodir", "./repos")?
-        .build(
+            .set_default("cachedir", "./cache")?
-            Root::builder()
+            .set_default("workers", 4)?
-                .appender("stdout")
+            .set_default("port", 8080)?
-                .appender("file")
+            .set_default("host", "0.0.0.0")?;
-                .build(LevelFilter::Info),
+        config.try_into()
-        )?;
+    }
-    log4rs::init_config(config)?;
-    Ok(())
 }

src/count.rs

@@ -1,10 +1,13 @@
 use crate::error::Result;
 use std::{fs::read_dir, path::Path, result::Result as StdResult};
 
+#[instrument]
 pub(crate) fn count_repositories<P>(repo_path: P) -> Result<usize>
 where
-    P: AsRef<Path>,
+    P: AsRef<Path> + std::fmt::Debug,
 {
+    trace!("Counting repositories");
+    std::fs::create_dir_all(&repo_path)?;
     Ok(read_dir(repo_path)?
         .filter_map(StdResult::ok)
         .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))

src/error.rs

@@ -1,9 +1,6 @@
-use crate::{
+use crate::{statics::VERSION_INFO, templates};
-    statics::{REPO_COUNT, VERSION_INFO},
+use actix_web::{http::StatusCode, HttpResponse, ResponseError};
-    templates,
+use std::fmt;
-};
-use actix_web::{HttpResponse, ResponseError};
-use std::{fmt, sync::atomic::Ordering};
 
 pub(crate) type Result<T> = std::result::Result<T, Error>;
 
@@ -14,9 +11,9 @@ pub(crate) enum Error {
     Git(git2::Error),
     Internal,
     Io(std::io::Error),
-    Log(log::SetLoggerError),
+    Parse(std::num::ParseIntError),
-    LogBuilder(log4rs::config::Errors),
     Serial(serde_json::Error),
+    BranchNotFound,
 }
 
 impl fmt::Display for Error {
@@ -27,24 +24,35 @@ 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::Parse(e) => write!(fmt, "Parse({})", e),
-            Error::LogBuilder(e) => write!(fmt, "LogBuilder({})", e),
             Error::Serial(e) => write!(fmt, "Serial({})", e),
+            Error::BranchNotFound => write!(fmt, "Repo doesn't have master branch"),
         }
     }
 }
 
 impl ResponseError for Error {
-    fn error_response(&self) -> HttpResponse {
+    fn status_code(&self) -> StatusCode {
-        let mut buf = Vec::new();
+        match self {
-        templates::p500(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed)).unwrap();
+            Error::BranchNotFound => StatusCode::NOT_FOUND,
-        HttpResponse::InternalServerError()
+            _ => StatusCode::INTERNAL_SERVER_ERROR,
-            .content_type("text/html")
+        }
-            .body(buf)
     }
 
-    fn render_response(&self) -> HttpResponse {
+    fn error_response(&self) -> HttpResponse {
-        self.error_response()
+        let mut buf = Vec::new();
+        match self {
+            Error::BranchNotFound => {
+                templates::p404_no_master(&mut buf, VERSION_INFO, 0).unwrap();
+                HttpResponse::NotFound().content_type("text/html").body(buf)
+            }
+            _ => {
+                templates::p500(&mut buf, VERSION_INFO, 0).unwrap();
+                HttpResponse::InternalServerError()
+                    .content_type("text/html")
+                    .body(buf)
+            }
+        }
     }
 }
 
@@ -62,12 +70,6 @@ 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)
@@ -86,8 +88,8 @@ impl From<reqwest::Error> for Error {
     }
 }
 
-impl From<log4rs::config::Errors> for Error {
+impl From<std::num::ParseIntError> for Error {
-    fn from(err: log4rs::config::Errors) -> Self {
+    fn from(err: std::num::ParseIntError) -> Self {
-        Error::LogBuilder(err)
+        Error::Parse(err)
     }
 }

src/lib.rs

@@ -0,0 +1,532 @@
+#![type_length_limit = "2257138"]
+
+#[macro_use]
+extern crate actix_web;
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate serde_derive;
+#[macro_use]
+extern crate tracing;
+
+mod cache;
+pub mod config;
+mod count;
+mod error;
+mod service;
+mod statics;
+pub mod telemetry;
+mod template;
+
+use crate::{
+    cache::CacheState,
+    config::Settings,
+    error::{Error, Result},
+    service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut},
+    statics::{CLIENT, CSS, FAVICON, VERSION_INFO},
+    template::RepoInfo,
+};
+use actix_web::{
+    dev::Server,
+    http::header::{CacheControl, CacheDirective, Expires, LOCATION},
+    middleware::{self, TrailingSlash},
+    web, App, HttpResponse, HttpServer, Responder,
+};
+use badge::{Badge, BadgeOptions};
+use git2::{BranchType, Repository};
+use number_prefix::NumberPrefix;
+use std::{
+    borrow::Cow,
+    fs::create_dir_all,
+    io,
+    net::TcpListener,
+    path::Path,
+    process::Command,
+    sync::atomic::AtomicUsize,
+    sync::atomic::Ordering,
+    time::{Duration, SystemTime},
+};
+use tracing::Instrument;
+
+include!(concat!(env!("OUT_DIR"), "/templates.rs"));
+
+#[derive(Deserialize, Serialize)]
+struct GeneratorForm<'a> {
+    service: FormService,
+    user: Cow<'a, str>,
+    repo: Cow<'a, str>,
+}
+
+#[derive(Debug)]
+pub(crate) struct State {
+    settings: Settings,
+}
+
+impl State {
+    fn repos(&self) -> String {
+        self.settings.repodir.display().to_string()
+    }
+
+    fn cache(&self) -> String {
+        self.settings.cachedir.display().to_string()
+    }
+}
+
+#[derive(Serialize)]
+struct JsonResponse<'a> {
+    head: &'a str,
+    branch: &'a str,
+    count: u64,
+    commits: u64,
+}
+
+#[derive(Deserialize, Debug)]
+struct BranchQuery {
+    branch: Option<String>,
+}
+
+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, branch: &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 repo = Repository::open_bare(&repo_dir)?;
+    // TODO: do better...
+    let head = repo
+        .find_branch(branch, BranchType::Local)
+        .map_err(|_| Error::BranchNotFound)?
+        .into_reference();
+    let head = format!("{}", head.target().ok_or(Error::BranchNotFound)?);
+    let mut arg_commit_count = vec!["rev-list".to_string(), "--count".to_string()];
+    let mut arg = vec![
+        "log".to_string(),
+        "--pretty=tformat:".to_string(),
+        "--numstat".to_string(),
+        "--ignore-space-change".to_string(),
+        "--ignore-all-space".to_string(),
+        "--ignore-submodules".to_string(),
+        "--no-color".to_string(),
+        "--find-copies-harder".to_string(),
+        "-M".to_string(),
+        "--diff-filter=ACDM".to_string(),
+    ];
+    let cache = CacheState::read_from_file(&cache_dir, branch, &head)?;
+    match &cache {
+        CacheState::Current { count, commits, .. } => {
+            info!("Using cache");
+            return Ok((*count, head, *commits));
+        }
+        CacheState::Old { head, .. } => {
+            info!("Updating cache");
+            arg.push(format!("{}..{}", head, branch));
+            arg_commit_count.push(format!("{}..{}", head, branch));
+        }
+        CacheState::No | CacheState::NoneForBranch(..) => {
+            info!("Creating cache");
+            arg.push(branch.to_string());
+            arg_commit_count.push(branch.to_string());
+        }
+    };
+    arg.push("--".to_string());
+    arg.push(".".to_string());
+    let output = Command::new("git")
+        .args(&arg)
+        .current_dir(&repo_dir)
+        .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| {
+            s.split_whitespace()
+                .take(2)
+                .map(str::parse::<u64>)
+                .filter_map(std::result::Result::ok)
+                .sum::<u64>()
+        })
+        .sum();
+
+    let cache = cache.calculate_new_cache(count, commits, (&head).into(), branch);
+    cache.write_to_file(cache_dir)?;
+
+    Ok((count, head, commits))
+}
+
+async fn remote_exists(url: &str) -> Result<bool> {
+    let resp = CLIENT.head(url).send().await?;
+    Ok(resp.status() == reqwest::StatusCode::OK)
+}
+
+enum HocResult {
+    Hoc {
+        hoc: u64,
+        commits: u64,
+        hoc_pretty: String,
+        head: String,
+        url: String,
+        repo: String,
+        service_path: String,
+    },
+    NotFound,
+}
+
+async fn delete_repo_and_cache<T>(
+    state: web::Data<State>,
+    repo_count: web::Data<AtomicUsize>,
+    data: web::Path<(String, String)>,
+) -> Result<impl Responder>
+where
+    T: Service,
+{
+    let data = data.into_inner();
+    let span = info_span!(
+        "deleting repository and cache",
+        service = T::domain(),
+        user = data.0.as_str(),
+        repo = data.1.as_str()
+    );
+    let future = async {
+        let repo = format!(
+            "{}/{}/{}",
+            T::domain(),
+            data.0.to_lowercase(),
+            data.1.to_lowercase()
+        );
+        info!("Deleting cache and repository");
+        let cache_dir = format!("{}/{}.json", &state.cache(), repo);
+        let repo_dir = format!("{}/{}", &state.repos(), repo);
+        std::fs::remove_file(&cache_dir).or_else(|e| {
+            if e.kind() == io::ErrorKind::NotFound {
+                Ok(())
+            } else {
+                Err(e)
+            }
+        })?;
+        std::fs::remove_dir_all(&repo_dir).or_else(|e| {
+            if e.kind() == io::ErrorKind::NotFound {
+                Ok(())
+            } else {
+                Err(e)
+            }
+        })?;
+        repo_count.fetch_sub(1, Ordering::Relaxed);
+        Ok(HttpResponse::TemporaryRedirect()
+            .insert_header((
+                LOCATION,
+                format!("/{}/{}/{}/view", T::url_path(), data.0, data.1),
+            ))
+            .finish())
+    };
+    future.instrument(span).await
+}
+
+async fn handle_hoc_request<T, F>(
+    state: web::Data<State>,
+    repo_count: web::Data<AtomicUsize>,
+    data: web::Path<(String, String)>,
+    branch: &str,
+    mapper: F,
+) -> Result<HttpResponse>
+where
+    T: Service,
+    F: FnOnce(HocResult) -> Result<HttpResponse>,
+{
+    let data = data.into_inner();
+    let span = info_span!(
+        "handling hoc calculation",
+        service = T::domain(),
+        user = data.0.as_str(),
+        repo = data.1.as_str(),
+        branch
+    );
+    let future = async {
+        let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
+        let service_path = format!("{}/{}", T::url_path(), repo);
+        let service_url = format!("{}/{}", T::domain(), repo);
+        let path = format!("{}/{}", state.repos(), service_url);
+        let url = format!("https://{}", service_url);
+        let remote_exists = remote_exists(&url).await?;
+        let file = Path::new(&path);
+        if !file.exists() {
+            if !remote_exists {
+                warn!("Repository does not exist");
+                return mapper(HocResult::NotFound);
+            }
+            info!("Cloning for the first time");
+            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, commits) = hoc(&service_url, &state.repos(), &state.cache(), branch)?;
+        let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
+            NumberPrefix::Standalone(hoc) => hoc.to_string(),
+            NumberPrefix::Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
+        };
+        let res = HocResult::Hoc {
+            hoc,
+            commits,
+            hoc_pretty,
+            head,
+            url,
+            repo,
+            service_path,
+        };
+        mapper(res)
+    };
+    future.instrument(span).await
+}
+
+pub(crate) async fn json_hoc<T: Service>(
+    state: web::Data<State>,
+    repo_count: web::Data<AtomicUsize>,
+    data: web::Path<(String, String)>,
+    branch: web::Query<BranchQuery>,
+) -> Result<HttpResponse> {
+    let branch = branch.branch.as_deref().unwrap_or("master");
+    let rc_clone = repo_count.clone();
+    let mapper = move |r| match r {
+        HocResult::NotFound => p404(rc_clone),
+        HocResult::Hoc {
+            hoc, head, commits, ..
+        } => Ok(HttpResponse::Ok().json(JsonResponse {
+            branch,
+            head: &head,
+            count: hoc,
+            commits,
+        })),
+    };
+    handle_hoc_request::<T, _>(state, repo_count, data, branch, mapper).await
+}
+
+fn no_cache_response(body: Vec<u8>) -> HttpResponse {
+    let expiration = SystemTime::now() + Duration::from_secs(30);
+    HttpResponse::Ok()
+        .content_type("image/svg+xml")
+        .insert_header(Expires(expiration.into()))
+        .insert_header(CacheControl(vec![
+            CacheDirective::MaxAge(0u32),
+            CacheDirective::MustRevalidate,
+            CacheDirective::NoCache,
+            CacheDirective::NoStore,
+        ]))
+        .body(body)
+}
+
+pub(crate) async fn calculate_hoc<T: Service>(
+    state: web::Data<State>,
+    repo_count: web::Data<AtomicUsize>,
+    data: web::Path<(String, String)>,
+    branch: web::Query<BranchQuery>,
+) -> HttpResponse {
+    let rc_clone = repo_count.clone();
+    let mapper = move |r| match r {
+        HocResult::NotFound => p404(rc_clone),
+        HocResult::Hoc { hoc_pretty, .. } => {
+            let badge_opt = BadgeOptions {
+                subject: "Hits-of-Code".to_string(),
+                color: "#007ec6".to_string(),
+                status: hoc_pretty,
+            };
+            let badge = Badge::new(badge_opt)?;
+            // TODO: remove clone
+            let body = badge.to_svg().as_bytes().to_vec();
+
+            Ok(no_cache_response(body))
+        }
+    };
+    let branch = branch.branch.as_deref().unwrap_or("master");
+    let error_badge = |_| {
+        let error_badge = Badge::new(BadgeOptions {
+            subject: "Hits-of-Code".to_string(),
+            color: "#ff0000".to_string(),
+            status: "error".to_string(),
+        })
+        .unwrap();
+        let body = error_badge.to_svg().as_bytes().to_vec();
+        no_cache_response(body)
+    };
+    handle_hoc_request::<T, _>(state, repo_count, data, branch, mapper)
+        .await
+        .unwrap_or_else(error_badge)
+}
+
+async fn overview<T: Service>(
+    state: web::Data<State>,
+    repo_count: web::Data<AtomicUsize>,
+    data: web::Path<(String, String)>,
+    branch: web::Query<BranchQuery>,
+) -> Result<HttpResponse> {
+    let branch = branch.branch.as_deref().unwrap_or("master");
+    let base_url = state.settings.base_url.clone();
+    let rc_clone = repo_count.clone();
+    let mapper = move |r| match r {
+        HocResult::NotFound => p404(rc_clone),
+        HocResult::Hoc {
+            hoc,
+            commits,
+            hoc_pretty,
+            url,
+            head,
+            repo,
+            service_path,
+        } => {
+            let mut buf = Vec::new();
+            let repo_info = RepoInfo {
+                commit_url: &T::commit_url(&repo, &head),
+                commits,
+                base_url: &base_url,
+                head: &head,
+                hoc,
+                hoc_pretty: &hoc_pretty,
+                path: &service_path,
+                url: &url,
+                branch,
+            };
+            templates::overview(
+                &mut buf,
+                VERSION_INFO,
+                rc_clone.load(Ordering::Relaxed),
+                repo_info,
+            )?;
+
+            Ok(HttpResponse::Ok().content_type("text/html").body(buf))
+        }
+    };
+    handle_hoc_request::<T, _>(state, repo_count, data, branch, mapper).await
+}
+
+#[get("/health_check")]
+async fn health_check() -> HttpResponse {
+    HttpResponse::Ok().finish()
+}
+
+#[get("/")]
+async fn index(
+    state: web::Data<State>,
+    repo_count: web::Data<AtomicUsize>,
+) -> Result<HttpResponse> {
+    let mut buf = Vec::new();
+    templates::index(
+        &mut buf,
+        VERSION_INFO,
+        repo_count.load(Ordering::Relaxed),
+        &state.settings.base_url,
+    )?;
+    Ok(HttpResponse::Ok().content_type("text/html").body(buf))
+}
+
+#[post("/generate")]
+async fn generate(
+    params: web::Form<GeneratorForm<'_>>,
+    state: web::Data<State>,
+    repo_count: web::Data<AtomicUsize>,
+) -> 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),
+        &state.settings.base_url,
+        params.service.url(),
+        params.service.service(),
+        &repo,
+    )?;
+
+    Ok(HttpResponse::Ok().content_type("text/html").body(buf))
+}
+
+fn p404(repo_count: web::Data<AtomicUsize>) -> 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))
+}
+
+async fn async_p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse> {
+    p404(repo_count)
+}
+
+fn css() -> HttpResponse {
+    HttpResponse::Ok().content_type("text/css").body(CSS)
+}
+
+fn favicon32() -> HttpResponse {
+    HttpResponse::Ok().content_type("image/png").body(FAVICON)
+}
+
+async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
+    let workers = settings.workers;
+    let repo_count =
+        // TODO: errorhandling
+        web::Data::new(AtomicUsize::new(count::count_repositories(&settings.repodir).unwrap()));
+    let state = web::Data::new(State { settings });
+    Ok(HttpServer::new(move || {
+        App::new()
+            .app_data(state.clone())
+            .app_data(repo_count.clone())
+            .wrap(tracing_actix_web::TracingLogger::default())
+            .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
+            .service(index)
+            .service(health_check)
+            .service(web::resource("/tacit-css.min.css").route(web::get().to(css)))
+            .service(web::resource("/favicon.ico").route(web::get().to(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("/sourcehut/{user}/{repo}").to(calculate_hoc::<Sourcehut>))
+            .service(
+                web::resource("/github/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<GitHub>)),
+            )
+            .service(
+                web::resource("/gitlab/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<Gitlab>)),
+            )
+            .service(
+                web::resource("/bitbucket/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<Bitbucket>)),
+            )
+            .service(
+                web::resource("/sourcehut/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<Sourcehut>)),
+            )
+            .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("/sourcehut/{user}/{repo}/json").to(json_hoc::<Sourcehut>))
+            .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>))
+            .service(web::resource("/github/{user}/{repo}/view").to(overview::<GitHub>))
+            .service(web::resource("/gitlab/{user}/{repo}/view").to(overview::<Gitlab>))
+            .service(web::resource("/bitbucket/{user}/{repo}/view").to(overview::<Bitbucket>))
+            .service(web::resource("/sourcehut/{user}/{repo}/view").to(overview::<Sourcehut>))
+            .default_service(web::to(async_p404))
+    })
+    .workers(workers)
+    .listen(listener)?
+    .run())
+}
+
+pub async fn run(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
+    let span = info_span!("hoc", version = env!("CARGO_PKG_VERSION"));
+    let _ = span.enter();
+    start_server(listener, settings).instrument(span).await
+}

src/main.rs

@@ -1,360 +1,26 @@
-#![type_length_limit = "2257138"]
+use hoc::{config::Settings, telemetry};
 
-#[macro_use]
+use std::net::TcpListener;
-extern crate actix_web;
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
 
-mod cache;
+fn init() {
-mod config;
+    dotenv::dotenv().ok();
-mod count;
+    openssl_probe::init_ssl_cert_env_vars();
-mod error;
-mod service;
-mod statics;
 
-use crate::{
+    telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))
-    cache::CacheState,
-    error::{Error, Result},
-    service::{Bitbucket, FormService, GitHub, Gitlab, Service},
-    statics::{CLIENT, CSS, FAVICON, OPT, REPO_COUNT, VERSION_INFO},
-};
-use actix_web::{
-    error::ErrorBadRequest,
-    http::header::{CacheControl, CacheDirective, Expires},
-    middleware, web, App, HttpResponse, HttpServer,
-};
-use badge::{Badge, BadgeOptions};
-use bytes::Bytes;
-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,
-    process::Command,
-    sync::atomic::Ordering,
-    sync::Arc,
-    time::{Duration, SystemTime},
-};
-
-include!(concat!(env!("OUT_DIR"), "/templates.rs"));
-
-#[derive(Deserialize, Serialize)]
-struct GeneratorForm<'a> {
-    service: FormService,
-    user: Cow<'a, str>,
-    repo: Cow<'a, str>,
 }
 
-struct State {
+#[actix_rt::main]
-    repos: String,
+async fn main() -> std::io::Result<()> {
-    cache: String,
+    init();
-}
+
-
+    // TODO: error handling
-#[derive(Serialize)]
+    let settings = Settings::load().expect("Cannot load config");
-struct JsonResponse<'a> {
+
-    head: &'a str,
+    let address = format!("{}:{}", settings.host, settings.port);
-    count: u64,
+    // TODO: error handling
-}
+    let listener = TcpListener::bind(address)?;
-
+    hoc::run(listener, settings)
-fn pull(path: impl AsRef<Path>) -> Result<()> {
+        .await
-    let repo = Repository::open_bare(path)?;
+        .expect("Server error")
-    let mut origin = repo.find_remote("origin")?;
+        .await
-    origin.fetch(&["refs/heads/*:refs/heads/*"], None, None)?;
-    Ok(())
-}
-
-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);
-    let head = format!(
-        "{}",
-        Repository::open_bare(&repo_dir)?
-            .head()?
-            .target()
-            .ok_or(Error::Internal)?
-    );
-    let mut arg = vec![
-        "log".to_string(),
-        "--pretty=tformat:".to_string(),
-        "--numstat".to_string(),
-        "--ignore-space-change".to_string(),
-        "--ignore-all-space".to_string(),
-        "--ignore-submodules".to_string(),
-        "--no-color".to_string(),
-        "--find-copies-harder".to_string(),
-        "-M".to_string(),
-        "--diff-filter=ACDM".to_string(),
-    ];
-    let cache = CacheState::read_from_file(&cache_dir, &head)?;
-    match &cache {
-        CacheState::Current(res) => {
-            info!("Using cache for {}", repo_dir);
-            return Ok((*res, head));
-        }
-        CacheState::Old(cache) => {
-            info!("Updating cache for {}", repo_dir);
-            arg.push(format!("{}..HEAD", cache.head));
-        }
-        CacheState::No => {
-            info!("Creating cache for {}", repo_dir);
-        }
-    };
-    arg.push("--".to_string());
-    arg.push(".".to_string());
-    let output = Command::new("git")
-        .args(&arg)
-        .current_dir(&repo_dir)
-        .output()?
-        .stdout;
-    let output = String::from_utf8_lossy(&output);
-    let count: u64 = output
-        .lines()
-        .map(|s| {
-            s.split_whitespace()
-                .take(2)
-                .map(str::parse::<u64>)
-                .filter_map(std::result::Result::ok)
-                .sum::<u64>()
-        })
-        .sum();
-
-    let cache = cache.calculate_new_cache(count, (&head).into());
-    cache.write_to_file(cache_dir)?;
-
-    Ok((cache.count, head))
-}
-
-fn remote_exists(url: &str) -> Result<bool> {
-    Ok(CLIENT.head(url).send()?.status() == reqwest::StatusCode::OK)
-}
-
-enum HocResult {
-    Hoc {
-        hoc: u64,
-        hoc_pretty: String,
-        head: String,
-        url: String,
-        repo: String,
-        service_path: String,
-    },
-    NotFound,
-}
-
-fn handle_hoc_request<T, F>(
-    state: web::Data<Arc<State>>,
-    data: web::Path<(String, String)>,
-    mapper: F,
-) -> impl Future<Item = HttpResponse, Error = Error>
-where
-    T: Service,
-    F: Fn(HocResult) -> Result<HttpResponse>,
-{
-    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 json_hoc<T: Service>(
-    state: web::Data<Arc<State>>,
-    data: web::Path<(String, String)>,
-) -> impl Future<Item = HttpResponse, Error = Error> {
-    let mapper = |r| match r {
-        HocResult::NotFound => p404(),
-        HocResult::Hoc { hoc, head, .. } => Ok(HttpResponse::Ok().json(JsonResponse {
-            head: &head,
-            count: hoc,
-        })),
-    };
-    handle_hoc_request::<T, _>(state, data, mapper)
-}
-
-fn calculate_hoc<T: Service>(
-    state: web::Data<Arc<State>>,
-    data: web::Path<(String, String)>,
-) -> impl Future<Item = HttpResponse, Error = Error> {
-    let mapper = |r| match r {
-        HocResult::NotFound => p404(),
-        HocResult::Hoc { hoc_pretty, .. } => {
-            let badge_opt = BadgeOptions {
-                subject: "Hits-of-Code".to_string(),
-                color: "#007ec6".to_string(),
-                status: hoc_pretty,
-            };
-            let badge = Badge::new(badge_opt)?;
-
-            let (tx, rx_body) = mpsc::unbounded();
-            let _ = tx.unbounded_send(Bytes::from(badge.to_svg().as_bytes()));
-
-            let expiration = SystemTime::now() + Duration::from_secs(30);
-            Ok(HttpResponse::Ok()
-                .content_type("image/svg+xml")
-                .set(Expires(expiration.into()))
-                .set(CacheControl(vec![
-                    CacheDirective::MaxAge(0u32),
-                    CacheDirective::MustRevalidate,
-                    CacheDirective::NoCache,
-                    CacheDirective::NoStore,
-                ]))
-                .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request"))))
-        }
-    };
-    handle_hoc_request::<T, _>(state, data, mapper)
-}
-
-fn overview<T: Service>(
-    state: web::Data<Arc<State>>,
-    data: web::Path<(String, String)>,
-) -> impl Future<Item = HttpResponse, Error = Error> {
-    let mapper = |r| match r {
-        HocResult::NotFound => p404(),
-        HocResult::Hoc {
-            hoc,
-            hoc_pretty,
-            url,
-            head,
-            repo,
-            service_path,
-        } => {
-            let mut buf = Vec::new();
-            templates::overview(
-                &mut buf,
-                VERSION_INFO,
-                REPO_COUNT.load(Ordering::Relaxed),
-                &OPT.domain,
-                &service_path,
-                &url,
-                hoc,
-                &hoc_pretty,
-                &head,
-                &T::commit_url(&repo, &head),
-            )?;
-
-            let (tx, rx_body) = mpsc::unbounded();
-            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() -> Result<HttpResponse> {
-    let mut buf = Vec::new();
-    templates::index(
-        &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> {
-    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")
-        .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")]
-fn css() -> HttpResponse {
-    HttpResponse::Ok().content_type("text/css").body(CSS)
-}
-
-#[get("/favicon.ico")]
-fn favicon32() -> HttpResponse {
-    HttpResponse::Ok().content_type("image/png").body(FAVICON)
-}
-
-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(),
-    });
-    Ok(HttpServer::new(move || {
-        App::new()
-            .data(state.clone())
-            .wrap(middleware::Logger::default())
-            .service(index)
-            .service(css)
-            .service(favicon32)
-            .service(generate)
-            .service(web::resource("/github/{user}/{repo}").to_async(calculate_hoc::<GitHub>))
-            .service(web::resource("/gitlab/{user}/{repo}").to_async(calculate_hoc::<Gitlab>))
-            .service(web::resource("/bitbucket/{user}/{repo}").to_async(calculate_hoc::<Bitbucket>))
-            .service(web::resource("/github/{user}/{repo}/json").to_async(json_hoc::<GitHub>))
-            .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()?)
 }

src/service.rs

@@ -12,6 +12,8 @@ pub(crate) enum FormService {
     Gitlab,
     #[serde(rename = "bitbucket")]
     Bitbucket,
+    #[serde(rename = "sourcehut")]
+    Sourcehut,
 }
 
 impl FormService {
@@ -20,6 +22,7 @@ impl FormService {
             FormService::GitHub => "github.com",
             FormService::Gitlab => "gitlab.com",
             FormService::Bitbucket => "bitbucket.org",
+            FormService::Sourcehut => "git.sr.ht",
         }
     }
 
@@ -28,6 +31,7 @@ impl FormService {
             FormService::GitHub => "github",
             FormService::Gitlab => "gitlab",
             FormService::Bitbucket => "bitbucket",
+            FormService::Sourcehut => "sourcehut",
         }
     }
 }
@@ -73,3 +77,17 @@ impl Service for Bitbucket {
         format!("https://{}/{}/commits/{}", Self::domain(), repo, commit_ref)
     }
 }
+
+pub(crate) struct Sourcehut;
+
+impl Service for Sourcehut {
+    fn domain() -> &'static str {
+        "git.sr.ht"
+    }
+    fn url_path() -> &'static str {
+        "sourcehut"
+    }
+    fn commit_url(repo: &str, commit_ref: &str) -> String {
+        format!("https://{}/{}/commit/{}", Self::domain(), repo, commit_ref)
+    }
+}

src/statics.rs

@@ -1,14 +1,10 @@
-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"),
+    commit: env!("VERGEN_GIT_SHA_SHORT"),
     version: env!("CARGO_PKG_VERSION"),
 };
 pub(crate) const CSS: &str = include_str!("../static/tacit-css.min.css");
@@ -16,7 +12,4 @@ 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/telemetry.rs

@@ -0,0 +1,21 @@
+use tracing::{subscriber::set_global_default, Subscriber};
+use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
+use tracing_log::LogTracer;
+use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
+
+pub fn get_subscriber(name: &str, env_filter: &str) -> impl Subscriber + Send + Sync {
+    let env_filter =
+        EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new(env_filter));
+
+    let formatting_layer = BunyanFormattingLayer::new(name.to_string(), std::io::stdout);
+
+    Registry::default()
+        .with(env_filter)
+        .with(JsonStorageLayer)
+        .with(formatting_layer)
+}
+
+pub fn init_subscriber(subscriber: impl Subscriber + Send + Sync) {
+    LogTracer::init().expect("Failed to set logger");
+    set_global_default(subscriber).expect("Failed to set tracing subscriber");
+}

src/template.rs

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

templates/generate.rs.html

@@ -1,7 +1,7 @@
 @use super::base;
 @use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo, repo_count: usize, domain: &str, url: &str, service: &str, path: &str)
+@(version_info: VersionInfo, repo_count: usize, base_url: &str, url: &str, service: &str, path: &str)
 
 @:base("Hits-of-Code Badges", "Badge Generator", {
 
@@ -10,7 +10,7 @@ Here is the markdown for the badge for <a href="https://@url/@path">@url/@path</
 </p>
 
 <pre>
-[![Hits-of-Code](https://@domain/@service/@path)](https://@domain/view/@service/@path)
+[![Hits-of-Code](@base_url/@service/@path)](@base_url/@service/@path/view)
 </pre>
 
 <p>
@@ -18,6 +18,6 @@ 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>
+<a href="@base_url/@service/@path/view"><img src="@base_url/@service/@path" alt="example badge" /></a>
 </pre>
 }, version_info, repo_count)

templates/index.rs.html

@@ -1,7 +1,7 @@
 @use super::base;
 @use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo, repo_count: usize, domain: &str)
+@(version_info: VersionInfo, repo_count: usize, base_url: &str)
 
 @:base("Hits-of-Code Badges", "Hits-of-Code Badges", {
 
@@ -20,20 +20,20 @@ gives an overview about the amount of work put into a codebase.
 <p>
 There is a <a href="https://github.com/yegor256/hoc/">command-line tool</a> to calculate the HoC of a repository, but
 some people might want a nice badge to put in their README, that's why I implemented this API. Currently the API can be
-used for GitHub, GitLab and Bitbucket repositories. Just put the following code in your README:
+used for GitHub, GitLab, Bitbucket and Sourcehut repositories. Just put the following code in your README:
 </p>
 
 <pre>
-[![Hits-of-Code](https://@domain/&lt;service&gt;/&lt;user&gt;/&lt;repo&gt;)](https://@domain/view/&lt;service&gt;/&lt;user&gt;/&lt;repo&gt;)
+[![Hits-of-Code](@base_url/&lt;service&gt;/&lt;user&gt;/&lt;repo&gt;)](@base_url/&lt;service&gt;/&lt;user&gt;/&lt;repo&gt;/view)
 </pre>
 
 <p>
-where <code>&lt;service&gt;</code> is one of <code>github</code>, <code>gitlab</code> or <code>bitbucket</code>. So the
+where <code>&lt;service&gt;</code> is one of <code>github</code>, <code>gitlab</code>, <code>bitbucket</code> or
-following Markdown
+<code>sourcehut</code>. So the following Markdown
 </p>
 
 <pre>
-[![Hits-of-Code](https://@domain/github/vbrandl/hoc)](https://@domain/view/github/vbrandl/hoc)
+[![Hits-of-Code](@base_url/github/vbrandl/hoc)](@base_url/github/vbrandl/hoc/view)
 </pre>
 
 <p>
@@ -41,22 +41,29 @@ would render this badge:
 </p>
 
 <pre>
-<a href="https://@domain/view/github/vbrandl/hoc"><img src="https://@domain/github/vbrandl/hoc"
+<a href="@base_url/github/vbrandl/hoc/view"><img src="@base_url/github/vbrandl/hoc"
 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
+By default, this service assumes the existence of a branch named <code>master</code>. If no branch with that name exists
-object with two fields: <code>count</code> and <code>head</code> with count being the HoC value and head being the
+in your repository or you want a badge for another branch of your repository, just append
-commit ref of <code>HEAD</code>. Requesting
+<code>?branch=&lt;branch-name&gt;</code> to the URL.
-<a href="https://@domain/github/vbrandl/hoc/json">https://@domain/github/vbrandl/hoc/json</a> might return something
+</p>
-along the lines of
+
+<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="@base_url/github/vbrandl/hoc/json">@base_url/github/vbrandl/hoc/json</a> might return something along
+the lines of
 </p>
 
 <pre>
 &#123;
-    "head" : "05736ee3ba256ec9a7227c436aef2bf43db109ab",
+    "head": "1f01c3b964b018fb0c0c2c5b572bf4ace2968546",
-    "count": 7582
+    "count": 8324,
+    "commits": 223
 &#125;
 </pre>
 
@@ -67,6 +74,7 @@ along the lines of
         <option value="github">GitHub</option>
         <option value="gitlab">Gitlab</option>
         <option value="bitbucket">Bitbucket</option>
+        <option value="sourcehut">Sourcehut</option>
     </select>
     <label>/</label>
     <input name="user" id="user" type="text" placeholder="user" />
@@ -87,7 +95,7 @@ welcome.
 
 <p>
     You can reach me via mail: <a href="mailto:mail+hoc@@vbrandl.net">mail+hoc@@vbrandl.net</a> preferably using
-my <a href="https://mirror.oldsql.cc/key.asc">GPG key</a>
+my <a href="https://www.vbrandl.net/static/keys/0x1FFE431282F4B8CC0A7579167FB009175885FC76.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>

templates/overview.rs.html

@@ -1,12 +1,17 @@
 @use super::base;
 @use crate::statics::VersionInfo;
+@use crate::template::RepoInfo;
 
-@(version_info: VersionInfo, repo_count: usize, 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> on the
+<code>@repo_info.branch</code> branch. The repository contains
+<strong>@repo_info.commits</strong> commits.
 </p>
 
 <p>
@@ -14,6 +19,11 @@ 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](@repo_info.base_url/@repo_info.path?branch=@repo_info.branch)](@repo_info.base_url/@repo_info.path/view?branch=@repo_info.branch)
 </pre>
+
+
+<form method="post" action="/@repo_info.path/delete">
+    <button type="submit">Rebuild Cache</button>
+</form>
 }, 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("Branch not Found - Hits-of-Code Badges", "404 - Branch not Found", {
+<p>
+<big>Sorry</big>. I couldn't find the requested branch of your repositroy.  Currently this service assumes the
+extistence of a branch named <code>master</code>. If you'd like to request a badge for another branch, you can do so by
+attaching <code>?branch=&lt;branch-name&gt;</code> to the request.
+</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)

tests/badge.rs

@@ -0,0 +1,16 @@
+mod util;
+
+#[actix_rt::test]
+async fn badge_succeeds() {
+    let test_app = util::spawn_app().await;
+
+    let client = awc::Client::default();
+
+    let response = client
+        .get(&format!("{}/github/vbrandl/hoc", test_app.address))
+        .send()
+        .await
+        .expect("Failed to execute request");
+
+    assert!(response.status().is_success());
+}

tests/health_check.rs

@@ -0,0 +1,16 @@
+mod util;
+
+#[actix_rt::test]
+async fn health_check_works() {
+    let test_app = util::spawn_app().await;
+
+    let client = awc::Client::default();
+
+    let response = client
+        .get(&format!("{}/health_check", test_app.address))
+        .send()
+        .await
+        .expect("Failed to execute request");
+
+    assert!(response.status().is_success());
+}

tests/index.rs

@@ -0,0 +1,16 @@
+mod util;
+
+#[actix_rt::test]
+async fn index_returns_success() {
+    let test_app = util::spawn_app().await;
+
+    let client = awc::Client::default();
+
+    let response = client
+        .get(&format!("{}/", test_app.address))
+        .send()
+        .await
+        .expect("Failed to execute request");
+
+    assert!(response.status().is_success());
+}

tests/json.rs

@@ -0,0 +1,16 @@
+mod util;
+
+#[actix_rt::test]
+async fn json_returns_success() {
+    let test_app = util::spawn_app().await;
+
+    let client = awc::Client::default();
+
+    let response = client
+        .get(&format!("{}/github/vbrandl/hoc/json", test_app.address))
+        .send()
+        .await
+        .expect("Failed to execute request");
+
+    assert!(response.status().is_success());
+}

tests/util/mod.rs

@@ -0,0 +1,50 @@
+use hoc::{config::Settings, telemetry};
+
+use std::net::TcpListener;
+
+use tempfile::{tempdir, TempDir};
+
+lazy_static::lazy_static! {
+    static ref TRACING: () = {
+        let filter = if std::env::var("TEST_LOG").is_ok() { "debug" } else { "" };
+        let subscriber = telemetry::get_subscriber("test", filter);
+        telemetry::init_subscriber(subscriber);
+    };
+}
+
+pub struct TestApp {
+    pub address: String,
+    repo_dir: TempDir,
+    cache_dir: TempDir,
+}
+
+pub async fn spawn_app() -> TestApp {
+    lazy_static::initialize(&TRACING);
+
+    let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind random port");
+
+    let port = listener.local_addr().unwrap().port();
+    let address = format!("http://127.0.0.1:{}", port);
+
+    let repo_dir = tempdir().expect("Cannot create repo_dir");
+    let cache_dir = tempdir().expect("Cannot create cache_dir");
+
+    let mut settings = Settings::load().expect("Failed to read configuration.");
+    settings.repodir = repo_dir.path().to_path_buf();
+    settings.cachedir = cache_dir.path().to_path_buf();
+    // configuration.database.database_name = Uuid::new_v4().to_string();
+
+    // let connection_pool = configure_database(&configuration.database).await;
+
+    let server = hoc::run(listener, settings)
+        .await
+        .expect("Failed to bind address");
+
+    let _ = tokio::spawn(server);
+
+    TestApp {
+        address,
+        repo_dir,
+        cache_dir,
+    }
+}

vm.nix

@@ -0,0 +1,80 @@
+# Nix configuration for a VM to run a custom configured Vim
+#
+# It is intended as an example of building a VM that builds Vim for testing
+# and evaluation purposes. It does not represent a production or secure
+# deployment.
+
+{ sources ? import ./nix/sources.nix
+, pkgs ? import sources.nixpkgs { }
+, callPackage ? pkgs.callPackage
+, config
+, lib
+, ...
+}:
+  # config, pkgs, lib, ... }:
+
+let
+  hoc = pkgs.callPackage ./default.nix { };
+
+  # hoc = cargoNix.rootCrate.build;
+in
+{
+  environment = {
+    systemPackages = with pkgs; [
+      (
+        hoc
+        # import ./default.nix
+      )
+    ];
+  };
+
+
+  networking.hostName = "hoc";   # Define your hostname.
+
+  system.stateVersion = "19.09";    # The version of NixOS originally installed
+
+  # Set security options:
+  security = {
+    sudo = {
+      enable = true;                # Enable sudo
+      wheelNeedsPassword = false;   # Allow wheel members to run sudo without a passowrd
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [ 80 ];
+
+  # List services that you want to enable:
+  services.openssh = {
+    enable = true;                             # Enable the OpenSSH daemon.
+    #permitRootLogin = "yes";                  # Probably want to change this in production
+    #challengeResponseAuthentication = true;   # Probably want to change this in production
+    #passwordAuthentication = true;            # Probably want to change this in production
+    openFirewall = true;
+    hostKeys = [
+      {
+        path = "/etc/ssh/ssh_host_ed25519_key";   # Generate a key for the vm
+        type = "ed25519";                         # Use the current best key type
+      }
+    ];
+  };
+
+  # Users of the Vim VM:
+  users.mutableUsers = false;        # Remove any users not defined in here
+
+  users.users.root = {
+    password = "123456";             # Probably want to change this in production
+  };
+
+  # Misc groups:
+  users.groups.nixos.gid = 1000;
+
+  # NixOS users
+  users.users.nixos = {
+    isNormalUser = true;
+    uid = 1000;
+    group = "nixos";
+    extraGroups = [ "wheel" ];
+    password = "123456";             # Probably want to change this in production
+  };
+
+}