Update main.rs to use new attachment iface

The Attachment struct exists, but this makes it glaringly obvious that
I've made a bad interface. The create_release_attachment should only
accept one file at a time and the loop over all files should happen in
main.rs

I've changed the signature, removed the loops, and wired in the newer
error handling routines. Needs fixing at call sites.

src/api/release.rs

@@ -1,9 +1,7 @@
-use serde::{Deserialize, Serialize};
 
 use crate::{
     ApiError, Result,
     structs::{
-        self,
         release::{CreateReleaseOption, Release},
     },
 };
@@ -23,23 +21,21 @@ pub async fn list_releases(
     let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/");
     let req = client.get(request_url).send().await;
     let response = req.map_err(|reqwest_err| crate::Error::WrappedReqwestErr(reqwest_err))?;
-    let release_list = response
+    if response.status().is_success() {
-        .json::<Vec<Release>>()
+        let release_list = response
-        .await
+            .json::<Vec<Release>>()
-        .map_err(|reqwest_err| {
+            .await
-            // Convert reqwest errors to my own
+            .map_err(|reqwest_err| {
-            // TODO: Create all error variants (see lib.rs)
+                // Convert reqwest errors to my own
-            crate::Error::WrappedReqwestErr(reqwest_err)
+                // TODO: Create all error variants (see lib.rs)
-        })?;
+                crate::Error::WrappedReqwestErr(reqwest_err)
-    return Ok(release_list);
+            })?;
-}
+        return Ok(release_list);
-
+    } else if response.status().is_client_error() {
-#[derive(Debug, Deserialize, Serialize)]
+        let mesg = crate::decode_client_error(response).await?;
-#[serde(untagged)]
+        return Err(crate::Error::ApiErrorMessage(mesg));
-enum CreateResult {
+    }
-    Success(structs::release::Release),
+    panic!("Reached end of list_releases without matching a return pathway.");
-    ErrWithMessage(ApiError),
-    Empty,
 }
 
 pub async fn create_release(
@@ -49,27 +45,23 @@ pub async fn create_release(
     submission: CreateReleaseOption,
 ) -> Result<Release> {
     let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases");
-    let req = client
+    let response = client
         .post(request_url)
         .json(&submission)
         .send()
         .await
         .map_err(|e| crate::Error::from(e))?;
-    let new_release = req
+    if response.status().is_success() {
-        .json::<CreateResult>()
+        let new_release = response
-        .await
+            .json::<Release>()
-        .map_err(|e| crate::Error::from(e))?;
+            .await
-    match new_release {
+            .map_err(|e| crate::Error::from(e))?;
-        CreateResult::Success(release) => Ok(release),
+        return Ok(new_release);
-        CreateResult::ErrWithMessage(api_error) => {
+    } else if response.status().is_client_error() {
-            if api_error.message == "token is required" {
+        let mesg = crate::decode_client_error(response).await?;
-                Err(crate::Error::MissingAuthToken)
+        return Err(crate::Error::ApiErrorMessage(mesg))
-            } else {
-                Err(crate::Error::ApiErrorMessage(api_error))
-            }
-        }
-        CreateResult::Empty => panic!("How can we have 200 OK and no release info? No. Crash"),
     }
+    panic!("Reached end of create_release without matching a return path");
 }
 pub fn edit_release(id: u64) -> Result<Release> {
     todo!();

src/api/release_attachment.rs

@@ -1,5 +1,7 @@
 use std::fs;
 
+use crate::structs::Attachment;
+
 pub fn check_release_match_repo() {}
 pub fn get_release_attachment() {}
 pub fn list_release_attachments() {
@@ -10,38 +12,44 @@ pub async fn create_release_attachment(
     gitea_url: &str,
     repo: &str,
     release_id: usize,
-    files: Vec<String>,
+    file: String,
-) -> crate::Result<()> {
+) -> crate::Result<Attachment> {
     let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/{release_id}/assets");
 
-    // Ensure all files exists before starting the uploads
+    match fs::exists(&file) {
-    for file in &files {
+        Ok(true) => (),
-        match fs::exists(file) {
+        Ok(false) => return Err(crate::Error::NoSuchFile),
-            Ok(true) => continue,
+        Err(e) => {
-            Ok(false) => return Err(crate::Error::NoSuchFile),
+            eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
-            Err(e) => {
+            panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)");
-                eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
+        },
-                panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)");
-            },
-        }
     }
 
-    for file in files {
+    println!("Uploading file {}", &file);
-        println!("Uploading file {}", &file);
+    let data = reqwest::multipart::Part::stream(fs::read(&file).unwrap())
-        let data = reqwest::multipart::Part::stream(fs::read(&file).unwrap())
+        .file_name("attachment")
-            .file_name("attachment")
+        .mime_str("text/plain")?;
-            .mime_str("text/plain")?;
 
-        let form = reqwest::multipart::Form::new().part("attachment", data);
+    let form = reqwest::multipart::Form::new().part("attachment", data);
 
-        let request = client
+    let response = client
-            .post(&request_url)
+        .post(&request_url)
-            .multipart(form)
+        .multipart(form)
-            .query(&[("name", file.split("/").last())])
+        .query(&[("name", file.split("/").last())])
-            .send()
+        .send()
-            .await?;
+        .await?;
+    if response.status().is_success() {
+        // TODO: create a struct Attachment and return it to the caller.
+        let attachment_desc = response
+            .json::<Attachment>()
+            .await
+            .map_err(|e| crate::Error::from(e))?;
+        return Ok(attachment_desc);
+    } else if response.status().is_client_error() {
+        let mesg = crate::decode_client_error(response).await?;
+        return Err(crate::Error::ApiErrorMessage(mesg));
     }
-    Ok(())
+    panic!("Reached end of release_attachment without matching a return path");
 }
 pub fn edit_release_attachment() {}
 pub fn delete_release_attachment() {}
@@ -103,11 +111,12 @@ mod tests {
         .await;
         let api_err = api_result.expect_err("Received Ok(()) after uploading non-existent file. That's nonsense, the API Function is wrong.");
         match api_err {
-            crate::Error::Placeholder => panic!("Received dummy response from the API function. Finish implementing it, stupid"),
+            crate::Error::Placeholder=>panic!("Received dummy response from the API function. Finish implementing it, stupid"),
-            crate::Error::WrappedReqwestErr(error) => panic!("Received a reqwest::Error from the API function: {error}"),
+            crate::Error::WrappedReqwestErr(error)=>panic!("Received a reqwest::Error from the API function: {error}"),
-            crate::Error::MissingAuthToken => unreachable!("Missing auth token... in a unit test that already panics without the auth token..."),
+            crate::Error::MissingAuthToken=>unreachable!("Missing auth token... in a unit test that already panics without the auth token..."),
-            crate::Error::NoSuchFile => (), // test passes
+            crate::Error::NoSuchFile=>(),
-            crate::Error::ApiErrorMessage(api_error) => panic!("Received an error message from the API: {api_error:?}"),
+            crate::Error::ApiErrorMessage(api_error)=>panic!("Received an error message from the API: {api_error:?}"),
+            crate::Error::NoSuchRelease => todo!(),
         }
     }
 

src/lib.rs

@@ -10,6 +10,15 @@ pub struct ApiError {
     url: String,
 }
 
+pub (crate) async fn decode_client_error(response: reqwest::Response) -> Result<ApiError> {
+    response
+        .json::<ApiError>()
+        .await
+        .map_err(|reqwest_err| {
+            crate::Error::WrappedReqwestErr(reqwest_err)
+        })
+}
+
 #[derive(Debug)]
 pub enum Error {
     Placeholder, // TODO: Enumerate error modes

src/main.rs

@@ -1,3 +1,5 @@
+use std::fs;
+
 use gt_tool::cli::Args;
 use gt_tool::structs::release::{CreateReleaseOption, Release};
 
@@ -78,14 +80,26 @@ async fn main() -> Result<(), gt_tool::Error> {
                 gt_tool::api::release::list_releases(&client, &args.gitea_url, &args.repo).await?;
 
             if let Some(release) = match_release_by_tag(&tag_name, release_candidates) {
-                gt_tool::api::release_attachment::create_release_attachment(
+                for file in &files {
-                    &client,
+                    match fs::exists(file) {
-                    &args.gitea_url,
+                        Ok(true) => continue,
-                    &args.repo,
+                        Ok(false) => return Err(gt_tool::Error::NoSuchFile),
-                    release.id,
+                        Err(e) => {
-                    files,
+                            eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
-                )
+                            panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)");
-                .await?;
+                        },
+                    }
+                }
+                for file in files {
+                    let _attach_desc = gt_tool::api::release_attachment::create_release_attachment(
+                        &client,
+                        &args.gitea_url,
+                        &args.repo,
+                        release.id,
+                        file,
+                    )
+                    .await?;
+                }
             } else {
                 println!("ERR: Couldn't find a release matching the tag \"{tag_name}\".");
                 return Err(gt_tool::Error::NoSuchRelease);

src/structs/mod.rs

@@ -1,2 +1,15 @@
+use serde::{Deserialize, Serialize};
+
 pub mod release;
 pub mod repo;
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Attachment {
+    id: usize,
+    name: String,
+    size: i64,
+    download_count: i64,
+    created: String, // TODO: Date-time struct
+    uuid: String,
+    download_url: String,
+}