cleanup for packaging

package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-RELEASE_VERSION="1.0.3"
+RELEASE_VERSION="1.1.0"
 
 PLATFORM=$(rustc -vV | grep host | cut -d ' ' -f2)
 

src/image_description.rs

@@ -1,5 +1,5 @@
 use base64::{engine::general_purpose::STANDARD, Engine as _};
-use log::{debug, error, info, log_enabled, Level};
+use log::{debug, error, info};
 use serde::Deserialize;
 use serde::Serialize;
 use serde_json::json;

src/main.rs

@@ -1,16 +1,15 @@
-use std::fs;
+use clap::{Parser, ValueEnum};
+use log::info;
 use serde::Deserialize;
 use serde_json::{json, Value};
 use std::error::Error;
+use std::fs;
 use std::fs::File;
 use std::io::BufReader;
-use clap::{Parser, ValueEnum};
 use std::path::PathBuf;
-use log::{debug, error, log_enabled, info, Level};
 
-
-mod pixelfed;
 pub mod image_description;
+mod pixelfed;
 
 #[derive(Parser)]
 #[command(name = "Pixelfed Image Bulk Uploader")]
@@ -18,7 +17,7 @@ pub mod image_description;
 #[command(about = "Bulk uploads images to Pixelfed with image descriptions", long_about = None)]
 #[command(version, about, long_about = None)]
 struct Cli {
-    /// Image description mode 
+    /// Image description mode
     #[arg(short, long, default_value = "file")]
     mode: Mode,
     /// The title of the posting
@@ -30,12 +29,11 @@ struct Cli {
     /// Sets a custom config file
     #[arg(short, long, value_name = "FILE")]
     config: Option<String>,
-    
+
     #[arg(short, long, value_name = "private")]
     visibility: Option<String>,
 }
 
-
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
 enum Mode {
     /// Use ChatGTP
@@ -46,12 +44,11 @@ enum Mode {
     Local,
 }
 
-
 #[derive(Debug, Deserialize)]
 struct Config {
     pixelfed_url: String,
     pixelfed_access_token: String,
-    pixelfed_visibility: String,  // Should be "unlisted"
+    pixelfed_visibility: String, // Should be "unlisted"
     pixelfed_default_text: String,
     pixelfed_batch_size: usize,
     openai_api_key: String,
@@ -61,25 +58,22 @@ struct Config {
     ollama_api_url: String,
     ollama_model: String,
     caption_extension: String,
-    prompt:  String,
-    
+    prompt: String,
 }
 
 fn load_config(config_file: String) -> Result<Config, Box<dyn Error>> {
     //let config_str = fs::read_to_string("config.json")?;
     // Open the file in read-only mode with buffer.
-    
+
     let file = File::open(PathBuf::from(config_file))?;
     let reader = BufReader::new(file);
 
     // Read the JSON contents of the file as an instance of `User`.
 
-
     let config: Config = serde_json::from_reader(reader)?;
     Ok(config)
 }
 
-
 // get all the JPEG files from the give directory
 fn get_jpeg_files(directory: &str) -> Vec<String> {
     let mut images = Vec::new();
@@ -96,58 +90,62 @@ fn get_jpeg_files(directory: &str) -> Vec<String> {
     images
 }
 
-
-
- fn main() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<(), Box<dyn Error>> {
     env_logger::init();
 
     let args = Cli::parse();
-    
+
     //if args.len() < 2 || args.len() > 3 {
     //    eprintln!("Usage: {} <directory> [--title <title>]", args[0]);
     //    eprintln!("Usage: {} <directory> -ready [--title <title>]", args[0]);
     //    std::process::exit(1);
-    //} 
+    //}
+
+    let title = args.title;
+    let my_config: String;
 
-    let  title = args.title;
-    let mut my_config: String;
-    
-    
-    
     match args.config {
-        Some(configstring)  => { my_config = configstring}, 
-        None => {my_config = "config.json".to_string()},
-        
+        Some(configstring) => my_config = configstring,
+        None => my_config = "config.json".to_string(),
     }
     info!("effective config file: {}", &my_config);
 
-    
     let mut config = load_config(my_config).unwrap();
-    
-     info!("Config OK?: " );
-    
+
+    info!("Config OK?: ");
+
     // Overwrite config values with command line arguments
     match args.visibility {
-        Some(visibility)  => { config.pixelfed_visibility = visibility}, 
+        Some(visibility) => config.pixelfed_visibility = visibility,
         None => {}
     }
-    
-    
-    
-    
+
     // get list of all the images in the gives path
     let images = get_jpeg_files(&args.image_path);
     info!("Images empty? {}", &images.is_empty().to_string());
-    
+
     // knowing now the total number of images, calculate the number of batches
-    let total_batches = (images.len() + config.pixelfed_batch_size - 1) / config.pixelfed_batch_size;
-    println!("Found a total of {} images to upload. Will take {} batches", &images.len(), &total_batches);
-    
-    // now iterate over all images in batches of batch_size 
+    let total_batches =
+        (images.len() + config.pixelfed_batch_size - 1) / config.pixelfed_batch_size;
+    println!(
+        "Found a total of {} images to upload. Will take {} batches",
+        &images.len(),
+        &total_batches
+    );
+
+    // now iterate over all images in batches of batch_size
     for (i, chunk) in images.chunks(config.pixelfed_batch_size).enumerate() {
         info!("{}", i.clone());
-        let _ =pixelfed::bulk_upload_images(&config, chunk, i + 1, total_batches, &title, &args.mode);
+        match pixelfed::bulk_upload_images(&config, chunk, i + 1, total_batches, &title, &args.mode)
+        {
+            Ok(_) => {
+                println!("Upload of batch {} suceeded", &i + 1);
+            }
+            Err(e) => {
+                println!("Upload of batch {} failed: {}", &i + 1, e.to_string());
+            }
+        };
     }
-    println!("All images uploaded successfully.");
+    // println!("All images uploaded successfully.");
     Ok(())
 }

src/pixelfed.rs

@@ -1,7 +1,5 @@
-use log::{debug, error, info, log_enabled, Level};
+use log::{debug, error, info};
 use reqwest::{self};
-use serde::{Deserialize, Serialize};
-use serde_json::json;
 
 use std::error::Error;
 use std::time::Duration;
@@ -11,20 +9,6 @@ struct PixelfedConfig {
     pixelfed_access_token: String,
     pixelfed_visibility: String, // Should be "unlisted"
     pixelfed_default_text: String,
-    pixelfed_batch_size: usize,
-}
-
-// Example response structure - customize to your API's response format
-#[derive(Deserialize, Debug)]
-struct SuccessResponse {
-    success: bool,
-    data: ResponseData,
-}
-
-#[derive(Deserialize, Debug)]
-struct ResponseData {
-    id: String,
-    result: String,
 }
 
 fn format_post_text(template: &str, batch_num: usize, total_batches: usize, title: &str) -> String {
@@ -54,7 +38,6 @@ pub fn bulk_upload_images(
         pixelfed_access_token: config.pixelfed_access_token.clone(),
         pixelfed_visibility: config.pixelfed_visibility.clone(),
         pixelfed_default_text: config.pixelfed_default_text.clone(),
-        pixelfed_batch_size: config.pixelfed_batch_size.clone(),
     };
 
     let client = match reqwest::blocking::ClientBuilder::new()