From 0ba551e2dc6b0bc9f9152f74a8139de3eac3bf96 Mon Sep 17 00:00:00 2001
From: Falko Zurell <falko.zurell@here.com>
Date: Tue, 11 Mar 2025 08:38:46 +0100
Subject: [PATCH] added some more debugging output

---
 src/image_description.rs | 10 ++-----
 src/pixelfed.rs          | 61 +++++++++++++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/src/image_description.rs b/src/image_description.rs
index e5e418a..98e19cf 100644
--- a/src/image_description.rs
+++ b/src/image_description.rs
@@ -165,17 +165,11 @@ pub fn get_description_from_ollama(
 
     let response = match response {
         Ok(response) => {
-            if response.status().is_success() {
-                info!("success!");
-            } else if response.status().is_server_error() {
-                error!("server error!");
-            } else {
-                error!("Something else happened. Status: {:?}", response.status());
-            }
+            info!("success!");
             response
         }
         Err(e) => {
-            error!("Failed to send request: {}", e);
+            error!("Failed to send request to OLLAMA: {}", e);
             return Err(Box::from(e));
         }
     };
diff --git a/src/pixelfed.rs b/src/pixelfed.rs
index 72dc70a..7de546c 100644
--- a/src/pixelfed.rs
+++ b/src/pixelfed.rs
@@ -41,7 +41,7 @@ pub fn bulk_upload_images(
     };
 
     let client = match reqwest::blocking::ClientBuilder::new()
-        .connect_timeout(Duration::new(30, 0))
+        .connect_timeout(Duration::new(60, 0))
         .timeout(Duration::new(300, 0))
         .connection_verbose(true)
         .build()
@@ -54,11 +54,16 @@ pub fn bulk_upload_images(
     };
     // construct the full URL for the Pixelfed Upload
     let url = format!("{}/api/v1/media", pxl_config.pixelfed_url.clone());
-
+    let mut image_counter: i8 = 0;
     // Iterate over all the images we were given
     for image_path in images {
         let description: String;
-        debug!("Handling image {}", &image_path.to_string());
+        image_counter = image_counter + 1;
+        debug!(
+            "Handling image #{} at {}",
+            &image_counter,
+            &image_path.to_string()
+        );
         // get image description depending on the caption_mode
         match caption_mode {
             super::Mode::ChatGPT => {
@@ -136,7 +141,11 @@ pub fn bulk_upload_images(
             }
         }
 
-        println!("Uploading image {} to Pixelfed", &image_path.to_string());
+        println!(
+            "Uploading image #{} from {} to Pixelfed",
+            &image_counter,
+            &image_path.to_string()
+        );
 
         // construct the upload form for Pixelfed Upload of a single image including image description
         let form = match reqwest::blocking::multipart::Form::new()
@@ -145,7 +154,7 @@ pub fn bulk_upload_images(
         {
             Ok(f) => f,
             Err(e) => {
-                error!("Failed to construct multipart form: {}", e);
+                error!("Failed to construct multipart form for Pixelfed: {}", e);
                 return Err(Box::from(e));
             }
         };
@@ -159,7 +168,7 @@ pub fn bulk_upload_images(
         {
             Ok(result) => result,
             Err(e) => {
-                error!("Failed to send request: {}", e);
+                error!("Failed to send request to Pixelfed: {}", e);
                 return Err(Box::from(e));
             }
         };
@@ -169,12 +178,25 @@ pub fn bulk_upload_images(
         // Check if the response status indicates success
         if status.is_success() {
             // Parse the success response
-            let success_response: serde_json::Value = res.json()?;
-            let image_id = success_response["id"].clone();
+            let success_response: serde_json::Value = match res.json() {
+                Ok(response_json) => response_json,
+                Err(e) => {
+                    error!(
+                        "Could not decode the Pixelfed response JSON: {}",
+                        e.to_string()
+                    );
+                    return Err(Box::from(e));
+                }
+            };
+
+            let image_id: serde_json::Value = success_response["id"].clone();
             media_ids.push(image_id);
         } else {
             let error_text = res.text()?;
-            return Err(Box::from(format!("Failed to upload image: {}", error_text)));
+            return Err(Box::from(format!(
+                "Failed to upload image to Pixelfed: {}",
+                error_text
+            )));
         }
     }
 
@@ -195,7 +217,7 @@ pub fn bulk_upload_images(
             "alt_texts": media_descriptions,
             "visibility": pxl_config.pixelfed_visibility.to_string(),
         });
-        info!("Body: \n{}", &body.to_string());
+        debug!("Body: \n{}", &body.to_string());
         info!("MediaIDs: {}", &media_ids.len());
         info!("Alt_texts: {}", &media_descriptions.len());
         println!(
@@ -212,17 +234,22 @@ pub fn bulk_upload_images(
         match res {
             Ok(response) => {
                 if response.status().is_success() {
-                    info!("Post created successfully!");
+                    info!("Post on Pixelfed created successfully!");
                 } else {
-                    error!("Failed to create post. Status: {:?}", response.status());
-                    let error_message = response
-                        .text()
-                        .unwrap_or_else(|_| "Unknown error".to_string());
-                    error!("Error message: {}", error_message);
+                    error!(
+                        "Failed to create post on Pixelfed. Status: {:?}",
+                        response
+                            .text()
+                            .unwrap_or_else(|_| "Unknown error from Pixelfed".to_string())
+                    )
                 }
             }
             Err(e) => {
-                error!("Failed to send request: {}", e);
+                error!("Failed to send request to Pixelfed: {}", e);
+                return Err(Box::from(format!(
+                    "Failed to upload image to Pixelfed: {}",
+                    e
+                )));
             }
         }
     }