ai slop

Author: amtoaer

Cargo.lock

@@ -51,12 +51,18 @@ clap = { version = "4", features = ["derive"] }
 fnv = "1.0.7"
 rand = "0.10.1"
 base64 = "0.22.1"
-libmpv2 = "4.1.0"
 glow = "0.17"
 xxhash-rust = { version = "0.8.15", features = ["xxh3"] }
 futures-util = "0.3.31"
 itertools = "0.14.0"
 moka = { version = "0.12.15", features = ["future"] }
+mutsumi = { path = "../mutsumi" }
+mpris-server = "0.10"
+xattr = { version = "1.6.1" }
+gdk-wayland = { version = "0.11", package = "gdk4-wayland", features = [
+  "v4_18",
+  "wayland_crate",
+] }
 
 [dev-dependencies]
 cargo-husky = { version = "1", default-features = false, features = ["user-hooks"] }
@@ -68,18 +74,6 @@ protocols = []                    # Enable custom protocol callbacks
 render = []                       # Enable custom rendering
 build_libmpv = []                 # build libmpv automatically, provided MPV_SOURCE is set
 
-[target.'cfg(target_os = "linux")'.dependencies]
-mpris-server = "0.10"
-xattr = { version = "1.6.1" }
-gdk-x11 = { version = "0.11", package = "gdk4-x11", features = [
-  "v4_18",
-  "xlib",
-] }
-gdk-wayland = { version = "0.11", package = "gdk4-wayland", features = [
-  "v4_18",
-  "wayland_crate",
-] }
-
 [profile.release]
 lto = true
 strip = true

Cargo.toml

@@ -81,11 +81,9 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/action_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/check_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/mpv_menu.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">ui/mpv_menu_actions.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/mpv_shortcuts_window.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/tu_overview_item.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/item_carousel.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">ui/mpv_control_sidebar.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/server_action_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/image_drop_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/image_dialog_search_page.ui</file>
@@ -97,7 +95,6 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/filters_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/filter_label.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/filter_search_page.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">ui/volume_bar.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/episode_switcher.ui</file>
   </gresource>
 </gresources>

resources/resources.gresource.xml

@@ -34,53 +34,6 @@ impl UserFacingError for std::boxed::Box<dyn std::error::Error> {
     }
 }
 
-impl UserFacingError for libmpv2::Error {
-    fn to_user_facing(&self) -> String {
-        match self {
-            Self::Loadfile { error } => {
-                warn!("MPV ErrorLoadfile: {}", error);
-                format!("ErrorLoadfile: {error}")
-            }
-            Self::Raw(error) => {
-                let string = mpv_error_to_string(*error);
-                warn!("MPV Error: {} ({})", string, error);
-                format!("Error: {string} ({error})")
-            }
-            _ => {
-                warn!("MPV Error: {}", self);
-                format!("Unknown Error: {self}")
-            }
-        }
-    }
-}
-
-fn mpv_error_to_string(error: i32) -> &'static str {
-    match error {
-        0 => "Success",
-        -1 => "Event queue full",
-        -2 => "Out of memory",
-        -3 => "Uninitialized",
-        -4 => "Invalid parameter",
-        -5 => "Option not found",
-        -6 => "Option format",
-        -7 => "Option error",
-        -8 => "Property not found",
-        -9 => "Property format",
-        -10 => "Property unavailable",
-        -11 => "Property error",
-        -12 => "Command",
-        -13 => "Loading failed",
-        -14 => "Audio output init failed",
-        -15 => "Video output init failed",
-        -16 => "Nothing to play",
-        -17 => "Unknown format",
-        -18 => "Unsupported",
-        -19 => "Not implemented",
-        -20 => "Generic",
-        _ => "Unknown",
-    }
-}
-
 impl UserFacingError for anyhow::Error {
     fn to_user_facing(&self) -> String {
         warn!("Unknown Error: {:#}", self);

resources/ui/mpv_control_sidebar.ui

@@ -1,3 +1,2 @@
-#[cfg(target_os = "linux")]
 pub mod mpris;
 pub mod player;

resources/ui/mpv_menu_actions.ui

@@ -32,7 +32,6 @@ pub mod imp {
         },
         subclass::prelude::*,
     };
-    #[cfg(target_os = "linux")]
     use mpris_server::LocalServer;
     use once_cell::sync::*;
     use tracing::{
@@ -101,7 +100,6 @@ pub mod imp {
         pub repeat_mode: Cell<ListRepeatMode>,
         #[property(get, set, default_value = false)]
         pub gapless: RefCell<bool>,
-        #[cfg(target_os = "linux")]
         pub mpris_server: OnceCell<LocalServer<super::MusicPlayer>>,
     }
 
@@ -117,7 +115,6 @@ pub mod imp {
             let pipeline = gst::ElementFactory::make("playbin3").build().unwrap();
 
             // Initialize the mpris server
-            #[cfg(target_os = "linux")]
             glib::spawn_future_local(glib::clone!(
                 #[weak(rename_to = imp)]
                 self,
@@ -450,27 +447,22 @@ pub mod imp {
         pub fn notify_song_changed(&self) {
             let has_prev = self.prev_song().is_some();
             let has_next = self.next_song().is_some();
-            #[cfg(target_os = "linux")]
             self.obj().notify_mpris_song_changed(has_prev, has_next);
         }
 
         pub fn notify_playing(&self) {
-            #[cfg(target_os = "linux")]
             self.obj().notify_mpris_playing();
         }
 
         pub fn notify_paused(&self) {
-            #[cfg(target_os = "linux")]
             self.obj().notify_mpris_paused();
         }
 
         pub fn notify_stopped(&self) {
-            #[cfg(target_os = "linux")]
             self.obj().notify_mpris_stopped();
         }
 
         pub fn notify_seeked(&self, position: i64) {
-            #[cfg(target_os = "linux")]
             self.obj().notify_mpris_seeked(position);
         }
     }

resources/ui/volume_bar.ui

@@ -8,7 +8,6 @@ mod arg;
 mod config;
 mod gstl;
 mod macros;
-#[cfg(target_os = "linux")]
 mod mpris_common;
 mod ui;
 mod utils;
@@ -73,3 +72,19 @@ fn register_gio_resources() {
     let resources = gtk::gio::Resource::load(path).expect("Failed to load resources.");
     gtk::gio::resources_register(&resources);
 }
+
+#[cfg(test)]
+mod tests {
+    use gtk::gio;
+
+    #[test]
+    fn registers_embedded_mutsumi_templates() {
+        mutsumi::register_resources();
+
+        gio::resources_lookup_data(
+            "/io/github/mutsumi/ui/mpv_control_sidebar.ui",
+            gio::ResourceLookupFlags::NONE,
+        )
+        .expect("mutsumi MPVControlSidebar template should be registered");
+    }
+}