notifications

Tricked-dev · Tricked-dev · commit 06314c78338b · 2023-06-27T20:17:09.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ascella"
-version = "0.11.0"
+version = "0.12.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -51,6 +51,7 @@ hyper = { version = "0.14.26", features = ["http1", "server"] }
 oxipng = { version = "8.0.0", default-features = false, features = [
     "parallel"
 ] }
+notify-rust = { version = "4.8.0", features = ["images"] }
 
 [target.'cfg(not(linux))'.dependencies]
 clipboard2 = "0"
diff --git a/src/ascella_config.rs b/src/ascella_config.rs
@@ -22,6 +22,7 @@ pub struct AscellaConfig {
     pub optimize_png: bool,
     pub optimize_timeout: u64,
     pub console_logging: bool,
+    pub notifications_enabled: bool,
 }
 
 impl AscellaConfig {
diff --git a/src/cli.rs b/src/cli.rs
@@ -20,5 +20,5 @@ pub enum Commands {
     /// Screenshot a screen
     Screen { delay: Option<u64> },
     /// Upload a file
-    Upload { file: PathBuf }
+    Upload { file: PathBuf },
 }
diff --git a/src/main.rs b/src/main.rs
@@ -126,6 +126,7 @@ fn main() -> Result<()> {
         .set_default("optimize_png", false)?
         .set_default("optimize_timeout", 100)?
         .set_default("console_logging", false)?
+        .set_default("notifications_enabled", true)?
         .set_default(
             "s_type",
             toml::from_str::<config::Value>(&toml::to_string(&ScreenshotType::Flameshot)?)?,
diff --git a/src/request_handler.rs b/src/request_handler.rs
@@ -8,7 +8,9 @@ use reqwest::{
 use tokio::{process::Command, sync::mpsc::UnboundedSender};
 use tracing::info;
 
-use crate::{ascella_config::AscellaConfig, clipboard::copy, Request, RequestResponse, UploadResponse};
+use crate::{
+    ascella_config::AscellaConfig, clipboard::copy, utils::ascella_notif, Request, RequestResponse, UploadResponse,
+};
 
 pub async fn handle_event(
     data: Request,
@@ -157,6 +159,15 @@ pub async fn upload_file(
         println!("Image uploaded {}", response.url);
         println!("Delete URL: {}", response.delete);
     }
+    if config.notifications_enabled {
+        let mut notif = &mut ascella_notif();
+        notif = notif.body("Upload success, url copied to clipboard!");
+        #[cfg(all(unix, not(target_os = "macos")))]
+        {
+            notif = notif.image_path(&path.to_string_lossy());
+        };
+        notif.show()?;
+    }
     Ok(response)
 }
 
diff --git a/src/screens/settings.rs b/src/screens/settings.rs
@@ -83,6 +83,7 @@ pub fn screen(app: &mut MyApp, ui: &mut Ui, _ctx: &egui::Context) -> Result<()>
             ui.text_edit_singleline(window).labelled_by(token_label.id);
         });
     }
+    ui.horizontal(|ui| ui.checkbox(&mut app.config.notifications_enabled, "Notifications Enabled"));
 
     egui::CollapsingHeader::new("Advanced").show(ui, |ui| {
         ui.horizontal(|ui| {
@@ -91,6 +92,7 @@ pub fn screen(app: &mut MyApp, ui: &mut Ui, _ctx: &egui::Context) -> Result<()>
                 .labelled_by(url_label.id);
         });
 
+
         ui.horizontal(|ui| ui.checkbox(&mut app.config.debug, "Debug Mode"));
         ui.heading(RichText::new("Headers").size(15.0));
 
diff --git a/src/utils.rs b/src/utils.rs
@@ -1,6 +1,7 @@
 use std::{env, path::PathBuf};
 
 use home::home_dir;
+use notify_rust::Notification;
 
 use crate::theme::{themes, Theme};
 
@@ -42,3 +43,6 @@ pub fn theme_to_name(theme: u8) -> String {
         _ => panic!("Invalid theme"),
     }
 }
+pub fn ascella_notif() -> Notification {
+    Notification::new().summary("Ascella").clone()
+}
diff --git a/src/webserver.rs b/src/webserver.rs
@@ -1,12 +1,13 @@
 use std::{convert::Infallible, net::SocketAddr};
 
-use crate::RequestResponse;
+use crate::{utils::ascella_notif, RequestResponse};
 use anyhow::Result;
 use hyper::{
     server::conn::AddrStream,
     service::{make_service_fn, service_fn},
     Body, Request, Response, Server,
 };
+
 use tokio::sync::mpsc::UnboundedSender;
 
 fn create_res(body: Body) -> Response<Body> {
@@ -33,6 +34,7 @@ async fn handle_req(req: Request<Body>, sender: UnboundedSender<RequestResponse>
             sender
                 .send(RequestResponse::UpdateConfigFromStringSxcu(body.to_vec()))
                 .ok();
+            ascella_notif().body("Config Imported successfully").show()?;
             return Ok(create_res(Body::empty()));
         }
 
@@ -70,6 +72,6 @@ pub async fn start_server(sender: UnboundedSender<RequestResponse>) -> Result<()
     let server = Server::bind(&addr).serve(make_service);
 
     // And run forever...
-    server.await;
+    let _ = server.await;
     Ok(())
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ pub struct AscellaConfig {`
`22`	`22`	`pub optimize_png: bool,`
`23`	`23`	`pub optimize_timeout: u64,`
`24`	`24`	`pub console_logging: bool,`
	`25`	`+ pub notifications_enabled: bool,`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`impl AscellaConfig {`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ pub enum Commands {`
`20`	`20`	`/// Screenshot a screen`
`21`	`21`	`Screen { delay: Option<u64> },`
`22`	`22`	`/// Upload a file`
`23`		`- Upload { file: PathBuf }`
	`23`	`+ Upload { file: PathBuf },`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`use std::{env, path::PathBuf};`
`2`	`2`
`3`	`3`	`use home::home_dir;`
	`4`	`+use notify_rust::Notification;`
`4`	`5`
`5`	`6`	`use crate::theme::{themes, Theme};`
`6`	`7`
`@@ -42,3 +43,6 @@ pub fn theme_to_name(theme: u8) -> String {`
`42`	`43`	`_ => panic!("Invalid theme"),`
`43`	`44`	`}`
`44`	`45`	`}`
	`46`	`+pub fn ascella_notif() -> Notification {`
	`47`	`+ Notification::new().summary("Ascella").clone()`
	`48`	`+}`