fix(wall): wallpaper traits

Author: eythaann

libs/core/src/resource/interface.rs

@@ -83,7 +83,7 @@ pub trait SluResource: Sized + Serialize + DeserializeOwned {
     /// Sanitize the resource data
     fn sanitize(&mut self) {}
 
-    /// Validates the resource
+    /// Validates the resource after sanitization
     fn validate(&self) -> Result<()> {
         Ok(())
     }

libs/core/src/state/wallpaper/mod.rs

@@ -11,16 +11,31 @@ use crate::{
 };
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, TS)]
+#[serde(default, rename_all = "camelCase")]
 #[cfg_attr(feature = "gen-binds", ts(export))]
 pub struct Wallpaper {
     pub id: WallpaperId,
     pub metadata: ResourceMetadata,
+    pub r#type: WallpaperKind,
     pub url: Option<Url>,
     pub thumbnail_url: Option<Url>,
     pub filename: Option<String>,
+    #[serde(alias = "thumbnail_filename")]
     pub thumbnail_filename: Option<String>,
 }
 
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, JsonSchema, TS)]
+#[ts(repr(enum = name))]
+pub enum WallpaperKind {
+    #[serde(alias = "image")]
+    Image,
+    #[serde(alias = "video")]
+    Video,
+    /// used for wallpapers created before v2.4.9, will be changed on sanitization
+    #[default]
+    Unsupported,
+}
+
 impl SluResource for Wallpaper {
     const KIND: ResourceKind = ResourceKind::Wallpaper;
 
@@ -31,6 +46,33 @@ impl SluResource for Wallpaper {
     fn metadata_mut(&mut self) -> &mut ResourceMetadata {
         &mut self.metadata
     }
+
+    fn sanitize(&mut self) {
+        // migration step for old wallpapers
+        if WallpaperKind::Unsupported == self.r#type {
+            if let Some(filename) = &self.filename {
+                if Self::SUPPORTED_VIDEOS
+                    .iter()
+                    .any(|ext| filename.ends_with(ext))
+                {
+                    self.r#type = WallpaperKind::Video;
+                }
+                if Self::SUPPORTED_IMAGES
+                    .iter()
+                    .any(|ext| filename.ends_with(ext))
+                {
+                    self.r#type = WallpaperKind::Image;
+                }
+            }
+        }
+    }
+
+    fn validate(&self) -> Result<()> {
+        if self.r#type == WallpaperKind::Unsupported {
+            return Err("Unsupported wallpaper extension".into());
+        }
+        Ok(())
+    }
 }
 
 impl Wallpaper {
@@ -74,16 +116,26 @@ impl Wallpaper {
             std::fs::rename(path, folder_to_store.join(&filename))?;
         }
 
+        let r#type = if Self::SUPPORTED_IMAGES.contains(&ext.as_str()) {
+            WallpaperKind::Image
+        } else if Self::SUPPORTED_VIDEOS.contains(&ext.as_str()) {
+            WallpaperKind::Video
+        } else {
+            WallpaperKind::Unsupported
+        };
+
         let wallpaper = Self {
             id,
             metadata,
+            r#type,
+            url: None,
+            thumbnail_url: None,
             filename: Some(filename.clone()),
             thumbnail_filename: if Self::SUPPORTED_IMAGES.contains(&ext.as_str()) {
                 Some(filename)
             } else {
                 None
             },
-            ..Default::default()
         };
         wallpaper.save()?;
 

src/ui/react/settings/modules/resources/ResourceCard.tsx

@@ -153,29 +153,15 @@ function ResourcePortraitInner({ resource, kind }: ResourcePortraitProps) {
 
   if (kind === "Wallpaper") {
     const wallpaper = resource as Wallpaper;
-    if (wallpaper.thumbnail_filename) {
+    if (wallpaper.thumbnailFilename) {
       return (
         <img
-          src={convertFileSrc(`${resource.metadata.path}\\${wallpaper.thumbnail_filename}`)}
+          src={convertFileSrc(`${resource.metadata.path}\\${wallpaper.thumbnailFilename}`)}
           style={{ filter: "blur(0.4px)" }}
           loading="lazy"
         />
       );
     }
-
-    /* if (
-        wallpaper.filename &&
-        SUPPORTED_VIDEO_WALLPAPER_EXTENSIONS.includes(wallpaper.filename.split('.').pop()!)
-      ) {
-        return (
-          <video
-            src={convertFileSrc(`${resource.metadata.path}\\${wallpaper.filename}`)}
-            controls={false}
-            preload="metadata"
-            style={{ filter: 'blur(0.4px)' }}
-          />
-        );
-      } */
   }
 
   return <ResourceIcon kind={kind} />;