From 1d233e39afb5bbd7daab2a81ef2a4eb883ce8830 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 26 Jun 2022 15:12:49 +0200 Subject: [PATCH 1/9] Added a playlist view. Can only play the playlists for now (no save/edit) --- approot/admin-users.xml | 5 +- approot/artist.xml | 8 +- approot/explore.xml | 3 - approot/main.xml | 2 +- approot/mediaplayer.xml | 15 +- approot/messages.xml | 7 +- approot/messages_fr.xml | 7 +- approot/messages_it.xml | 7 +- approot/messages_zh.xml | 7 +- approot/misc.xml | 7 +- approot/playqueue.xml | 10 +- approot/release.xml | 14 +- approot/releases.xml | 4 +- approot/tracklists.xml | 37 +++++ approot/tracks.xml | 10 +- src/libs/services/database/impl/Track.cpp | 10 ++ src/libs/services/database/impl/TrackList.cpp | 52 ++++--- .../include/services/database/Track.hpp | 3 + .../include/services/database/TrackList.hpp | 31 ++-- .../include/services/database/Types.hpp | 7 + src/libs/services/database/test/Cluster.cpp | 8 +- src/libs/services/database/test/TrackList.cpp | 81 ++++++++++- src/libs/subsonic/impl/SubsonicResource.cpp | 14 +- src/libs/utils/impl/String.cpp | 2 +- src/libs/utils/include/utils/String.hpp | 2 +- src/lms/CMakeLists.txt | 1 + src/lms/ui/LmsApplication.cpp | 4 +- src/lms/ui/MediaPlayer.cpp | 7 + src/lms/ui/PlayQueue.cpp | 17 +-- src/lms/ui/PlayQueueAction.hpp | 2 + src/lms/ui/admin/UsersView.cpp | 8 +- .../ui/common/InfiniteScrollingContainer.hpp | 2 +- src/lms/ui/explore/Explore.cpp | 34 ++++- src/lms/ui/explore/Explore.hpp | 1 + src/lms/ui/explore/ReleaseView.cpp | 4 +- src/lms/ui/explore/ReleasesView.hpp | 2 - src/lms/ui/explore/SearchView.cpp | 2 +- src/lms/ui/explore/TrackListHelpers.cpp | 5 +- src/lms/ui/explore/TrackListsView.cpp | 133 ++++++++++++++++++ src/lms/ui/explore/TrackListsView.hpp | 59 ++++++++ src/lms/ui/resource/DownloadResource.cpp | 38 ++++- src/lms/ui/resource/DownloadResource.hpp | 11 ++ 42 files changed, 563 insertions(+), 120 deletions(-) create mode 100644 approot/tracklists.xml create mode 100644 src/lms/ui/explore/TrackListsView.cpp create mode 100644 src/lms/ui/explore/TrackListsView.hpp diff --git a/approot/admin-users.xml b/approot/admin-users.xml index ac326d97..6578223e 100644 --- a/approot/admin-users.xml +++ b/approot/admin-users.xml @@ -14,9 +14,12 @@
${name}${}${tag}${}
+ ${}
- ${}${edit-btn class="btn btn-sm btn-secondary me-1"}${del-btn class="btn btn-sm btn-danger"}${} + ${edit-btn class="btn btn-sm btn-outline-secondary border-0"} + ${del-btn class="btn btn-sm btn-outline-danger border-0"}
+ ${} diff --git a/approot/artist.xml b/approot/artist.xml index 24045219..67d65f0a 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -10,13 +10,13 @@ ${play-btn class="btn btn-primary"} @@ -29,16 +29,21 @@ ${title class="d-block text-truncate"} ${release class="text-decoration-none text-truncate link-success"} -
+
+ + -- / -- +
+
-
- - -- / -- +
+ ${playqueue-btn class="btn btn-outline-primary border-0"}
+ + diff --git a/approot/messages.xml b/approot/messages.xml index 93d68433..4b9b2f9e 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -6,9 +6,11 @@ Add Administration Apply -Discard Cancel Create +Delete +Discard +Edit Loading... Login Logout @@ -85,11 +87,9 @@ New user Admin -Delete Delete user Delete user? Demo -Edit Users Users @@ -130,6 +130,7 @@ Albums Star Starred +Playlists Tracks Type Unstar diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index e1fff9b1..87dae2f4 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -6,9 +6,11 @@ Ajouter Administration Appliquer -Annuler Annuler Créer +Supprimer +Annuler +Editer Chargement... Login Quitter @@ -85,11 +87,9 @@ Ajouter Admin -Supprimer Supprimer l'utilisateur Supprimer l'utilisateur ? Demo -Editer Utilisateurs Utilisateurs @@ -130,6 +130,7 @@ Albums Ajouter aux favoris Favoris +Playlists Pistes Type Retirer des favoris diff --git a/approot/messages_it.xml b/approot/messages_it.xml index 7fd6fdfd..ecaf084f 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -6,9 +6,11 @@ Aggiungi Amministrazione Applica -Annulla Annulla Crea +Elimina +Annulla +Modifica Caricamento... Login Logout @@ -84,11 +86,9 @@ Nuovo utente Amministratore -Elimina Elimina l'utente Vuoi eliminare l'utente? Demo -Modifica Utenti Utenti @@ -129,6 +129,7 @@ Album Aggiungi ai preferiti Preferiti + Tracce Tipo Rimuovi dai preferiti diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index 094fffa0..5e696bb4 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -6,9 +6,11 @@ 添加 管理 应用 -撤销 取消 新建 +删除 +撤销 +编辑 加载中... 登陆 注销 @@ -85,11 +87,9 @@ 新建用户 管理员 -删除 删除用户 确认要删除此用户？ 演示 -编辑 用户 用户 @@ -130,6 +130,7 @@ 专辑 收藏 已收藏 + 音轨 类型 取消收藏 diff --git a/approot/misc.xml b/approot/misc.xml index 195c305f..92bb948d 100644 --- a/approot/misc.xml +++ b/approot/misc.xml @@ -9,9 +9,14 @@ - + ${elements} ${loading-indicator} + + + + + diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 55d9c47e..21a57b44 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -26,10 +26,6 @@ ${entries} - - - -
@@ -44,14 +40,14 @@
${play-btn class="btn btn-sm btn-outline-secondary border-0"} - ${del-btn class="btn btn-sm btn-outline-secondary border-0"}
${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
    -
  • ${star class="btn dropdown-item"}
    • -
  • ${download class="btn dropdown-item"}
    • +
  • ${star class="dropdown-item"}
    • +
  • ${download class="dropdown-item"}
+ ${del-btn class="btn btn-sm btn-outline-secondary border-0"}
diff --git a/approot/release.xml b/approot/release.xml index 715c2d3d..944437db 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -21,13 +21,13 @@ ${play-btn class="btn btn-primary"}