feat: add support for mobile (React Native)

Cargo.toml

@@ -39,7 +39,7 @@ path = "src/main.rs"
 
 [dependencies.music-player-server]
 path = "server"
-version = "0.2.0"
+version = "0.2.1"
 
 [dependencies.music-player-playback]
 path = "playback"
@@ -63,19 +63,19 @@ version = "0.1.3"
 
 [dependencies.music-player-storage]
 path = "storage"
-version = "0.1.6"
+version = "0.1.10"
 
 [dependencies.music-player-addons]
 path = "addons"
-version = "0.1.4"
+version = "0.1.6"
 
 [dependencies.music-player-tracklist]
 path = "tracklist"
 version = "0.1.7"
 
 [dependencies.music-player-client]
 path = "client"
-version = "0.1.4"
+version = "0.1.6"
 
 [dependencies.music-player-webui]
 path = "webui"
@@ -87,7 +87,7 @@ version = "0.1.2"
 
 [dependencies.music-player-graphql]
 path = "graphql"
-version = "0.1.7"
+version = "0.1.11"
 
 [dependencies.music-player-types]
 path = "types"

addons/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "music-player-addons"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 repository = "https://github.com/tsirysndr/music-player"
 license = "MIT"
@@ -14,7 +14,7 @@ version = "0.1.5"
 
 [dependencies.music-player-client]
 path = "../client"
-version = "0.1.4"
+version = "0.1.6"
 
 [dependencies.music-player-tracklist]
 path = "../tracklist"

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "music-player-client"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 repository = "https://github.com/tsirysndr/music-player"
 license = "MIT"
@@ -16,7 +16,7 @@ envtestkit = "1.1.2"
 
 [dependencies.music-player-server]
 path = "../server"
-version = "0.2.0"
+version = "0.2.1"
 
 [dependencies.music-player-settings]
 path = "../settings"
@@ -32,7 +32,7 @@ version = "0.1.10"
 
 [dev-dependencies.music-player-storage]
 path = "../storage"
-version = "0.1.4"
+version = "0.1.10"
 
 [dev-dependencies.music-player-tracklist]
 path = "../tracklist"

client/src/tests/mod.rs

@@ -27,7 +27,7 @@ pub async fn setup_new_params(
     Arc<Mutex<UnboundedSender<PlayerCommand>>>,
     Arc<Mutex<UnboundedReceiver<PlayerCommand>>>,
     Arc<Mutex<Tracklist>>,
-    Arc<tokio::sync::Mutex<Database>>,
+    Database,
     SocketAddr,
     String,
 ) {
@@ -50,7 +50,7 @@ pub async fn setup_new_params(
     let addr: SocketAddr = format!("0.0.0.0:{}", port).parse().unwrap();
     let url = format!("http://{}:{}", settings.host, port);
 
-    let db = Arc::new(tokio::sync::Mutex::new(Database::new().await));
+    let db = Database::new().await;
 
     return (
         backend,

client/src/tests/playback.rs

@@ -37,7 +37,7 @@ async fn play() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await
@@ -95,7 +95,7 @@ async fn pause() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await
@@ -150,7 +150,7 @@ async fn stop() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await
@@ -203,7 +203,7 @@ async fn next() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await
@@ -256,7 +256,7 @@ async fn prev() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await
@@ -310,7 +310,7 @@ async fn current() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await

client/src/tests/tracklist.rs

@@ -39,7 +39,7 @@ async fn add() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await
@@ -86,7 +86,7 @@ async fn list() -> Result<(), Box<dyn std::error::Error>> {
                 Playback::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx)),
             )))
             .add_service(tonic_web::enable(TracklistServiceServer::new(
-                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), Arc::clone(&db)),
+                Tracklist::new(Arc::clone(&tracklist), Arc::clone(&cmd_tx), db),
             )))
             .serve_with_shutdown(addr, rx.map(drop))
             .await

graphql/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "music-player-graphql"
-version = "0.1.10"
+version = "0.1.11"
 edition = "2021"
 repository = "https://github.com/tsirysndr/music-player"
 license = "MIT"
@@ -25,7 +25,7 @@ version = "0.1.4"
 
 [dependencies.music-player-storage]
 path = "../storage"
-version = "0.1.6"
+version = "0.1.10"
 
 [dependencies.music-player-entity]
 path = "../entity"
@@ -45,7 +45,7 @@ version = "0.1.2"
 
 [dependencies.music-player-addons]
 path = "../addons"
-version = "0.1.5"
+version = "0.1.6"
 
 [dev-dependencies.music-player-migration]
 path = "../migration"

graphql/src/schema/library.rs

@@ -9,7 +9,7 @@ use music_player_storage::{
     searcher::Searcher,
     Database,
 };
-use music_player_types::types::{self, RemoteCoverUrl, RemoteTrackUrl};
+use music_player_types::types::{RemoteCoverUrl, RemoteTrackUrl};
 use sea_orm::{ActiveModelTrait, ActiveValue};
 use tokio::sync::Mutex;
 
@@ -56,9 +56,13 @@ impl LibraryQuery {
                 .collect());
         }
 
-        let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
-        let results = TrackRepository::new(db.lock().await.get_connection())
-            .find_all(filter, 100)
+        let db = ctx.data::<Database>().unwrap();
+        let results = TrackRepository::new(db.get_connection())
+            .find_all(
+                filter,
+                Some(offset.unwrap_or(0) as u64),
+                limit.unwrap_or(100) as u64,
+            )
             .await?;
 
         Ok(results.into_iter().map(Into::into).collect())
@@ -99,10 +103,10 @@ impl LibraryQuery {
                 .collect());
         }
 
-        let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
+        let db = ctx.data::<Database>().unwrap();
 
-        let results = ArtistRepository::new(db.lock().await.get_connection())
-            .find_all(filter)
+        let results = ArtistRepository::new(db.get_connection())
+            .find_all(filter, offset.map(|x| x as u64), limit.map(|x| x as u64))
             .await?;
 
         Ok(results.into_iter().map(Into::into).collect())
@@ -144,10 +148,10 @@ impl LibraryQuery {
                 .collect());
         }
 
-        let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
+        let db = ctx.data::<Database>().unwrap();
 
-        let results = AlbumRepository::new(db.lock().await.get_connection())
-            .find_all(filter)
+        let results = AlbumRepository::new(db.get_connection())
+            .find_all(filter, offset.map(|x| x as u64), limit.map(|x| x as u64))
             .await?;
 
         Ok(results.into_iter().map(Into::into).collect())
@@ -175,11 +179,9 @@ impl LibraryQuery {
                 .with_remote_cover_url(base_url.as_str()));
         }
 
-        let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
+        let db = ctx.data::<Database>().unwrap();
 
-        let track = TrackRepository::new(db.lock().await.get_connection())
-            .find(&id)
-            .await?;
+        let track = TrackRepository::new(db.get_connection()).find(&id).await?;
 
         Ok(track.into())
     }
@@ -207,11 +209,9 @@ impl LibraryQuery {
                 .into());
         }
 
-        let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
+        let db = ctx.data::<Database>().unwrap();
 
-        let artist = ArtistRepository::new(db.lock().await.get_connection())
-            .find(&id)
-            .await?;
+        let artist = ArtistRepository::new(db.get_connection()).find(&id).await?;
 
         Ok(artist.into())
     }
@@ -239,19 +239,15 @@ impl LibraryQuery {
                 .with_remote_track_url(base_url.as_str()));
         }
 
-        let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
+        let db = ctx.data::<Database>().unwrap();
 
-        let album = AlbumRepository::new(db.lock().await.get_connection())
-            .find(&id)
-            .await?;
+        let album = AlbumRepository::new(db.get_connection()).find(&id).await?;
 
         Ok(album.into())
     }
 
     async fn search(&self, ctx: &Context<'_>, keyword: String) -> Result<SearchResult, Error> {
-        let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
         let searcher = ctx.data::<Arc<Mutex<Searcher>>>().unwrap();
-        let mut db = db.lock().await;
         let indexer = searcher.lock().await;
         let artists = indexer.artist.search(&keyword)?;
         let albums = indexer.album.search(&keyword)?;