curseforge works now (also fix a caching bug)

Cargo.toml

@@ -49,6 +49,7 @@ roxmltree = "0.19"
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serde_repr = "0.1"
 sha1 = "0.10"
 sha2 = "0.10"
 tempfile = "3.9"

src/api/app/http.rs

@@ -1,6 +1,6 @@
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use anyhow::Result;
+use anyhow::{Context, Result};
 use reqwest::{IntoUrl, Response};
 use serde::de::DeserializeOwned;
 use tokio::time::sleep;
@@ -13,6 +13,8 @@ impl App {
         url: impl IntoUrl,
         f: F,
     ) -> Result<Response> {
+        println!("HTTP GET {}", url.as_str());
+
         let req = self.http_client.get(url.as_str());
 
         let req = f(req);
@@ -50,12 +52,15 @@ impl App {
     }
 
     pub async fn http_get_json<T: DeserializeOwned>(&self, url: impl IntoUrl) -> Result<T> {
-        let res = self.http_get(url).await?;
-        Ok(res.json().await?)
+        self.http_get_json_with(url, |x| x).await
     }
 
     pub async fn http_get_json_with<T: DeserializeOwned, F: FnOnce(reqwest::RequestBuilder) -> reqwest::RequestBuilder>(&self, url: impl IntoUrl, f: F) -> Result<T> {
         let res = self.http_get_with(url, f).await?;
-        Ok(res.json().await?)
+
+        let full = res.bytes().await?;
+
+        Ok(serde_json::from_slice(&full)
+            .with_context(|| format!("JSON parsing error: {}", String::from_utf8_lossy(&full)))?)
     }
 }

src/api/sources/curseforge/models.rs

@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use serde_repr::{Deserialize_repr, Serialize_repr};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Data<T> {
@@ -54,7 +55,8 @@ pub struct CurseforgeDependency {
     pub relation_type: CurseforgeDependencyType,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize_repr, Deserialize_repr, Clone)]
+#[repr(u8)]
 pub enum CurseforgeDependencyType {
     EmbeddedLibrary = 1,
     OptionalDependency = 2,
@@ -70,13 +72,15 @@ pub struct CurseforgeFileHash {
     pub algo: CurseforgeHashAlgo,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize_repr, Deserialize_repr, Clone)]
+#[repr(u8)]
 pub enum CurseforgeHashAlgo {
     Sha1 = 1,
     Md5 = 2,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize_repr, Deserialize_repr, Clone)]
+#[repr(u8)]
 pub enum FileReleaseType {
     Release = 1,
     Beta = 2,

src/api/sources/modrinth/mod.rs

@@ -56,10 +56,9 @@ impl<'a> ModrinthAPI<'a> {
 
         let res: ModrinthProjectCheckResponse = self.fetch_api(format!("project/{slug}/check")).await?;
 
-        if let Some(mut ids) = store {
-            ids.insert(slug.to_owned(), res.id.clone());
-            self.0.cache.try_write_json(path, &ids)?;
-        }
+        let mut ids = store.unwrap_or_default();
+        ids.insert(slug.to_owned(), res.id.clone());
+        self.0.cache.try_write_json(path, &ids)?;
 
         Ok(res.id)
     }