Bump version number

Bump git2 from 0.13.0 to 0.13.1

.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/nix-build.yml

@@ -0,0 +1,20 @@
+name: "Nix Build"
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: cachix/install-nix-action@v8
+      - name: Cache nix store
+        uses: actions/cache@v1
+        with:
+          path: /nix
+          key: ${{ runner.os }}-nix-store
+      - uses: cachix/cachix-action@v5
+        with:
+          name: hitsofcode
+          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+          attributes: package

.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

@@ -3,3 +3,4 @@
 repos
 cache
 hoc.log
+result

Cargo.toml

@@ -1,27 +1,28 @@
 [package]
 name = "hoc"
-version = "0.11.2"
+version = "0.11.8"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-actix-web = "1.0.5"
+actix-web = "2.0.0"
 badge = "0.2.0"
-bytes = "0.4.12"
+bytes = "0.5.4"
-futures = "0.1.28"
+futures = "0.3.1"
-git2 = "0.9.1"
+git2 = "0.13.1"
 lazy_static = "1.4.0"
 log = "0.4.8"
-log4rs = "0.8.3"
+log4rs = "0.11.0"
 number_prefix = "0.3.0"
 openssl-probe = "0.1.2"
-reqwest = "0.9.20"
+reqwest = "0.10.4"
-serde = "1.0.99"
+serde = "1.0.105"
-serde_derive = "1.0.99"
+serde_derive = "1.0.103"
-serde_json = "1.0.40"
+serde_json = "1.0.50"
-structopt = "0.2.18"
+structopt = "0.3.12"
+actix-rt = "1.0.0"
 
 [build-dependencies]
-ructe = "0.7.0"
+ructe = "0.9.2"
-vergen = "3.0.4"
+vergen = "3.1.0"

README.md

@@ -45,6 +45,10 @@ $ 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
 

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";
+      };
+    };
+}

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": "053ad4e0db7241ae6a02394d62750fdc5d64aa9f",
+        "sha256": "11l9sr8zg8j1n5p43zjkqwpj59gn8c84z1kf16icnsbnv2smzqdc",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/053ad4e0db7241ae6a02394d62750fdc5d64aa9f.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); }

shell.nix

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

src/config.rs

@@ -48,7 +48,7 @@ pub(crate) struct Opt {
     pub(crate) logfile: PathBuf,
 }
 
-pub(crate) fn init() -> Result<()> {
+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();

src/error.rs

@@ -18,6 +18,7 @@ pub(crate) enum Error {
     LogBuilder(log4rs::config::Errors),
     Parse(std::num::ParseIntError),
     Serial(serde_json::Error),
+    GitNoMaster,
 }
 
 impl fmt::Display for Error {
@@ -32,6 +33,7 @@ impl fmt::Display for Error {
             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"),
         }
     }
 }
@@ -39,14 +41,24 @@ impl fmt::Display for Error {
 impl ResponseError for Error {
     fn error_response(&self) -> HttpResponse {
         let mut buf = Vec::new();
-        templates::p500(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed)).unwrap();
+        match self {
-        HttpResponse::InternalServerError()
+            Error::GitNoMaster => {
-            .content_type("text/html")
+                templates::p404_no_master(
-            .body(buf)
+                    &mut buf,
-    }
+                    VERSION_INFO,
-
+                    REPO_COUNT.load(Ordering::Relaxed),
-    fn render_response(&self) -> HttpResponse {
+                )
-        self.error_response()
+                .unwrap();
+                HttpResponse::NotFound().content_type("text/html").body(buf)
+            }
+            _ => {
+                templates::p500(&mut buf, VERSION_INFO, REPO_COUNT.load(Ordering::Relaxed))
+                    .unwrap();
+                HttpResponse::InternalServerError()
+                    .content_type("text/html")
+                    .body(buf)
+            }
+        }
     }
 }
 

src/main.rs

@@ -15,21 +15,21 @@ 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, Future, Stream};
 use git2::Repository;
 use number_prefix::{NumberPrefix, Prefixed, Standalone};
 use std::{
@@ -75,7 +75,12 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String, u64)
     let cache_dir = format!("{}/{}.json", cache_dir, repo);
     let cache_dir = Path::new(&cache_dir);
     let repo = Repository::open_bare(&repo_dir)?;
-    let head = format!("{}", repo.head()?.target().ok_or(Error::Internal)?);
+    // TODO: do better...
+    let head = match repo.head() {
+        Ok(v) => v,
+        Err(_) => return Err(Error::GitNoMaster),
+    };
+    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(),
@@ -137,12 +142,12 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String, u64)
     Ok((cache.count, head, commits))
 }
 
-fn remote_exists(url: &str) -> impl Future<Item = bool, Error = Error> {
+async fn remote_exists(url: &str) -> Result<bool> {
-    CLIENT
+    let resp = CLIENT.head(url).send().await?;
-        .head(url)
+    Ok(resp.status() == reqwest::StatusCode::OK)
-        .send()
+
-        .map(|resp| resp.status() == reqwest::StatusCode::OK)
+    // .map(|resp| resp.status() == reqwest::StatusCode::OK)
-        .from_err()
+    // .from_err()
 }
 
 enum HocResult {
@@ -158,11 +163,11 @@ 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,
-) -> impl Future<Item = HttpResponse, Error = Error>
+) -> Result<HttpResponse>
 where
     T: Service,
     F: Fn(HocResult) -> Result<HttpResponse>,
@@ -171,44 +176,42 @@ where
     let service_path = format!("{}/{}", T::domain(), repo);
     let path = format!("{}/{}", state.repos, service_path);
     let url = format!("https://{}", service_path);
-    remote_exists(&url)
+    let remote_exists = remote_exists(&url).await?;
-        .and_then(move |remote_exists| {
+    let file = Path::new(&path);
-            let file = Path::new(&path);
+    if !file.exists() {
-            if !file.exists() {
+        if !remote_exists {
-                if !remote_exists {
+            warn!("Repository does not exist: {}", url);
-                    warn!("Repository does not exist: {}", url);
+            return mapper(HocResult::NotFound);
-                    return Ok(HocResult::NotFound);
+        }
-                }
+        info!("Cloning {} for the first time", url);
-                info!("Cloning {} for the first time", url);
+        create_dir_all(file)?;
-                create_dir_all(file)?;
+        let repo = Repository::init_bare(file)?;
-                let repo = Repository::init_bare(file)?;
+        repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?;
-                repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?;
+        repo.remote_set_url("origin", &url)?;
-                repo.remote_set_url("origin", &url)?;
+        REPO_COUNT.fetch_add(1, Ordering::Relaxed);
-                REPO_COUNT.fetch_add(1, Ordering::Relaxed);
+    }
-            }
+    pull(&path)?;
-            pull(&path)?;
+    let (hoc, head, commits) = 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) {
-            let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
+        Standalone(hoc) => hoc.to_string(),
-                Standalone(hoc) => hoc.to_string(),
+        Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
-                Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
+    };
-            };
+    let res = HocResult::Hoc {
-            Ok(HocResult::Hoc {
+        hoc,
-                hoc,
+        commits,
-                commits,
+        hoc_pretty,
-                hoc_pretty,
+        head,
-                head: head.to_string(),
+        url,
-                url,
+        repo,
-                repo,
+        service_path,
-                service_path,
+    };
-            })
+    mapper(res)
-        })
-        .and_then(mapper)
 }
 
 fn json_hoc<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> impl Future<Item = HttpResponse, Error = Error> {
+) -> impl Future<Output = Result<HttpResponse>> {
     let mapper = |r| match r {
         HocResult::NotFound => p404(),
         HocResult::Hoc {
@@ -225,8 +228,8 @@ fn json_hoc<T: Service>(
 fn calculate_hoc<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> impl Future<Item = HttpResponse, Error = Error> {
+) -> impl Future<Output = Result<HttpResponse>> {
-    let mapper = |r| match r {
+    let mapper = move |r| match r {
         HocResult::NotFound => p404(),
         HocResult::Hoc { hoc_pretty, .. } => {
             let badge_opt = BadgeOptions {
@@ -235,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()
@@ -249,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)
@@ -258,7 +260,7 @@ fn calculate_hoc<T: Service>(
 fn overview<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> impl Future<Item = HttpResponse, Error = Error> {
+) -> impl Future<Output = Result<HttpResponse>> {
     let mapper = |r| match r {
         HocResult::NotFound => p404(),
         HocResult::Hoc {
@@ -271,33 +273,31 @@ 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,
                 REPO_COUNT.load(Ordering::Relaxed),
-                &OPT.domain,
+                repo_info,
-                &service_path,
-                &url,
-                hoc,
-                &hoc_pretty,
-                &head,
-                &T::commit_url(&repo, &head),
-                commits,
             )?;
 
-            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() -> Result<HttpResponse> {
+async fn index() -> Result<HttpResponse> {
     let mut buf = Vec::new();
     templates::index(
         &mut buf,
@@ -309,7 +309,7 @@ fn index() -> Result<HttpResponse> {
 }
 
 #[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(
@@ -321,12 +321,8 @@ fn generate(params: web::Form<GeneratorForm>) -> Result<HttpResponse> {
         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() -> Result<HttpResponse> {
@@ -335,6 +331,10 @@ fn p404() -> Result<HttpResponse> {
     Ok(HttpResponse::NotFound().content_type("text/html").body(buf))
 }
 
+async fn async_p404() -> Result<HttpResponse> {
+    p404()
+}
+
 #[get("/tacit-css.min.css")]
 fn css() -> HttpResponse {
     HttpResponse::Ok().content_type("text/css").body(CSS)
@@ -345,13 +345,13 @@ fn favicon32() -> HttpResponse {
     HttpResponse::Ok().content_type("image/png").body(FAVICON)
 }
 
-fn start_server() -> Result<()> {
+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(),
         cache: OPT.cachedir.display().to_string(),
     });
-    Ok(HttpServer::new(move || {
+    HttpServer::new(move || {
         App::new()
             .data(state.clone())
             .wrap(middleware::Logger::default())
@@ -360,23 +360,25 @@ fn start_server() -> Result<()> {
             .service(css)
             .service(favicon32)
             .service(generate)
-            .service(web::resource("/github/{user}/{repo}").to_async(calculate_hoc::<GitHub>))
+            .service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>))
-            .service(web::resource("/gitlab/{user}/{repo}").to_async(calculate_hoc::<Gitlab>))
+            .service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>))
-            .service(web::resource("/bitbucket/{user}/{repo}").to_async(calculate_hoc::<Bitbucket>))
+            .service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>))
-            .service(web::resource("/github/{user}/{repo}/json").to_async(json_hoc::<GitHub>))
+            .service(web::resource("/github/{user}/{repo}/json").to(json_hoc::<GitHub>))
-            .service(web::resource("/gitlab/{user}/{repo}/json").to_async(json_hoc::<Gitlab>))
+            .service(web::resource("/gitlab/{user}/{repo}/json").to(json_hoc::<Gitlab>))
-            .service(web::resource("/bitbucket/{user}/{repo}/json").to_async(json_hoc::<Bitbucket>))
+            .service(web::resource("/bitbucket/{user}/{repo}/json").to(json_hoc::<Bitbucket>))
-            .service(web::resource("/view/github/{user}/{repo}").to_async(overview::<GitHub>))
+            .service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>))
-            .service(web::resource("/view/gitlab/{user}/{repo}").to_async(overview::<Gitlab>))
+            .service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>))
-            .service(web::resource("/view/bitbucket/{user}/{repo}").to_async(overview::<Bitbucket>))
+            .service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>))
-            .default_service(web::resource("").route(web::get().to_async(p404)))
+            .default_service(web::resource("").route(web::get().to(async_p404)))
     })
     .workers(OPT.workers)
     .bind(interface)?
-    .run()?)
+    .run()
+    .await
 }
 
-fn main() -> Result<()> {
+#[actix_rt::main]
-    config::init()?;
+async fn main() -> std::io::Result<()> {
-    start_server()
+    config::init().await.unwrap();
+    start_server().await
 }

src/statics.rs

@@ -15,7 +15,7 @@ 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::r#async::Client = reqwest::r#async::Client::new();
+    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/overview.rs.html

@@ -1,13 +1,16 @@
 @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, commits: u64)
+@(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
+The project <a href="@repo_info.url">@repo_info.url</a> has
-<a href="@commit_url">@head</a>. The repository contains <strong>@commits</strong> commits.
+<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>
@@ -15,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, 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)

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