From 5e3ab8a22b5dce9ff2c14af0c3883ba769315c93 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sun, 28 Sep 2025 07:18:45 -0500 Subject: [PATCH] more formatting --- src/core/images.rs | 4 ++-- src/core/model.rs | 2 +- src/core/presentations.rs | 4 ++-- src/core/service_items.rs | 2 +- src/core/slide.rs | 2 +- src/core/songs.rs | 8 ++++---- src/core/videos.rs | 4 ++-- src/lisp.rs | 2 +- src/main.rs | 20 ++++++++++---------- src/ui/image_editor.rs | 10 +++++----- src/ui/library.rs | 21 ++++++++++----------- src/ui/presentation_editor.rs | 10 +++++----- src/ui/presenter.rs | 14 +++++++------- src/ui/service.rs | 7 ++++--- src/ui/slide_editor.rs | 2 +- src/ui/song_editor.rs | 8 ++++---- src/ui/text_svg.rs | 6 +++--- src/ui/video_editor.rs | 10 +++++----- src/ui/widgets/draggable/column.rs | 8 ++++---- src/ui/widgets/draggable/row.rs | 6 +++--- 20 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/core/images.rs b/src/core/images.rs index fda63f4..cd9b2e7 100644 --- a/src/core/images.rs +++ b/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, - SqlitePool, + Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection, + query, query_as, }; use std::path::{Path, PathBuf}; use tracing::{debug, error}; diff --git a/src/core/model.rs b/src/core/model.rs index a778a14..13ddda8 100644 --- a/src/core/model.rs +++ b/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)] diff --git a/src/core/presentations.rs b/src/core/presentations.rs index 4ada88e..76d19ea 100644 --- a/src/core/presentations.rs +++ b/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, + Row, Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection, + prelude::FromRow, query, sqlite::SqliteRow, }; use std::path::{Path, PathBuf}; use tracing::{debug, error}; diff --git a/src/core/service_items.rs b/src/core/service_items.rs index 3912fa0..5b4aed7 100644 --- a/src/core/service_items.rs +++ b/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; diff --git a/src/core/slide.rs b/src/core/slide.rs index 30bf847..70e60c1 100644 --- a/src/core/slide.rs +++ b/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, diff --git a/src/core/songs.rs b/src/core/songs.rs index feb9d65..2be3a66 100644 --- a/src/core/songs.rs +++ b/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, - Row, Sqlite, SqliteConnection, SqlitePool, + Acquire, FromRow, 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, diff --git a/src/core/videos.rs b/src/core/videos.rs index dc97db6..c881572 100644 --- a/src/core/videos.rs +++ b/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, - SqlitePool, + Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection, + query, query_as, }; use std::path::{Path, PathBuf}; use tracing::{debug, error}; diff --git a/src/lisp.rs b/src/lisp.rs index 2f803e4..c2f4c8f 100644 --- a/src/lisp.rs +++ b/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::*; diff --git a/src/main.rs b/src/main.rs index 472a816..9cd9055 100644 --- a/src/main.rs +++ b/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, - Length, + self, Background as IcedBackground, Border, Color, Length, event, + 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, - nav_bar_toggle, responsive, scrollable, search_input, tooltip, - vertical_space, Space, + Space, button, context_menu, horizontal_space, mouse_area, + nav_bar, nav_bar_toggle, responsive, scrollable, search_input, + tooltip, vertical_space, }; use cosmic::widget::{container, text}; use cosmic::widget::{icon, slider}; -use cosmic::widget::{menu, Container}; -use cosmic::{executor, Application, ApplicationExt, Element}; +use cosmic::{Application, ApplicationExt, Element, executor}; 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}; diff --git a/src/ui/image_editor.rs b/src/ui/image_editor.rs index 878fe8e..194484f 100644 --- a/src/ui/image_editor.rs +++ b/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}, - iced::{alignment::Vertical, Length}, + Element, Task, + dialog::file_chooser::{FileFilter, open::Dialog}, + iced::{Length, alignment::Vertical}, iced_widget::{column, row}, theme, widget::{ - self, button, container, horizontal_space, icon, text, - text_input, Space, + self, Space, button, container, horizontal_space, icon, text, + text_input, }, - Element, Task, }; use tracing::{debug, error, warn}; diff --git a/src/ui/library.rs b/src/ui/library.rs index 80c9fe7..f4ca0b0 100644 --- a/src/ui/library.rs +++ b/src/ui/library.rs @@ -1,36 +1,35 @@ use std::collections::HashMap; use cosmic::{ + Element, Task, dialog::file_chooser::open::Dialog, iced::{ - alignment::Vertical, clipboard::dnd::DndAction, - keyboard::Modifiers, Background, Border, Color, Length, + Background, Border, Color, Length, alignment::Vertical, + clipboard::dnd::DndAction, keyboard::Modifiers, }, iced_core::widget::tree::State, iced_widget::{column, row as rowm, text as textm}, theme, widget::{ - button, container, context_menu, dnd_destination, - horizontal_space, icon, + Container, DndSource, Space, button, container, context_menu, + dnd_destination, horizontal_space, icon, menu::{self, Action as MenuAction}, mouse_area, responsive, row, scrollable, text, text_input, - Container, DndSource, Space, }, - Element, Task, }; use miette::{IntoDiagnostic, Result}; use rapidfuzz::distance::levenshtein; -use sqlx::{migrate, SqlitePool}; +use sqlx::{SqlitePool, migrate}; use tracing::{debug, error, warn}; use crate::core::{ content::Content, - images::{self, update_image_in_db, Image}, + images::{self, Image, update_image_in_db}, model::{LibraryKind, Model}, - presentations::{self, update_presentation_in_db, Presentation}, + presentations::{self, Presentation, update_presentation_in_db}, service_items::ServiceItem, - songs::{self, update_song_in_db, Song}, - videos::{self, update_video_in_db, Video}, + songs::{self, Song, update_song_in_db}, + videos::{self, Video, update_video_in_db}, }; #[derive(Debug, Clone)] diff --git a/src/ui/presentation_editor.rs b/src/ui/presentation_editor.rs index 7b181b0..17f4a9f 100644 --- a/src/ui/presentation_editor.rs +++ b/src/ui/presentation_editor.rs @@ -5,15 +5,15 @@ use crate::core::{ slide::Slide, }; use cosmic::{ - dialog::file_chooser::{open::Dialog, FileFilter}, - iced::{alignment::Vertical, Length}, + Element, Task, + dialog::file_chooser::{FileFilter, open::Dialog}, + iced::{Length, alignment::Vertical}, iced_widget::{column, row}, theme, widget::{ - button, container, horizontal_space, icon, text, text_input, - Space, + Space, button, container, horizontal_space, icon, text, + text_input, }, - Element, Task, }; use tracing::{debug, error, warn}; diff --git a/src/ui/presenter.rs b/src/ui/presenter.rs index a758311..84b9e18 100644 --- a/src/ui/presenter.rs +++ b/src/ui/presenter.rs @@ -7,32 +7,32 @@ 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, Id, Row, Space, container, image, mouse_area, + 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; diff --git a/src/ui/service.rs b/src/ui/service.rs index 4a7dd81..ceca63c 100644 --- a/src/ui/service.rs +++ b/src/ui/service.rs @@ -2,15 +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, Clipboard, Shell, + self, Clipboard, Shell, layout, renderer, widget::Tree, }, widget::Widget, - Element, }; use tracing::debug; diff --git a/src/ui/slide_editor.rs b/src/ui/slide_editor.rs index c9ae9cb..ca6ce51 100644 --- a/src/ui/slide_editor.rs +++ b/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; diff --git a/src/ui/song_editor.rs b/src/ui/song_editor.rs index 6a524bd..309e86c 100644 --- a/src/ui/song_editor.rs +++ b/src/ui/song_editor.rs @@ -1,8 +1,9 @@ use std::{io, path::PathBuf, sync::Arc}; use cosmic::{ - dialog::file_chooser::{open::Dialog, FileFilter}, - iced::{alignment::Vertical, Length}, + Element, Task, + 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)] diff --git a/src/ui/text_svg.rs b/src/ui/text_svg.rs index 58c574a..07b0e9a 100644 --- a/src/ui/text_svg.rs +++ b/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}; diff --git a/src/ui/video_editor.rs b/src/ui/video_editor.rs index d0d4fd2..f4a27c1 100644 --- a/src/ui/video_editor.rs +++ b/src/ui/video_editor.rs @@ -1,15 +1,15 @@ use std::{io, path::PathBuf}; use cosmic::{ - dialog::file_chooser::{open::Dialog, FileFilter}, - iced::{alignment::Vertical, Length}, + Element, Task, + dialog::file_chooser::{FileFilter, open::Dialog}, + iced::{Length, alignment::Vertical}, iced_widget::{column, row}, theme, widget::{ - button, container, horizontal_space, icon, progress_bar, - text, text_input, Space, + Space, button, container, horizontal_space, icon, + progress_bar, text, text_input, }, - Element, Task, }; use iced_video_player::{Video, VideoPlayer}; use tracing::{debug, error, warn}; diff --git a/src/ui/widgets/draggable/column.rs b/src/ui/widgets/draggable/column.rs index b35a2bc..2d77bcb 100644 --- a/src/ui/widgets/draggable/column.rs +++ b/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::{overlay, renderer, Clipboard, Shell}; +use cosmic::iced::advanced::widget::{Operation, Tree, Widget, tree}; +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 tracing::debug; use super::{Action, DragEvent, DropPosition}; diff --git a/src/ui/widgets/draggable/row.rs b/src/ui/widgets/draggable/row.rs index 4bbaf7d..67f2212 100644 --- a/src/ui/widgets/draggable/row.rs +++ b/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::{overlay, renderer, Clipboard, Shell}; +use cosmic::iced::advanced::widget::{Operation, Tree, Widget, tree}; +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,