Lots more updates

Also begin adding rust building capabilities
to be able to write rust binaries for some commands.
This commit is contained in:
Kaare Hoff Skovgaard 2025-07-06 22:37:16 +02:00
parent 624508dd14
commit dd1cfa79e7
Signed by: khs
GPG key ID: C7D890804F01E9F0
52 changed files with 2509 additions and 150 deletions

View file

@ -0,0 +1,69 @@
use anyhow::Context;
use serde::{Deserialize, Serialize};
pub fn from_str<D: for<'de> Deserialize<'de>>(s: &str) -> anyhow::Result<D> {
serde_json::from_str(s).map_err(|e| anyhow::format_err!("{e}:\n{}", extract_context(&e, s)))
}
pub fn to_string<S: Serialize>(data: &S) -> anyhow::Result<String> {
serde_json::to_string(data).context("Could not serialize data to json")
}
pub fn to_string_pretty<S: Serialize>(data: &S) -> anyhow::Result<String> {
serde_json::to_string_pretty(data).context("Could not serialize data to json")
}
pub fn to_vec<S: Serialize>(data: &S) -> anyhow::Result<Vec<u8>> {
serde_json::to_vec(data).context("Could not serialize data to json")
}
pub fn to_vec_pretty<S: Serialize>(data: &S) -> anyhow::Result<Vec<u8>> {
serde_json::to_vec_pretty(data).context("Could not serialize data to json")
}
pub fn string(v: &str) -> String {
serde_json::to_string(v).expect("Could not encode json string")
}
fn extract_context(serde_error: &serde_json::Error, s: &str) -> String {
let lines: Vec<_> = s.lines().collect();
if lines.len() == 1 {
let (col_begin, highlight) = if serde_error.column() > 30 {
(serde_error.column() - 30, 30)
} else {
(1, serde_error.column())
};
let col_end = if lines[0].len() + 31 < serde_error.column() {
lines[0].len() + 1
} else {
serde_error.column() + 30
};
let mut line: String = lines[0]
.chars()
.skip(col_begin - 1)
.take(col_end - col_begin)
.collect();
line.push('\n');
line.extend(std::iter::repeat_n(' ', highlight - 1));
line.push('^');
line
} else {
let error_line = serde_error.line();
let mut result = String::new();
if error_line > 1 {
result.push_str(&format!("{}: {}\n", error_line - 1, lines[error_line - 2]));
}
result.push_str(&format!("{}: {}\n", error_line, lines[error_line - 1]));
result.push_str(&format!(
"{} {}\n",
" ".repeat(error_line.to_string().len()),
std::iter::repeat_n(' ', serde_error.column() - 1)
.chain(['^'].into_iter())
.collect::<String>(),
));
if lines.len() > error_line {
result.push_str(&format!("{}: {}\n", error_line + 1, lines[error_line]));
}
result
}
}