Add changelog, and supporting several UIs with formats [ci] [cd]

Author: MrDanilus

.gitignore

@@ -1,5 +1,3 @@
-/.vscode
-/target
-
-**/*.ai
-/src/assets/colors.png
+/.*
+!/.github
+/target

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/)
+
+## [1.2.0] - 2025-06-23
+
+Adding support for ForgeUI and Automatic1111 with different image formats
+
+### Added
+
+- Support UI - ForgeUI
+- Support UI - Automatic1111
+- Table of supported UIs and image formats
+
+### Changed
+
+### Fixed
+
+Updates before will be describing here soon...

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
-name = "sd-extract-output"
-version = "1.1.1"
+name = "di-extract-output"
+version = "1.2.0"
 edition = "2024"
 build = "build.rs"
 
@@ -28,9 +28,9 @@ panic = "abort"
 
 [package.metadata.packager]
 before-packaging-command = "cargo build --release"
-product-name = "SD E/O"
-identifier = "com.airfish.sd-extract-output"
+product-name = "DI E/O"
+identifier = "com.airfish.di-extract-output"
 icons = ["icon.png", "icon.ico"]
 
 [package.metadata.winresource]
-ProductName = "SD E/O"
+ProductName = "DI E/O"

Cargo.toml

@@ -1,5 +1,24 @@
-# TODO
+# DiffusionImage Export/Output
 
-- [ ] Write README
+## 🧰 TODO
 
-Readme soon
+- [ ] Update README
+- [ ] Add support of ComfyUI
+
+## ✅/❌ Support of UIs and image formats
+
+| UI            | PNG | JP(E)G | WebP | AVIF | HEIF | BMP | TIF(F) |
+| :------------ | :-: | :----: | :--: | :--: | :--: | :-: | :----: |
+| Forge UI      | ✅ |   ✅  |  ✅  |  ✅  |  ➖  | ➖ |  ➖   |
+| AUTOMATIC1111 | ✅ |   ✅  |  ✅  |  ✅  |  ➖  | ➖ |  ➖   |
+| ComfyUI       | 🛠️ |  🛠️*  |  🛠️* |  ✖️* |  ✖️* | ➖*|  ➖*  |
+| EasyDiffusion | ➖ |  ➖   |  ➖  |  ✖️  |  ✖️  | ✖️ |  ✖️   |
+
+- ✅ - Supported
+- 🛠️ - In development
+- ❔ - Not tested
+- ❌ - No support
+- ➖ - UI don't save params
+- ✖️ - UI don't support
+
+\*With using [Save Image Extended for ComfyUI](https://github.com/audioscavenger/save-image-extended-comfyui)

README.md

@@ -1,12 +1,18 @@
 use std::{collections::HashMap, path::PathBuf};
 use copypasta::{ClipboardContext, ClipboardProvider};
 
-use crate::core::{civitai::get_by_hash, exif::parse_image, params::Params};
+use crate::core::{civitai::get_by_hash, file::check_image, params::Params, parse::{self, raw}};
 
 pub async fn save_to_clipboard(files: Vec<PathBuf>, civitai_value: bool) -> bool{
     let mut params: Vec<(PathBuf, Option<Params>)> = files.iter()
-        .map(|file| match parse_image(&file){
-            Ok(res) => (file.clone(), Some(res)),
+        .map(|file| match raw::parse(
+            check_image(&file).unwrap().extensions_str().get(0).unwrap(), 
+            &file
+        ){
+            Ok(params) => match parse::extract(params){
+                Ok(res) => (file.clone(), Some(res)),
+                Err(_) => (file.clone(), None)
+            },
             Err(_) => (file.clone(), None)
         }).collect();
 

src/core/clipboard.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 use freya::{events::FileData, prelude::{Event, Readable, Signal, Writable}};
-use image::ImageReader;
+use image::{ImageFormat, ImageReader};
 use walkdir::WalkDir;
 
 use crate::ui::app::DnDStatus;
@@ -16,15 +16,15 @@ pub fn check_file(files: Signal<Vec<PathBuf>>, file: Event<FileData>) -> DnDStat
         .into_iter().filter_map(|e| e.ok()){
             let path = entry.path().to_path_buf();
             match check_image(&path){
-                true => {
+                Some(_) => {
                     if files.read().contains(&path){
                         status = DnDStatus::Exists;
                     } else{
                         status = DnDStatus::Ok;
                         break;
                     }
                 },
-                false => continue
+                None => continue
             }
         }
 
@@ -34,25 +34,25 @@ pub fn check_file(files: Signal<Vec<PathBuf>>, file: Event<FileData>) -> DnDStat
             return DnDStatus::Exists;
         }
         match check_image(path){
-            true => DnDStatus::Ok,
-            false => DnDStatus::Wrong
+            Some(_) => DnDStatus::Ok,
+            None => DnDStatus::Wrong
         }
     }
 }
 
-fn check_image(path: &PathBuf) -> bool{
+pub fn check_image(path: &PathBuf) -> Option<ImageFormat>{
     return match ImageReader::open(path){
         Ok(img) => match img.with_guessed_format(){
             Ok(img) => {
                 if img.format().is_none(){
-                    false
+                    None
                 } else {
-                    true
+                    Some(img.format().unwrap())
                 }
             },
-            Err(_) => false
+            Err(_) => None
         },
-        Err(_) => false
+        Err(_) => None
     }
 }
 
@@ -76,12 +76,12 @@ pub fn write(
                 .into_iter().filter_map(|e| e.ok()){
                     let path = entry.path().to_path_buf();
                     match check_image(&path){
-                        true => {
+                        Some(_) => {
                             if !files.read().contains(&path){
                                 files.write().push(path.clone());
                             }
                         },
-                        false => continue
+                        None => continue
                     }
                 }
             } else{

src/core/file.rs

@@ -1,7 +1,7 @@
 pub mod config;
 
 pub mod file;
-pub mod exif;
+pub mod parse;
 pub mod params;
 
 pub mod civitai;

src/core/mod.rs

@@ -1,20 +1,9 @@
-use std::path::PathBuf;
-use std::fs;
-
 use crate::core::{civitai::get_all, params::Params};
 
-pub fn parse_image(path: &PathBuf) -> Result<Params, String>{
-    let mut res = Params::default();
-    let file = fs::read(path).map_err(|e| format!("Ошибка чтения файла: {e}"))?;
+pub mod raw;
 
-    let file_str = String::from_utf8_lossy(&file);
-    let raw_params = file_str.split("parameters").nth(1)
-        .ok_or(format!("Не удалось найти данные"))?;
-    let raw_params = raw_params.split("IDAT").nth(0)
-        .ok_or(format!("Не удалось найти данные"))?;
-    let params = String::from_utf8(clean_text_bytes(raw_params.as_bytes()))
-        .map_err(|e| format!("Ошибка чистки байтов: {e}"))?;
-    
+pub fn extract(params: String) -> Result<Params, String>{
+    let mut res = Params::default();
     // Get prompts
     let params_clone = params.clone();
     let prompts_split = params_clone.split("Steps:").nth(0)

src/core/exif.rs renamed to src/core/parse/mod.rs

@@ -0,0 +1,24 @@
+use std::{fs, path::PathBuf};
+
+use crate::core::parse::clean_text_bytes;
+
+pub fn parse(format: &str, path: &PathBuf) -> Result<String, String>{
+    let split = match format{
+        "jpg" | "jpeg" => ("UNICODE", ""),
+        "avif" => ("UNICODE", ""),
+        "png" => ("parameters", "IDAT"),
+        _ => ("UNICODE", "NO SECOND SPLIT CHARACTER !#@")
+    };
+
+    let file = fs::read(path).map_err(|e| format!("Ошибка чтения файла: {e}"))?;
+
+    let file_str = String::from_utf8_lossy(&file);
+    let raw_params = file_str.split(split.0).nth(1)
+        .ok_or(format!("Не удалось найти данные"))?;
+    let raw_params = raw_params.split(split.1).nth(0)
+        .ok_or(format!("Не удалось найти данные"))?;
+    let params = String::from_utf8(clean_text_bytes(raw_params.as_bytes()))
+        .map_err(|e| format!("Ошибка чистки байтов: {e}"))?;
+
+    Ok(params)
+}