REPO: Fix the repo-downloader with the updated NKDB

lektor_repo/src/downloader.rs

@@ -13,8 +13,8 @@ use kurisu_api::{
 use lektor_nkdb::{DatabaseStorage, KId, RemoteKId, UpdateHandler};
 use lektor_utils::config::LektorRepoConfig;
 use reqwest::{
-    header::{self, HeaderName, HeaderValue},
-    Client, Method, Request, RequestBuilder, Url,
+    header::{self, HeaderName, HeaderValue}, Client, Method, Request, RequestBuilder,
+    Url,
 };
 use serde::de::DeserializeOwned;
 use std::cmp::Ordering;
@@ -80,7 +80,8 @@ pub async fn download_kara<Storage: DatabaseStorage>(
     handle: &UpdateHandler<'_, Storage>,
     (kid, rkid, sha256): (KId, RemoteKId, SHA256),
 ) -> Result<()> {
-    let mut stream = std::pin::pin!(stream::iter(
+    let mut stream = std::pin::pin!(
+        stream::iter(
             // Build the urls we will try
             config
                 .urls
@@ -122,7 +123,8 @@ pub async fn download_kara<Storage: DatabaseStorage>(
                 handle.submit_kara(file, kid, sha256).await?;
                 Ok(())
             }
-    }));
+        })
+    );
 
     loop {
         if let Some(x) = stream.next().await {
@@ -148,18 +150,13 @@ async fn download_from_urls<T: DeserializeOwned>(urls: Vec<String>) -> Option<T>
             .ok()?;
 
         if r.status().is_success() {
-            match r.json::<T>().await {
-                Ok(list) => {
-                    log::info!("success fetching {url}, keeping it...");
-                    Some(list)
-                }
-                Err(e) => {
-                    log::info!("error decoding data from {url} ({e}) skipping it...");
-                    None
-                }
-            }
+            r.json::<T>()
+                .await
+                .inspect(|_| log::info!("success fetching {url}, keeping it..."))
+                .map_err(|e| log::info!("error decoding data from {url} ({e}) skipping it..."))
+                .ok()
         } else {
-            log::info!(
+            log::warn!(
                 "error while fetching {url} ({}), skipping it...",
                 r.text().await.unwrap_or(String::from("unknown error"))
             );

lektor_repo/src/lib.rs

@@ -4,11 +4,11 @@ mod downloader;
 mod routes;
 
 use crate::downloader::*;
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use futures::future::join_all;
 use kurisu_api::{
+    v2::{Infos, Kara, KaraList},
     SHA256,
-    v2::{Infos, KaraList},
 };
 use lektor_nkdb::{DatabaseStorage, UpdateHandler};
 use lektor_nkdb::{KId, RemoteKId};
@@ -76,17 +76,17 @@ impl Repo {
                     vec![]
                 }
             }
-            .into_iter()
+            .into_iter();
+
+        let updated_list = updated_list
             .map(|kara| async {
-                let remote_id = kara.id;
-                let hash = kara.file_hash;
-                let filesize = kara.filesize;
+                let Kara{id, file_hash, filesize, ..} = kara;
                 log::trace!("got kara from {}: {kara:#?}", repo_name);
                 if let Some((kid, rkid)) = handler.add_kara_v2(repo_name, kara).await {
                     log::trace!("got from {repo_name}: {kid} / {rkid} is new (and non-virtual) or had a file update");
-                    Some((kid, rkid, hash, filesize))
+                    Some((kid, rkid, file_hash, filesize))
                 } else {
-                    log::trace!("got from {repo_name}: kara {remote_id} is the same or only metadata got changed");
+                    log::trace!("got from {repo_name}: kara {id} is the same or only metadata got changed");
                     None
                 }
             });