cy/nixcp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

actually use user-supplied upstreams

Browse source
This commit is contained in:
cy 2025-04-01 11:45:11 -04:00
parent e10c3e86e3
commit 15f3d0e478
Signed by: cy
SSH key fingerprint: SHA256:o/geVWV4om1QhUSkKvDQeW/eAihwnjyXkqMwrVdbuts
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main.rs
View file

@ -11,10 +11,9 @@ use std::sync::{
use clap::Parser; use clap::Parser;
use log::{debug, trace}; use log::{debug, trace};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json;
use tokio::sync::Semaphore; use tokio::sync::Semaphore;
const UPSTREAM_CACHES: &'static [&'static str] = &["https://cache.nixos.org"]; const UPSTREAM_CACHES: &[&str] = &["https://cache.nixos.org"];
// nix path-info --derivation --json // nix path-info --derivation --json
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
@ -117,7 +116,7 @@ async fn main() {
store_paths, store_paths,
cacheable_tx, cacheable_tx,
cli.upstream_checker_concurrency, cli.upstream_checker_concurrency,
upstream_caches, Arc::new(upstream_caches),
) )
.await; .await;
})); }));
@ -138,12 +137,15 @@ async fn check_upstream(
store_paths: Vec<String>, store_paths: Vec<String>,
cacheable_tx: mpsc::Sender<String>, cacheable_tx: mpsc::Sender<String>,
concurrency: u8, concurrency: u8,
upstream_caches: Vec<String>, upstream_caches: Arc<Vec<String>>,
) { ) {
let concurrent = Semaphore::new(concurrency.into()); let concurrent = Semaphore::new(concurrency.into());
for store_path in store_paths { for store_path in store_paths {
let _ = concurrent.acquire().await.unwrap(); let _ = concurrent.acquire().await.unwrap();
let tx = cacheable_tx.clone(); let tx = cacheable_tx.clone();
let upstream_caches = Arc::clone(&upstream_caches);
tokio::spawn(async move { tokio::spawn(async move {
let basename = Path::new(&store_path) let basename = Path::new(&store_path)
.file_name() .file_name()
@ -151,11 +153,11 @@ async fn check_upstream(
.to_str() .to_str()
.unwrap() .unwrap()
.to_string(); .to_string();
let hash = basename.split("-").nth(0).unwrap(); let hash = basename.split("-").next().unwrap();
let mut hit = false; let mut hit = false;
for upstream in UPSTREAM_CACHES { for upstream in upstream_caches.as_ref() {
let mut uri = String::from(*upstream); let mut uri = upstream.clone();
uri.push_str(format!("/{}.narinfo", hash).as_str()); uri.push_str(format!("/{}.narinfo", hash).as_str());
let res_status = reqwest::Client::new() let res_status = reqwest::Client::new()
@ -197,7 +199,7 @@ async fn uploader(cacheable_rx: mpsc::Receiver<String>, binary_cache: String, co
if Command::new("nix") if Command::new("nix")
.arg("copy") .arg("copy")
.arg("--to") .arg("--to")
.arg(&binary_cache.to_string()) .arg(&binary_cache)
.arg(&path_to_upload) .arg(&path_to_upload)
.output() .output()
.is_err() .is_err()