iv-org/instances-api
1
0
Fork 0
mirror of https://github.com/iv-org/instances-api.git synced 2024-10-01 04:35:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

also updating crystal version and shards

Browse Source
This commit is contained in:
Emilien Devos 2023-11-04 18:38:55 +01:00
parent 40d40d3122
commit 63e9e4cdc6
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
- name: Install Crystal - name: Install Crystal
uses: oprypin/install-crystal@v1 uses: oprypin/install-crystal@v1
with: with:
crystal: 1.0.0 crystal: 1.10.1
- name: Cache Shards - name: Cache Shards
uses: actions/cache@v2 uses: actions/cache@v2

6
Dockerfile
View File

@ -1,12 +1,12 @@
FROM docker.io/crystallang/crystal:1.0.0-alpine AS builder FROM crystallang/crystal:1.10.1-alpine AS builder
WORKDIR /app WORKDIR /app
COPY ./shard.yml ./shard.yml COPY ./shard.yml ./shard.yml
RUN shards install RUN shards install
COPY ./src/ ./src/ COPY ./src/ ./src/
RUN crystal build ./src/instances.cr --release RUN crystal build ./src/instances.cr --release
FROM alpine:latest FROM alpine:3.18
RUN apk add --no-cache gc pcre libgcc RUN apk add --no-cache gc pcre2 libgcc
WORKDIR /app WORKDIR /app
RUN addgroup -g 1000 -S invidious && \ RUN addgroup -g 1000 -S invidious && \
adduser -u 1000 -S invidious -G invidious adduser -u 1000 -S invidious -G invidious

10
shard.lock
View File

@ -2,19 +2,15 @@ version: 2.0
shards: shards:
backtracer: backtracer:
git: https://github.com/sija/backtracer.cr.git git: https://github.com/sija/backtracer.cr.git
version: 1.2.1 version: 1.2.2
exception_page: exception_page:
git: https://github.com/crystal-loot/exception_page.git git: https://github.com/crystal-loot/exception_page.git
version: 0.2.0 version: 0.3.1
kemal: kemal:
git: https://github.com/kemalcr/kemal.git git: https://github.com/kemalcr/kemal.git
version: 1.0.0+git.commit.218be2422172d330feb62c6a8abc7df5402fdb84 version: 1.4.0
kilt:
git: https://github.com/jeromegn/kilt.git
version: 0.6.1
radix: radix:
git: https://github.com/luislavena/radix.git git: https://github.com/luislavena/radix.git

7
shard.yml
View File

@ -1,8 +1,9 @@
name: instances name: instances
version: 0.1.0 version: 0.2.0
authors: authors:
- Omar Roth <omarroth@protonmail.com> - Omar Roth <omarroth@protonmail.com>
- Invidious team
targets: targets:
instances: instances:
@ -11,8 +12,8 @@ targets:
dependencies: dependencies:
kemal: kemal:
github: kemalcr/kemal github: kemalcr/kemal
branch: master version: ~> 1.4.0
crystal: 1.0.0 crystal: 1.10.1
license: AGPLv3 license: AGPLv3

2
src/instances.cr
View File

@ -160,7 +160,7 @@ SORT_PROCS = {
"api" => ->(name : String, instance : Instance) { instance[:api] == nil ? 2 : instance[:api] ? 0 : 1 }, "api" => ->(name : String, instance : Instance) { instance[:api] == nil ? 2 : instance[:api] ? 0 : 1 },
"users" => ->(name : String, instance : Instance) { -(instance[:stats]?.try &.["usage"]?.try &.["users"]["total"].as_i || 0) }, "users" => ->(name : String, instance : Instance) { -(instance[:stats]?.try &.["usage"]?.try &.["users"]["total"].as_i || 0) },
"version" => ->(name : String, instance : Instance) { instance[:stats]?.try &.["software"]?.try &.["version"].as_s.try &.split("-", 2)[0].split(".").map { |a| -a.to_i } || [0, 0, 0] }, "version" => ->(name : String, instance : Instance) { instance[:stats]?.try &.["software"]?.try &.["version"].as_s.try &.split("-", 2)[0].split(".").map { |a| -a.to_i } || [0, 0, 0] },
"playback" => ->(name : String, instance : Instance) { -(instance[:stats]?.try &.["playback"]?.try &.["ratio"]?.try { |ratio| ratio.as_f.to_i * 100 } || 100) }, "playback" => ->(name : String, instance : Instance) { -(instance[:stats]?.try &.["playback"]?.try &.["ratio"]?.try { |ratio| ratio.as_f } || 0.0) },
} }
def sort_instances(instances, sort_by) def sort_instances(instances, sort_by)