Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
4446d9b879 | |||
ac8ba338bb | |||
d609f9bf43 | |||
6bc783451e | |||
21243e6cfb |
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -761,7 +761,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hoc"
|
name = "hoc"
|
||||||
version = "0.9.0"
|
version = "0.9.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"actix-web 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"actix-web 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"badge 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"badge 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "hoc"
|
name = "hoc"
|
||||||
version = "0.9.0"
|
version = "0.9.2"
|
||||||
authors = ["Valentin Brandl <vbrandl@riseup.net>"]
|
authors = ["Valentin Brandl <vbrandl@riseup.net>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
@ -20,8 +20,14 @@ The API is as simple as
|
|||||||
https://<host>/<service>/<user>/<repo>
|
https://<host>/<service>/<user>/<repo>
|
||||||
```
|
```
|
||||||
|
|
||||||
where `<service>` is one of `gitub`, `gitlab` or `bitbucket`.
|
where `<service>` is one of `gitub`, `gitlab` or `bitbucket`. The HoC data can also be received as JSON by appending
|
||||||
|
`/json` to the reuqest path:
|
||||||
|
|
||||||
|
```
|
||||||
|
https://<host>/<service>/<user>/<repo>/json
|
||||||
|
```
|
||||||
|
|
||||||
|
There is also an overview page available via `https://<host>/view/<service>/<user>/<repo>`
|
||||||
|
|
||||||
## Building
|
## Building
|
||||||
|
|
||||||
|
12
src/main.rs
12
src/main.rs
@ -17,7 +17,7 @@ mod service;
|
|||||||
mod statics;
|
mod statics;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
cache::{Cache, CacheState},
|
cache::CacheState,
|
||||||
error::{Error, Result},
|
error::{Error, Result},
|
||||||
service::{Bitbucket, FormService, GitHub, Gitlab, Service},
|
service::{Bitbucket, FormService, GitHub, Gitlab, Service},
|
||||||
statics::{CLIENT, CSS, FAVICON, OPT, REPO_COUNT, VERSION_INFO},
|
statics::{CLIENT, CSS, FAVICON, OPT, REPO_COUNT, VERSION_INFO},
|
||||||
@ -56,6 +56,12 @@ struct State {
|
|||||||
cache: String,
|
cache: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct JsonResponse<'a> {
|
||||||
|
head: &'a str,
|
||||||
|
count: u64,
|
||||||
|
}
|
||||||
|
|
||||||
fn pull(path: impl AsRef<Path>) -> Result<()> {
|
fn pull(path: impl AsRef<Path>) -> Result<()> {
|
||||||
let repo = Repository::open_bare(path)?;
|
let repo = Repository::open_bare(path)?;
|
||||||
let mut origin = repo.find_remote("origin")?;
|
let mut origin = repo.find_remote("origin")?;
|
||||||
@ -193,8 +199,8 @@ fn json_hoc<T: Service>(
|
|||||||
) -> impl Future<Item = HttpResponse, Error = Error> {
|
) -> impl Future<Item = HttpResponse, Error = Error> {
|
||||||
let mapper = |r| match r {
|
let mapper = |r| match r {
|
||||||
HocResult::NotFound => p404(),
|
HocResult::NotFound => p404(),
|
||||||
HocResult::Hoc { hoc, head, .. } => Ok(HttpResponse::Ok().json(Cache {
|
HocResult::Hoc { hoc, head, .. } => Ok(HttpResponse::Ok().json(JsonResponse {
|
||||||
head: head.into(),
|
head: &head,
|
||||||
count: hoc,
|
count: hoc,
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
|
@ -45,6 +45,21 @@ would render this badge:
|
|||||||
alt="example badge" /></a>
|
alt="example badge" /></a>
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
You can also request the HoC as JSON by appending <code>/json</code> to the request path. This will return a JSON
|
||||||
|
object with two fields: <code>count</code> and <code>head</code> with count being the HoC value and head being the
|
||||||
|
commit ref of <code>HEAD</code>. Requesting
|
||||||
|
<a href="https://@domain/github/vbrandl/hoc/json">https://@domain/github/vbrandl/hoc/json</a> might return something
|
||||||
|
along the lines of
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<pre>
|
||||||
|
{
|
||||||
|
"head" : "05736ee3ba256ec9a7227c436aef2bf43db109ab",
|
||||||
|
"count": 7582
|
||||||
|
}
|
||||||
|
</pre>
|
||||||
|
|
||||||
<h2>Badge Generator</h2>
|
<h2>Badge Generator</h2>
|
||||||
|
|
||||||
<form method="post" action="/generate">
|
<form method="post" action="/generate">
|
||||||
|
Reference in New Issue
Block a user