moved the api to its own repo
This commit is contained in:
@@ -4,6 +4,6 @@ version = "0.1.0"
|
|||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
alhp_api = {path = "crates/alhp_api"}
|
alhp_api = {git="https://gitea.puchstein.bayern/mpuchstein/ALHP_API_RS"}
|
||||||
alpm = "4.0.2"
|
alpm = "4.0.2"
|
||||||
serde_json = "1.0.140"
|
serde_json = "1.0.140"
|
||||||
|
96
crates/alhp_api/Cargo.lock
generated
96
crates/alhp_api/Cargo.lock
generated
@@ -1,96 +0,0 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
|
||||||
# It is not intended for manual editing.
|
|
||||||
version = 4
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "alhp_api"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "itoa"
|
|
||||||
version = "1.0.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "memchr"
|
|
||||||
version = "2.7.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro2"
|
|
||||||
version = "1.0.94"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
|
|
||||||
dependencies = [
|
|
||||||
"unicode-ident",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "quote"
|
|
||||||
version = "1.0.40"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ryu"
|
|
||||||
version = "1.0.20"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde"
|
|
||||||
version = "1.0.219"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
|
|
||||||
dependencies = [
|
|
||||||
"serde_derive",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_derive"
|
|
||||||
version = "1.0.219"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_json"
|
|
||||||
version = "1.0.140"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
|
|
||||||
dependencies = [
|
|
||||||
"itoa",
|
|
||||||
"memchr",
|
|
||||||
"ryu",
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "syn"
|
|
||||||
version = "2.0.100"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"unicode-ident",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-ident"
|
|
||||||
version = "1.0.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
|
|
@@ -1,11 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "alhp_api"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2024"
|
|
||||||
authors = ["mpuchstein"]
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
|
||||||
serde_json = "1.0.140"
|
|
||||||
reqwest = { version = "0.12.15" , features = ["blocking"] }
|
|
||||||
log = "0.4.27"
|
|
@@ -1,205 +0,0 @@
|
|||||||
use log::{error, info};
|
|
||||||
use reqwest::StatusCode;
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use std::error::Error;
|
|
||||||
use std::fmt;
|
|
||||||
use std::io::ErrorKind;
|
|
||||||
|
|
||||||
const API_BASE_URL: &str = "https://api.alhp.dev";
|
|
||||||
const API_PACKAGES_EXT: &str = "/packages?";
|
|
||||||
const API_GENERAL_EXT: &str = "/stats?";
|
|
||||||
|
|
||||||
pub mod packages {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Eq, PartialEq)]
|
|
||||||
#[serde(rename_all = "lowercase")]
|
|
||||||
pub enum PackageStatus {
|
|
||||||
Latest,
|
|
||||||
Failed,
|
|
||||||
Built,
|
|
||||||
Skipped,
|
|
||||||
Delayed,
|
|
||||||
Building,
|
|
||||||
Signing,
|
|
||||||
Unknown,
|
|
||||||
Queued,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for PackageStatus {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
write!(
|
|
||||||
f,
|
|
||||||
"{}",
|
|
||||||
match self {
|
|
||||||
PackageStatus::Latest => "latest",
|
|
||||||
PackageStatus::Failed => "failed",
|
|
||||||
PackageStatus::Built => "build",
|
|
||||||
PackageStatus::Skipped => "skipped",
|
|
||||||
PackageStatus::Delayed => "delayed",
|
|
||||||
PackageStatus::Building => "building",
|
|
||||||
PackageStatus::Signing => "signing",
|
|
||||||
PackageStatus::Unknown => "unknown",
|
|
||||||
PackageStatus::Queued => "queued",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct Package {
|
|
||||||
pub pkgbase: String,
|
|
||||||
pub repo: String,
|
|
||||||
pub split_packages: Vec<String>,
|
|
||||||
pub status: PackageStatus,
|
|
||||||
pub skip_reason: Option<String>,
|
|
||||||
pub lto: String,
|
|
||||||
pub debug_symbols: String,
|
|
||||||
pub arch_version: String,
|
|
||||||
pub repo_version: String,
|
|
||||||
pub build_date: Option<String>,
|
|
||||||
pub peak_mem: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct PackageResponse {
|
|
||||||
pub total: usize,
|
|
||||||
pub offset: usize,
|
|
||||||
pub limit: usize,
|
|
||||||
pub packages: Vec<Package>,
|
|
||||||
}
|
|
||||||
#[derive(Debug, Serialize, Default)]
|
|
||||||
pub struct PackageRequest {
|
|
||||||
pub status: Vec<PackageStatus>,
|
|
||||||
pub pkgbase: Option<String>,
|
|
||||||
pub exact: bool,
|
|
||||||
pub repo: Option<String>,
|
|
||||||
pub offset: usize,
|
|
||||||
pub limit: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl PackageRequest {
|
|
||||||
fn query_string(&self) -> String {
|
|
||||||
let mut params = Vec::new();
|
|
||||||
for status in &self.status {
|
|
||||||
params.push(format!("status={}", status));
|
|
||||||
}
|
|
||||||
if let Some(pkgbase) = &self.pkgbase {
|
|
||||||
params.push(format!("pkgbase={}", pkgbase));
|
|
||||||
}
|
|
||||||
if self.exact {
|
|
||||||
params.push("exact".to_string());
|
|
||||||
}
|
|
||||||
if let Some(repo) = &self.repo {
|
|
||||||
params.push(format!("repo={}", repo));
|
|
||||||
}
|
|
||||||
params.push(format!("offset={}", self.offset));
|
|
||||||
params.push(format!("limit={}", self.limit));
|
|
||||||
params.join("&")
|
|
||||||
}
|
|
||||||
pub fn response(&self) -> Result<PackageResponse, Box<dyn Error>> {
|
|
||||||
let query_url = format!(
|
|
||||||
"{}{}{}",
|
|
||||||
API_BASE_URL,
|
|
||||||
API_PACKAGES_EXT,
|
|
||||||
self.query_string()
|
|
||||||
);
|
|
||||||
info!("Fetching URL: {}", query_url);
|
|
||||||
let response = reqwest::blocking::get(query_url)?;
|
|
||||||
match response.status() {
|
|
||||||
StatusCode::OK => {
|
|
||||||
let response = response.text()?;
|
|
||||||
match serde_json::from_str(&response) {
|
|
||||||
Ok(pkgResponse) => Ok(pkgResponse),
|
|
||||||
Err(e) => {
|
|
||||||
error!("Failed to deserialize JSON: {}", e);
|
|
||||||
error!("Response body: {}", response);
|
|
||||||
Err(Box::new(e))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
StatusCode::NOT_FOUND => {
|
|
||||||
info!("No packages found");
|
|
||||||
Ok(PackageResponse {
|
|
||||||
total: 0,
|
|
||||||
offset: 0,
|
|
||||||
limit: 0,
|
|
||||||
packages: vec![],
|
|
||||||
})
|
|
||||||
}
|
|
||||||
StatusCode::INTERNAL_SERVER_ERROR => {
|
|
||||||
error!("Internal server error");
|
|
||||||
Err(Box::new(std::io::Error::new(
|
|
||||||
ErrorKind::ConnectionAborted,
|
|
||||||
"Internal server error",
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
error!("Unexpected status: {}", response.status());
|
|
||||||
Err(Box::new(std::io::Error::new(
|
|
||||||
ErrorKind::Unsupported,
|
|
||||||
"Unexpected server response"
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub mod general {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct LtoStats {
|
|
||||||
pub enabled: usize,
|
|
||||||
pub disabled: usize,
|
|
||||||
pub unknown: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct GeneralResponse {
|
|
||||||
pub failed: usize,
|
|
||||||
pub skipped: usize,
|
|
||||||
pub latest: usize,
|
|
||||||
pub queued: usize,
|
|
||||||
pub lto: LtoStats,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
||||||
pub struct GeneralRequest {
|
|
||||||
//No params yet.
|
|
||||||
}
|
|
||||||
impl GeneralRequest {
|
|
||||||
pub fn response(&self) -> Result<GeneralResponse, Box<dyn Error>> {
|
|
||||||
let query_url = format!("{}{}", API_BASE_URL, API_GENERAL_EXT);
|
|
||||||
let response = reqwest::blocking::get(query_url)?;
|
|
||||||
match response.status() {
|
|
||||||
StatusCode::OK => {
|
|
||||||
let response = response.text()?;
|
|
||||||
match serde_json::from_str(&response) {
|
|
||||||
Ok(genResponse) => Ok(genResponse),
|
|
||||||
Err(e) => {
|
|
||||||
error!("Failed to deserialize JSON: {}", e);
|
|
||||||
error!("Response body: {}", response);
|
|
||||||
Err(Box::new(e))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
StatusCode::INTERNAL_SERVER_ERROR => {
|
|
||||||
error!("Internal server error");
|
|
||||||
Err(Box::new(std::io::Error::new(
|
|
||||||
ErrorKind::ConnectionAborted,
|
|
||||||
"Internal server error",
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
error!("Unexpected status: {}", response.status());
|
|
||||||
Err(Box::new(std::io::Error::new(
|
|
||||||
ErrorKind::Unsupported,
|
|
||||||
"Unexpected server response"
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user