Skip to content

Commit f07c690

Browse files
tsirysndrtsirysndr
authored
Merge pull request #87 from tsirysndr/feat/move-playlist-to-folder
feat(webui): implement move playlist to folder
2 parents d291f94 + 4d2e8b3 commit f07c690

File tree

26 files changed

+462
-95
lines changed

26 files changed

+462
-95
lines changed

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "music-player"
3-
version = "0.2.0-alpha.4"
3+
version = "0.2.0-alpha.5"
44
edition = "2021"
55
repository = "https://github.com/tsirysndr/music-player"
66
license = "MIT"
@@ -76,7 +76,7 @@ version = "0.1.1"
7676

7777
[dependencies.music-player-webui]
7878
path = "webui"
79-
version = "0.1.5"
79+
version = "0.1.6"
8080

8181
[dependencies.music-player-discovery]
8282
path = "discovery"

‎graphql/src/schema/playlist.rs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,30 @@ impl PlaylistQuery {
9494
.map_err(|e| Error::new(e.to_string()))
9595
}
9696

97+
async fn main_playlists(&self, ctx: &Context<'_>) -> Result<Vec<Playlist>, Error> {
98+
let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
99+
let db = db.lock().await;
100+
playlist_entity::Entity::find()
101+
.order_by_asc(playlist_entity::Column::Name)
102+
.filter(playlist_entity::Column::FolderId.is_null())
103+
.all(db.get_connection())
104+
.await
105+
.map(|playlists| playlists.into_iter().map(Into::into).collect())
106+
.map_err(|e| Error::new(e.to_string()))
107+
}
108+
109+
async fn recent_playlists(&self, ctx: &Context<'_>) -> Result<Vec<Playlist>, Error> {
110+
let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
111+
let db = db.lock().await;
112+
playlist_entity::Entity::find()
113+
.order_by_desc(playlist_entity::Column::CreatedAt)
114+
.limit(10)
115+
.all(db.get_connection())
116+
.await
117+
.map(|playlists| playlists.into_iter().map(Into::into).collect())
118+
.map_err(|e| Error::new(e.to_string()))
119+
}
120+
97121
async fn folder(&self, ctx: &Context<'_>, id: ID) -> Result<Folder, Error> {
98122
let db = ctx.data::<Arc<Mutex<Database>>>().unwrap();
99123
let db = db.lock().await;

‎webui/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "music-player-webui"
3-
version = "0.1.5"
3+
version = "0.1.6"
44
edition = "2021"
55
repository = "https://github.com/tsirysndr/music-player"
66
license = "MIT"

‎webui/musicplayer/build/asset-manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.56b69c4b.css",
4-
"main.js": "/static/js/main.2a80932d.js",
4+
"main.js": "/static/js/main.f477739f.js",
55
"static/js/787.26bf0a29.chunk.js": "/static/js/787.26bf0a29.chunk.js",
66
"static/media/RockfordSans-ExtraBold.otf": "/static/media/RockfordSans-ExtraBold.1513e8fd97078bfb7708.otf",
77
"static/media/RockfordSans-Bold.otf": "/static/media/RockfordSans-Bold.c9f599ae01b13e565598.otf",
@@ -10,11 +10,11 @@
1010
"static/media/RockfordSans-Light.otf": "/static/media/RockfordSans-Light.b4a12e8abb38f7d105c4.otf",
1111
"index.html": "/index.html",
1212
"main.56b69c4b.css.map": "/static/css/main.56b69c4b.css.map",
13-
"main.2a80932d.js.map": "/static/js/main.2a80932d.js.map",
13+
"main.f477739f.js.map": "/static/js/main.f477739f.js.map",
1414
"787.26bf0a29.chunk.js.map": "/static/js/787.26bf0a29.chunk.js.map"
1515
},
1616
"entrypoints": [
1717
"static/css/main.56b69c4b.css",
18-
"static/js/main.2a80932d.js"
18+
"static/js/main.f477739f.js"
1919
]
2020
}

‎webui/musicplayer/build/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Music Player</title><script defer="defer" src="/static/js/main.2a80932d.js"></script><link href="/static/css/main.56b69c4b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Music Player</title><script defer="defer" src="/static/js/main.f477739f.js"></script><link href="/static/css/main.56b69c4b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

‎webui/musicplayer/build/static/js/main.2a80932d.js‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎webui/musicplayer/build/static/js/main.2a80932d.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎webui/musicplayer/build/static/js/main.f477739f.js‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webui/musicplayer/build/static/js/main.2a80932d.js.LICENSE.txt‎ renamed to ‎webui/musicplayer/build/static/js/main.f477739f.js.LICENSE.txt‎

File renamed without changes.

0 commit comments

Comments
 (0)