chore: remove deps in lib for libwayshot

waycrate · Oct 6, 2023 · daf5eed · daf5eed
1 parent b5ea00e
commit daf5eed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libs/screenshotdialog/Cargo.toml b/libs/screenshotdialog/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 
 [dependencies]
 slint = "1.2.1"
-libwayshot = { git = "https://github.com/waycrate/wayshot.git" }
 
 [build-dependencies]
 slint-build = "1.2.1"
diff --git a/libs/screenshotdialog/src/lib.rs b/libs/screenshotdialog/src/lib.rs
@@ -1,6 +1,5 @@
 use std::rc::Rc;
 
-use libwayshot::output::OutputInfo;
 use slint::VecModel;
 slint::include_modules!();
 
@@ -32,20 +31,9 @@ fn init_slots(ui: &AppWindow, sender: mpsc::Sender<SlintSelection>) {
     });
 }
 
-pub fn selectgui(screen: Vec<OutputInfo>) -> SlintSelection {
+pub fn selectgui(screen: Vec<ScreenInfo>) -> SlintSelection {
     let ui = AppWindow::new().unwrap();
-    ui.set_infos(
-        Rc::new(VecModel::from(
-            screen
-                .iter()
-                .map(|screen| ScreenInfo {
-                    name: screen.name.clone().into(),
-                    description: screen.description.clone().into(),
-                })
-                .collect::<Vec<ScreenInfo>>(),
-        ))
-        .into(),
-    );
+    ui.set_infos(Rc::new(VecModel::from(screen)).into());
     let (sender, receiver) = mpsc::channel();
     init_slots(&ui, sender);
     ui.run().unwrap();

diff --git a/src/screenshot.rs b/src/screenshot.rs
@@ -1,4 +1,5 @@
 use libwayshot::WayshotConnection;
+use screenshotdialog::ScreenInfo;
 use screenshotdialog::SlintSelection;
 use std::collections::HashMap;
 use zbus::zvariant::{DeserializeDict, SerializeDict, Type, Value};
@@ -53,8 +54,14 @@ impl ScreenShotBackend {
                 })?
                 .get_all_outputs()
                 .clone();
-
-            match screenshotdialog::selectgui(wayinfos.clone()) {
+            let screen_infos = wayinfos
+                .iter()
+                .map(|screen| ScreenInfo {
+                    name: screen.name.clone().into(),
+                    description: screen.description.clone().into(),
+                })
+                .collect();
+            match screenshotdialog::selectgui(screen_infos) {
                 SlintSelection::Canceled => return Ok(PortalResponse::Cancelled),
                 SlintSelection::Slurp => {
                     let slurp = std::process::Command::new("slurp")