Merge image uploading from kernel

kernelkind (8):
      upload media button
      get file binary
      import base64
      notedeck_columns: use sha2 & base64
      use rfd for desktop file selection
      add utils for uploading media
      draft fields for media upload feat
      ui: user can upload images

Author: jb55

Cargo.lock

@@ -10,6 +10,7 @@ members = [
 
 [workspace.dependencies]
 base32 = "0.4.0"
+base64 = "0.22.1"
 bech32 = { version = "0.11", default-features = false }
 bitflags = "2.5.0"
 dirs = "5.0.1"

Cargo.toml

@@ -43,6 +43,11 @@ tracing-subscriber = { workspace = true }
 url = { workspace = true }
 urlencoding = { workspace = true }
 uuid = { workspace = true }
+sha2 = { workspace = true }
+base64 = { workspace = true }
+
+[target.'cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))'.dependencies]
+rfd = "0.15"
 
 [dev-dependencies]
 tempfile = { workspace = true }

assets/icons/media_upload_dark_4x.png

@@ -1,9 +1,14 @@
-use crate::ui::note::PostType;
+use poll_promise::Promise;
+
+use crate::{media_upload::Nip94Event, ui::note::PostType, Error};
 use std::collections::HashMap;
 
 #[derive(Default)]
 pub struct Draft {
     pub buffer: String,
+    pub uploaded_media: Vec<Nip94Event>, // media uploads to include
+    pub uploading_media: Vec<Promise<Result<Nip94Event, Error>>>, // promises that aren't ready yet
+    pub upload_errors: Vec<String>,      // media upload errors to show the user
 }
 
 #[derive(Default)]
@@ -42,5 +47,8 @@ impl Draft {
 
     pub fn clear(&mut self) {
         self.buffer = "".to_string();
+        self.upload_errors = Vec::new();
+        self.uploaded_media = Vec::new();
+        self.uploading_media = Vec::new();
     }
 }

crates/notedeck_columns/Cargo.toml

@@ -4,6 +4,7 @@ use notedeck::ImageCache;
 use notedeck::Result;
 use poll_promise::Promise;
 use std::path;
+use std::path::PathBuf;
 use tokio::fs;
 
 //pub type ImageCacheKey = String;
@@ -198,6 +199,10 @@ fn fetch_img_from_disk(
     })
 }
 
+pub fn fetch_binary_from_disk(path: PathBuf) -> Result<Vec<u8>> {
+    std::fs::read(path).map_err(|e| notedeck::Error::Generic(e.to_string()))
+}
+
 /// Controls type-specific handling
 #[derive(Debug, Clone, Copy)]
 pub enum ImageType {

crates/notedeck_columns/src/draft.rs

@@ -18,6 +18,7 @@ mod frame_history;
 mod images;
 mod key_parsing;
 pub mod login_manager;
+mod media_upload;
 mod multi_subscriber;
 mod nav;
 mod post;