feat(graphql): refactor device detection

Author: tsirysndr

Cargo.lock

@@ -191,3 +191,4 @@ futures-channel = "0.3.24"
 serde_json = "1.0.85"
 dirs = "4.0.0"
 spinners = "4.1.0"
+anyhow = "1.0.67"

Cargo.toml

@@ -8,4 +8,15 @@ authors = ["Tsiry Sandratraina <tsiry.sndr@aol.com>"]
 description = "The addons for the music player"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[dependencies.music-player-types]
+path = "../types"
+version = "0.1.1"
+
+[dependencies.music-player-client]
+path = "../client"
+version = "0.1.1"
+
 [dependencies]
+surf = "2.3.2"
+async-trait = "0.1.59"
+anyhow = "1.0.67"

addons/Cargo.toml

@@ -1,3 +1,5 @@
+use anyhow::Error;
+
 use super::{Addon, StreamingAddon};
 
 pub struct DatPiff {
@@ -47,7 +49,7 @@ impl Addon for DatPiff {
 }
 
 impl StreamingAddon for DatPiff {
-    fn stream(&self, url: &str) -> Result<(), Box<dyn std::error::Error>> {
+    fn stream(&self, url: &str) -> Result<(), Error> {
         todo!("Implement DatPiff::stream");
     }
 }

addons/src/datpiff.rs

@@ -1,3 +1,5 @@
+use anyhow::Error;
+
 use super::{Addon, StreamingAddon};
 
 pub struct Deezer {
@@ -47,7 +49,7 @@ impl Addon for Deezer {
 }
 
 impl StreamingAddon for Deezer {
-    fn stream(&self, url: &str) -> Result<(), Box<dyn std::error::Error>> {
+    fn stream(&self, url: &str) -> Result<(), Error> {
         todo!("Implement Deezer::stream");
     }
 }

addons/src/deezer.rs

@@ -0,0 +1,125 @@
+use anyhow::Error;
+
+use async_trait::async_trait;
+use music_player_types::types::{Album, Artist, Device, Track};
+
+use super::{Addon, Browseable, Player, StreamingAddon};
+
+pub struct Client {
+    pub host: String,
+    pub port: u16,
+}
+
+pub struct Kodi {
+    name: String,
+    version: String,
+    author: String,
+    description: String,
+    enabled: bool,
+    client: Option<Client>,
+}
+
+impl Kodi {
+    pub fn new() -> Self {
+        Self {
+            name: "Kodi".to_string(),
+            version: "0.1.0".to_string(),
+            author: "Tsiry Sandratraina".to_string(),
+            description: "Kodi addon".to_string(),
+            enabled: true,
+            client: None,
+        }
+    }
+}
+
+impl Addon for Kodi {
+    fn name(&self) -> &str {
+        &self.name
+    }
+
+    fn version(&self) -> &str {
+        &self.version
+    }
+
+    fn author(&self) -> &str {
+        &self.author
+    }
+
+    fn description(&self) -> &str {
+        &self.description
+    }
+
+    fn enabled(&self) -> bool {
+        self.enabled
+    }
+
+    fn set_enabled(&mut self, enabled: bool) {
+        self.enabled = enabled;
+    }
+}
+
+impl StreamingAddon for Kodi {
+    fn stream(&self, url: &str) -> Result<(), Error> {
+        todo!("Implement Kodi::stream");
+    }
+}
+
+#[async_trait]
+impl Browseable for Kodi {
+    async fn albums(&mut self) -> Result<Vec<Album>, Error> {
+        todo!()
+    }
+
+    async fn artists(&mut self) -> Result<Vec<Artist>, Error> {
+        todo!()
+    }
+
+    async fn tracks(&mut self) -> Result<Vec<Track>, Error> {
+        todo!()
+    }
+
+    async fn album(&mut self, id: &str) -> Result<Album, Error> {
+        todo!()
+    }
+
+    async fn artist(&mut self, id: &str) -> Result<Artist, Error> {
+        todo!()
+    }
+
+    async fn track(&mut self, id: &str) -> Result<Track, Error> {
+        todo!()
+    }
+}
+
+#[async_trait]
+impl Player for Kodi {
+    async fn play(&mut self) -> Result<(), Error> {
+        todo!()
+    }
+
+    async fn pause(&mut self) -> Result<(), Error> {
+        todo!()
+    }
+
+    async fn stop(&mut self) -> Result<(), Error> {
+        todo!()
+    }
+
+    async fn next(&mut self) -> Result<(), Error> {
+        todo!()
+    }
+
+    async fn previous(&mut self) -> Result<(), Error> {
+        todo!()
+    }
+
+    async fn seek(&mut self, position: u32) -> Result<(), Error> {
+        todo!()
+    }
+}
+
+impl From<Device> for Kodi {
+    fn from(device: Device) -> Self {
+        Self { ..Kodi::new() }
+    }
+}

addons/src/kodi.rs

@@ -1,10 +1,15 @@
 pub mod datpiff;
 pub mod deezer;
 pub mod genius;
+pub mod kodi;
 pub mod local;
 pub mod myvazo;
 pub mod tononkira;
 
+use anyhow::Error;
+use async_trait::async_trait;
+use music_player_types::types::{Album, Artist, Track};
+
 pub trait Addon {
     fn name(&self) -> &str;
     fn version(&self) -> &str;
@@ -15,9 +20,29 @@ pub trait Addon {
 }
 
 pub trait StreamingAddon {
-    fn stream(&self, url: &str) -> Result<(), Box<dyn std::error::Error>>;
+    fn stream(&self, url: &str) -> Result<(), Error>;
 }
 
 pub trait LyricsAddon {
     fn get_lyrics(&self, artist: &str, title: &str) -> Option<String>;
 }
+
+#[async_trait]
+pub trait Browseable {
+    async fn albums(&mut self) -> Result<Vec<Album>, Error>;
+    async fn artists(&mut self) -> Result<Vec<Artist>, Error>;
+    async fn tracks(&mut self) -> Result<Vec<Track>, Error>;
+    async fn album(&mut self, id: &str) -> Result<Album, Error>;
+    async fn artist(&mut self, id: &str) -> Result<Artist, Error>;
+    async fn track(&mut self, id: &str) -> Result<Track, Error>;
+}
+
+#[async_trait]
+pub trait Player {
+    async fn play(&mut self) -> Result<(), Error>;
+    async fn pause(&mut self) -> Result<(), Error>;
+    async fn stop(&mut self) -> Result<(), Error>;
+    async fn next(&mut self) -> Result<(), Error>;
+    async fn previous(&mut self) -> Result<(), Error>;
+    async fn seek(&mut self, position: u32) -> Result<(), Error>;
+}