more clippy fixes

src/core/images.rs

@@ -10,8 +10,8 @@ use crisp::types::{Keyword, Symbol, Value};
 use miette::{IntoDiagnostic, Result};
 use serde::{Deserialize, Serialize};
 use sqlx::{
-    pool::PoolConnection, query, query_as, Sqlite, SqliteConnection,
+    Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection,
-    SqlitePool,
+    query, query_as,
 };
 use std::path::{Path, PathBuf};
 use tracing::{debug, error};

src/core/model.rs

@@ -1,6 +1,6 @@
 use std::mem::replace;
 
-use miette::{miette, Result};
+use miette::{Result, miette};
 use sqlx::{Connection, SqliteConnection};
 
 #[derive(Debug, Clone)]

src/core/presentations.rs

@@ -4,8 +4,8 @@ use miette::{IntoDiagnostic, Result};
 use mupdf::{Colorspace, Document, Matrix};
 use serde::{Deserialize, Serialize};
 use sqlx::{
-    pool::PoolConnection, prelude::FromRow, query, sqlite::SqliteRow,
+    Row, Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection,
-    Row, Sqlite, SqliteConnection, SqlitePool,
+    prelude::FromRow, query, sqlite::SqliteRow,
 };
 use std::path::{Path, PathBuf};
 use tracing::{debug, error};

src/core/service_items.rs

@@ -12,7 +12,7 @@ use crate::Slide;
 
 use super::images::Image;
 use super::presentations::Presentation;
-use super::songs::{lisp_to_song, Song};
+use super::songs::{Song, lisp_to_song};
 use super::videos::Video;
 
 use super::kinds::ServiceItemKind;

src/core/slide.rs

@@ -2,7 +2,7 @@ use cosmic::widget::image::Handle;
 // use cosmic::dialog::ashpd::url::Url;
 use crisp::types::{Keyword, Symbol, Value};
 use iced_video_player::Video;
-use miette::{miette, Result};
+use miette::{Result, miette};
 use serde::{Deserialize, Serialize};
 use std::{
     fmt::Display,

src/core/songs.rs

@@ -1,15 +1,15 @@
 use std::{collections::HashMap, option::Option, path::PathBuf};
 
 use crisp::types::{Keyword, Symbol, Value};
-use miette::{miette, IntoDiagnostic, Result};
+use miette::{IntoDiagnostic, Result, miette};
 use serde::{Deserialize, Serialize};
 use sqlx::{
-    pool::PoolConnection, query, sqlite::SqliteRow, Acquire, FromRow,
+    Acquire, FromRow, Row, Sqlite, SqliteConnection, SqlitePool,
-    Row, Sqlite, SqliteConnection, SqlitePool,
+    pool::PoolConnection, query, sqlite::SqliteRow,
 };
 use tracing::error;
 
-use crate::{core::slide, Slide, SlideBuilder};
+use crate::{Slide, SlideBuilder, core::slide};
 
 use super::{
     content::Content,

src/core/videos.rs

@@ -11,8 +11,8 @@ use crisp::types::{Keyword, Symbol, Value};
 use miette::{IntoDiagnostic, Result};
 use serde::{Deserialize, Serialize};
 use sqlx::{
-    pool::PoolConnection, query, query_as, Sqlite, SqliteConnection,
+    Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection,
-    SqlitePool,
+    query, query_as,
 };
 use std::path::{Path, PathBuf};
 use tracing::{debug, error};

src/lisp.rs

@@ -40,11 +40,11 @@ mod test {
     use std::{fs::read_to_string, path::PathBuf};
 
     use crate::{
+        Background, TextAlignment,
         core::{
             images::Image, kinds::ServiceItemKind,
             service_items::ServiceTrait, songs::Song, videos::Video,
         },
-        Background, TextAlignment,
     };
 
     use super::*;

src/main.rs

@@ -1,4 +1,4 @@
-use clap::{command, Parser};
+use clap::{Parser, command};
 use core::service_items::ServiceItem;
 use core::slide::{
     Background, BackgroundKind, Slide, SlideBuilder, TextAlignment,
@@ -9,8 +9,8 @@ use cosmic::iced::alignment::Vertical;
 use cosmic::iced::keyboard::{Key, Modifiers};
 use cosmic::iced::window::{Mode, Position};
 use cosmic::iced::{
-    self, event, window, Background as IcedBackground, Border, Color,
+    self, Background as IcedBackground, Border, Color, Length, event,
-    Length,
+    window,
 };
 use cosmic::iced_core::text::Wrapping;
 use cosmic::iced_futures::Subscription;
@@ -21,18 +21,18 @@ use cosmic::widget::menu::key_bind::Modifier;
 use cosmic::widget::menu::{ItemWidth, KeyBind};
 use cosmic::widget::nav_bar::nav_bar_style;
 use cosmic::widget::tooltip::Position as TPosition;
+use cosmic::widget::{Container, menu};
 use cosmic::widget::{
-    button, context_menu, horizontal_space, mouse_area, nav_bar,
+    Space, button, context_menu, horizontal_space, mouse_area,
-    nav_bar_toggle, responsive, scrollable, search_input, tooltip,
+    nav_bar, nav_bar_toggle, responsive, scrollable, search_input,
-    vertical_space, Space,
+    tooltip, vertical_space,
 };
 use cosmic::widget::{container, text};
 use cosmic::widget::{icon, slider};
-use cosmic::widget::{menu, Container};
+use cosmic::{Application, ApplicationExt, Element, executor};
-use cosmic::{executor, Application, ApplicationExt, Element};
 use crisp::types::Value;
 use lisp::parse_lisp;
-use miette::{miette, Result};
+use miette::{Result, miette};
 use rayon::prelude::*;
 use resvg::usvg::fontdb;
 use std::collections::HashMap;
@@ -42,10 +42,10 @@ use std::sync::Arc;
 use tracing::{debug, level_filters::LevelFilter};
 use tracing::{error, warn};
 use tracing_subscriber::EnvFilter;
+use ui::EditorMode;
 use ui::library::{self, Library};
 use ui::presenter::{self, Presenter};
 use ui::song_editor::{self, SongEditor};
-use ui::EditorMode;
 
 use crate::core::kinds::ServiceItemKind;
 use crate::ui::image_editor::{self, ImageEditor};

src/ui/image_editor.rs

@@ -2,15 +2,15 @@ use std::{io, path::PathBuf};
 
 use crate::core::images::Image;
 use cosmic::{
-    dialog::file_chooser::{open::Dialog, FileFilter},
+    Element, Task,
-    iced::{alignment::Vertical, Length},
+    dialog::file_chooser::{FileFilter, open::Dialog},
+    iced::{Length, alignment::Vertical},
     iced_widget::{column, row},
     theme,
     widget::{
-        self, button, container, horizontal_space, icon, text,
+        self, Space, button, container, horizontal_space, icon, text,
-        text_input, Space,
+        text_input,
     },
-    Element, Task,
 };
 use tracing::{debug, error, warn};
 

src/ui/library.rs

@@ -4,8 +4,7 @@ use cosmic::{
     dialog::file_chooser::open::Dialog,
     iced::{
         alignment::Vertical, clipboard::dnd::DndAction,
-        futures::FutureExt, keyboard::Modifiers, Background, Border,
+        keyboard::Modifiers, Background, Border, Color, Length,
-        Color, Length,
     },
     iced_core::widget::tree::State,
     iced_widget::{column, row as rowm, text as textm},
@@ -53,8 +52,8 @@ pub struct Library {
 
 #[derive(Debug, Clone, Eq, PartialEq, Copy)]
 enum MenuMessage {
-    Delete((LibraryKind, i32)),
+    Delete,
-    Open,
+    Open((LibraryKind, i32)),
 }
 
 impl MenuAction for MenuMessage {
@@ -62,10 +61,10 @@ impl MenuAction for MenuMessage {
 
     fn message(&self) -> Self::Message {
         match self {
-            MenuMessage::Delete((kind, index)) => {
+            MenuMessage::Delete => Message::DeleteItem,
-                Message::DeleteItem((*kind, *index))
+            MenuMessage::Open((kind, index)) => {
+                Message::OpenItem(Some((*kind, *index)))
             }
-            MenuMessage::Open => todo!(),
         }
     }
 }
@@ -80,7 +79,7 @@ pub enum Action {
 #[derive(Clone, Debug)]
 pub enum Message {
     AddItem,
-    DeleteItem((LibraryKind, i32)),
+    DeleteItem,
     OpenItem(Option<(LibraryKind, i32)>),
     HoverLibrary(Option<LibraryKind>),
     OpenLibrary(Option<LibraryKind>),
@@ -135,7 +134,7 @@ impl<'a> Library {
     pub fn update(&'a mut self, message: Message) -> Action {
         match message {
             Message::None => (),
-            Message::DeleteItem((kind, index)) => {
+            Message::DeleteItem => {
                 return self.delete_items();
             }
             Message::AddItem => {
@@ -185,6 +184,7 @@ impl<'a> Library {
                 return self.update(Message::OpenItem(item));
             }
             Message::AddVideos(videos) => {
+                debug!(?videos);
                 if let Some(videos) = videos {
                     for video in videos {
                         if let Err(e) =
@@ -604,7 +604,10 @@ impl<'a> Library {
 
                                 if let Some(context_id) = self.context_menu {
                                     if index == context_id as usize {
-                                        let menu_items = vec![menu::Item::Button("Delete", None, MenuMessage::Delete((model.kind, index as i32)))];
+                                        let menu_items = vec![
+                                            menu::Item::Button("Open", None, MenuMessage::Open((model.kind, index as i32))),
+                                            menu::Item::Button("Delete", None, MenuMessage::Delete)
+                                        ];
                                         let context_menu = context_menu(
                                             mouse_area,
                                             self.context_menu.map_or_else(|| None, |_| {
@@ -684,11 +687,11 @@ impl<'a> Library {
                     "text/org".into(),
                 ],
             )
-            .on_enter(|x, y, mimes| {
+            .on_enter(|_, _, mimes| {
                 warn!(?mimes);
                 Message::None
             })
-            .on_finish(|mime, data, action, x, y| {
+            .on_finish(|mime, data, action, _, _| {
                 warn!(?mime, ?data, ?action);
                 Message::None
             });
@@ -892,7 +895,8 @@ impl<'a> Library {
             return Action::None;
         };
         items.sort_by(|(_, index), (_, other)| index.cmp(other));
-        let tasks: Vec<Task<Message>> = items
+        let tasks: Vec<Task<Message>> =
+            items
                 .iter()
                 .rev()
                 .map(|(kind, index)| match kind {
@@ -907,7 +911,6 @@ impl<'a> Library {
                                 error!(?e);
                                 Task::none()
                             } else {
-                            
                                 Task::future(self.db.acquire())
                                     .and_then(move |db| {
                                         Task::perform(
@@ -938,7 +941,6 @@ impl<'a> Library {
                                 error!(?e);
                                 Task::none()
                             } else {
-                            
                                 Task::future(self.db.acquire())
                                     .and_then(move |db| {
                                         Task::perform(
@@ -969,7 +971,6 @@ impl<'a> Library {
                                 error!(?e);
                                 Task::none()
                             } else {
-                            
                                 Task::future(self.db.acquire())
                                     .and_then(move |db| {
                                         Task::perform(
@@ -1001,7 +1002,6 @@ impl<'a> Library {
                                 error!(?e);
                                 Task::none()
                             } else {
-                            
                                 Task::future(self.db.acquire())
                                     .and_then(move |db| {
                                         Task::perform(

src/ui/presentation_editor.rs

@@ -5,15 +5,15 @@ use crate::core::{
     slide::Slide,
 };
 use cosmic::{
-    dialog::file_chooser::{open::Dialog, FileFilter},
+    Element, Task,
-    iced::{alignment::Vertical, Length},
+    dialog::file_chooser::{FileFilter, open::Dialog},
+    iced::{Length, alignment::Vertical},
     iced_widget::{column, row},
     theme,
     widget::{
-        button, container, horizontal_space, icon, text,
+        Space, button, container, horizontal_space, icon, text,
-        text_input, Space,
+        text_input,
     },
-    Element, Task,
 };
 use tracing::{debug, error, warn};
 

src/ui/presenter.rs

@@ -7,37 +7,36 @@ use std::{
 };
 
 use cosmic::{
+    Task,
     iced::{
-        font::{Family, Stretch, Style, Weight},
         Background, Border, Color, ContentFit, Font, Length, Shadow,
         Vector,
+        font::{Family, Stretch, Style, Weight},
     },
     iced_widget::{
         scrollable::{
-            scroll_to, AbsoluteOffset, Direction, Scrollbar,
+            AbsoluteOffset, Direction, Scrollbar, scroll_to,
         },
         stack, vertical_rule,
     },
     prelude::*,
     widget::{
-        container, image, mouse_area, responsive, scrollable, text,
+        Container, Id, Row, Space, container, image, mouse_area,
-        Container, Id, Row, Space,
+        responsive, scrollable, text,
     },
-    Task,
 };
-use iced_video_player::{gst_pbutils, Position, Video, VideoPlayer};
+use iced_video_player::{Position, Video, VideoPlayer, gst_pbutils};
 use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink};
 use tracing::{debug, error, info, warn};
 use url::Url;
 
 use crate::{
-    core::{service_items::ServiceItem, slide::Slide},
     BackgroundKind,
+    core::{service_items::ServiceItem, slide::Slide},
 };
 
 const REFERENCE_WIDTH: f32 = 1920.0;
-static DEFAULT_SLIDE: LazyLock<Slide> =
+static DEFAULT_SLIDE: LazyLock<Slide> = LazyLock::new(Slide::default);
-    LazyLock::new(Slide::default);
 
 // #[derive(Default, Clone, Debug)]
 pub(crate) struct Presenter {
@@ -156,8 +155,11 @@ impl Presenter {
 
         let slide =
             items.first().and_then(|item| item.slides.first());
-        let audio = items.first()
+        let audio = items
-            .and_then(|item| item.slides.first().map(|slide| slide.audio()))
+            .first()
+            .and_then(|item| {
+                item.slides.first().map(|slide| slide.audio())
+            })
             .flatten();
 
         Self {

src/ui/service.rs

@@ -2,16 +2,16 @@ use cosmic::iced::Size;
 
 use cosmic::iced_core::widget::tree;
 use cosmic::{
+    Element,
     iced::{
+        Event, Length, Point, Rectangle, Vector,
         clipboard::dnd::{DndEvent, SourceEvent},
-        event, mouse, Event, Length, Point, Rectangle, Vector,
+        event, mouse,
     },
     iced_core::{
-        self, layout, renderer, widget::Tree,
+        self, Clipboard, Shell, layout, renderer, widget::Tree,
-        Clipboard, Shell,
     },
     widget::Widget,
-    Element,
 };
 use tracing::debug;
 
@@ -203,8 +203,7 @@ impl<Message: Clone + 'static>
                                 if let Some(on_start) =
                                     self.on_start.as_ref()
                                 {
-                                        shell
+                                    shell.publish(on_start.clone())
-                                            .publish(on_start.clone())
                                 }
                                 let offset = Vector::new(
                                     left_pressed_position.x
@@ -213,8 +212,7 @@ impl<Message: Clone + 'static>
                                         - layout.bounds().y,
                                 );
                                 state.is_dragging = true;
-                                    state.left_pressed_position =
+                                state.left_pressed_position = None;
-                                        None;
                             }
                             if !cursor.is_over(layout.bounds()) {
                                 state.hovered = false;

src/ui/slide_editor.rs

@@ -1,13 +1,13 @@
 use std::{io, path::PathBuf};
 
 use cosmic::{
+    Renderer,
     iced::{Color, Font, Length, Size},
     widget::{
         self,
         canvas::{self, Program, Stroke},
         container,
     },
-    Renderer,
 };
 use tracing::debug;
 

src/ui/song_editor.rs

@@ -1,8 +1,9 @@
 use std::{io, path::PathBuf, sync::Arc};
 
 use cosmic::{
-    dialog::file_chooser::{open::Dialog, FileFilter},
+    Element, Task,
-    iced::{alignment::Vertical, Length},
+    dialog::file_chooser::{FileFilter, open::Dialog},
+    iced::{Length, alignment::Vertical},
     iced_wgpu::graphics::text::cosmic_text::fontdb,
     iced_widget::{column, row},
     theme,
@@ -10,7 +11,6 @@ use cosmic::{
         button, combo_box, container, horizontal_space, icon,
         progress_bar, scrollable, text, text_editor, text_input,
     },
-    Element, Task,
 };
 use dirs::font_dir;
 use iced_video_player::Video;
@@ -18,11 +18,11 @@ use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use tracing::{debug, error};
 
 use crate::{
+    Background, BackgroundKind,
     core::{service_items::ServiceTrait, slide::Slide, songs::Song},
     ui::{
         presenter::slide_view, slide_editor::SlideEditor, text_svg,
     },
-    Background, BackgroundKind,
 };
 
 #[derive(Debug)]

src/ui/text_svg.rs

@@ -8,16 +8,16 @@ use std::{
 use colors_transform::Rgb;
 use cosmic::{
     iced::{
-        font::{Style, Weight},
         ContentFit, Length, Size,
+        font::{Style, Weight},
     },
     prelude::*,
-    widget::{image::Handle, Image},
+    widget::{Image, image::Handle},
 };
 use rapidhash::v3::rapidhash_v3;
 use resvg::{
     tiny_skia::{self, Pixmap},
-    usvg::{fontdb, Tree},
+    usvg::{Tree, fontdb},
 };
 use tracing::{debug, error};
 

src/ui/video_editor.rs

@@ -1,15 +1,15 @@
 use std::{io, path::PathBuf};
 
 use cosmic::{
-    dialog::file_chooser::{open::Dialog, FileFilter},
+    Element, Task,
-    iced::{alignment::Vertical, Length},
+    dialog::file_chooser::{FileFilter, open::Dialog},
+    iced::{Length, alignment::Vertical},
     iced_widget::{column, row},
     theme,
     widget::{
-        button, container, horizontal_space, icon, progress_bar,
+        Space, button, container, horizontal_space, icon,
-        text, text_input, Space,
+        progress_bar, text, text_input,
     },
-    Element, Task,
 };
 use iced_video_player::{Video, VideoPlayer};
 use tracing::{debug, error, warn};

src/ui/widgets/draggable/column.rs

@@ -22,17 +22,17 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+use cosmic::Theme;
 use cosmic::iced::advanced::layout::{self, Layout};
-use cosmic::iced::advanced::widget::{tree, Operation, Tree, Widget};
+use cosmic::iced::advanced::widget::{Operation, Tree, Widget, tree};
-use cosmic::iced::advanced::{overlay, renderer, Clipboard, Shell};
+use cosmic::iced::advanced::{Clipboard, Shell, overlay, renderer};
 use cosmic::iced::alignment::{self, Alignment};
 use cosmic::iced::event::{self, Event};
-use cosmic::iced::{self, mouse, Transformation};
+use cosmic::iced::{self, Transformation, mouse};
 use cosmic::iced::{
     Background, Border, Color, Element, Length, Padding, Pixels,
     Point, Rectangle, Size, Vector,
 };
-use cosmic::Theme;
 
 use super::{Action, DragEvent, DropPosition};
 
@@ -477,15 +477,12 @@ where
                                 origin,
                                 last_cursor: cursor_position,
                             };
-                                if let Some(on_reorder) =
+                            if let Some(on_reorder) = &self.on_drag {
-                                    &self.on_drag
-                                {
                                 shell.publish(on_reorder(
                                     DragEvent::Picked { index },
                                 ));
                             }
-                                event_status =
+                            event_status = event::Status::Captured;
-                                    event::Status::Captured;
                         }
                     }
                     Action::Dragging { origin, index, .. } => {

src/ui/widgets/draggable/row.rs

@@ -23,11 +23,11 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 use cosmic::iced::advanced::layout::{self, Layout};
-use cosmic::iced::advanced::widget::{tree, Operation, Tree, Widget};
+use cosmic::iced::advanced::widget::{Operation, Tree, Widget, tree};
-use cosmic::iced::advanced::{overlay, renderer, Clipboard, Shell};
+use cosmic::iced::advanced::{Clipboard, Shell, overlay, renderer};
 use cosmic::iced::alignment::{self, Alignment};
 use cosmic::iced::event::{self, Event};
-use cosmic::iced::{self, mouse, Transformation};
+use cosmic::iced::{self, Transformation, mouse};
 use cosmic::iced::{
     Background, Border, Color, Element, Length, Padding, Pixels,
     Point, Rectangle, Size, Theme, Vector,
@@ -463,15 +463,12 @@ where
                                 origin,
                                 last_cursor: cursor_position,
                             };
-                                if let Some(on_reorder) =
+                            if let Some(on_reorder) = &self.on_drag {
-                                    &self.on_drag
-                                {
                                 shell.publish(on_reorder(
                                     DragEvent::Picked { index },
                                 ));
                             }
-                                event_status =
+                            event_status = event::Status::Captured;
-                                    event::Status::Captured;
                         }
                     }
                     Action::Dragging { origin, index, .. } => {