Fix Clippy warnings for CI

backend/src/ffmpeg/error.rs

@@ -14,18 +14,9 @@ pub enum VideoInfoError {
     NoDuration,
     #[error("No stream in video file")]
     NoStream,
-    #[error("Failed to probe video file")]
+    #[error("Failed to probe video file: {source}")]
     FfprobeFailed {
         #[from]
         source: ffprobe::FfProbeError,
     },
 }
-
-#[derive(Debug, Error)]
-pub enum FfmpegError {
-    #[error("Failed to spawn FFMPEG process")]
-    FailedToSpawnFfmpeg {
-        #[from]
-        source: std::io::Error,
-    },
-}

backend/src/font/dimensions.rs

@@ -80,51 +80,51 @@ impl FontType {
 }
 
 pub fn detect_dimensions(width: u32, height: u32) -> Result<(CharacterSize, FontType, u32), FontFileError> {
-    let (size, r#type) = if width == CHARACTER_WIDTH_SMALL && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
+    let (size, r#type) = if width == CHARACTER_WIDTH_SMALL && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
         (CharacterSize::Small, FontType::Standard)
-    } else if width == CHARACTER_WIDTH_LARGE && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_LARGE && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
         (CharacterSize::Large, FontType::Standard)
-    } else if width == CHARACTER_WIDTH_2K && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_2K && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
         (CharacterSize::XLarge, FontType::Standard)
-    } else if width == CHARACTER_WIDTH_4K && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_4K && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
         (CharacterSize::Ultra, FontType::Standard)
-    } else if width == CHARACTER_WIDTH_RACE && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_RACE && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
         (CharacterSize::Race, FontType::Standard)
-    } else if width == CHARACTER_WIDTH_SMALL * 2 && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_SMALL * 2 && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
         (CharacterSize::Small, FontType::TwoPages)
-    } else if width == CHARACTER_WIDTH_LARGE * 2 && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_LARGE * 2 && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
         (CharacterSize::Large, FontType::TwoPages)
-    } else if width == CHARACTER_WIDTH_2K * 2 && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_2K * 2 && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
         (CharacterSize::XLarge, FontType::TwoPages)
-    } else if width == CHARACTER_WIDTH_4K * 2 && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_4K * 2 && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
         (CharacterSize::Ultra, FontType::TwoPages)
-    } else if width == CHARACTER_WIDTH_RACE * 2 && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_RACE * 2 && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
         (CharacterSize::Race, FontType::TwoPages)
-    } else if width == CHARACTER_WIDTH_SMALL * 3 && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_SMALL * 3 && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
         (CharacterSize::Small, FontType::ThreePages)
-    } else if width == CHARACTER_WIDTH_LARGE * 3 && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_LARGE * 3 && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
         (CharacterSize::Large, FontType::ThreePages)
-    } else if width == CHARACTER_WIDTH_2K * 3 && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_2K * 3 && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
         (CharacterSize::XLarge, FontType::ThreePages)
-    } else if width == CHARACTER_WIDTH_4K * 3 && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_4K * 3 && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
         (CharacterSize::Ultra, FontType::ThreePages)
-    } else if width == CHARACTER_WIDTH_RACE * 3 && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_RACE * 3 && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
         (CharacterSize::Race, FontType::ThreePages)
-    } else if width == CHARACTER_WIDTH_SMALL * 4 && (height / CHARACTER_HEIGHT_SMALL) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_SMALL * 4 && (height / CHARACTER_HEIGHT_SMALL).is_multiple_of(256) {
         (CharacterSize::Small, FontType::FourColor)
-    } else if width == CHARACTER_WIDTH_LARGE * 4 && (height / CHARACTER_HEIGHT_LARGE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_LARGE * 4 && (height / CHARACTER_HEIGHT_LARGE).is_multiple_of(256) {
         (CharacterSize::Large, FontType::FourColor)
-    } else if width == CHARACTER_WIDTH_2K * 4 && (height / CHARACTER_HEIGHT_2K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_2K * 4 && (height / CHARACTER_HEIGHT_2K).is_multiple_of(256) {
         (CharacterSize::XLarge, FontType::FourColor)
-    } else if width == CHARACTER_WIDTH_4K * 4 && (height / CHARACTER_HEIGHT_4K) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_4K * 4 && (height / CHARACTER_HEIGHT_4K).is_multiple_of(256) {
         (CharacterSize::Ultra, FontType::FourColor)
-    } else if width == CHARACTER_WIDTH_RACE * 4 && (height / CHARACTER_HEIGHT_RACE) % 256 == 0 {
+    } else if width == CHARACTER_WIDTH_RACE * 4 && (height / CHARACTER_HEIGHT_RACE).is_multiple_of(256) {
         (CharacterSize::Race, FontType::FourColor)
     } else {
         return Err(FontFileError::InvalidFontFileWidth { width });
     };
 
-    if height % size.height() != 0 {
+    if !height.is_multiple_of(size.height()) {
         return Err(FontFileError::InvalidFontFileHeight { height });
     }
 

backend/src/font/error.rs

@@ -4,13 +4,13 @@ use crate::util::Dimension;
 
 #[derive(Error, Debug)]
 pub enum FontFileError {
-    #[error("Failed to open font file")]
+    #[error("Failed to open font file: {source}")]
     FailedToOpen {
         #[from]
         source: std::io::Error,
     },
 
-    #[error("Failed to decode font file")]
+    #[error("Failed to decode font file: {source}")]
     FailedToDecode {
         #[from]
         source: image::ImageError,

backend/src/osd/error.rs

@@ -7,13 +7,13 @@ pub enum OsdFileError {
 
     // #[error("Incomplete frame with index {index}")]
     // IncompleteFrame { index: u32 },
-    #[error("Malformed OSD file")]
+    #[error("Malformed OSD file: {source}")]
     MalformedOsdFile {
         #[from]
         source: std::str::Utf8Error,
     },
 
-    #[error("Unable to open OSD file")]
+    #[error("Unable to open OSD file: {source}")]
     UnableToOpenFile {
         #[from]
         source: std::io::Error,

ui/src/app.rs

@@ -260,7 +260,7 @@ impl WalksnailOsdTool {
     fn save_config_if_changed(&mut self) {
         if self
             .config_changed
-            .map_or(false, |t| t.elapsed() > Duration::from_millis(2000))
+            .is_some_and(|t| t.elapsed() > Duration::from_millis(2000))
         {
             let config: AppConfig = self.into();
             config.save();

ui/src/util.rs

@@ -286,7 +286,7 @@ pub fn check_updates() -> Result<Option<GitHubReleaseItem>, LookupError> {
             .iter()
             .find(|release| {
                 Version::parse(release.tag_name.trim_start_matches('v'))
-                    .map_or(false, |version| should_update_to_version(&current_version, &version))
+                    .is_ok_and(|version| should_update_to_version(&current_version, &version))
             })
             .cloned();
         Ok(update_target)