owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial support for multi library, still WIP

Browse Source
This commit is contained in:
emeric
2024-01-25 00:01:11 +01:00
parent f5f577af52
commit 0ed3f1ba79
85 changed files with 3076 additions and 1445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/admin-medialibraries.xml
+47
View File
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<message id="Lms.Admin.MediaLibraries.template">
<legend>${tr:Lms.Admin.MediaLibraries.media-libraries}</legend>
${libraries class="d-grid gap-1 mb-3 Lms-row-container"}
${add-btn class="btn btn-primary"}
</message>
<message id="Lms.Admin.MediaLibraries.template.entry">
<div class="d-flex align-items-center Lms-bg-dark-hover">
<div class="row align-items-center flex-fill">
<div class="col-12 col-md-4">
<div class="p-2">
${name class="d-block text-truncate"}
</div>
</div>
<div class="col-12 col-md-8">
<div class="p-2 d-none d-md-block">
${path class="d-block text-truncate"}
</div>
</div>
</div>
<div class="p-2 d-flex">
${edit-btn class="btn btn-sm btn-outline-secondary border-0"}
${del-btn class="btn btn-sm btn-outline-danger border-0"}
</div>
</div>
</message>
<message id="Lms.Admin.MediaLibraries.template.delete-library">
<div class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">${tr:Lms.Admin.MediaLibrary.del-library-confirm}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-footer">
${del-btn class="btn btn-danger me-1"}${cancel-btn class="btn btn-secondary"}
</div>
</div>
</div>
</div>
</message>
</messages>
approot/admin-medialibrary.xml
+44
View File
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<message id="Lms.Admin.MediaLibrary.template">
<div class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">${title}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form>
<div class="row">
<div class="col-12">
<label class="form-label" for="${id:name}">
${tr:Lms.Admin.MediaLibrary.name}
</label>
${name class="form-control"}
<div class="invalid-feedback">
${name-info}
</div>
</div>
<div class="col-12">
<label class="form-label" for="${id:directory}">
${tr:Lms.Admin.MediaLibrary.root-path}
</label>
${directory class="form-control"}
<div class="invalid-feedback">
${directory-info}
</div>
</div>
</div>
</form>
</div>
<div class="modal-footer">
${save-btn class="btn btn-primary me-1"}${cancel-btn class="btn btn-secondary"}
</div>
</div>
</div>
</div>
</message>
</messages>
approot/admin-scannercontroller.xml
+34 -38
View File
@@ -2,46 +2,42 @@
<messages xmlns:if="Wt.WTemplate.conditions"> <messages xmlns:if="Wt.WTemplate.conditions">
<message id="Lms.Admin.ScannerController.template"> <message id="Lms.Admin.ScannerController.template">
<div class="card"> <form>
<h5 class="card-header">${tr:Lms.Admin.ScannerController.scanner}</h5> <legend>${tr:Lms.Admin.ScannerController.scanner}</legend>
<div class="card-body"> <div class="row g-3">
<form> <div class="col-lg-6">
<div class="row g-3"> <label class="form-label" for="${id:status}">
<div class="col-lg-6"> ${tr:Lms.Admin.ScannerController.status}
<label class="form-label" for="${id:status}"> </label>
${tr:Lms.Admin.ScannerController.status} ${status class="form-control"}
</label> </div>
${status class="form-control"} <div class="col-lg-6">
</div> <label class="form-label" for="${id:step-status}">
<div class="col-lg-6"> ${tr:Lms.Admin.ScannerController.step-status}
<label class="form-label" for="${id:step-status}"> </label>
${tr:Lms.Admin.ScannerController.step-status} ${step-status class="form-control"}
</label> </div>
${step-status class="form-control"} <div class="col-12">
</div> <label class="form-label" for="{id:last-scan}">
<div class="col-12"> ${tr:Lms.Admin.ScannerController.last-scan}
<label class="form-label" for="{id:last-scan}"> </label>
${tr:Lms.Admin.ScannerController.last-scan} <div class="input-group">
</label> ${last-scan class="form-control"}
<div class="input-group"> ${report-btn class="btn btn-outline-info"}
${last-scan class="form-control"}
${report-btn class="btn btn-outline-info"}
</div>
</div>
<div class="col-12">
<div class="btn-group">
${scan-btn class="btn btn-primary"}
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
</button>
<ul class="dropdown-menu">
<li>${full-scan-btn class="dropdown-item"}</li>
</ul>
</div>
</div>
</div> </div>
</form> </div>
<div class="col-12">
<div class="btn-group">
${scan-btn class="btn btn-primary"}
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
</button>
<ul class="dropdown-menu">
<li>${full-scan-btn class="dropdown-item"}</li>
</ul>
</div>
</div>
</div> </div>
</div> </form>
</message> </message>
</messages> </messages>
approot/admin-database.xml → approot/admin-scansettings.xml
+4 -15
View File
@@ -5,17 +5,8 @@
<message id="Lms.Admin.Database.template"> <message id="Lms.Admin.Database.template">
<form class="row g-3"> <form class="row g-3">
<legend>${tr:Lms.Admin.Database.database}</legend> <legend>${tr:Lms.Admin.Database.scan-settings}</legend>
<div class="col-12"> <div class="col-sm-6">
<label class="form-label" for="${id:media-directory}">
${tr:Lms.Admin.Database.path}
</label>
${media-directory class="form-control"}
<div class="invalid-feedback">
${media-directory-info}
</div>
</div>
<div class="col-lg-6">
<label class="form-label" for="${id:update-period}"> <label class="form-label" for="${id:update-period}">
${tr:Lms.Admin.Database.update-period} ${tr:Lms.Admin.Database.update-period}
</label> </label>
@@ -24,7 +15,7 @@
${update-period-info"} ${update-period-info"}
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-sm-6">
<label class="form-label" for="${id:update-start-time}"> <label class="form-label" for="${id:update-start-time}">
${tr:Lms.Admin.Database.update-start-time} ${tr:Lms.Admin.Database.update-start-time}
</label> </label>
@@ -33,7 +24,6 @@
${update-start-time-info} ${update-start-time-info}
</div> </div>
</div> </div>
<legend>${tr:Lms.Admin.Database.scan-options}</legend>
<div class="col-12"> <div class="col-12">
<label class="form-label" for="${id:similarity-engine-type}"> <label class="form-label" for="${id:similarity-engine-type}">
${tr:Lms.Admin.Database.similarity-engine-type} ${tr:Lms.Admin.Database.similarity-engine-type}
@@ -53,11 +43,10 @@
</div> </div>
</div> </div>
<div class="col-12"> <div class="col-12">
${apply-btn class="btn btn-primary me-1"}${discard-btn class="btn btn-secondary"} ${save-btn class="btn btn-primary me-1"}${discard-btn class="btn btn-secondary"}
</div> </div>
</form> </form>
<br/> <br/>
${scanner-controller}
</message> </message>
</messages> </messages>
approot/admin-users.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<messages xmlns:if="Wt.WTemplate.conditions"> <messages xmlns:if="Wt.WTemplate.conditions">
<message id="Lms.Admin.Users.template"> <message id="Lms.Admin.Users.template">
<h3>${tr:Lms.Admin.Users.users}</h3> <legend>${tr:Lms.Admin.Users.users}</legend>
${users class="d-grid gap-1 mb-3 Lms-row-container"} ${users class="d-grid gap-1 mb-3 Lms-row-container"}
${<if-can-create-user>} ${<if-can-create-user>}
${add-btn class="btn btn-primary"} ${add-btn class="btn btn-primary"}
approot/main.xml
+3 -1
View File
@@ -45,7 +45,9 @@
<i class="fa fa-cogs" aria-hidden="true"></i> <i class="fa fa-cogs" aria-hidden="true"></i>
</a> </a>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown"> <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
<li>${database class="dropdown-item"}</li> <li>${media-libraries class="dropdown-item"}</li>
<li>${scan-settings class="dropdown-item"}</li>
<li>${scanner class="dropdown-item"}</li>
<li>${users class="dropdown-item"}</li> <li>${users class="dropdown-item"}</li>
</ul> </ul>
</li> </li>
approot/messages.xml
+23 -9
View File
@@ -5,7 +5,6 @@
<!--Common--> <!--Common-->
<message id="Lms.add">Add</message> <message id="Lms.add">Add</message>
<message id="Lms.administration">Administration</message> <message id="Lms.administration">Administration</message>
<message id="Lms.apply">Apply</message>
<message id="Lms.cancel">Cancel</message> <message id="Lms.cancel">Cancel</message>
<message id="Lms.clusters">Tags</message> <message id="Lms.clusters">Tags</message>
<message id="Lms.create">Create</message> <message id="Lms.create">Create</message>
@@ -16,7 +15,6 @@
<message id="Lms.loading">Loading...</message> <message id="Lms.loading">Loading...</message>
<message id="Lms.login">Login</message> <message id="Lms.login">Login</message>
<message id="Lms.logout"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> Logout</message> <message id="Lms.logout"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> Logout</message>
<message id="Lms.not-a-directory">Not a directory</message>
<message id="Lms.ok">Ok</message> <message id="Lms.ok">Ok</message>
<message id="Lms.password">Password</message> <message id="Lms.password">Password</message>
<message id="Lms.password-bad-login-combination">Bad login / password combination</message> <message id="Lms.password-bad-login-combination">Bad login / password combination</message>
@@ -29,6 +27,7 @@
<message id="Lms.passwords-dont-match">Passwords don't match</message> <message id="Lms.passwords-dont-match">Passwords don't match</message>
<message id="Lms.quit-other-session">Another session has been open. Reopen this one?</message> <message id="Lms.quit-other-session">Another session has been open. Reopen this one?</message>
<message id="Lms.save">Save</message> <message id="Lms.save">Save</message>
<message id="Lms.settings-saved">Settings saved!</message>
<message id="Lms.track-count"> <message id="Lms.track-count">
<plural case="0">{1} track</plural> <plural case="0">{1} track</plural>
<plural case="1">{1} tracks</plural> <plural case="1">{1} tracks</plural>
@@ -45,20 +44,36 @@
<message id="Lms.Error.user-not-found">User not found</message> <message id="Lms.Error.user-not-found">User not found</message>
<!--Administration--> <!--Administration-->
<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Music libraries</message>
<message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Scan settings</message>
<message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
<message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Users</message>
<!--MediaLibraries-->
<message id="Lms.Admin.MediaLibraries.media-libraries">Music libraries</message>
<message id="Lms.Admin.MediaLibrary.create-library">Create library</message>
<message id="Lms.Admin.MediaLibrary.del-library-confirm">Delete library?</message>
<message id="Lms.Admin.MediaLibrary.edit-library">Edit library</message>
<message id="Lms.Admin.MediaLibrary.library-created">Library created!</message>
<message id="Lms.Admin.MediaLibrary.library-deleted">Library deleted!</message>
<message id="Lms.Admin.MediaLibrary.name">Library name</message>
<message id="Lms.Admin.MediaLibrary.name-already-exists">Library name already exists</message>
<message id="Lms.Admin.MediaLibrary.path-must-be-absolute">Path must be absolute</message>
<message id="Lms.Admin.MediaLibrary.path-must-not-overlap">Path must not overlap that of another library</message>
<message id="Lms.Admin.MediaLibrary.path-must-be-existing-directory">Path must be an existing directory</message>
<message id="Lms.Admin.MediaLibrary.root-path">Root directory</message>
<message id="Lms.Admin.Database.add-library">Add library</message>
<message id="Lms.Admin.Database.daily">Daily</message> <message id="Lms.Admin.Database.daily">Daily</message>
<message id="Lms.Admin.Database.database">Music collection</message>
<message id="Lms.Admin.Database.extra-tags-to-scan">Extra tags to scan (use <kbd>;</kbd> as separator)</message> <message id="Lms.Admin.Database.extra-tags-to-scan">Extra tags to scan (use <kbd>;</kbd> as separator)</message>
<message id="Lms.Admin.Database.hourly">Hourly</message> <message id="Lms.Admin.Database.hourly">Hourly</message>
<message id="Lms.Admin.Database.immediate-scan">Scan now!</message> <message id="Lms.Admin.Database.immediate-scan">Scan now!</message>
<message id="Lms.Admin.Database.monthly">Monthly</message> <message id="Lms.Admin.Database.monthly">Monthly</message>
<message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Music collection</message>
<message id="Lms.Admin.Database.never">Never</message> <message id="Lms.Admin.Database.never">Never</message>
<message id="Lms.Admin.Database.path">Media root directory</message> <message id="Lms.Admin.Database.scan-aborted">Scan aborted!</message>
<message id="Lms.Admin.Database.path-help">Directories containing a <code>.lmsignore</code> file are skipped</message>
<message id="Lms.Admin.Database.scan-complete">Scan complete: {1} total files, {2} additions, {3} updates, {4} deletions, {5} duplicates, {6} errors</message> <message id="Lms.Admin.Database.scan-complete">Scan complete: {1} total files, {2} additions, {3} updates, {4} deletions, {5} duplicates, {6} errors</message>
<message id="Lms.Admin.Database.scan-launched">Scan launched!</message> <message id="Lms.Admin.Database.scan-launched">Scan launched!</message>
<message id="Lms.Admin.Database.scan-options">Scan options</message> <message id="Lms.Admin.Database.scan-settings">Scan settings</message>
<message id="Lms.Admin.Database.settings-saved">New settings saved!</message>
<message id="Lms.Admin.Database.similarity-engine-type">Similarity engine</message> <message id="Lms.Admin.Database.similarity-engine-type">Similarity engine</message>
<message id="Lms.Admin.Database.similarity-engine-type.clusters">Tag-based</message> <message id="Lms.Admin.Database.similarity-engine-type.clusters">Tag-based</message>
<message id="Lms.Admin.Database.similarity-engine-type.none">None</message> <message id="Lms.Admin.Database.similarity-engine-type.none">None</message>
@@ -100,7 +115,6 @@
<message id="Lms.Admin.Users.del-user-confirm">Delete user?</message> <message id="Lms.Admin.Users.del-user-confirm">Delete user?</message>
<message id="Lms.Admin.Users.demo">Demo</message> <message id="Lms.Admin.Users.demo">Demo</message>
<message id="Lms.Admin.Users.users">Users</message> <message id="Lms.Admin.Users.users">Users</message>
<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Users</message>
<!--User--> <!--User-->
<message id="Lms.Admin.User.demo-account">Demo account</message> <message id="Lms.Admin.User.demo-account">Demo account</message>
approot/messages_fr.xml
+1 -3
View File
@@ -5,7 +5,6 @@
<!--Common--> <!--Common-->
<message id="Lms.add">Ajouter</message> <message id="Lms.add">Ajouter</message>
<message id="Lms.administration">Administration</message> <message id="Lms.administration">Administration</message>
<message id="Lms.apply">Appliquer</message>
<message id="Lms.cancel">Annuler</message> <message id="Lms.cancel">Annuler</message>
<message id="Lms.clusters">Tags</message> <message id="Lms.clusters">Tags</message>
<message id="Lms.create">Créer</message> <message id="Lms.create">Créer</message>
@@ -54,10 +53,9 @@
<message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Collection de musiques</message> <message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Collection de musiques</message>
<message id="Lms.Admin.Database.never">Jamais</message> <message id="Lms.Admin.Database.never">Jamais</message>
<message id="Lms.Admin.Database.path">Dossier racine des fichiers de musique</message> <message id="Lms.Admin.Database.path">Dossier racine des fichiers de musique</message>
<message id="Lms.Admin.Database.path-help">Les dossiers contenant un fichier <code>.lmsignore</code> sont ignorés</message>
<message id="Lms.Admin.Database.scan-complete">Scan terminé : {1} fichiers, {2} ajouts, {3} mises à jour, {4} suppressions, {5} duplicatas, {6} erreurs</message> <message id="Lms.Admin.Database.scan-complete">Scan terminé : {1} fichiers, {2} ajouts, {3} mises à jour, {4} suppressions, {5} duplicatas, {6} erreurs</message>
<message id="Lms.Admin.Database.scan-launched">Scan lancé !</message> <message id="Lms.Admin.Database.scan-launched">Scan lancé !</message>
<message id="Lms.Admin.Database.scan-options">Options </message> <message id="Lms.Admin.Database.scan-settings">Options </message>
<message id="Lms.Admin.Database.settings-saved">Nouveaux paramètres sauvegardés !</message> <message id="Lms.Admin.Database.settings-saved">Nouveaux paramètres sauvegardés !</message>
<message id="Lms.Admin.Database.similarity-engine-type">Moteur de similarité</message> <message id="Lms.Admin.Database.similarity-engine-type">Moteur de similarité</message>
<message id="Lms.Admin.Database.similarity-engine-type.clusters">Basé sur les tags</message> <message id="Lms.Admin.Database.similarity-engine-type.clusters">Basé sur les tags</message>
approot/messages_it.xml
+1 -2
View File
@@ -5,7 +5,6 @@
<!--Common--> <!--Common-->
<message id="Lms.add">Aggiungi</message> <message id="Lms.add">Aggiungi</message>
<message id="Lms.administration">Amministrazione</message> <message id="Lms.administration">Amministrazione</message>
<message id="Lms.apply">Applica</message>
<message id="Lms.cancel">Annulla</message> <message id="Lms.cancel">Annulla</message>
<message id="Lms.clusters">Tags</message> <message id="Lms.clusters">Tags</message>
<message id="Lms.create">Crea</message> <message id="Lms.create">Crea</message>
@@ -57,7 +56,7 @@
<message id="Lms.Admin.Database.scan-complete">Scansione completata: {1} file totali, {2} aggiunti, {3} aggiornati, {4} eliminati, {5} duplicati, {6} errati</message> <message id="Lms.Admin.Database.scan-complete">Scansione completata: {1} file totali, {2} aggiunti, {3} aggiornati, {4} eliminati, {5} duplicati, {6} errati</message>
<message id="Lms.Admin.Database.scan-launched">Scansione avviata!</message> <message id="Lms.Admin.Database.scan-launched">Scansione avviata!</message>
<message id="Lms.Admin.Database.scan-options">Impostazioni scansione</message> <message id="Lms.Admin.Database.scan-settings">Impostazioni scansione</message>
<message id="Lms.Admin.Database.settings-saved">Impostazioni salvate!</message> <message id="Lms.Admin.Database.settings-saved">Impostazioni salvate!</message>
approot/messages_zh.xml
+1 -3
View File
@@ -5,7 +5,6 @@
<!--Common--> <!--Common-->
<message id="Lms.add">添加</message> <message id="Lms.add">添加</message>
<message id="Lms.administration">管理</message> <message id="Lms.administration">管理</message>
<message id="Lms.apply">应用</message>
<message id="Lms.cancel">取消</message> <message id="Lms.cancel">取消</message>
<message id="Lms.clusters">标签</message> <message id="Lms.clusters">标签</message>
<message id="Lms.create">新建</message> <message id="Lms.create">新建</message>
@@ -54,10 +53,9 @@
<message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> 音乐收藏</message> <message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> 音乐收藏</message>
<message id="Lms.Admin.Database.never">从不</message> <message id="Lms.Admin.Database.never">从不</message>
<message id="Lms.Admin.Database.path">媒体根目录</message> <message id="Lms.Admin.Database.path">媒体根目录</message>
<message id="Lms.Admin.Database.path-help">包含 <code>.lmsignore</code> 文件的目录将会被跳过</message>
<message id="Lms.Admin.Database.scan-complete">扫描完成：总文件 {1}，添加文件 {2}，更新文件 {3}，删除文件 {4}，重复文件 {5}，错误文件 {6}</message> <message id="Lms.Admin.Database.scan-complete">扫描完成：总文件 {1}，添加文件 {2}，更新文件 {3}，删除文件 {4}，重复文件 {5}，错误文件 {6}</message>
<message id="Lms.Admin.Database.scan-launched">扫描已完成！</message> <message id="Lms.Admin.Database.scan-launched">扫描已完成！</message>
<message id="Lms.Admin.Database.scan-options">扫描选项</message> <message id="Lms.Admin.Database.scan-settings">扫描选项</message>
<message id="Lms.Admin.Database.settings-saved">新设置已保存！</message> <message id="Lms.Admin.Database.settings-saved">新设置已保存！</message>
approot/misc.xml
+1
View File
@@ -14,6 +14,7 @@
${loading-indicator} ${loading-indicator}
</message> </message>
<message id="Lms.template.trash-btn"><i class="fa fa-fw fa-trash"></i></message>
<message id="Lms.template.delete-btn"><i class="fa fa-fw fa-times"></i></message> <message id="Lms.template.delete-btn"><i class="fa fa-fw fa-times"></i></message>
<message id="Lms.template.edit-btn"><i class="fa fa-fw fa-edit"></i></message> <message id="Lms.template.edit-btn"><i class="fa fa-fw fa-edit"></i></message>
<message id="Lms.template.more-btn"><i class="fa fa-fw fa-ellipsis-v"></i></message> <message id="Lms.template.more-btn"><i class="fa fa-fw fa-ellipsis-v"></i></message>
approot/settings.xml
+1 -1
View File
@@ -177,7 +177,7 @@
</div> </div>
${</if-has-change-password>} ${</if-has-change-password>}
<div class="col-12"> <div class="col-12">
${apply-btn class="btn btn-primary me-1"}${discard-btn class="btn btn-secondary"} ${save-btn class="btn btn-primary me-1"}${discard-btn class="btn btn-secondary"}
</div> </div>
</form> </form>
</message> </message>
src/libs/database/CMakeLists.txt
+1
View File
@@ -4,6 +4,7 @@ add_library(lmsdatabase SHARED
impl/Cluster.cpp impl/Cluster.cpp
impl/Db.cpp impl/Db.cpp
impl/Listen.cpp impl/Listen.cpp
impl/MediaLibrary.cpp
impl/Migration.cpp impl/Migration.cpp
impl/TrackArtistLink.cpp impl/TrackArtistLink.cpp
impl/TrackFeatures.cpp impl/TrackFeatures.cpp
src/libs/database/impl/Artist.cpp
+5 -1
View File
@@ -46,7 +46,8 @@ namespace Database
|| params.linkType || params.linkType
|| params.track.isValid() || params.track.isValid()
|| params.release.isValid() || params.release.isValid()
|| params.clusters.size() == 1) || params.clusters.size() == 1
|| params.mediaLibrary.isValid())
{ {
query.join("track t ON t.id = t_a_l.track_id"); query.join("track t ON t.id = t_a_l.track_id");
query.join("track_artist_link t_a_l ON t_a_l.artist_id = a.id"); query.join("track_artist_link t_a_l ON t_a_l.artist_id = a.id");
@@ -120,6 +121,9 @@ namespace Database
if (params.release.isValid()) if (params.release.isValid())
query.where("t.release_id = ?").bind(params.release); query.where("t.release_id = ?").bind(params.release);
if (params.mediaLibrary.isValid())
query.where("t.media_library_id = ?").bind(params.mediaLibrary);
switch (params.sortMethod) switch (params.sortMethod)
{ {
case ArtistSortMethod::None: case ArtistSortMethod::None:
src/libs/database/impl/Cluster.cpp
+1
View File
@@ -20,6 +20,7 @@
#include "database/Cluster.hpp" #include "database/Cluster.hpp"
#include "database/Artist.hpp" #include "database/Artist.hpp"
#include "database/MediaLibrary.hpp"
#include "database/Release.hpp" #include "database/Release.hpp"
#include "database/ScanSettings.hpp" #include "database/ScanSettings.hpp"
#include "database/Session.hpp" #include "database/Session.hpp"
src/libs/database/impl/EnumSetTraits.hpp
+21 -22
View File
@@ -26,29 +26,28 @@
namespace Wt::Dbo namespace Wt::Dbo
{ {
template<typename T>
struct sql_value_traits<EnumSet<T>, void> : public sql_value_traits<long long>
{
using ValueType = typename EnumSet<T>::ValueType;
static_assert(sizeof(long long) > sizeof(ValueType));
template<typename T> static void bind(EnumSet<T> v, SqlStatement* statement, int column, int size)
struct sql_value_traits<EnumSet<T>, void> : public sql_value_traits<long long> {
{ sql_value_traits<long long>::bind(static_cast<long long>(v.getBitfield()), statement, column, size);
using ValueType = typename EnumSet<T>::ValueType; }
static_assert(sizeof(long long) > sizeof(ValueType));
static void bind(EnumSet<T> v, SqlStatement *statement, int column, int size) static bool read(EnumSet<T>& v, SqlStatement* statement, int column, int size)
{ {
sql_value_traits<long long>::bind(static_cast<long long>(v.getBitfield()), statement, column, size); long long val;
} if (sql_value_traits<long long>::read(val, statement, column, size))
{
static bool read(EnumSet<T>& v, SqlStatement *statement, int column, int size) v.setBitfield(val);
{ return true;
long long val; }
if (sql_value_traits<long long>::read(val, statement, column, size)) v.clear();
{ return false;
v.setBitfield(val); }
return true; };
}
v.clear();
return false;
}
};
} }
src/libs/database/impl/Listen.cpp
+66 -50
View File
@@ -29,19 +29,26 @@ namespace Database
{ {
namespace namespace
{ {
Wt::Dbo::Query<ArtistId> createArtistsQuery(Wt::Dbo::Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType) Wt::Dbo::Query<ArtistId> createArtistsQuery(Wt::Dbo::Session& session, const Listen::ArtistStatsFindParameters& params)
{ {
auto query{ session.query<ArtistId>("SELECT a.id from artist a") auto query{ session.query<ArtistId>("SELECT a.id from artist a")
.join("track t ON t.id = t_a_l.track_id") .join("track t ON t.id = t_a_l.track_id")
.join("track_artist_link t_a_l ON t_a_l.artist_id = a.id") .join("track_artist_link t_a_l ON t_a_l.artist_id = a.id")
.join("listen l ON l.track_id = t.id") .join("listen l ON l.track_id = t.id")
.where("l.user_id = ?").bind(userId) .where("l.user_id = ?").bind(params.user) };
.where("l.backend = ?").bind(backend) };
if (linkType) if (params.backend)
query.where("t_a_l.type = ?").bind(*linkType); query.where("l.backend = ?").bind(*params.backend);
if (!clusterIds.empty()) assert(!params.artist.isValid()); // poor check
if (params.library.isValid())
query.where("t.media_library_id = ?").bind(params.library);
if (params.linkType)
query.where("t_a_l.type = ?").bind(*params.linkType);
if (!params.clusters.empty())
{ {
std::ostringstream oss; std::ostringstream oss;
oss << "a.id IN (SELECT DISTINCT a.id FROM artist a" oss << "a.id IN (SELECT DISTINCT a.id FROM artist a"
@@ -51,14 +58,14 @@ namespace Database
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; " INNER JOIN track_cluster t_c ON t_c.track_id = t.id";
WhereClause clusterClause; WhereClause clusterClause;
for (auto id : clusterIds) for (auto id : params.clusters)
{ {
clusterClause.Or(WhereClause("c.id = ?")); clusterClause.Or(WhereClause("c.id = ?"));
query.bind(id); query.bind(id);
} }
oss << " " << clusterClause.get(); oss << " " << clusterClause.get();
oss << " GROUP BY t.id,a.id HAVING COUNT(DISTINCT c.id) = " << clusterIds.size() << ")"; oss << " GROUP BY t.id,a.id HAVING COUNT(DISTINCT c.id) = " << params.clusters.size() << ")";
query.where(oss.str()); query.where(oss.str());
} }
@@ -66,15 +73,26 @@ namespace Database
return query; return query;
} }
Wt::Dbo::Query<ReleaseId> createReleasesQuery(Wt::Dbo::Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds) Wt::Dbo::Query<ReleaseId> createReleasesQuery(Wt::Dbo::Session& session, const Listen::StatsFindParameters& params)
{ {
auto query{ session.query<ReleaseId>("SELECT r.id from release r") auto query{ session.query<ReleaseId>("SELECT r.id from release r")
.join("track t ON t.release_id = r.id") .join("track t ON t.release_id = r.id")
.join("listen l ON l.track_id = t.id") .join("listen l ON l.track_id = t.id")
.where("l.user_id = ?").bind(userId) .where("l.user_id = ?").bind(params.user) };
.where("l.backend = ?").bind(backend) };
if (!clusterIds.empty()) if (params.backend)
query.where("l.backend = ?").bind(*params.backend);
if (params.artist.isValid())
{
query.join("track_artist_link t_a_l ON t_a_l.track_id = t.id")
.where("t_a_l.artist_id = ?").bind(params.artist);
}
if (params.library.isValid())
query.where("t.media_library_id = ?").bind(params.library);
if (!params.clusters.empty())
{ {
std::ostringstream oss; std::ostringstream oss;
oss << "r.id IN (SELECT DISTINCT r.id FROM release r" oss << "r.id IN (SELECT DISTINCT r.id FROM release r"
@@ -83,14 +101,14 @@ namespace Database
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; " INNER JOIN track_cluster t_c ON t_c.track_id = t.id";
WhereClause clusterClause; WhereClause clusterClause;
for (ClusterId id : clusterIds) for (ClusterId id : params.clusters)
{ {
clusterClause.Or(WhereClause("c.id = ?")); clusterClause.Or(WhereClause("c.id = ?"));
query.bind(id); query.bind(id);
} }
oss << " " << clusterClause.get(); oss << " " << clusterClause.get();
oss << " GROUP BY t.id HAVING COUNT(DISTINCT c.id) = " << clusterIds.size() << ")"; oss << " GROUP BY t.id HAVING COUNT(DISTINCT c.id) = " << params.clusters.size() << ")";
query.where(oss.str()); query.where(oss.str());
} }
@@ -98,17 +116,25 @@ namespace Database
return query; return query;
} }
Wt::Dbo::Query<TrackId> createTracksQuery(Wt::Dbo::Session& session, UserId userId, ArtistId artistId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds) Wt::Dbo::Query<TrackId> createTracksQuery(Wt::Dbo::Session& session, const Listen::StatsFindParameters& params)
{ {
auto query{ session.query<TrackId>("SELECT t.id from track t") auto query{ session.query<TrackId>("SELECT t.id from track t")
.join("listen l ON l.track_id = t.id") .join("listen l ON l.track_id = t.id")
.where("l.user_id = ?").bind(userId) .where("l.user_id = ?").bind(params.user) };
.where("l.backend = ?").bind(backend) };
if (artistId.isValid()) if (params.backend)
query.join("track_artist_link t_a_l ON t_a_l.track_id = t.id").where("t_a_l.artist_id = ?").bind(artistId); query.where("l.backend = ?").bind(*params.backend);
if (!clusterIds.empty()) if (params.artist.isValid())
{
query.join("track_artist_link t_a_l ON t_a_l.track_id = t.id")
.where("t_a_l.artist_id = ?").bind(params.artist);
}
if (params.library.isValid())
query.where("t.media_library_id = ?").bind(params.library);
if (!params.clusters.empty())
{ {
std::ostringstream oss; std::ostringstream oss;
oss << "t.id IN (SELECT DISTINCT t.id FROM track t" oss << "t.id IN (SELECT DISTINCT t.id FROM track t"
@@ -116,14 +142,14 @@ namespace Database
" INNER JOIN cluster c ON c.id = t_c.cluster_id"; " INNER JOIN cluster c ON c.id = t_c.cluster_id";
WhereClause clusterClause; WhereClause clusterClause;
for (auto id : clusterIds) for (auto id : params.clusters)
{ {
clusterClause.Or(WhereClause("c.id = ?")).bind(id.toString()); clusterClause.Or(WhereClause("c.id = ?")).bind(id.toString());
query.bind(id); query.bind(id);
} }
oss << " " << clusterClause.get(); oss << " " << clusterClause.get();
oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size() << ")"; oss << " GROUP BY t.id HAVING COUNT(*) = " << params.clusters.size() << ")";
query.where(oss.str()); query.where(oss.str());
} }
@@ -188,76 +214,66 @@ namespace Database
.resultValue(); .resultValue();
} }
RangeResults<ArtistId> Listen::getTopArtists(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, std::optional<Range> range) RangeResults<ArtistId> Listen::getTopArtists(Session& session, const ArtistStatsFindParameters& params)
{ {
session.checkReadTransaction(); session.checkReadTransaction();
auto query{ createArtistsQuery(session.getDboSession(), userId, backend, clusterIds, linkType) }; auto query{ createArtistsQuery(session.getDboSession(), params) };
auto collection{ query auto collection{ query
.orderBy("COUNT(a.id) DESC") .orderBy("COUNT(a.id) DESC")
.groupBy("a.id") }; .groupBy("a.id") };
return Utils::execQuery<ArtistId>(query, range); return Utils::execQuery<ArtistId>(query, params.range);
} }
RangeResults<ReleaseId> Listen::getTopReleases(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range) RangeResults<ReleaseId> Listen::getTopReleases(Session& session, const StatsFindParameters& params)
{ {
session.checkReadTransaction(); session.checkReadTransaction();
auto query{ createReleasesQuery(session.getDboSession(), userId, backend, clusterIds) auto query{ createReleasesQuery(session.getDboSession(), params)
.orderBy("COUNT(r.id) DESC") .orderBy("COUNT(r.id) DESC")
.groupBy("r.id") }; .groupBy("r.id") };
return Utils::execQuery<ReleaseId>(query, range); return Utils::execQuery<ReleaseId>(query, params.range);
} }
RangeResults<TrackId> Listen::getTopTracks(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range) RangeResults<TrackId> Listen::getTopTracks(Session& session, const StatsFindParameters& params)
{ {
session.checkReadTransaction(); session.checkReadTransaction();
auto query{ createTracksQuery(session.getDboSession(), userId, ArtistId{}, backend, clusterIds) auto query{ createTracksQuery(session.getDboSession(), params)
.orderBy("COUNT(t.id) DESC") .orderBy("COUNT(t.id) DESC")
.groupBy("t.id") }; .groupBy("t.id") };
return Utils::execQuery<TrackId>(query, range); return Utils::execQuery<TrackId>(query, params.range);
} }
RangeResults<TrackId> Listen::getTopTracks(Session& session, UserId userId, ArtistId artistId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range) RangeResults<ArtistId> Listen::getRecentArtists(Session& session, const ArtistStatsFindParameters& params)
{ {
session.checkReadTransaction(); session.checkReadTransaction();
auto query{ createTracksQuery(session.getDboSession(), userId, artistId, backend, clusterIds) auto query{ createArtistsQuery(session.getDboSession(), params)
.orderBy("COUNT(t.id) DESC")
.groupBy("t.id") };
return Utils::execQuery<TrackId>(query, range);
}
RangeResults<ArtistId> Listen::getRecentArtists(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, std::optional<Range> range)
{
session.checkReadTransaction();
auto query{ createArtistsQuery(session.getDboSession(), userId, backend, clusterIds, linkType)
.groupBy("a.id").having("l.date_time = MAX(l.date_time)") .groupBy("a.id").having("l.date_time = MAX(l.date_time)")
.orderBy("l.date_time DESC") }; .orderBy("l.date_time DESC") };
return Utils::execQuery<ArtistId>(query, range); return Utils::execQuery<ArtistId>(query, params.range);
} }
RangeResults<ReleaseId> Listen::getRecentReleases(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range) RangeResults<ReleaseId> Listen::getRecentReleases(Session& session, const StatsFindParameters& params)
{ {
session.checkReadTransaction(); session.checkReadTransaction();
auto query{ createReleasesQuery(session.getDboSession(), userId, backend, clusterIds) auto query{ createReleasesQuery(session.getDboSession(), params)
.groupBy("r.id").having("l.date_time = MAX(l.date_time)") .groupBy("r.id").having("l.date_time = MAX(l.date_time)")
.orderBy("l.date_time DESC") }; .orderBy("l.date_time DESC") };
return Utils::execQuery<ReleaseId>(query, range); return Utils::execQuery<ReleaseId>(query, params.range);
} }
RangeResults<TrackId> Listen::getRecentTracks(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range) RangeResults<TrackId> Listen::getRecentTracks(Session& session, const StatsFindParameters& params)
{ {
session.checkReadTransaction(); session.checkReadTransaction();
auto query{ createTracksQuery(session.getDboSession(), userId, ArtistId{}, backend, clusterIds) auto query{ createTracksQuery(session.getDboSession(), params)
.groupBy("t.id").having("l.date_time = MAX(l.date_time)") .groupBy("t.id").having("l.date_time = MAX(l.date_time)")
.orderBy("l.date_time DESC") }; .orderBy("l.date_time DESC") };
return Utils::execQuery<TrackId>(query, range); return Utils::execQuery<TrackId>(query, params.range);
} }
std::size_t Listen::getCount(Session& session, UserId userId, TrackId trackId) std::size_t Listen::getCount(Session& session, UserId userId, TrackId trackId)
src/libs/database/impl/MediaLibrary.cpp
+78
View File
@@ -0,0 +1,78 @@
/*
* Copyright (C) 2013-2016 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "database/MediaLibrary.hpp"
#include "database/ScanSettings.hpp"
#include "database/Session.hpp"
#include "database/Track.hpp"
#include "IdTypeTraits.hpp"
#include "PathTraits.hpp"
#include "StringViewTraits.hpp"
namespace Database
{
MediaLibrary::MediaLibrary(const std::filesystem::path& p, std::string_view name)
: _path{ p },
_name{ std::string {name, 0, maxNameLength} }
{
}
MediaLibrary::pointer MediaLibrary::create(Session& session, const std::filesystem::path& p, std::string_view name)
{
return session.getDboSession().add(std::unique_ptr<MediaLibrary>{ new MediaLibrary{ p, name } });
}
std::size_t MediaLibrary::getCount(Session& session)
{
session.checkReadTransaction();
return session.getDboSession().query<int>("SELECT COUNT(*) FROM cluster");
}
MediaLibrary::pointer MediaLibrary::find(Session& session, MediaLibraryId id)
{
session.checkReadTransaction();
return session.getDboSession().find<MediaLibrary>().where("id = ?").bind(id).resultValue();
}
MediaLibrary::pointer MediaLibrary::find(Session& session, std::string_view name)
{
session.checkReadTransaction();
return session.getDboSession().find<MediaLibrary>().where("name = ?").bind(name).resultValue();
}
MediaLibrary::pointer MediaLibrary::find(Session& session, const std::filesystem::path& p)
{
session.checkReadTransaction();
return session.getDboSession().find<MediaLibrary>().where("path = ?").bind(p).resultValue();
}
void MediaLibrary::find(Session& session, std::function<void(const MediaLibrary::pointer&)> func)
{
session.checkReadTransaction();
auto results{ session.getDboSession().find<MediaLibrary>().resultList() };
for (const auto& result : results)
func(result);
}
} // namespace Database
src/libs/database/impl/Migration.cpp
+62
View File
@@ -309,6 +309,67 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
session.getDboSession().execute("UPDATE scan_settings SET scan_version = scan_version + 1"); session.getDboSession().execute("UPDATE scan_settings SET scan_version = scan_version + 1");
} }
void migrateFromV50(Session& session)
{
// MediaLibrary support
session.getDboSession().execute(R"(CREATE TABLE IF NOT EXISTS "media_library" (
"id" integer primary key autoincrement,
"version" integer not null,
"path" text not null,
"name" text not null
))");
const int scanSettingsId{ session.getDboSession().query<int>("SELECT id FROM scan_settings") };
// Convert the existing media_directory in the scan_settings table to a media_library with id '1'
session.getDboSession().execute(R"(INSERT INTO "media_library" ("id", "version", "path", "name")
SELECT 1, 0, s_s.media_directory, "Main"
FROM scan_settings s_s
WHERE id = ?)").bind(scanSettingsId);
// Remove the outdated column in scan_settings
session.getDboSession().execute("ALTER TABLE scan_settings DROP media_directory");
// Add the media_library column in tracks, with id '1'
session.getDboSession().execute(R"(
CREATE TABLE IF NOT EXISTS "track_backup" (
"id" integer primary key autoincrement,
"version" integer not null,
"scan_version" integer not null,
"track_number" integer,
"disc_number" integer,
"total_track" integer,
"disc_subtitle" text not null,
"name" text not null,
"duration" integer,
"bitrate" integer not null,
"date" text,
"year" integer,
"original_date" text,
"original_year" integer,
"file_path" text not null,
"file_last_write" text,
"file_added" text,
"has_cover" boolean not null,
"mbid" text not null,
"recording_mbid" text not null,
"copyright" text not null,
"copyright_url" text not null,
"track_replay_gain" real,
"release_replay_gain" real,
"artist_display_name" text not null,
"release_id" bigint,
"media_library_id" bigint,
constraint "fk_track_release" foreign key ("release_id") references "release" ("id") on delete cascade deferrable initially deferred,
constraint "fk_track_media_library" foreign key ("media_library_id") references "media_library" ("id") on delete set null deferrable initially deferred
))");
// Migrate data, with the new media_library_id field set to 1
session.getDboSession().execute("INSERT INTO track_backup SELECT id, version, scan_version, track_number, disc_number, total_track, disc_subtitle, name, duration, bitrate, date, year, original_date, original_year, file_path, file_last_write, file_added, has_cover, mbid, recording_mbid, copyright, copyright_url, track_replay_gain, release_replay_gain, artist_display_name, release_id, 1 FROM track");
session.getDboSession().execute("DROP TABLE track");
session.getDboSession().execute("ALTER TABLE track_backup RENAME TO track");
}
void doDbMigration(Session& session) void doDbMigration(Session& session)
{ {
static const std::string outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" }; static const std::string outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
@@ -337,6 +398,7 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
{47, migrateFromV47}, {47, migrateFromV47},
{48, migrateFromV48}, {48, migrateFromV48},
{49, migrateFromV49}, {49, migrateFromV49},
{50, migrateFromV50},
}; };
{ {
src/libs/database/impl/Migration.hpp
+1 -1
View File
@@ -26,7 +26,7 @@ namespace Database
class Session; class Session;
using Version = std::size_t; using Version = std::size_t;
static constexpr Version LMS_DATABASE_VERSION{ 50 }; static constexpr Version LMS_DATABASE_VERSION{ 51 };
class VersionInfo class VersionInfo
{ {
public: public:
src/libs/database/impl/PathTraits.hpp
+54
View File
@@ -0,0 +1,54 @@
/*
* Copyright (C) 2021 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <string>
#include <filesystem>
#include <Wt/Dbo/SqlTraits.h>
namespace Wt::Dbo
{
template<>
struct sql_value_traits<std::filesystem::path>
{
static std::string type(SqlConnection* conn, int size)
{
return sql_value_traits<std::string>::type(conn, size);
}
static void bind(const std::filesystem::path& path, SqlStatement* statement, int column, int /* size */)
{
statement->bind(column, path.string());
}
static bool read(std::filesystem::path& p, SqlStatement* statement, int column, int size)
{
std::string s;
bool result = statement->getResult(column, &s, size);
if (!result)
return false;
p = std::filesystem::path{ s };
return true;
}
};
}
src/libs/database/impl/Release.cpp
+12 -18
View File
@@ -42,18 +42,23 @@ namespace Database
{ {
auto query{ session.getDboSession().query<ResultType>("SELECT " + std::string{ itemToSelect } + " from release r") }; auto query{ session.getDboSession().query<ResultType>("SELECT " + std::string{ itemToSelect } + " from release r") };
if (params.sortMethod == ReleaseSortMethod::LastWritten if (params.sortMethod == ReleaseSortMethod::ArtistNameThenName
|| params.sortMethod == ReleaseSortMethod::LastWritten
|| params.sortMethod == ReleaseSortMethod::Date || params.sortMethod == ReleaseSortMethod::Date
|| params.sortMethod == ReleaseSortMethod::OriginalDate || params.sortMethod == ReleaseSortMethod::OriginalDate
|| params.sortMethod == ReleaseSortMethod::OriginalDateDesc || params.sortMethod == ReleaseSortMethod::OriginalDateDesc
|| params.writtenAfter.isValid() || params.writtenAfter.isValid()
|| params.dateRange || params.dateRange
|| params.artist.isValid() || params.artist.isValid()
|| params.clusters.size() == 1) || params.clusters.size() == 1
|| params.mediaLibrary.isValid())
{ {
query.join("track t ON t.release_id = r.id"); query.join("track t ON t.release_id = r.id");
} }
if (params.mediaLibrary.isValid())
query.where("t.media_library_id = ?").bind(params.mediaLibrary);
if (!params.releaseType.empty()) if (!params.releaseType.empty())
{ {
query.join("release_release_type r_r_t ON r_r_t.release_id = r.id"); query.join("release_release_type r_r_t ON r_r_t.release_id = r.id");
@@ -82,7 +87,8 @@ namespace Database
.where("s_r.sync_state <> ?").bind(SyncState::PendingRemove); .where("s_r.sync_state <> ?").bind(SyncState::PendingRemove);
} }
if (params.artist.isValid()) if (params.artist.isValid()
|| params.sortMethod == ReleaseSortMethod::ArtistNameThenName)
{ {
query.join("artist a ON a.id = t_a_l.artist_id") query.join("artist a ON a.id = t_a_l.artist_id")
.join("track_artist_link t_a_l ON t_a_l.track_id = t.id") .join("track_artist_link t_a_l ON t_a_l.track_id = t.id")
@@ -163,6 +169,9 @@ namespace Database
case ReleaseSortMethod::Name: case ReleaseSortMethod::Name:
query.orderBy("r.name COLLATE NOCASE"); query.orderBy("r.name COLLATE NOCASE");
break; break;
case ReleaseSortMethod::ArtistNameThenName:
query.orderBy("a.name COLLATE NOCASE, r.name COLLATE NOCASE");
break;
case ReleaseSortMethod::Random: case ReleaseSortMethod::Random:
query.orderBy("RANDOM()"); query.orderBy("RANDOM()");
break; break;
@@ -276,21 +285,6 @@ namespace Database
return session.getDboSession().query<int>("SELECT COUNT(*) FROM release"); return session.getDboSession().query<int>("SELECT COUNT(*) FROM release");
} }
RangeResults<ReleaseId> Release::findIdsOrderedByArtist(Session& session, std::optional<Range> range)
{
session.checkReadTransaction();
// TODO merge with find
auto query{ session.getDboSession().query<ReleaseId>(
"SELECT DISTINCT r.id FROM release r"
" INNER JOIN track t ON r.id = t.release_id"
" INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id"
" INNER JOIN artist a ON t_a_l.artist_id = a.id")
.orderBy("a.name COLLATE NOCASE, r.name COLLATE NOCASE") };
return Utils::execQuery<ReleaseId>(query, range);
}
RangeResults<ReleaseId> Release::findOrphanIds(Session& session, std::optional<Range> range) RangeResults<ReleaseId> Release::findOrphanIds(Session& session, std::optional<Range> range)
{ {
session.checkReadTransaction(); session.checkReadTransaction();
src/libs/database/impl/ScanSettings.cpp
+2 -10
View File
@@ -21,12 +21,9 @@
#include <Wt/Dbo/WtSqlTraits.h> #include <Wt/Dbo/WtSqlTraits.h>
#include "utils/Path.hpp" #include "database/MediaLibrary.hpp"
#include "utils/ILogger.hpp"
#include "utils/String.hpp"
#include "database/Cluster.hpp"
#include "database/Session.hpp" #include "database/Session.hpp"
#include "utils/String.hpp"
namespace Database namespace Database
{ {
@@ -68,11 +65,6 @@ namespace Database
return StringUtils::splitString(_extraTagsToScan, ";"); return StringUtils::splitString(_extraTagsToScan, ";");
} }
void ScanSettings::setMediaDirectory(const std::filesystem::path& p)
{
_mediaDirectory = StringUtils::stringTrimEnd(p.string(), "/\\");
}
void ScanSettings::setExtraTagsToScan(const std::vector<std::string_view>& extraTags) void ScanSettings::setExtraTagsToScan(const std::vector<std::string_view>& extraTags)
{ {
std::string newTagsToScan{ StringUtils::joinStrings(extraTags, ";") }; std::string newTagsToScan{ StringUtils::joinStrings(extraTags, ";") };
src/libs/database/impl/Session.cpp
+6
View File
@@ -29,6 +29,7 @@
#include "database/Cluster.hpp" #include "database/Cluster.hpp"
#include "database/Db.hpp" #include "database/Db.hpp"
#include "database/Listen.hpp" #include "database/Listen.hpp"
#include "database/MediaLibrary.hpp"
#include "database/Release.hpp" #include "database/Release.hpp"
#include "database/ScanSettings.hpp" #include "database/ScanSettings.hpp"
#include "database/StarredArtist.hpp" #include "database/StarredArtist.hpp"
@@ -42,6 +43,7 @@
#include "database/TransactionChecker.hpp" #include "database/TransactionChecker.hpp"
#include "database/User.hpp" #include "database/User.hpp"
#include "EnumSetTraits.hpp" #include "EnumSetTraits.hpp"
#include "PathTraits.hpp"
#include "Migration.hpp" #include "Migration.hpp"
namespace Database namespace Database
@@ -81,6 +83,7 @@ namespace Database
_session.mapClass<Cluster>("cluster"); _session.mapClass<Cluster>("cluster");
_session.mapClass<ClusterType>("cluster_type"); _session.mapClass<ClusterType>("cluster_type");
_session.mapClass<Listen>("listen"); _session.mapClass<Listen>("listen");
_session.mapClass<MediaLibrary>("media_library");
_session.mapClass<Release>("release"); _session.mapClass<Release>("release");
_session.mapClass<ReleaseType>("release_type"); _session.mapClass<ReleaseType>("release_type");
_session.mapClass<ScanSettings>("scan_settings"); _session.mapClass<ScanSettings>("scan_settings");
@@ -152,7 +155,10 @@ namespace Database
_session.execute("CREATE INDEX IF NOT EXISTS track_release_idx ON track(release_id)"); _session.execute("CREATE INDEX IF NOT EXISTS track_release_idx ON track(release_id)");
_session.execute("CREATE INDEX IF NOT EXISTS track_file_last_write_idx ON track(file_last_write)"); _session.execute("CREATE INDEX IF NOT EXISTS track_file_last_write_idx ON track(file_last_write)");
_session.execute("CREATE INDEX IF NOT EXISTS track_date_idx ON track(date)"); _session.execute("CREATE INDEX IF NOT EXISTS track_date_idx ON track(date)");
_session.execute("CREATE INDEX IF NOT EXISTS track_year_idx ON track(year)");
_session.execute("CREATE INDEX IF NOT EXISTS track_original_date_idx ON track(original_date)"); _session.execute("CREATE INDEX IF NOT EXISTS track_original_date_idx ON track(original_date)");
_session.execute("CREATE INDEX IF NOT EXISTS track_original_year_idx ON track(original_year)");
_session.execute("CREATE INDEX IF NOT EXISTS track_media_library_idx ON track(media_library_id)");
_session.execute("CREATE INDEX IF NOT EXISTS tracklist_name_idx ON tracklist(name)"); _session.execute("CREATE INDEX IF NOT EXISTS tracklist_name_idx ON tracklist(name)");
_session.execute("CREATE INDEX IF NOT EXISTS tracklist_user_idx ON tracklist(user_id)"); _session.execute("CREATE INDEX IF NOT EXISTS tracklist_user_idx ON tracklist(user_id)");
_session.execute("CREATE INDEX IF NOT EXISTS track_features_track_idx ON track_features(track_id)"); _session.execute("CREATE INDEX IF NOT EXISTS track_features_track_idx ON track_features(track_id)");
src/libs/database/impl/StringViewTraits.hpp
+11 -8
View File
@@ -19,15 +19,18 @@
#pragma once #pragma once
#include <string_view>
#include <Wt/Dbo/SqlTraits.h>
namespace Wt::Dbo namespace Wt::Dbo
{ {
template<> template<>
struct sql_value_traits<std::string_view> struct sql_value_traits<std::string_view>
{ {
static void bind(std::string_view str, SqlStatement *statement, int column, int /* size */) static void bind(std::string_view str, SqlStatement* statement, int column, int /* size */)
{ {
statement->bind(column, std::string {str}); statement->bind(column, std::string{ str });
} }
}; };
} }
src/libs/database/impl/Track.cpp
+4
View File
@@ -23,6 +23,7 @@
#include "database/Artist.hpp" #include "database/Artist.hpp"
#include "database/Cluster.hpp" #include "database/Cluster.hpp"
#include "database/MediaLibrary.hpp"
#include "database/Release.hpp" #include "database/Release.hpp"
#include "database/TrackArtistLink.hpp" #include "database/TrackArtistLink.hpp"
#include "database/TrackFeatures.hpp" #include "database/TrackFeatures.hpp"
@@ -140,6 +141,9 @@ namespace Database
if (params.trackNumber) if (params.trackNumber)
query.where("t.track_number = ?").bind(*params.trackNumber); query.where("t.track_number = ?").bind(*params.trackNumber);
if (params.mediaLibrary.isValid())
query.where("t.media_library_id = ?").bind(params.mediaLibrary);
switch (params.sortMethod) switch (params.sortMethod)
{ {
case TrackSortMethod::None: case TrackSortMethod::None:
src/libs/database/include/database/Artist.hpp
+3
View File
@@ -29,6 +29,7 @@
#include "database/ArtistId.hpp" #include "database/ArtistId.hpp"
#include "database/ClusterId.hpp" #include "database/ClusterId.hpp"
#include "database/MediaLibraryId.hpp"
#include "database/Object.hpp" #include "database/Object.hpp"
#include "database/ReleaseId.hpp" #include "database/ReleaseId.hpp"
#include "database/Types.hpp" #include "database/Types.hpp"
@@ -64,6 +65,7 @@ namespace Database
std::optional<FeedbackBackend> feedbackBackend; // and for this feedback backend std::optional<FeedbackBackend> feedbackBackend; // and for this feedback backend
TrackId track; // artists involved in this track TrackId track; // artists involved in this track
ReleaseId release; // artists involved in this release ReleaseId release; // artists involved in this release
MediaLibraryId mediaLibrary; // artists that belong to this library
FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; } FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; }
FindParameters& setKeywords(const std::vector<std::string_view>& _keywords) { keywords = _keywords; return *this; } FindParameters& setKeywords(const std::vector<std::string_view>& _keywords) { keywords = _keywords; return *this; }
@@ -74,6 +76,7 @@ namespace Database
FindParameters& setStarringUser(UserId _user, FeedbackBackend _feedbackBackend) { starringUser = _user; feedbackBackend = _feedbackBackend; return *this; } FindParameters& setStarringUser(UserId _user, FeedbackBackend _feedbackBackend) { starringUser = _user; feedbackBackend = _feedbackBackend; return *this; }
FindParameters& setTrack(TrackId _track) { track = _track; return *this; } FindParameters& setTrack(TrackId _track) { track = _track; return *this; }
FindParameters& setRelease(ReleaseId _release) { release = _release; return *this; } FindParameters& setRelease(ReleaseId _release) { release = _release; return *this; }
FindParameters& setMediaLibrary(MediaLibraryId _mediaLibrary) { mediaLibrary = _mediaLibrary; return *this; }
}; };
Artist() = default; Artist() = default;
src/libs/database/include/database/Listen.hpp
+31 -7
View File
@@ -27,6 +27,7 @@
#include "database/ArtistId.hpp" #include "database/ArtistId.hpp"
#include "database/ClusterId.hpp" #include "database/ClusterId.hpp"
#include "database/ListenId.hpp" #include "database/ListenId.hpp"
#include "database/MediaLibraryId.hpp"
#include "database/Object.hpp" #include "database/Object.hpp"
#include "database/ReleaseId.hpp" #include "database/ReleaseId.hpp"
#include "database/TrackId.hpp" #include "database/TrackId.hpp"
@@ -65,14 +66,37 @@ namespace Database
static RangeResults<ListenId> find(Session& session, const FindParameters& parameters); static RangeResults<ListenId> find(Session& session, const FindParameters& parameters);
// Stats // Stats
static RangeResults<ArtistId> getTopArtists(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, std::optional<Range> range = std::nullopt); struct StatsFindParameters
static RangeResults<ReleaseId> getTopReleases(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range = std::nullopt); {
static RangeResults<TrackId> getTopTracks(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range = std::nullopt); UserId user;
static RangeResults<TrackId> getTopTracks(Session& session, UserId userId, ArtistId artistId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range = std::nullopt); std::optional<ScrobblingBackend> backend;
std::vector<ClusterId> clusters; // if non empty, entities that belong to these clusters
std::optional<Range> range;
ArtistId artist; // if set, matching this artist
MediaLibraryId library;
static RangeResults<ArtistId> getRecentArtists(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, std::optional<Range> range = std::nullopt); StatsFindParameters& setUser(UserId _user) { user = _user; return *this; }
static RangeResults<ReleaseId> getRecentReleases(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range = std::nullopt); StatsFindParameters& setScrobblingBackend(std::optional<ScrobblingBackend> _backend) { backend = _backend; return *this; }
static RangeResults<TrackId> getRecentTracks(Session& session, UserId userId, ScrobblingBackend backend, const std::vector<ClusterId>& clusterIds, std::optional<Range> range = std::nullopt); StatsFindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; }
StatsFindParameters& setRange(std::optional<Range> _range) { range = _range; return *this; }
StatsFindParameters& setArtist(ArtistId _artist) { artist = _artist; return *this; }
StatsFindParameters& setMediaLibrary(MediaLibraryId _library) { library = _library; return *this; }
};
struct ArtistStatsFindParameters : public StatsFindParameters
{
std::optional<TrackArtistLinkType> linkType; // if set, only artists that have produced at least one track with this link type
ArtistStatsFindParameters& setLinkType(std::optional<TrackArtistLinkType> _linkType) { linkType = _linkType; return *this; }
};
static RangeResults<ArtistId> getTopArtists(Session& session, const ArtistStatsFindParameters& params);
static RangeResults<ReleaseId> getTopReleases(Session& session, const StatsFindParameters& params);
static RangeResults<TrackId> getTopTracks(Session& session, const StatsFindParameters& params);
static RangeResults<ArtistId> getRecentArtists(Session& session, const ArtistStatsFindParameters& params);
static RangeResults<ReleaseId> getRecentReleases(Session& session, const StatsFindParameters& params);
static RangeResults<TrackId> getRecentTracks(Session& session, const StatsFindParameters& params);
static std::size_t getCount(Session& session, UserId userId, TrackId trackId); // for the current backend static std::size_t getCount(Session& session, UserId userId, TrackId trackId); // for the current backend
static std::size_t getCount(Session& session, UserId userId, ReleaseId trackId); // for the current backend static std::size_t getCount(Session& session, UserId userId, ReleaseId trackId); // for the current backend
src/libs/database/include/database/MediaLibrary.hpp
+71
View File
@@ -0,0 +1,71 @@
/*
* Copyright (C) 2024 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include <filesystem>
#include <string>
#include <string_view>
#include <Wt/Dbo/Dbo.h>
#include "database/MediaLibraryId.hpp"
#include "database/Object.hpp"
namespace Database
{
class Session;
class MediaLibrary : public Object<MediaLibrary, MediaLibraryId>
{
public:
static const std::size_t maxNameLength{ 128 };
MediaLibrary() = default;
// find
std::size_t getCount(Session& session);
static pointer find(Session& session, MediaLibraryId id);
static pointer find(Session& session, std::string_view name);
static pointer find(Session& session, const std::filesystem::path& path);
static void find(Session& session, std::function<void(const pointer&)> func);
static std::vector<pointer> find(Session& session);
// getters
std::string_view getName() const { return _name; }
const std::filesystem::path& getPath() const { return _path; }
// setters
void setName(std::string_view name) { _name = name; }
void setPath(const std::filesystem::path& p) { _path = p; }
template<class Action>
void persist(Action& a)
{
Wt::Dbo::field(a, _path, "path");
Wt::Dbo::field(a, _name, "name");
}
private:
friend class ::Database::Session;
MediaLibrary(const std::filesystem::path& p, std::string_view name);
static pointer create(Session& session, const std::filesystem::path& p = {}, std::string_view name = {});
std::filesystem::path _path;
std::string _name;
};
} // namespace Database
src/lms/ui/common/DirectoryValidator.hpp → src/libs/database/include/database/MediaLibraryId.hpp
+3 -7
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2021 Emeric Poupon * Copyright (C) 2024 Emeric Poupon
* *
* This file is part of LMS. * This file is part of LMS.
* *
@@ -19,10 +19,6 @@
#pragma once #pragma once
#include <Wt/WValidator.h> #include "database/IdType.hpp"
namespace UserInterface
{
std::unique_ptr<Wt::WValidator> createDirectoryValidator();
} // namespace UserInterface
LMS_DECLARE_IDTYPE(MediaLibraryId)
src/libs/database/include/database/Object.hpp
+45 -45
View File
@@ -26,61 +26,61 @@
namespace Database namespace Database
{ {
template <typename T> template <typename T>
class ObjectPtr class ObjectPtr
{ {
public: public:
ObjectPtr() = default; ObjectPtr() = default;
ObjectPtr(Wt::Dbo::ptr<T> obj) : _obj {obj} {} ObjectPtr(Wt::Dbo::ptr<T> obj) : _obj{ obj } {}
const T* operator->() const { return _obj.get(); } const T* operator->() const { return _obj.get(); }
operator bool() const { return _obj.get(); } operator bool() const { return _obj.get(); }
bool operator!() const { return !_obj.get(); } bool operator!() const { return !_obj.get(); }
bool operator==(const ObjectPtr& other) const { return _obj == other._obj; } bool operator==(const ObjectPtr& other) const { return _obj == other._obj; }
bool operator!=(const ObjectPtr& other) const { return other._obj != _obj; } bool operator!=(const ObjectPtr& other) const { return other._obj != _obj; }
auto modify() { TransactionChecker::checkWriteTransaction(*_obj.session()); return _obj.modify(); } auto modify() { TransactionChecker::checkWriteTransaction(*_obj.session()); return _obj.modify(); }
void remove() void remove()
{ {
TransactionChecker::checkWriteTransaction(*_obj.session()); TransactionChecker::checkWriteTransaction(*_obj.session());
if (_obj->hasOnPreRemove()) if (_obj->hasOnPreRemove())
_obj.modify()->onPreRemove(); _obj.modify()->onPreRemove();
_obj.remove(); _obj.remove();
} }
private: private:
template <typename, typename> friend class Object; template <typename, typename> friend class Object;
Wt::Dbo::ptr<T> _obj; Wt::Dbo::ptr<T> _obj;
}; };
template <typename T, typename ObjectIdType> template <typename T, typename ObjectIdType>
class Object : public Wt::Dbo::Dbo<T> class Object : public Wt::Dbo::Dbo<T>
{ {
static_assert(std::is_base_of_v<Database::IdType, ObjectIdType>); static_assert(std::is_base_of_v<Database::IdType, ObjectIdType>);
static_assert(!std::is_same_v<Database::IdType, ObjectIdType>); static_assert(!std::is_same_v<Database::IdType, ObjectIdType>);
public: public:
using pointer = ObjectPtr<T>; using pointer = ObjectPtr<T>;
using IdType = ObjectIdType; using IdType = ObjectIdType;
IdType getId() const { return Wt::Dbo::Dbo<T>::self()->Wt::Dbo::template Dbo<T>::id(); } IdType getId() const { return Wt::Dbo::Dbo<T>::self()->Wt::Dbo::template Dbo<T>::id(); }
// catch some misuses // catch some misuses
typename Wt::Dbo::dbo_traits<T>::IdType id() const = delete; typename Wt::Dbo::dbo_traits<T>::IdType id() const = delete;
protected: protected:
template <typename> friend class ObjectPtr; template <typename> friend class ObjectPtr;
virtual bool hasOnPreRemove() const { return false; } virtual bool hasOnPreRemove() const { return false; }
virtual void onPreRemove() {} virtual void onPreRemove() {}
virtual bool hasOnPostCreated() const { return false; } virtual bool hasOnPostCreated() const { return false; }
virtual void onPostCreated() {} virtual void onPostCreated() {}
// Can get raw dbo ptr only from Objects // Can get raw dbo ptr only from Objects
template <typename SomeObject> template <typename SomeObject>
static static
Wt::Dbo::ptr<SomeObject> getDboPtr(ObjectPtr<SomeObject> ptr) { return ptr._obj; } Wt::Dbo::ptr<SomeObject> getDboPtr(ObjectPtr<SomeObject> ptr) { return ptr._obj; }
}; };
} }
src/libs/database/include/database/Release.hpp
+3 -1
View File
@@ -30,6 +30,7 @@
#include "database/ArtistId.hpp" #include "database/ArtistId.hpp"
#include "database/ClusterId.hpp" #include "database/ClusterId.hpp"
#include "database/MediaLibraryId.hpp"
#include "database/Object.hpp" #include "database/Object.hpp"
#include "database/ReleaseId.hpp" #include "database/ReleaseId.hpp"
#include "database/ReleaseTypeId.hpp" #include "database/ReleaseTypeId.hpp"
@@ -93,6 +94,7 @@ namespace Database
EnumSet<TrackArtistLinkType> trackArtistLinkTypes; // and for these link types EnumSet<TrackArtistLinkType> trackArtistLinkTypes; // and for these link types
EnumSet<TrackArtistLinkType> excludedTrackArtistLinkTypes; // but not for these link types EnumSet<TrackArtistLinkType> excludedTrackArtistLinkTypes; // but not for these link types
std::string releaseType; // If set, albums that has this release type std::string releaseType; // If set, albums that has this release type
MediaLibraryId mediaLibrary; // If set, releases that has at least a track in this library
FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; } FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; }
FindParameters& setKeywords(const std::vector<std::string_view>& _keywords) { keywords = _keywords; return *this; } FindParameters& setKeywords(const std::vector<std::string_view>& _keywords) { keywords = _keywords; return *this; }
@@ -109,6 +111,7 @@ namespace Database
return *this; return *this;
} }
FindParameters& setReleaseType(std::string_view _releaseType) { releaseType = _releaseType; return *this; } FindParameters& setReleaseType(std::string_view _releaseType) { releaseType = _releaseType; return *this; }
FindParameters& setMediaLibrary(MediaLibraryId _mediaLibrary) { mediaLibrary = _mediaLibrary; return *this; }
}; };
Release() = default; Release() = default;
@@ -124,7 +127,6 @@ namespace Database
static RangeResults<ReleaseId> findIds(Session& session, const FindParameters& parameters); static RangeResults<ReleaseId> findIds(Session& session, const FindParameters& parameters);
static std::size_t getCount(Session& session, const FindParameters& parameters); static std::size_t getCount(Session& session, const FindParameters& parameters);
static RangeResults<ReleaseId> findOrphanIds(Session& session, std::optional<Range> range = std::nullopt); // not track related static RangeResults<ReleaseId> findOrphanIds(Session& session, std::optional<Range> range = std::nullopt); // not track related
static RangeResults<ReleaseId> findIdsOrderedByArtist(Session& session, std::optional<Range> range = std::nullopt);
// Get the cluster of the tracks that belong to this release // Get the cluster of the tracks that belong to this release
// Each clusters are grouped by cluster type, sorted by the number of occurence (max to min) // Each clusters are grouped by cluster type, sorted by the number of occurence (max to min)
src/libs/database/include/database/ScanSettings.hpp
-4
View File
@@ -63,7 +63,6 @@ namespace Database
// Getters // Getters
std::size_t getScanVersion() const { return _scanVersion; } std::size_t getScanVersion() const { return _scanVersion; }
std::filesystem::path getMediaDirectory() const { return _mediaDirectory; }
Wt::WTime getUpdateStartTime() const { return _startTime; } Wt::WTime getUpdateStartTime() const { return _startTime; }
UpdatePeriod getUpdatePeriod() const { return _updatePeriod; } UpdatePeriod getUpdatePeriod() const { return _updatePeriod; }
std::vector<std::string_view> getExtraTagsToScan() const; std::vector<std::string_view> getExtraTagsToScan() const;
@@ -72,7 +71,6 @@ namespace Database
// Setters // Setters
void addAudioFileExtension(const std::filesystem::path& ext); void addAudioFileExtension(const std::filesystem::path& ext);
void setMediaDirectory(const std::filesystem::path& p);
void setUpdateStartTime(Wt::WTime t) { _startTime = t; } void setUpdateStartTime(Wt::WTime t) { _startTime = t; }
void setUpdatePeriod(UpdatePeriod p) { _updatePeriod = p; } void setUpdatePeriod(UpdatePeriod p) { _updatePeriod = p; }
void setExtraTagsToScan(const std::vector<std::string_view>& extraTags); void setExtraTagsToScan(const std::vector<std::string_view>& extraTags);
@@ -83,7 +81,6 @@ namespace Database
void persist(Action& a) void persist(Action& a)
{ {
Wt::Dbo::field(a, _scanVersion, "scan_version"); Wt::Dbo::field(a, _scanVersion, "scan_version");
Wt::Dbo::field(a, _mediaDirectory, "media_directory");
Wt::Dbo::field(a, _startTime, "start_time"); Wt::Dbo::field(a, _startTime, "start_time");
Wt::Dbo::field(a, _updatePeriod, "update_period"); Wt::Dbo::field(a, _updatePeriod, "update_period");
Wt::Dbo::field(a, _audioFileExtensions, "audio_file_extensions"); Wt::Dbo::field(a, _audioFileExtensions, "audio_file_extensions");
@@ -93,7 +90,6 @@ namespace Database
private: private:
int _scanVersion{}; int _scanVersion{};
std::string _mediaDirectory;
Wt::WTime _startTime = Wt::WTime{ 0,0,0 }; Wt::WTime _startTime = Wt::WTime{ 0,0,0 };
UpdatePeriod _updatePeriod{ UpdatePeriod::Never }; UpdatePeriod _updatePeriod{ UpdatePeriod::Never };
SimilarityEngineType _similarityEngineType{ SimilarityEngineType::Clusters }; SimilarityEngineType _similarityEngineType{ SimilarityEngineType::Clusters };
src/libs/database/include/database/Track.hpp
+13 -5
View File
@@ -37,6 +37,7 @@
#include "database/ArtistId.hpp" #include "database/ArtistId.hpp"
#include "database/ClusterId.hpp" #include "database/ClusterId.hpp"
#include "database/MediaLibraryId.hpp"
#include "database/Object.hpp" #include "database/Object.hpp"
#include "database/ReleaseId.hpp" #include "database/ReleaseId.hpp"
#include "database/TrackId.hpp" #include "database/TrackId.hpp"
@@ -49,6 +50,7 @@ namespace Database {
class Artist; class Artist;
class Cluster; class Cluster;
class ClusterType; class ClusterType;
class MediaLibrary;
class Release; class Release;
class Session; class Session;
class TrackArtistLink; class TrackArtistLink;
@@ -76,6 +78,7 @@ namespace Database {
std::string releaseName; // matching this release name std::string releaseName; // matching this release name
TrackListId trackList; // matching this trackList TrackListId trackList; // matching this trackList
std::optional<int> trackNumber; // matching this track number std::optional<int> trackNumber; // matching this track number
MediaLibraryId mediaLibrary; // If set, tracks in this library
bool distinct{ true }; bool distinct{ true };
FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; } FindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; }
@@ -92,6 +95,7 @@ namespace Database {
FindParameters& setReleaseName(std::string_view _releaseName) { releaseName = _releaseName; return *this; } FindParameters& setReleaseName(std::string_view _releaseName) { releaseName = _releaseName; return *this; }
FindParameters& setTrackList(TrackListId _trackList) { trackList = _trackList; return *this; } FindParameters& setTrackList(TrackListId _trackList) { trackList = _trackList; return *this; }
FindParameters& setTrackNumber(int _trackNumber) { trackNumber = _trackNumber; return *this; } FindParameters& setTrackNumber(int _trackNumber) { trackNumber = _trackNumber; return *this; }
FindParameters& setMediaLibrary(MediaLibraryId _mediaLibrary) { mediaLibrary = _mediaLibrary; return *this; }
FindParameters& setDistinct(bool _distinct) { distinct = _distinct; return *this; } FindParameters& setDistinct(bool _distinct) { distinct = _distinct; return *this; }
}; };
@@ -147,6 +151,7 @@ namespace Database {
void addArtistLink(const ObjectPtr<TrackArtistLink>& artistLink); void addArtistLink(const ObjectPtr<TrackArtistLink>& artistLink);
void setRelease(ObjectPtr<Release> release) { _release = getDboPtr(release); } void setRelease(ObjectPtr<Release> release) { _release = getDboPtr(release); }
void setClusters(const std::vector<ObjectPtr<Cluster>>& clusters); void setClusters(const std::vector<ObjectPtr<Cluster>>& clusters);
void setMediaLibrary(ObjectPtr<MediaLibrary> mediaLibrary) { _mediaLibrary = getDboPtr(mediaLibrary); }
std::size_t getScanVersion() const { return _scanVersion; } std::size_t getScanVersion() const { return _scanVersion; }
std::optional<std::size_t> getTrackNumber() const { return _trackNumber; } std::optional<std::size_t> getTrackNumber() const { return _trackNumber; }
@@ -158,9 +163,9 @@ namespace Database {
std::chrono::milliseconds getDuration() const { return _duration; } std::chrono::milliseconds getDuration() const { return _duration; }
std::size_t getBitrate() const { return _bitrate; } std::size_t getBitrate() const { return _bitrate; }
const Wt::WDateTime& getLastWritten() const { return _fileLastWrite; } const Wt::WDateTime& getLastWritten() const { return _fileLastWrite; }
const Wt::WDate& getDate() const { return _date; } const Wt::WDate& getDate() const { return _date; }
std::optional<int> getYear() const { return _year; } std::optional<int> getYear() const { return _year; }
const Wt::WDate& getOriginalDate() const { return _originalDate; } const Wt::WDate& getOriginalDate() const { return _originalDate; }
std::optional<int> getOriginalYear() const { return _originalYear; }; std::optional<int> getOriginalYear() const { return _originalYear; };
Wt::WDateTime getLastWriteTime() const { return _fileLastWrite; } Wt::WDateTime getLastWriteTime() const { return _fileLastWrite; }
Wt::WDateTime getAddedTime() const { return _fileAdded; } Wt::WDateTime getAddedTime() const { return _fileAdded; }
@@ -179,6 +184,7 @@ namespace Database {
ObjectPtr<Release> getRelease() const { return _release; } ObjectPtr<Release> getRelease() const { return _release; }
std::vector<ObjectPtr<Cluster>> getClusters() const; std::vector<ObjectPtr<Cluster>> getClusters() const;
std::vector<ClusterId> getClusterIds() const; std::vector<ClusterId> getClusterIds() const;
ObjectPtr<MediaLibrary> getMediaLibrary() const { return _mediaLibrary; }
std::vector<std::vector<ObjectPtr<Cluster>>> getClusterGroups(const std::vector<ClusterTypeId>& clusterTypes, std::size_t size) const; std::vector<std::vector<ObjectPtr<Cluster>>> getClusterGroups(const std::vector<ClusterTypeId>& clusterTypes, std::size_t size) const;
@@ -209,6 +215,7 @@ namespace Database {
Wt::Dbo::field(a, _releaseReplayGain, "release_replay_gain"); // here in Track since Release does not have concept of "disc" (yet?) Wt::Dbo::field(a, _releaseReplayGain, "release_replay_gain"); // here in Track since Release does not have concept of "disc" (yet?)
Wt::Dbo::field(a, _artistDisplayName, "artist_display_name"); Wt::Dbo::field(a, _artistDisplayName, "artist_display_name");
Wt::Dbo::belongsTo(a, _release, "release", Wt::Dbo::OnDeleteCascade); Wt::Dbo::belongsTo(a, _release, "release", Wt::Dbo::OnDeleteCascade);
Wt::Dbo::belongsTo(a, _mediaLibrary, "media_library", Wt::Dbo::OnDeleteSetNull); // don't delete track on media library removal, we want to wait for the next scan to have a chance to migrate files
Wt::Dbo::hasMany(a, _trackArtistLinks, Wt::Dbo::ManyToOne, "track"); Wt::Dbo::hasMany(a, _trackArtistLinks, Wt::Dbo::ManyToOne, "track");
Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade);
} }
@@ -246,9 +253,10 @@ namespace Database {
std::optional<float> _releaseReplayGain; std::optional<float> _releaseReplayGain;
std::string _artistDisplayName; std::string _artistDisplayName;
Wt::Dbo::ptr<Release> _release; Wt::Dbo::ptr<Release> _release;
Wt::Dbo::collection<Wt::Dbo::ptr<TrackArtistLink>> _trackArtistLinks; Wt::Dbo::ptr<MediaLibrary> _mediaLibrary;
Wt::Dbo::collection<Wt::Dbo::ptr<Cluster>> _clusters; Wt::Dbo::collection<Wt::Dbo::ptr<TrackArtistLink>> _trackArtistLinks;
Wt::Dbo::collection<Wt::Dbo::ptr<Cluster>> _clusters;
}; };
namespace Debug namespace Debug
src/libs/database/include/database/Types.hpp
+1
View File
@@ -119,6 +119,7 @@ namespace Database
{ {
None, None,
Name, Name,
ArtistNameThenName,
Date, Date,
OriginalDate, OriginalDate,
OriginalDateDesc, OriginalDateDesc,
src/libs/database/test/Artist.cpp
+33
View File
@@ -148,6 +148,39 @@ TEST_F(DatabaseFixture, Artist_singleTrack)
} }
} }
TEST_F(DatabaseFixture, Artist_singleTrack_mediaLibrary)
{
ScopedTrack track{ session, "MyTrack" };
ScopedArtist artist{ session, "MyArtist" };
ScopedMediaLibrary library{ session };
ScopedMediaLibrary otherLibrary{ session };
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setName("MyTrackName");
TrackArtistLink::create(session, track.get(), artist.get(), TrackArtistLinkType::Artist);
track.get().modify()->setMediaLibrary(library.get());
}
{
auto transaction{ session.createReadTransaction() };
auto artists{ Artist::findIds(session, Artist::FindParameters{}.setTrack(track->getId())) };
ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results.front(), artist.getId());
}
{
auto transaction{ session.createReadTransaction() };
auto artists{ Artist::findIds(session, Artist::FindParameters{}.setMediaLibrary(library->getId())) };
ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results.front(), artist.getId());
}
{
auto transaction{ session.createReadTransaction() };
auto artists{ Artist::findIds(session, Artist::FindParameters{}.setMediaLibrary(otherLibrary->getId())) };
EXPECT_EQ(artists.results.size(), 0);
}
}
TEST_F(DatabaseFixture, Artist_singleTracktMultiRoles) TEST_F(DatabaseFixture, Artist_singleTracktMultiRoles)
{ {
ScopedTrack track{ session, "MyTrack" }; ScopedTrack track{ session, "MyTrack" };
src/libs/database/test/Common.hpp
+65 -63
View File
@@ -28,6 +28,7 @@
#include "database/Cluster.hpp" #include "database/Cluster.hpp"
#include "database/Db.hpp" #include "database/Db.hpp"
#include "database/Listen.hpp" #include "database/Listen.hpp"
#include "database/MediaLibrary.hpp"
#include "database/Release.hpp" #include "database/Release.hpp"
#include "database/ScanSettings.hpp" #include "database/ScanSettings.hpp"
#include "database/Session.hpp" #include "database/Session.hpp"
@@ -42,65 +43,66 @@
template <typename T> template <typename T>
class [[nodiscard]] ScopedEntity class [[nodiscard]] ScopedEntity
{ {
public: public:
using IdType = typename T::IdType; using IdType = typename T::IdType;
template <typename... Args> template <typename... Args>
ScopedEntity(Database::Session& session, Args&& ...args) ScopedEntity(Database::Session& session, Args&& ...args)
: _session {session} : _session{ session }
{ {
auto transaction {_session.createWriteTransaction()}; auto transaction{ _session.createWriteTransaction() };
auto entity {_session.create<T>(std::forward<Args>(args)...)}; auto entity{ _session.create<T>(std::forward<Args>(args)...) };
EXPECT_TRUE(entity); EXPECT_TRUE(entity);
_id = entity->getId(); _id = entity->getId();
} }
~ScopedEntity() ~ScopedEntity()
{ {
auto transaction {_session.createWriteTransaction()}; auto transaction{ _session.createWriteTransaction() };
auto entity {T::find(_session, _id)}; auto entity{ T::find(_session, _id) };
// could not be here due to "on delete cascade" constraints... // could not be here due to "on delete cascade" constraints...
if (entity) if (entity)
entity.remove(); entity.remove();
} }
ScopedEntity(const ScopedEntity&) = delete; ScopedEntity(const ScopedEntity&) = delete;
ScopedEntity(ScopedEntity&&) = delete; ScopedEntity(ScopedEntity&&) = delete;
ScopedEntity& operator=(const ScopedEntity&) = delete; ScopedEntity& operator=(const ScopedEntity&) = delete;
ScopedEntity& operator=(ScopedEntity&&) = delete; ScopedEntity& operator=(ScopedEntity&&) = delete;
typename T::pointer lockAndGet() typename T::pointer lockAndGet()
{ {
auto transaction {_session.createReadTransaction()}; auto transaction{ _session.createReadTransaction() };
return get(); return get();
} }
typename T::pointer get() typename T::pointer get()
{ {
_session.checkReadTransaction(); _session.checkReadTransaction();
auto entity {T::find(_session, _id)}; auto entity{ T::find(_session, _id) };
EXPECT_TRUE(entity); EXPECT_TRUE(entity);
return entity; return entity;
} }
typename T::pointer operator->() typename T::pointer operator->()
{ {
return get(); return get();
} }
IdType getId() const { return _id; } IdType getId() const { return _id; }
private: private:
Database::Session& _session; Database::Session& _session;
IdType _id {}; IdType _id{};
}; };
using ScopedArtist = ScopedEntity<Database::Artist>; using ScopedArtist = ScopedEntity<Database::Artist>;
using ScopedCluster = ScopedEntity<Database::Cluster>; using ScopedCluster = ScopedEntity<Database::Cluster>;
using ScopedClusterType = ScopedEntity<Database::ClusterType>; using ScopedClusterType = ScopedEntity<Database::ClusterType>;
using ScopedMediaLibrary = ScopedEntity<Database::MediaLibrary>;
using ScopedRelease = ScopedEntity<Database::Release>; using ScopedRelease = ScopedEntity<Database::Release>;
using ScopedTrack = ScopedEntity<Database::Track>; using ScopedTrack = ScopedEntity<Database::Track>;
using ScopedTrackList = ScopedEntity<Database::TrackList>; using ScopedTrackList = ScopedEntity<Database::TrackList>;
@@ -108,47 +110,47 @@ using ScopedUser = ScopedEntity<Database::User>;
class ScopedFileDeleter final class ScopedFileDeleter final
{ {
public: public:
ScopedFileDeleter(const std::filesystem::path& path) : _path {path} {} ScopedFileDeleter(const std::filesystem::path& path) : _path{ path } {}
~ScopedFileDeleter() { std::filesystem::remove(_path); } ~ScopedFileDeleter() { std::filesystem::remove(_path); }
ScopedFileDeleter(const ScopedFileDeleter&) = delete; private:
ScopedFileDeleter(ScopedFileDeleter&&) = delete; ScopedFileDeleter(const ScopedFileDeleter&) = delete;
ScopedFileDeleter operator=(const ScopedFileDeleter&) = delete; ScopedFileDeleter(ScopedFileDeleter&&) = delete;
ScopedFileDeleter operator=(ScopedFileDeleter&&) = delete; ScopedFileDeleter operator=(const ScopedFileDeleter&) = delete;
ScopedFileDeleter operator=(ScopedFileDeleter&&) = delete;
private: const std::filesystem::path _path;
const std::filesystem::path _path;
}; };
class TmpDatabase final class TmpDatabase final
{ {
public: public:
TmpDatabase (); TmpDatabase();
Database::Db& getDb(); Database::Db& getDb();
private: private:
const std::filesystem::path _tmpFile; const std::filesystem::path _tmpFile;
ScopedFileDeleter _fileDeleter; ScopedFileDeleter _fileDeleter;
Database::Db _db; Database::Db _db;
}; };
class DatabaseFixture : public ::testing::Test class DatabaseFixture : public ::testing::Test
{ {
public: public:
~DatabaseFixture(); ~DatabaseFixture();
public: public:
static void SetUpTestCase(); static void SetUpTestCase();
static void TearDownTestCase(); static void TearDownTestCase();
private: private:
void testDatabaseEmpty(); void testDatabaseEmpty();
static inline std::unique_ptr<TmpDatabase> _tmpDb {}; static inline std::unique_ptr<TmpDatabase> _tmpDb{};
public: public:
Database::Session session {_tmpDb->getDb()}; Database::Session session{ _tmpDb->getDb() };
}; };
src/libs/database/test/Listen.cpp
+502 -62
View File
@@ -153,7 +153,11 @@ TEST_F(DatabaseFixture, Listen_getTopArtists)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
const auto artists{ Listen::getTopArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
EXPECT_EQ(artists.moreResults, false); EXPECT_EQ(artists.moreResults, false);
} }
@@ -171,22 +175,36 @@ TEST_F(DatabaseFixture, Listen_getTopArtists)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist1->getId()); EXPECT_EQ(artists.results[0], artist1->getId());
} }
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::ListenBrainz, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::ListenBrainz);
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 0); ASSERT_EQ(artists.results.size(), 0);
} }
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {}, TrackArtistLinkType::Producer) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::ListenBrainz);
params.setLinkType(TrackArtistLinkType::Producer);
auto artists{ Listen::getTopArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
} }
{ {
ScopedClusterType clusterType{ session, "MyType" }; ScopedClusterType clusterType{ session, "MyType" };
ScopedCluster cluster{ session, clusterType.lockAndGet(), "MyCluster" }; ScopedCluster cluster{ session, clusterType.lockAndGet(), "MyCluster" };
@@ -194,7 +212,12 @@ TEST_F(DatabaseFixture, Listen_getTopArtists)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {cluster->getId()}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({cluster->getId()});
auto artists{ Listen::getTopArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
} }
} }
@@ -218,7 +241,11 @@ TEST_F(DatabaseFixture, Listen_getTopArtists_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getTopArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
} }
@@ -226,16 +253,25 @@ TEST_F(DatabaseFixture, Listen_getTopArtists_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist1->getId()); EXPECT_EQ(artists.results[0], artist1->getId());
} }
ScopedListen listen2{ session, user.lockAndGet(), track2.lockAndGet(), ScrobblingBackend::Internal, dateTime.addSecs(2) }; ScopedListen listen2{ session, user.lockAndGet(), track2.lockAndGet(), ScrobblingBackend::Internal, dateTime.addSecs(2) };
ScopedListen listen3{ session, user.lockAndGet(), track2.lockAndGet(), ScrobblingBackend::Internal, dateTime.addSecs(3) }; ScopedListen listen3{ session, user.lockAndGet(), track2.lockAndGet(), ScrobblingBackend::Internal, dateTime.addSecs(3) };
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 2); ASSERT_EQ(artists.results.size(), 2);
EXPECT_EQ(artists.results[0], artist2->getId()); EXPECT_EQ(artists.results[0], artist2->getId());
EXPECT_EQ(artists.results[1], artist1->getId()); EXPECT_EQ(artists.results[1], artist1->getId());
@@ -243,7 +279,12 @@ TEST_F(DatabaseFixture, Listen_getTopArtists_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt, Range {0, 1}) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setRange(Range {0, 1});
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.moreResults, true); EXPECT_EQ(artists.moreResults, true);
EXPECT_EQ(artists.results[0], artist2->getId()); EXPECT_EQ(artists.results[0], artist2->getId());
@@ -268,7 +309,12 @@ TEST_F(DatabaseFixture, Listen_getTopArtists_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 0); ASSERT_EQ(artists.results.size(), 0);
} }
{ {
@@ -278,12 +324,83 @@ TEST_F(DatabaseFixture, Listen_getTopArtists_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getTopArtists(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist.getId()); EXPECT_EQ(artists.results[0], artist.getId());
} }
} }
TEST_F(DatabaseFixture, Listen_getTopArtists_mediaLibrary)
{
ScopedTrack track{ session, "MyTrack" };
ScopedArtist artist{ session, "MyArtist" };
ScopedUser user{ session, "MyUser" };
const Wt::WDateTime dateTime1{ Wt::WDate{2000, 1, 2}, Wt::WTime{12,0, 1} };
ScopedListen listen{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime1 };
ScopedMediaLibrary library{ session };
ScopedMediaLibrary otherLibrary{ session };
{
auto transaction{ session.createReadTransaction() };
Listen::ArtistStatsFindParameters params;
params.setUser(user.getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(library.getId());
const auto artists{ Listen::getTopArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0);
EXPECT_EQ(artists.moreResults, false);
}
{
auto transaction{ session.createWriteTransaction() };
TrackArtistLink::create(session, track.get(), artist.get(), TrackArtistLinkType::Artist);
track.get().modify()->setMediaLibrary(library.get());
}
{
auto transaction{ session.createReadTransaction() };
Listen::ArtistStatsFindParameters params;
params.setUser(user.getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist->getId());
}
{
auto transaction{ session.createReadTransaction() };
Listen::ArtistStatsFindParameters params;
params.setUser(user.getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(library.getId());
auto artists{ Listen::getTopArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist->getId());
}
{
auto transaction{ session.createReadTransaction() };
Listen::ArtistStatsFindParameters params;
params.setUser(user.getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(otherLibrary.getId());
auto artists{ Listen::getTopArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0);
}
}
TEST_F(DatabaseFixture, Listen_getTopReleases) TEST_F(DatabaseFixture, Listen_getTopReleases)
{ {
ScopedTrack track{ session, "MyTrack" }; ScopedTrack track{ session, "MyTrack" };
@@ -298,7 +415,11 @@ TEST_F(DatabaseFixture, Listen_getTopReleases)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
EXPECT_EQ(releases.results.size(), 0); EXPECT_EQ(releases.results.size(), 0);
} }
@@ -308,7 +429,11 @@ TEST_F(DatabaseFixture, Listen_getTopReleases)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 1); ASSERT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results[0], release.getId()); EXPECT_EQ(releases.results[0], release.getId());
@@ -316,7 +441,11 @@ TEST_F(DatabaseFixture, Listen_getTopReleases)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::ListenBrainz, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::ListenBrainz);
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
EXPECT_EQ(releases.results.size(), 0); EXPECT_EQ(releases.results.size(), 0);
} }
@@ -341,7 +470,11 @@ TEST_F(DatabaseFixture, Listen_getTopReleases_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 1); ASSERT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results[0], release1.getId()); EXPECT_EQ(releases.results[0], release1.getId());
@@ -351,7 +484,11 @@ TEST_F(DatabaseFixture, Listen_getTopReleases_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 2); ASSERT_EQ(releases.results.size(), 2);
EXPECT_EQ(releases.results[0], release2.getId()); EXPECT_EQ(releases.results[0], release2.getId());
@@ -362,7 +499,11 @@ TEST_F(DatabaseFixture, Listen_getTopReleases_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 2); ASSERT_EQ(releases.results.size(), 2);
EXPECT_EQ(releases.results[0], release1.getId()); EXPECT_EQ(releases.results[0], release1.getId());
@@ -388,7 +529,12 @@ TEST_F(DatabaseFixture, Listen_getTopReleases_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.results.size(), 0); EXPECT_EQ(releases.results.size(), 0);
} }
{ {
@@ -399,12 +545,74 @@ TEST_F(DatabaseFixture, Listen_getTopReleases_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getTopReleases(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.results.size(), 1); EXPECT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results[0], release.getId()); EXPECT_EQ(releases.results[0], release.getId());
} }
} }
TEST_F(DatabaseFixture, Listen_getTopReleases_mediaLibrary)
{
ScopedTrack track{ session, "MyTrack" };
ScopedUser user{ session, "MyUser" };
const Wt::WDateTime dateTime{ Wt::WDate{2000, 1, 2}, Wt::WTime{12,0, 1} };
ScopedRelease release{ session, "MyRelease" };
ScopedMediaLibrary library{ session };
ScopedMediaLibrary otherLibrary{ session };
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setRelease(release.get());
track.get().modify()->setMediaLibrary(library.get());
}
{
auto transaction{ session.createReadTransaction() };
Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(library.getId());
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false);
EXPECT_EQ(releases.results.size(), 0);
}
ScopedListen listen{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime };
{
auto transaction{ session.createReadTransaction() };
Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(library.getId());
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results[0], release.getId());
}
{
auto transaction{ session.createReadTransaction() };
Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(otherLibrary.getId());
auto releases{ Listen::getTopReleases(session, params) };
EXPECT_EQ(releases.moreResults, false);
EXPECT_EQ(releases.results.size(), 0);
}
}
TEST_F(DatabaseFixture, Listen_getTopTracks) TEST_F(DatabaseFixture, Listen_getTopTracks)
{ {
ScopedTrack track{ session, "MyTrack" }; ScopedTrack track{ session, "MyTrack" };
@@ -414,7 +622,11 @@ TEST_F(DatabaseFixture, Listen_getTopTracks)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 0); ASSERT_EQ(tracks.results.size(), 0);
} }
@@ -424,7 +636,11 @@ TEST_F(DatabaseFixture, Listen_getTopTracks)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 1); ASSERT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track.getId()); EXPECT_EQ(tracks.results[0], track.getId());
@@ -432,13 +648,16 @@ TEST_F(DatabaseFixture, Listen_getTopTracks)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::ListenBrainz, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::ListenBrainz);
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
EXPECT_EQ(tracks.results.size(), 0); EXPECT_EQ(tracks.results.size(), 0);
} }
} }
TEST_F(DatabaseFixture, Listen_getTopTracks_artist) TEST_F(DatabaseFixture, Listen_getTopTracks_artist)
{ {
ScopedTrack track{ session, "MyTrack" }; ScopedTrack track{ session, "MyTrack" };
@@ -449,7 +668,12 @@ TEST_F(DatabaseFixture, Listen_getTopTracks_artist)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), artist->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setArtist(artist->getId());
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 0); ASSERT_EQ(tracks.results.size(), 0);
} }
@@ -459,8 +683,12 @@ TEST_F(DatabaseFixture, Listen_getTopTracks_artist)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), artist->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
EXPECT_EQ(tracks.moreResults, false); params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setArtist(artist->getId());
auto tracks{ Listen::getTopTracks(session, params) };
ASSERT_EQ(tracks.results.size(), 0); ASSERT_EQ(tracks.results.size(), 0);
} }
@@ -472,7 +700,12 @@ TEST_F(DatabaseFixture, Listen_getTopTracks_artist)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), artist->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setArtist(artist->getId());
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 1); ASSERT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track.getId()); EXPECT_EQ(tracks.results[0], track.getId());
@@ -490,7 +723,11 @@ TEST_F(DatabaseFixture, Listen_getTopTrack_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 1); ASSERT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track1.getId()); EXPECT_EQ(tracks.results[0], track1.getId());
@@ -500,7 +737,11 @@ TEST_F(DatabaseFixture, Listen_getTopTrack_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 2); ASSERT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results[0], track2.getId()); EXPECT_EQ(tracks.results[0], track2.getId());
@@ -511,7 +752,11 @@ TEST_F(DatabaseFixture, Listen_getTopTrack_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 2); ASSERT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results[0], track1.getId()); EXPECT_EQ(tracks.results[0], track1.getId());
@@ -531,7 +776,12 @@ TEST_F(DatabaseFixture, Listen_getTopTracks_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.results.size(), 0); EXPECT_EQ(tracks.results.size(), 0);
} }
{ {
@@ -542,12 +792,72 @@ TEST_F(DatabaseFixture, Listen_getTopTracks_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getTopTracks(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.results.size(), 1); EXPECT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track.getId()); EXPECT_EQ(tracks.results[0], track.getId());
} }
} }
TEST_F(DatabaseFixture, Listen_getTopTracks_mediaLibrary)
{
ScopedTrack track{ session, "MyTrack" };
ScopedUser user{ session, "MyUser" };
const Wt::WDateTime dateTime{ Wt::WDate{2000, 1, 2}, Wt::WTime{12,0, 1} };
ScopedMediaLibrary library{ session };
ScopedMediaLibrary otherLibrary{ session };
{
auto transaction{ session.createReadTransaction() };
Listen::StatsFindParameters params;
params.setUser(user.getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(library.getId());
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 0);
}
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setMediaLibrary(library.get());
}
ScopedListen listen{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime };
{
auto transaction{ session.createReadTransaction() };
Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(library.getId());
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track.getId());
}
{
auto transaction{ session.createReadTransaction() };
Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setMediaLibrary(otherLibrary.getId());
auto tracks{ Listen::getTopTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false);
EXPECT_EQ(tracks.results.size(), 0);
}
}
TEST_F(DatabaseFixture, Listen_getRecentArtists) TEST_F(DatabaseFixture, Listen_getRecentArtists)
{ {
ScopedTrack track{ session, "MyTrack" }; ScopedTrack track{ session, "MyTrack" };
@@ -562,7 +872,11 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getRecentArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
EXPECT_EQ(artists.moreResults, false); EXPECT_EQ(artists.moreResults, false);
} }
@@ -573,20 +887,33 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getRecentArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist->getId()); EXPECT_EQ(artists.results[0], artist->getId());
} }
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::ListenBrainz, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::ListenBrainz);
auto artists{ Listen::getRecentArtists(session, params) };
ASSERT_EQ(artists.results.size(), 0); ASSERT_EQ(artists.results.size(), 0);
} }
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {}, TrackArtistLinkType::Producer) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setLinkType(TrackArtistLinkType::Producer);
auto artists{ Listen::getRecentArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
} }
{ {
@@ -596,7 +923,12 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {cluster->getId()}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({cluster->getId()});
auto artists{ Listen::getRecentArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
} }
} }
@@ -620,7 +952,11 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getRecentArtists(session, params) };
EXPECT_EQ(artists.results.size(), 0); EXPECT_EQ(artists.results.size(), 0);
} }
@@ -628,7 +964,11 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getRecentArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist1->getId()); EXPECT_EQ(artists.results[0], artist1->getId());
} }
@@ -636,7 +976,11 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto artists{ Listen::getRecentArtists(session, params) };
ASSERT_EQ(artists.results.size(), 2); ASSERT_EQ(artists.results.size(), 2);
EXPECT_EQ(artists.results[0], artist2->getId()); EXPECT_EQ(artists.results[0], artist2->getId());
EXPECT_EQ(artists.results[1], artist1->getId()); EXPECT_EQ(artists.results[1], artist1->getId());
@@ -645,7 +989,12 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {}, std::nullopt, Range {0, 1}) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setRange(Range{ 0, 1 });
auto artists{ Listen::getRecentArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.moreResults, true); EXPECT_EQ(artists.moreResults, true);
EXPECT_EQ(artists.results[0], artist2->getId()); EXPECT_EQ(artists.results[0], artist2->getId());
@@ -670,7 +1019,12 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto artists{ Listen::getRecentArtists(session, params) };
ASSERT_EQ(artists.results.size(), 0); ASSERT_EQ(artists.results.size(), 0);
} }
{ {
@@ -680,7 +1034,12 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto artists{ Listen::getRecentArtists(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}, std::nullopt) }; Listen::ArtistStatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto artists{ Listen::getRecentArtists(session, params) };
ASSERT_EQ(artists.results.size(), 1); ASSERT_EQ(artists.results.size(), 1);
EXPECT_EQ(artists.results[0], artist.getId()); EXPECT_EQ(artists.results[0], artist.getId());
} }
@@ -700,7 +1059,11 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 0); ASSERT_EQ(releases.results.size(), 0);
} }
@@ -711,7 +1074,11 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 1); ASSERT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results[0], release.getId()); EXPECT_EQ(releases.results[0], release.getId());
@@ -719,7 +1086,11 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::ListenBrainz, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::ListenBrainz);
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
EXPECT_EQ(releases.results.size(), 0); EXPECT_EQ(releases.results.size(), 0);
} }
@@ -798,7 +1169,11 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 1); ASSERT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results[0], release2.getId()); EXPECT_EQ(releases.results[0], release2.getId());
@@ -808,7 +1183,11 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 2); ASSERT_EQ(releases.results.size(), 2);
EXPECT_EQ(releases.results[0], release1.getId()); EXPECT_EQ(releases.results[0], release1.getId());
@@ -819,7 +1198,11 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 2); ASSERT_EQ(releases.results.size(), 2);
EXPECT_EQ(releases.results[0], release2.getId()); EXPECT_EQ(releases.results[0], release2.getId());
@@ -830,7 +1213,11 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.moreResults, false); EXPECT_EQ(releases.moreResults, false);
ASSERT_EQ(releases.results.size(), 2); ASSERT_EQ(releases.results.size(), 2);
EXPECT_EQ(releases.results[0], release2.getId()); EXPECT_EQ(releases.results[0], release2.getId());
@@ -853,7 +1240,12 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.results.size(), 0); EXPECT_EQ(releases.results.size(), 0);
} }
@@ -863,7 +1255,12 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.results.size(), 0); EXPECT_EQ(releases.results.size(), 0);
} }
@@ -874,7 +1271,12 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto releases{ Listen::getRecentReleases(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto releases{ Listen::getRecentReleases(session, params) };
EXPECT_EQ(releases.results.size(), 1); EXPECT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results[0], release.getId()); EXPECT_EQ(releases.results[0], release.getId());
} }
@@ -888,7 +1290,11 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 0); ASSERT_EQ(tracks.results.size(), 0);
} }
@@ -899,7 +1305,11 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 1); ASSERT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track.getId()); EXPECT_EQ(tracks.results[0], track.getId());
@@ -908,7 +1318,11 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::ListenBrainz, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::ListenBrainz);
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
EXPECT_EQ(tracks.results.size(), 0); EXPECT_EQ(tracks.results.size(), 0);
} }
@@ -1054,7 +1468,11 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 1); ASSERT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track2.getId()); EXPECT_EQ(tracks.results[0], track2.getId());
@@ -1064,7 +1482,11 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 2); ASSERT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results[0], track1.getId()); EXPECT_EQ(tracks.results[0], track1.getId());
@@ -1075,7 +1497,11 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 2); ASSERT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results[0], track2.getId()); EXPECT_EQ(tracks.results[0], track2.getId());
@@ -1086,7 +1512,11 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks_multi)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.moreResults, false); EXPECT_EQ(tracks.moreResults, false);
ASSERT_EQ(tracks.results.size(), 2); ASSERT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results[0], track2.getId()); EXPECT_EQ(tracks.results[0], track2.getId());
@@ -1106,7 +1536,12 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.results.size(), 0); EXPECT_EQ(tracks.results.size(), 0);
} }
{ {
@@ -1117,7 +1552,12 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks_cluster)
{ {
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
auto tracks{ Listen::getRecentTracks(session, user->getId(), ScrobblingBackend::Internal, {cluster.getId()}) }; Listen::StatsFindParameters params;
params.setUser(user->getId());
params.setScrobblingBackend(ScrobblingBackend::Internal);
params.setClusters({ cluster.getId() });
auto tracks{ Listen::getRecentTracks(session, params) };
EXPECT_EQ(tracks.results.size(), 1); EXPECT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results[0], track.getId()); EXPECT_EQ(tracks.results[0], track.getId());
} }
src/libs/database/test/Release.cpp
+26
View File
@@ -133,6 +133,32 @@ TEST_F(DatabaseFixture, Release_singleTrack)
} }
} }
TEST_F(DatabaseFixture, Release_singleTrack_mediaLibrary)
{
ScopedTrack track{ session, "MyTrack" };
ScopedRelease release{ session, "MyRelease" };
ScopedMediaLibrary library{ session };
ScopedMediaLibrary otherLibrary{ session };
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setRelease(release.get());
track.get().modify()->setMediaLibrary(library.get());
}
{
auto transaction{ session.createReadTransaction() };
auto releases{ Release::findIds(session, Release::FindParameters{}.setMediaLibrary(library->getId())) };
ASSERT_EQ(releases.results.size(), 1);
EXPECT_EQ(releases.results.front(), release.getId());
}
{
auto transaction{ session.createReadTransaction() };
auto releases{ Release::findIds(session, Release::FindParameters{}.setMediaLibrary(otherLibrary->getId())) };
EXPECT_EQ(releases.results.size(), 0);
}
}
TEST_F(DatabaseFixture, Release_findByNameAndPath) TEST_F(DatabaseFixture, Release_findByNameAndPath)
{ {
ScopedRelease release1{ session, "MyRelease" }; ScopedRelease release1{ session, "MyRelease" };
src/libs/database/test/Track.cpp
+51
View File
@@ -63,6 +63,57 @@ TEST_F(DatabaseFixture, Track)
} }
} }
TEST_F(DatabaseFixture, Track_MediaLibrary)
{
ScopedTrack track{ session, "MyTrackFile" };
ScopedMediaLibrary library{ session };
ScopedMediaLibrary otherLibrary{ session };
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setMediaLibrary(library.get());
}
{
auto transaction{ session.createWriteTransaction() };
const auto tracks{ Track::findIds(session, Track::FindParameters{}.setMediaLibrary(library->getId()))};
ASSERT_EQ(tracks.results.size(), 1);
EXPECT_EQ(tracks.results.front(), track.getId());
}
{
auto transaction{ session.createWriteTransaction() };
const auto tracks{ Track::findIds(session, Track::FindParameters{}.setMediaLibrary(otherLibrary->getId()))};
EXPECT_EQ(tracks.results.size(), 0);
}
}
TEST_F(DatabaseFixture, Track_noMediaLibrary)
{
ScopedTrack track{ session, "MyTrackFile" };
{
auto transaction{ session.createReadTransaction() };
MediaLibrary::pointer mediaLibrary{ track->getMediaLibrary() };
EXPECT_EQ(mediaLibrary, MediaLibrary::pointer{});
EXPECT_FALSE(mediaLibrary);
EXPECT_TRUE(!mediaLibrary);
}
}
TEST_F(DatabaseFixture, TrackNotExists)
{
auto transaction{ session.createReadTransaction() };
EXPECT_FALSE(Track::exists(session, TrackId{ 42 }));
EXPECT_EQ(Track::find(session, TrackId{ 42 }), Track::pointer{});
EXPECT_FALSE(Track::find(session, TrackId{ 42 }));
EXPECT_EQ(Track::find(session, Track::FindParameters{}).results.size(), 0);
{
auto track{ Track::find(session, TrackId{ 42 }) };
EXPECT_TRUE(!track);
EXPECT_FALSE(track);
}
}
TEST_F(DatabaseFixture, MultipleTracks) TEST_F(DatabaseFixture, MultipleTracks)
{ {
ScopedTrack track1{ session, "MyTrackFile1" }; ScopedTrack track1{ session, "MyTrackFile1" };
src/libs/services/feedback/impl/FeedbackService.cpp
+3
View File
@@ -99,6 +99,7 @@ namespace Feedback
searchParams.setLinkType(params.linkType); searchParams.setLinkType(params.linkType);
searchParams.setSortMethod(params.sortMethod); searchParams.setSortMethod(params.sortMethod);
searchParams.setRange(params.range); searchParams.setRange(params.range);
searchParams.setMediaLibrary(params.library);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
@@ -137,6 +138,7 @@ namespace Feedback
searchParams.setClusters(params.clusters); searchParams.setClusters(params.clusters);
searchParams.setSortMethod(ReleaseSortMethod::StarredDateDesc); searchParams.setSortMethod(ReleaseSortMethod::StarredDateDesc);
searchParams.setRange(params.range); searchParams.setRange(params.range);
searchParams.setMediaLibrary(params.library);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
@@ -175,6 +177,7 @@ namespace Feedback
searchParams.setClusters(params.clusters); searchParams.setClusters(params.clusters);
searchParams.setSortMethod(TrackSortMethod::StarredDateDesc); searchParams.setSortMethod(TrackSortMethod::StarredDateDesc);
searchParams.setRange(params.range); searchParams.setRange(params.range);
searchParams.setMediaLibrary(params.library);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
src/libs/services/feedback/include/services/feedback/IFeedbackService.hpp
+3
View File
@@ -27,6 +27,7 @@
#include "database/Types.hpp" #include "database/Types.hpp"
#include "database/ArtistId.hpp" #include "database/ArtistId.hpp"
#include "database/ClusterId.hpp" #include "database/ClusterId.hpp"
#include "database/MediaLibraryId.hpp"
#include "database/ReleaseId.hpp" #include "database/ReleaseId.hpp"
#include "database/TrackId.hpp" #include "database/TrackId.hpp"
#include "database/UserId.hpp" #include "database/UserId.hpp"
@@ -53,10 +54,12 @@ namespace Feedback
Database::UserId user; Database::UserId user;
std::vector<Database::ClusterId> clusters; // if non empty, at least one artist that belongs to these clusters std::vector<Database::ClusterId> clusters; // if non empty, at least one artist that belongs to these clusters
std::optional<Database::Range> range; std::optional<Database::Range> range;
Database::MediaLibraryId library;
FindParameters& setUser(const Database::UserId _user) { user = _user; return *this; } FindParameters& setUser(const Database::UserId _user) { user = _user; return *this; }
FindParameters& setClusters(const std::vector<Database::ClusterId>& _clusters) { clusters = _clusters; return *this; } FindParameters& setClusters(const std::vector<Database::ClusterId>& _clusters) { clusters = _clusters; return *this; }
FindParameters& setRange(std::optional<Database::Range> _range) { range = _range; return *this; } FindParameters& setRange(std::optional<Database::Range> _range) { range = _range; return *this; }
FindParameters& setMediaLibrary(Database::MediaLibraryId _library) { library = _library; return *this; }
}; };
// Artists // Artists
src/libs/services/scanner/impl/IScanStep.hpp
+15 -15
View File
@@ -20,26 +20,26 @@
#pragma once #pragma once
#include <string_view> #include <string_view>
#include <vector>
#include "services/scanner/ScannerStats.hpp" #include "services/scanner/ScannerStats.hpp"
namespace Scanner namespace Scanner
{ {
class IScanStep class IScanStep
{ {
public: public:
virtual ~IScanStep() = default; virtual ~IScanStep() = default;
virtual ScanStep getStep() const = 0; virtual ScanStep getStep() const = 0;
virtual std::string_view getStepName() const = 0; virtual std::string_view getStepName() const = 0;
struct ScanContext struct ScanContext
{ {
const std::filesystem::path directory; const bool forceScan;
const bool forceScan; ScanStats stats;
ScanStats stats; ScanStepStats currentStepStats;
ScanStepStats currentStepStats; };
}; virtual void process(ScanContext& context) = 0;
virtual void process(ScanContext& context) = 0; };
};
} }
src/libs/services/scanner/impl/ScanStepDiscoverFiles.cpp
+20 -11
View File
@@ -18,6 +18,7 @@
*/ */
#include "ScanStepDiscoverFiles.hpp" #include "ScanStepDiscoverFiles.hpp"
#include "utils/ILogger.hpp" #include "utils/ILogger.hpp"
#include "utils/Path.hpp" #include "utils/Path.hpp"
@@ -26,22 +27,30 @@ namespace Scanner
void ScanStepDiscoverFiles::process(ScanContext& context) void ScanStepDiscoverFiles::process(ScanContext& context)
{ {
context.stats.filesScanned = 0; context.stats.filesScanned = 0;
PathUtils::exploreFilesRecursive(context.directory, [&](std::error_code ec, const std::filesystem::path& path)
{
if (_abortScan)
return false;
if (!ec && PathUtils::hasFileAnyExtension(path, _settings.supportedExtensions)) for (const ScannerSettings::MediaLibraryInfo& mediaLibrary : _settings.mediaLibraries)
{
std::size_t currentDirectoryProcessElemsCount{};
PathUtils::exploreFilesRecursive(mediaLibrary.rootDirectory, [&](std::error_code ec, const std::filesystem::path& path)
{ {
context.currentStepStats.processedElems++; if (_abortScan)
_progressCallback(context.currentStepStats); return false;
}
return true; if (!ec && PathUtils::hasFileAnyExtension(path, _settings.supportedExtensions))
}, &excludeDirFileName); {
context.currentStepStats.processedElems++;
currentDirectoryProcessElemsCount++;
_progressCallback(context.currentStepStats);
}
return true;
}, &excludeDirFileName);
LMS_LOG(DBUPDATER, DEBUG, "Discovered " << currentDirectoryProcessElemsCount << " files in '" << mediaLibrary.rootDirectory << "'");
}
context.stats.filesScanned = context.currentStepStats.processedElems; context.stats.filesScanned = context.currentStepStats.processedElems;
LMS_LOG(DBUPDATER, DEBUG, "Discovered " << context.stats.filesScanned << " files in '" << context.directory << "'"); LMS_LOG(DBUPDATER, DEBUG, "Discovered " << context.stats.filesScanned << " files in all directories");
} }
} }
src/libs/services/scanner/impl/ScanStepRemoveOrphanDbFiles.cpp
+5 -1
View File
@@ -183,7 +183,11 @@ namespace Scanner
return false; return false;
} }
if (!PathUtils::isPathInRootPath(p, _settings.mediaDirectory, &excludeDirFileName)) if (std::none_of(std::cbegin(_settings.mediaLibraries), std::cend(_settings.mediaLibraries),
[&](const ScannerSettings::MediaLibraryInfo& libraryInfo)
{
return PathUtils::isPathInRootPath(p, libraryInfo.rootDirectory, &excludeDirFileName);
}))
{ {
LMS_LOG(DBUPDATER, INFO, "Removing '" << p.string() << "': out of media directory"); LMS_LOG(DBUPDATER, INFO, "Removing '" << p.string() << "': out of media directory");
return false; return false;
src/libs/services/scanner/impl/ScanStepScanFiles.cpp
+59 -26
View File
@@ -23,6 +23,7 @@
#include "database/Artist.hpp" #include "database/Artist.hpp"
#include "database/Cluster.hpp" #include "database/Cluster.hpp"
#include "database/Db.hpp" #include "database/Db.hpp"
#include "database/MediaLibrary.hpp"
#include "database/Release.hpp" #include "database/Release.hpp"
#include "database/Session.hpp" #include "database/Session.hpp"
#include "database/Track.hpp" #include "database/Track.hpp"
@@ -232,33 +233,36 @@ namespace Scanner
context.currentStepStats.totalElems = context.stats.filesScanned; context.currentStepStats.totalElems = context.stats.filesScanned;
PathUtils::exploreFilesRecursive(context.directory, [&](std::error_code ec, const std::filesystem::path& path) for (const ScannerSettings::MediaLibraryInfo& mediaLibrary : _settings.mediaLibraries)
{ {
if (_abortScan) PathUtils::exploreFilesRecursive(mediaLibrary.rootDirectory, [&](std::error_code ec, const std::filesystem::path& path)
return false;
if (ec)
{ {
LMS_LOG(DBUPDATER, ERROR, "Cannot process entry '" << path.string() << "': " << ec.message()); if (_abortScan)
context.stats.errors.emplace_back(ScanError{ path, ScanErrorType::CannotReadFile, ec.message() }); return false;
}
else if (PathUtils::hasFileAnyExtension(path, _settings.supportedExtensions))
{
scanAudioFile(path, context);
context.currentStepStats.processedElems++; if (ec)
_progressCallback(context.currentStepStats); {
LMS_LOG(DBUPDATER, ERROR, "Cannot process entry '" << path.string() << "': " << ec.message());
context.stats.errors.emplace_back(ScanError{ path, ScanErrorType::CannotReadFile, ec.message() });
}
else if (PathUtils::hasFileAnyExtension(path, _settings.supportedExtensions))
{
scanAudioFile(path, context, mediaLibrary);
// optimize the database during scan (if we import a very large database, it may be too late to do it once at end) context.currentStepStats.processedElems++;
if ((context.currentStepStats.processedElems % 1'000) == 0) _progressCallback(context.currentStepStats);
_db.getTLSSession().optimize();
}
return true; // optimize the database during scan (if we import a very large database, it may be too late to do it once at end)
}, &excludeDirFileName); if ((context.currentStepStats.processedElems % 1'000) == 0)
_db.getTLSSession().optimize();
}
return true;
}, &excludeDirFileName);
}
} }
void ScanStepScanFiles::scanAudioFile(const std::filesystem::path& file, ScanContext& context) void ScanStepScanFiles::scanAudioFile(const std::filesystem::path& file, ScanContext& context, const ScannerSettings::MediaLibraryInfo& libraryInfo)
{ {
ScanStats& stats{ context.stats }; ScanStats& stats{ context.stats };
Wt::WDateTime lastWriteTime; Wt::WDateTime lastWriteTime;
@@ -273,6 +277,7 @@ namespace Scanner
return; return;
} }
bool needUpdateLibrary{};
if (!context.forceScan) if (!context.forceScan)
{ {
// Skip file if last write is the same // Skip file if last write is the same
@@ -281,14 +286,35 @@ namespace Scanner
const Track::pointer track{ Track::findByPath(dbSession, file) }; const Track::pointer track{ Track::findByPath(dbSession, file) };
if (track && track->getLastWriteTime().toTime_t() == lastWriteTime.toTime_t() if (track
&& track->getScanVersion() == _settings.scanVersion) && track->getLastWriteTime().toTime_t() == lastWriteTime.toTime_t()
&& track->getScanVersion() == _settings.scanVersion
)
{ {
stats.skips++; // this file may have been moved from one library to another, then we just need to update the media library id instead of a full rescan
return; auto trackMediaLibrary{ track->getMediaLibrary() };
if (trackMediaLibrary && trackMediaLibrary->getId() == libraryInfo.id)
{
stats.skips++;
return;
}
needUpdateLibrary = true;
} }
} }
if (needUpdateLibrary)
{
Database::Session& dbSession{ _db.getTLSSession() };
auto transaction{ _db.getTLSSession().createWriteTransaction() };
Track::pointer track{ Track::findByPath(dbSession, file) };
assert(track);
track.modify()->setMediaLibrary(Database::MediaLibrary::find(dbSession, libraryInfo.id)); // may be null, will be handled in the next scan anyway
stats.updates++;
return;
}
std::optional<MetaData::Track> trackInfo{ _metadataParser->parse(file) }; std::optional<MetaData::Track> trackInfo{ _metadataParser->parse(file) };
if (!trackInfo) if (!trackInfo)
{ {
@@ -330,8 +356,14 @@ namespace Scanner
continue; continue;
// Skip if duplicate files no longer in media root: as it will be removed later, we will end up with no file // Skip if duplicate files no longer in media root: as it will be removed later, we will end up with no file
if (!PathUtils::isPathInRootPath(file, _settings.mediaDirectory, &excludeDirFileName)) if (std::none_of(std::cbegin(_settings.mediaLibraries), std::cend(_settings.mediaLibraries),
[&](const ScannerSettings::MediaLibraryInfo& libraryInfo)
{
return PathUtils::isPathInRootPath(file, libraryInfo.rootDirectory, &excludeDirFileName);
}))
{
continue; continue;
}
LMS_LOG(DBUPDATER, DEBUG, "Skipped '" << file.string() << "' (similar MBID in '" << otherTrack->getPath().string() << "')"); LMS_LOG(DBUPDATER, DEBUG, "Skipped '" << file.string() << "' (similar MBID in '" << otherTrack->getPath().string() << "')");
// As this MBID already exists, just remove what we just scanned // As this MBID already exists, just remove what we just scanned
@@ -389,6 +421,7 @@ namespace Scanner
// Track related data // Track related data
assert(track); assert(track);
track.modify()->setMediaLibrary(MediaLibrary::find(dbSession, libraryInfo.id)); // may be null if settings are updated in // => next scan will correct this
track.modify()->clearArtistLinks(); track.modify()->clearArtistLinks();
// Do not fallback on artists with the same name but having a MBID for artist and releaseArtists, as it may be corrected by properly tagging files // Do not fallback on artists with the same name but having a MBID for artist and releaseArtists, as it may be corrected by properly tagging files
for (const Artist::pointer& artist : getOrCreateArtists(dbSession, trackInfo->artists, false)) for (const Artist::pointer& artist : getOrCreateArtists(dbSession, trackInfo->artists, false))
src/libs/services/scanner/impl/ScanStepScanFiles.hpp
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Scanner
std::string_view getStepName() const override { return "Scanning files"; } std::string_view getStepName() const override { return "Scanning files"; }
void process(ScanContext& context) override; void process(ScanContext& context) override;
void scanAudioFile(const std::filesystem::path& file, ScanContext& context); void scanAudioFile(const std::filesystem::path& file, ScanContext& context, const ScannerSettings::MediaLibraryInfo& libraryInfo);
std::unique_ptr<MetaData::IParser> _metadataParser; std::unique_ptr<MetaData::IParser> _metadataParser;
const std::vector<std::string> _extraTagsToParse{ "GENRE", "MOOD", "LANGUAGE", "ALBUMGROUPING" }; const std::vector<std::string> _extraTagsToParse{ "GENRE", "MOOD", "LANGUAGE", "ALBUMGROUPING" };
src/libs/services/scanner/impl/ScannerService.cpp
+21 -3
View File
@@ -22,7 +22,7 @@
#include <ctime> #include <ctime>
#include <boost/asio/placeholders.hpp> #include <boost/asio/placeholders.hpp>
#include "database/Cluster.hpp" #include "database/MediaLibrary.hpp"
#include "database/TrackFeatures.hpp" #include "database/TrackFeatures.hpp"
#include "database/ScanSettings.hpp" #include "database/ScanSettings.hpp"
#include "utils/Exception.hpp" #include "utils/Exception.hpp"
@@ -113,6 +113,12 @@ namespace Scanner
void ScannerService::abortScan() void ScannerService::abortScan()
{ {
bool isRunning{};
{
std::scoped_lock lock{ _statusMutex };
isRunning = _curState == State::InProgress;
}
LMS_LOG(DBUPDATER, DEBUG, "Aborting scan..."); LMS_LOG(DBUPDATER, DEBUG, "Aborting scan...");
std::scoped_lock lock{ _controlMutex }; std::scoped_lock lock{ _controlMutex };
@@ -125,6 +131,9 @@ namespace Scanner
_abortScan = false; _abortScan = false;
_ioService.start(); _ioService.start();
if (isRunning)
_events.scanAborted.emit();
} }
void ScannerService::requestImmediateScan(bool force) void ScannerService::requestImmediateScan(bool force)
@@ -139,6 +148,11 @@ namespace Scanner
}); });
} }
void ScannerService::requestStop()
{
abortScan();
}
void ScannerService::requestReload() void ScannerService::requestReload()
{ {
abortScan(); abortScan();
@@ -261,7 +275,7 @@ namespace Scanner
refreshScanSettings(); refreshScanSettings();
IScanStep::ScanContext scanContext{ _settings.mediaDirectory, forceScan, ScanStats {}, ScanStepStats {} }; IScanStep::ScanContext scanContext{ forceScan, ScanStats {}, ScanStepStats {} };
ScanStats& stats{ scanContext.stats }; ScanStats& stats{ scanContext.stats };
stats.startTime = Wt::WDateTime::currentDateTime(); stats.startTime = Wt::WDateTime::currentDateTime();
@@ -359,7 +373,11 @@ namespace Scanner
std::transform(std::cbegin(fileExtensions), std::end(fileExtensions), std::back_inserter(newSettings.supportedExtensions), std::transform(std::cbegin(fileExtensions), std::end(fileExtensions), std::back_inserter(newSettings.supportedExtensions),
[](const std::filesystem::path& extension) { return std::filesystem::path{ StringUtils::stringToLower(extension.string()) }; }); [](const std::filesystem::path& extension) { return std::filesystem::path{ StringUtils::stringToLower(extension.string()) }; });
} }
newSettings.mediaDirectory = scanSettings->getMediaDirectory();
MediaLibrary::find(_dbSession, [&](const MediaLibrary::pointer& mediaLibrary)
{
newSettings.mediaLibraries.push_back(ScannerSettings::MediaLibraryInfo{ mediaLibrary->getId(), mediaLibrary->getPath().lexically_normal() });
});
{ {
const auto& tags{ scanSettings->getExtraTagsToScan() }; const auto& tags{ scanSettings->getExtraTagsToScan() };
src/libs/services/scanner/impl/ScannerService.hpp
+2 -1
View File
@@ -48,7 +48,8 @@ namespace Scanner
ScannerService(const ScannerService&) = delete; ScannerService(const ScannerService&) = delete;
ScannerService& operator=(const ScannerService&) = delete; ScannerService& operator=(const ScannerService&) = delete;
private:
void requestStop() override;
void requestReload() override; void requestReload() override;
void requestImmediateScan(bool force) override; void requestImmediateScan(bool force) override;
src/libs/services/scanner/impl/ScannerSettings.hpp
+29 -20
View File
@@ -23,29 +23,38 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <Wt/WDateTime.h> #include <Wt/WDateTime.h>
#include "database/MediaLibraryId.hpp"
#include "database/ScanSettings.hpp" #include "database/ScanSettings.hpp"
namespace Scanner namespace Scanner
{ {
struct ScannerSettings struct ScannerSettings
{ {
std::size_t scanVersion {}; std::size_t scanVersion{};
Wt::WTime startTime; Wt::WTime startTime;
Database::ScanSettings::UpdatePeriod updatePeriod {Database::ScanSettings::UpdatePeriod::Never}; Database::ScanSettings::UpdatePeriod updatePeriod{ Database::ScanSettings::UpdatePeriod::Never };
std::vector<std::filesystem::path> supportedExtensions; std::vector<std::filesystem::path> supportedExtensions;
std::filesystem::path mediaDirectory; bool skipDuplicateMBID{};
bool skipDuplicateMBID {}; std::vector<std::string> extraTags;
std::vector<std::string> extraTags;
bool operator==(const ScannerSettings& rhs) const struct MediaLibraryInfo
{ {
return scanVersion == rhs.scanVersion Database::MediaLibraryId id;
&& startTime == rhs.startTime std::filesystem::path rootDirectory;
&& updatePeriod == rhs.updatePeriod
&& supportedExtensions == rhs.supportedExtensions bool operator==(const MediaLibraryInfo& other) const { return id == other.id && rootDirectory == other.rootDirectory; }
&& mediaDirectory == rhs.mediaDirectory };
&& skipDuplicateMBID == rhs.skipDuplicateMBID std::vector<MediaLibraryInfo> mediaLibraries;
&& extraTags == rhs.extraTags;
} bool operator==(const ScannerSettings& rhs) const
}; {
return scanVersion == rhs.scanVersion
&& startTime == rhs.startTime
&& updatePeriod == rhs.updatePeriod
&& supportedExtensions == rhs.supportedExtensions
&& mediaLibraries == rhs.mediaLibraries
&& skipDuplicateMBID == rhs.skipDuplicateMBID
&& extraTags == rhs.extraTags;
}
};
} }
src/libs/services/scanner/include/services/scanner/IScannerService.hpp
+1
View File
@@ -38,6 +38,7 @@ namespace Scanner
virtual ~IScannerService() = default; virtual ~IScannerService() = default;
// Async requests // Async requests
virtual void requestStop() = 0;
virtual void requestReload() = 0; virtual void requestReload() = 0;
virtual void requestImmediateScan(bool force) = 0; virtual void requestImmediateScan(bool force) = 0;
src/libs/services/scanner/include/services/scanner/ScannerEvents.hpp
+14 -11
View File
@@ -27,20 +27,23 @@
namespace Scanner namespace Scanner
{ {
struct Events struct Events
{ {
// Called just after scan start // Called if scan was aborted
Wt::Signal<> scanStarted; Wt::Signal<> scanAborted;
// Called just after scan complete (true if changes have been made) // Called just after scan start
Wt::Signal<ScanStats> scanComplete; Wt::Signal<> scanStarted;
// Called during scan in progress // Called just after scan complete (true if changes have been made)
Wt::Signal<ScanStepStats> scanInProgress; Wt::Signal<ScanStats> scanComplete;
// Called after a schedule // Called during scan in progress
Wt::Signal<Wt::WDateTime> scanScheduled; Wt::Signal<ScanStepStats> scanInProgress;
};
// Called after a schedule
Wt::Signal<Wt::WDateTime> scanScheduled;
};
} // ns Scanner } // ns Scanner
src/libs/services/scrobbling/impl/ScrobblingService.cpp
+56 -33
View File
@@ -35,6 +35,26 @@ namespace Scrobbling
{ {
using namespace Database; using namespace Database;
namespace
{
Database::Listen::StatsFindParameters convertToListenFindParameters(const ScrobblingService::FindParameters& params)
{
Database::Listen::StatsFindParameters listenFindParams;
listenFindParams.setUser(params.user);
listenFindParams.setClusters(params.clusters);
listenFindParams.setRange(params.range);
listenFindParams.setMediaLibrary(params.library);
listenFindParams.setArtist(params.artist);
return listenFindParams;
}
Database::Listen::ArtistStatsFindParameters convertToListenFindParameters(const ScrobblingService::ArtistFindParameters& params)
{
return Database::Listen::ArtistStatsFindParameters{ convertToListenFindParameters(static_cast<const ScrobblingService::FindParameters&>(params)), params.linkType };
}
}
std::unique_ptr<IScrobblingService> createScrobblingService(boost::asio::io_context& ioContext, Db& db) std::unique_ptr<IScrobblingService> createScrobblingService(boost::asio::io_context& ioContext, Db& db)
{ {
return std::make_unique<ScrobblingService>(ioContext, db); return std::make_unique<ScrobblingService>(ioContext, db);
@@ -84,48 +104,57 @@ namespace Scrobbling
return backend; return backend;
} }
ScrobblingService::ArtistContainer ScrobblingService::getRecentArtists(UserId userId, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range) ScrobblingService::ArtistContainer ScrobblingService::getRecentArtists(const ArtistFindParameters& params)
{ {
ArtistContainer res; ArtistContainer res;
const auto backend{ getUserBackend(userId) }; const auto backend{ getUserBackend(params.user) };
if (!backend) if (!backend)
return res; return res;
Database::Listen::ArtistStatsFindParameters listenFindParams{ convertToListenFindParameters(params) };
listenFindParams.setScrobblingBackend(backend);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
res = Database::Listen::getRecentArtists(session, userId, *backend, clusterIds, linkType, range); res = Database::Listen::getRecentArtists(session, listenFindParams);
return res; return res;
} }
ScrobblingService::ReleaseContainer ScrobblingService::getRecentReleases(UserId userId, const std::vector<ClusterId>& clusterIds, Range range) ScrobblingService::ReleaseContainer ScrobblingService::getRecentReleases(const FindParameters& params)
{ {
ReleaseContainer res; ReleaseContainer res;
const auto backend{ getUserBackend(userId) }; const auto backend{ getUserBackend(params.user) };
if (!backend) if (!backend)
return res; return res;
Database::Listen::StatsFindParameters listenFindParams{ convertToListenFindParameters(params) };
listenFindParams.setScrobblingBackend(backend);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
res = Database::Listen::getRecentReleases(session, userId, *backend, clusterIds, range); res = Database::Listen::getRecentReleases(session, listenFindParams);
return res; return res;
} }
ScrobblingService::TrackContainer ScrobblingService::getRecentTracks(UserId userId, const std::vector<ClusterId>& clusterIds, Range range) ScrobblingService::TrackContainer ScrobblingService::getRecentTracks(const FindParameters& params)
{ {
TrackContainer res; TrackContainer res;
const auto backend{ getUserBackend(userId) }; const auto backend{ getUserBackend(params.user) };
if (!backend) if (!backend)
return res; return res;
Database::Listen::StatsFindParameters listenFindParams{ convertToListenFindParameters(params) };
listenFindParams.setScrobblingBackend(backend);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
res = Database::Listen::getRecentTracks(session, userId, *backend, clusterIds, range); res = Database::Listen::getRecentTracks(session, listenFindParams);
return res; return res;
} }
@@ -170,63 +199,57 @@ namespace Scrobbling
} }
// Top // Top
ScrobblingService::ArtistContainer ScrobblingService::getTopArtists(UserId userId, const std::vector<ClusterId>& clusterIds, std::optional<TrackArtistLinkType> linkType, Range range) ScrobblingService::ArtistContainer ScrobblingService::getTopArtists(const ArtistFindParameters& params)
{ {
ArtistContainer res; ArtistContainer res;
const auto backend{ getUserBackend(userId) }; const auto backend{ getUserBackend(params.user) };
if (!backend) if (!backend)
return res; return res;
Database::Listen::ArtistStatsFindParameters listenFindParams{ convertToListenFindParameters(params) };
listenFindParams.setScrobblingBackend(backend);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
res = Database::Listen::getTopArtists(session, userId, *backend, clusterIds, linkType, range); res = Database::Listen::getTopArtists(session, listenFindParams);
return res; return res;
} }
ScrobblingService::ReleaseContainer ScrobblingService::getTopReleases(UserId userId, const std::vector<ClusterId>& clusterIds, Range range) ScrobblingService::ReleaseContainer ScrobblingService::getTopReleases(const FindParameters& params)
{ {
ReleaseContainer res; ReleaseContainer res;
const auto backend{ getUserBackend(userId) }; const auto backend{ getUserBackend(params.user) };
if (!backend) if (!backend)
return res; return res;
Database::Listen::StatsFindParameters listenFindParams{ convertToListenFindParameters(params) };
listenFindParams.setScrobblingBackend(backend);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
res = Database::Listen::getTopReleases(session, userId, *backend, clusterIds, range); res = Database::Listen::getTopReleases(session, listenFindParams);
return res; return res;
} }
ScrobblingService::TrackContainer ScrobblingService::getTopTracks(UserId userId, const std::vector<ClusterId>& clusterIds, Range range) ScrobblingService::TrackContainer ScrobblingService::getTopTracks(const FindParameters& params)
{ {
TrackContainer res; TrackContainer res;
const auto backend{ getUserBackend(userId) }; const auto backend{ getUserBackend(params.user) };
if (!backend) if (!backend)
return res; return res;
Database::Listen::StatsFindParameters listenFindParams{ convertToListenFindParameters(params) };
listenFindParams.setScrobblingBackend(backend);
Session& session{ _db.getTLSSession() }; Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
res = Database::Listen::getTopTracks(session, userId, *backend, clusterIds, range); res = Database::Listen::getTopTracks(session, listenFindParams);
return res;
}
ScrobblingService::TrackContainer ScrobblingService::getTopTracks(UserId userId, Database::ArtistId artistId, const std::vector<ClusterId>& clusterIds, Range range)
{
TrackContainer res;
const auto backend{ getUserBackend(userId) };
if (!backend)
return res;
Session& session{ _db.getTLSSession() };
auto transaction{ session.createReadTransaction() };
res = Database::Listen::getTopTracks(session, userId, artistId, *backend, clusterIds, range);
return res; return res;
} }
} // ns Scrobbling } // ns Scrobbling
src/libs/services/scrobbling/impl/ScrobblingService.hpp
+6 -7
View File
@@ -39,9 +39,9 @@ namespace Scrobbling
void listenFinished(const Listen& listen, std::optional<std::chrono::seconds> duration) override; void listenFinished(const Listen& listen, std::optional<std::chrono::seconds> duration) override;
void addTimedListen(const TimedListen& listen) override; void addTimedListen(const TimedListen& listen) override;
ArtistContainer getRecentArtists(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, std::optional<Database::TrackArtistLinkType> linkType,Database::Range range) override; ArtistContainer getRecentArtists(const ArtistFindParameters& params) override;
ReleaseContainer getRecentReleases(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds,Database::Range range) override; ReleaseContainer getRecentReleases(const FindParameters& params) override;
TrackContainer getRecentTracks(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) override; TrackContainer getRecentTracks(const FindParameters& params) override;
std::size_t getCount(Database::UserId userId, Database::ReleaseId releaseId) override; std::size_t getCount(Database::UserId userId, Database::ReleaseId releaseId) override;
std::size_t getCount(Database::UserId userId, Database::TrackId trackId) override; std::size_t getCount(Database::UserId userId, Database::TrackId trackId) override;
@@ -49,10 +49,9 @@ namespace Scrobbling
Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::ReleaseId releaseId) override; Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::ReleaseId releaseId) override;
Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::TrackId trackId) override; Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::TrackId trackId) override;
ArtistContainer getTopArtists(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, std::optional<Database::TrackArtistLinkType> linkType, Database::Range range) override; ArtistContainer getTopArtists(const ArtistFindParameters& params) override;
ReleaseContainer getTopReleases(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) override; ReleaseContainer getTopReleases(const FindParameters& params) override;
TrackContainer getTopTracks(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) override; TrackContainer getTopTracks(const FindParameters& params) override;
TrackContainer getTopTracks(Database::UserId userId, Database::ArtistId artistId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) override;
std::optional<Database::ScrobblingBackend> getUserBackend(Database::UserId userId); std::optional<Database::ScrobblingBackend> getUserBackend(Database::UserId userId);
src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp
+32 -10
View File
@@ -28,6 +28,7 @@
#include "services/scrobbling/Listen.hpp" #include "services/scrobbling/Listen.hpp"
#include "database/ArtistId.hpp" #include "database/ArtistId.hpp"
#include "database/ClusterId.hpp" #include "database/ClusterId.hpp"
#include "database/MediaLibraryId.hpp"
#include "database/ReleaseId.hpp" #include "database/ReleaseId.hpp"
#include "database/TrackId.hpp" #include "database/TrackId.hpp"
#include "database/Types.hpp" #include "database/Types.hpp"
@@ -39,7 +40,6 @@ namespace Database
namespace Scrobbling namespace Scrobbling
{ {
class IScrobblingService class IScrobblingService
{ {
public: public:
@@ -56,10 +56,35 @@ namespace Scrobbling
using ReleaseContainer = Database::RangeResults<Database::ReleaseId>; using ReleaseContainer = Database::RangeResults<Database::ReleaseId>;
using TrackContainer = Database::RangeResults<Database::TrackId>; using TrackContainer = Database::RangeResults<Database::TrackId>;
struct FindParameters
{
Database::UserId user;
std::vector<Database::ClusterId> clusters; // if non empty, at least one artist that belongs to these clusters
std::optional<Database::Range> range;
Database::MediaLibraryId library; // if set, match this library
Database::ArtistId artist; // if set, match this artist
FindParameters& setUser(const Database::UserId _user) { user = _user; return *this; }
FindParameters& setClusters(const std::vector<Database::ClusterId>& _clusters) { clusters = _clusters; return *this; }
FindParameters& setRange(std::optional<Database::Range> _range) { range = _range; return *this; }
FindParameters& setMediaLibrary(Database::MediaLibraryId _library) { library = _library; return *this; }
FindParameters& setArtist(Database::ArtistId _artist) { artist = _artist; return *this; }
};
// Artists
struct ArtistFindParameters : public FindParameters
{
std::optional<Database::TrackArtistLinkType> linkType; // if set, only artists that have produced at least one track with this link type
Database::ArtistSortMethod sortMethod{ Database::ArtistSortMethod::None };
ArtistFindParameters& setLinkType(std::optional<Database::TrackArtistLinkType> _linkType) { linkType = _linkType; return *this; }
ArtistFindParameters& setSortMethod(Database::ArtistSortMethod _sortMethod) { sortMethod = _sortMethod; return *this; }
};
// From most recent to oldest // From most recent to oldest
virtual ArtistContainer getRecentArtists(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, std::optional<Database::TrackArtistLinkType> linkType, Database::Range range) = 0; virtual ArtistContainer getRecentArtists(const ArtistFindParameters& params) = 0;
virtual ReleaseContainer getRecentReleases(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) = 0; virtual ReleaseContainer getRecentReleases(const FindParameters& params) = 0;
virtual TrackContainer getRecentTracks(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) = 0; virtual TrackContainer getRecentTracks(const FindParameters& params) = 0;
virtual std::size_t getCount(Database::UserId userId, Database::ReleaseId releaseId) = 0; virtual std::size_t getCount(Database::UserId userId, Database::ReleaseId releaseId) = 0;
virtual std::size_t getCount(Database::UserId userId, Database::TrackId trackId) = 0; virtual std::size_t getCount(Database::UserId userId, Database::TrackId trackId) = 0;
@@ -68,13 +93,10 @@ namespace Scrobbling
virtual Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::TrackId trackId) = 0; virtual Wt::WDateTime getLastListenDateTime(Database::UserId userId, Database::TrackId trackId) = 0;
// Top // Top
virtual ArtistContainer getTopArtists(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, std::optional<Database::TrackArtistLinkType> linkType, Database::Range) = 0; virtual ArtistContainer getTopArtists(const ArtistFindParameters& params) = 0;
virtual ReleaseContainer getTopReleases(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) = 0; virtual ReleaseContainer getTopReleases(const FindParameters& params) = 0;
virtual TrackContainer getTopTracks(Database::UserId userId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) = 0; virtual TrackContainer getTopTracks(const FindParameters& params) = 0;
virtual TrackContainer getTopTracks(Database::UserId userId, Database::ArtistId artistId, const std::vector<Database::ClusterId>& clusterIds, Database::Range range) = 0;
}; };
std::unique_ptr<IScrobblingService> createScrobblingService(boost::asio::io_service& ioService, Database::Db& db); std::unique_ptr<IScrobblingService> createScrobblingService(boost::asio::io_service& ioService, Database::Db& db);
} // ns Scrobbling } // ns Scrobbling
src/libs/subsonic/impl/SubsonicId.cpp
+15
View File
@@ -31,6 +31,12 @@ namespace API::Subsonic
return "ar-" + id.toString(); return "ar-" + id.toString();
} }
std::string idToString(Database::MediaLibraryId id)
{
// No need to prefix as this is only used at well known places
return id.toString();
}
std::string idToString(Database::ReleaseId id) std::string idToString(Database::ReleaseId id)
{ {
return "al-" + id.toString(); return "al-" + id.toString();
@@ -70,6 +76,15 @@ namespace StringUtils
return std::nullopt; return std::nullopt;
} }
template<>
std::optional<Database::MediaLibraryId> readAs(std::string_view str)
{
if (const auto value{ StringUtils::readAs<Database::MediaLibraryId::ValueType>(str) })
return Database::MediaLibraryId{ *value };
return std::nullopt;
}
template<> template<>
std::optional<Database::ReleaseId> readAs(std::string_view str) std::optional<Database::ReleaseId> readAs(std::string_view str)
{ {
src/libs/subsonic/impl/SubsonicId.hpp
+5
View File
@@ -20,6 +20,7 @@
#pragma once #pragma once
#include "database/ArtistId.hpp" #include "database/ArtistId.hpp"
#include "database/MediaLibraryId.hpp"
#include "database/ReleaseId.hpp" #include "database/ReleaseId.hpp"
#include "database/TrackId.hpp" #include "database/TrackId.hpp"
#include "database/TrackListId.hpp" #include "database/TrackListId.hpp"
@@ -30,6 +31,7 @@ namespace API::Subsonic
struct RootId {}; struct RootId {};
std::string idToString(Database::ArtistId id); std::string idToString(Database::ArtistId id);
std::string idToString(Database::MediaLibraryId id);
std::string idToString(Database::ReleaseId id); std::string idToString(Database::ReleaseId id);
std::string idToString(Database::TrackId id); std::string idToString(Database::TrackId id);
std::string idToString(Database::TrackListId id); std::string idToString(Database::TrackListId id);
@@ -45,6 +47,9 @@ namespace StringUtils
template<> template<>
std::optional<Database::ArtistId> readAs(std::string_view str); std::optional<Database::ArtistId> readAs(std::string_view str);
template<>
std::optional<Database::MediaLibraryId> readAs(std::string_view str);
template<> template<>
std::optional<Database::ReleaseId> readAs(std::string_view str); std::optional<Database::ReleaseId> readAs(std::string_view str);
src/libs/subsonic/impl/entrypoints/AlbumSongLists.cpp
+38 -6
View File
@@ -32,6 +32,7 @@
#include "responses/Song.hpp" #include "responses/Song.hpp"
#include "utils/Service.hpp" #include "utils/Service.hpp"
#include "ParameterParsing.hpp" #include "ParameterParsing.hpp"
#include "SubsonicId.hpp"
namespace API::Subsonic namespace API::Subsonic
{ {
@@ -45,6 +46,7 @@ namespace API::Subsonic
const std::string type{ getMandatoryParameterAs<std::string>(context.parameters, "type") }; const std::string type{ getMandatoryParameterAs<std::string>(context.parameters, "type") };
// Optional params // Optional params
const MediaLibraryId mediaLibraryId{ getParameterAs<MediaLibraryId>(context.parameters, "musicFolderId").value_or(MediaLibraryId{}) };
const std::size_t size{ getParameterAs<std::size_t>(context.parameters, "size").value_or(10) }; const std::size_t size{ getParameterAs<std::size_t>(context.parameters, "size").value_or(10) };
const std::size_t offset{ getParameterAs<std::size_t>(context.parameters, "offset").value_or(0) }; const std::size_t offset{ getParameterAs<std::size_t>(context.parameters, "offset").value_or(0) };
if (size > defaultMaxCountSize) if (size > defaultMaxCountSize)
@@ -67,12 +69,18 @@ namespace API::Subsonic
Release::FindParameters params; Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::Name); params.setSortMethod(ReleaseSortMethod::Name);
params.setRange(range); params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params); releases = Release::findIds(context.dbSession, params);
} }
else if (type == "alphabeticalByArtist") else if (type == "alphabeticalByArtist")
{ {
releases = Release::findIdsOrderedByArtist(context.dbSession, range); Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::ArtistNameThenName);
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params);
} }
else if (type == "byGenre") else if (type == "byGenre")
{ {
@@ -87,6 +95,7 @@ namespace API::Subsonic
params.setClusters({ cluster->getId() }); params.setClusters({ cluster->getId() });
params.setSortMethod(ReleaseSortMethod::Name); params.setSortMethod(ReleaseSortMethod::Name);
params.setRange(range); params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params); releases = Release::findIds(context.dbSession, params);
} }
@@ -101,18 +110,25 @@ namespace API::Subsonic
params.setSortMethod(ReleaseSortMethod::Date); params.setSortMethod(ReleaseSortMethod::Date);
params.setRange(range); params.setRange(range);
params.setDateRange(DateRange::fromYearRange(fromYear, toYear)); params.setDateRange(DateRange::fromYearRange(fromYear, toYear));
params.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params); releases = Release::findIds(context.dbSession, params);
} }
else if (type == "frequent") else if (type == "frequent")
{ {
releases = scrobblingService.getTopReleases(context.userId, {}, range); Scrobbling::IScrobblingService::FindParameters params;
params.setUser(context.userId);
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = scrobblingService.getTopReleases(params);
} }
else if (type == "newest") else if (type == "newest")
{ {
Release::FindParameters params; Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::LastWritten); params.setSortMethod(ReleaseSortMethod::LastWritten);
params.setRange(range); params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params); releases = Release::findIds(context.dbSession, params);
} }
@@ -123,18 +139,26 @@ namespace API::Subsonic
Release::FindParameters params; Release::FindParameters params;
params.setSortMethod(ReleaseSortMethod::Random); params.setSortMethod(ReleaseSortMethod::Random);
params.setRange(Range{ 0, size }); params.setRange(Range{ 0, size });
params.setMediaLibrary(mediaLibraryId);
releases = Release::findIds(context.dbSession, params); releases = Release::findIds(context.dbSession, params);
} }
else if (type == "recent") else if (type == "recent")
{ {
releases = scrobblingService.getRecentReleases(context.userId, {}, range); Scrobbling::IScrobblingService::FindParameters params;
params.setUser(context.userId);
params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = scrobblingService.getRecentReleases(params);
} }
else if (type == "starred") else if (type == "starred")
{ {
Feedback::IFeedbackService::FindParameters params; Feedback::IFeedbackService::FindParameters params;
params.setUser(context.userId); params.setUser(context.userId);
params.setRange(range); params.setRange(range);
params.setMediaLibrary(mediaLibraryId);
releases = feedbackService.findStarredReleases(params); releases = feedbackService.findStarredReleases(params);
} }
else else
@@ -156,6 +180,9 @@ namespace API::Subsonic
Response handleGetStarredRequestCommon(RequestContext& context, bool id3) Response handleGetStarredRequestCommon(RequestContext& context, bool id3)
{ {
// Optional parameters
const MediaLibraryId mediaLibrary{ getParameterAs<MediaLibraryId>(context.parameters, "musicFolderId").value_or(MediaLibraryId{}) };
auto transaction{ context.dbSession.createReadTransaction() }; auto transaction{ context.dbSession.createReadTransaction() };
User::pointer user{ User::find(context.dbSession, context.userId) }; User::pointer user{ User::find(context.dbSession, context.userId) };
@@ -167,9 +194,6 @@ namespace API::Subsonic
Feedback::IFeedbackService& feedbackService{ *Service<Feedback::IFeedbackService>::get() }; Feedback::IFeedbackService& feedbackService{ *Service<Feedback::IFeedbackService>::get() };
Feedback::IFeedbackService::FindParameters findParameters;
findParameters.setUser(context.userId);
{ {
Feedback::IFeedbackService::ArtistFindParameters artistFindParams; Feedback::IFeedbackService::ArtistFindParameters artistFindParams;
artistFindParams.setUser(context.userId); artistFindParams.setUser(context.userId);
@@ -181,6 +205,10 @@ namespace API::Subsonic
} }
} }
Feedback::IFeedbackService::FindParameters findParameters;
findParameters.setUser(context.userId);
findParameters.setMediaLibrary(mediaLibrary);
for (const ReleaseId releaseId : feedbackService.findStarredReleases(findParameters).results) for (const ReleaseId releaseId : feedbackService.findStarredReleases(findParameters).results)
{ {
if (auto release{ Release::find(context.dbSession, releaseId) }) if (auto release{ Release::find(context.dbSession, releaseId) })
@@ -210,6 +238,7 @@ namespace API::Subsonic
Response handleGetRandomSongsRequest(RequestContext& context) Response handleGetRandomSongsRequest(RequestContext& context)
{ {
// Optional params // Optional params
const MediaLibraryId mediaLibraryId{ getParameterAs<MediaLibraryId>(context.parameters, "musicFolderId").value_or(MediaLibraryId{}) };
std::size_t size{ getParameterAs<std::size_t>(context.parameters, "size").value_or(50) }; std::size_t size{ getParameterAs<std::size_t>(context.parameters, "size").value_or(50) };
if (size > defaultMaxCountSize) if (size > defaultMaxCountSize)
throw ParameterValueTooHighGenericError{ "size", defaultMaxCountSize }; throw ParameterValueTooHighGenericError{ "size", defaultMaxCountSize };
@@ -226,6 +255,7 @@ namespace API::Subsonic
Track::FindParameters params; Track::FindParameters params;
params.setSortMethod(TrackSortMethod::Random); params.setSortMethod(TrackSortMethod::Random);
params.setRange(Range{ 0, size }); params.setRange(Range{ 0, size });
params.setMediaLibrary(mediaLibraryId);
Track::find(context.dbSession, params, [&](const Track::pointer& track) Track::find(context.dbSession, params, [&](const Track::pointer& track)
{ {
@@ -241,6 +271,7 @@ namespace API::Subsonic
std::string genre{ getMandatoryParameterAs<std::string>(context.parameters, "genre") }; std::string genre{ getMandatoryParameterAs<std::string>(context.parameters, "genre") };
// Optional params // Optional params
const MediaLibraryId mediaLibrary{ getParameterAs<MediaLibraryId>(context.parameters, "musicFolderId").value_or(MediaLibraryId{}) };
std::size_t count{ getParameterAs<std::size_t>(context.parameters, "count").value_or(10) }; std::size_t count{ getParameterAs<std::size_t>(context.parameters, "count").value_or(10) };
if (count > defaultMaxCountSize) if (count > defaultMaxCountSize)
throw ParameterValueTooHighGenericError{"count", defaultMaxCountSize}; throw ParameterValueTooHighGenericError{"count", defaultMaxCountSize};
@@ -267,6 +298,7 @@ namespace API::Subsonic
Track::FindParameters params; Track::FindParameters params;
params.setClusters({ cluster->getId() }); params.setClusters({ cluster->getId() });
params.setRange(Range{ offset, count }); params.setRange(Range{ offset, count });
params.setMediaLibrary(mediaLibrary);
Track::find(context.dbSession, params, [&](const Track::pointer& track) Track::find(context.dbSession, params, [&](const Track::pointer& track)
{ {
src/libs/subsonic/impl/entrypoints/Browsing.cpp
+19 -4
View File
@@ -21,6 +21,7 @@
#include "database/Artist.hpp" #include "database/Artist.hpp"
#include "database/Cluster.hpp" #include "database/Cluster.hpp"
#include "database/MediaLibrary.hpp"
#include "database/Session.hpp" #include "database/Session.hpp"
#include "database/Release.hpp" #include "database/Release.hpp"
#include "database/Track.hpp" #include "database/Track.hpp"
@@ -92,6 +93,9 @@ namespace API::Subsonic
Response handleGetArtistsRequestCommon(RequestContext& context, bool id3) Response handleGetArtistsRequestCommon(RequestContext& context, bool id3)
{ {
// Optional params
const MediaLibraryId mediaLibrary{ getParameterAs<MediaLibraryId>(context.parameters, "musicFolderId").value_or(MediaLibraryId{}) };
Response response{ Response::createOkResponse(context.serverProtocolVersion) }; Response response{ Response::createOkResponse(context.serverProtocolVersion) };
Response::Node& artistsNode{ response.createNode(id3 ? "artists" : "indexes") }; Response::Node& artistsNode{ response.createNode(id3 ? "artists" : "indexes") };
@@ -119,6 +123,7 @@ namespace API::Subsonic
break; break;
} }
} }
parameters.setMediaLibrary(mediaLibrary);
// This endpoint does not scale: make sort lived transactions in order not to block the whole application // This endpoint does not scale: make sort lived transactions in order not to block the whole application
@@ -283,9 +288,14 @@ namespace API::Subsonic
Response response{ Response::createOkResponse(context.serverProtocolVersion) }; Response response{ Response::createOkResponse(context.serverProtocolVersion) };
Response::Node& musicFoldersNode{ response.createNode("musicFolders") }; Response::Node& musicFoldersNode{ response.createNode("musicFolders") };
Response::Node& musicFolderNode{ musicFoldersNode.createArrayChild("musicFolder") }; auto transaction{ context.dbSession.createReadTransaction() };
musicFolderNode.setAttribute("id", "0"); MediaLibrary::find(context.dbSession, [&](const MediaLibrary::pointer& library)
musicFolderNode.setAttribute("name", "Music"); {
Response::Node& musicFolderNode{ musicFoldersNode.createArrayChild("musicFolder") };
musicFolderNode.setAttribute("id", idToString(library->getId()));
musicFolderNode.setAttribute("name", library->getName());
});
return response; return response;
} }
@@ -502,7 +512,12 @@ namespace API::Subsonic
Response response{ Response::createOkResponse(context.serverProtocolVersion) }; Response response{ Response::createOkResponse(context.serverProtocolVersion) };
Response::Node& topSongs{ response.createNode("topSongs") }; Response::Node& topSongs{ response.createNode("topSongs") };
const auto trackIds{ Service<Scrobbling::IScrobblingService>::get()->getTopTracks(context.userId, artists.front()->getId(), {}, Database::Range{ 0, count }) }; Scrobbling::IScrobblingService::FindParameters params;
params.setUser(context.userId);
params.setRange(Database::Range{ 0, count });
params.setArtist(artists.front()->getId());
const auto trackIds{ Service<Scrobbling::IScrobblingService>::get()->getTopTracks(params) };
for (const TrackId trackId : trackIds.results) for (const TrackId trackId : trackIds.results)
{ {
if (Track::pointer track{ Track::find(context.dbSession, trackId) }) if (Track::pointer track{ Track::find(context.dbSession, trackId) })
src/libs/subsonic/impl/entrypoints/Searching.cpp
+7 -2
View File
@@ -28,8 +28,7 @@
#include "responses/Artist.hpp" #include "responses/Artist.hpp"
#include "responses/Song.hpp" #include "responses/Song.hpp"
#include "ParameterParsing.hpp" #include "ParameterParsing.hpp"
#include "SubsonicId.hpp"
#include "ParameterParsing.hpp"
namespace API::Subsonic namespace API::Subsonic
{ {
@@ -43,6 +42,9 @@ namespace API::Subsonic
std::string queryString{ getMandatoryParameterAs<std::string>(context.parameters, "query") }; std::string queryString{ getMandatoryParameterAs<std::string>(context.parameters, "query") };
std::string_view query{ queryString }; std::string_view query{ queryString };
// Optional params
const MediaLibraryId mediaLibrary{ getParameterAs<MediaLibraryId>(context.parameters, "musicFolderId").value_or(MediaLibraryId{}) };
// Symfonium adds extra "" // Symfonium adds extra ""
if (context.clientInfo.name == "Symfonium") if (context.clientInfo.name == "Symfonium")
query = StringUtils::stringTrim(query, "\""); query = StringUtils::stringTrim(query, "\"");
@@ -78,6 +80,7 @@ namespace API::Subsonic
Artist::FindParameters params; Artist::FindParameters params;
params.setKeywords(keywords); params.setKeywords(keywords);
params.setRange(Range{ artistOffset, artistCount }); params.setRange(Range{ artistOffset, artistCount });
params.setMediaLibrary(mediaLibrary);
Artist::find(context.dbSession, params, [&](const Artist::pointer& artist) Artist::find(context.dbSession, params, [&](const Artist::pointer& artist)
{ {
@@ -90,6 +93,7 @@ namespace API::Subsonic
Release::FindParameters params; Release::FindParameters params;
params.setKeywords(keywords); params.setKeywords(keywords);
params.setRange(Range{ albumOffset, albumCount }); params.setRange(Range{ albumOffset, albumCount });
params.setMediaLibrary(mediaLibrary);
Release::find(context.dbSession, params, [&](const Release::pointer& release) Release::find(context.dbSession, params, [&](const Release::pointer& release)
{ {
@@ -102,6 +106,7 @@ namespace API::Subsonic
Track::FindParameters params; Track::FindParameters params;
params.setKeywords(keywords); params.setKeywords(keywords);
params.setRange(Range{ songOffset, songCount }); params.setRange(Range{ songOffset, songCount });
params.setMediaLibrary(mediaLibrary);
Track::find(context.dbSession, params, [&](const Track::pointer& track) Track::find(context.dbSession, params, [&](const Track::pointer& track)
{ {
src/libs/utils/impl/Path.cpp
+9 -5
View File
@@ -139,14 +139,13 @@ namespace PathUtils
return (std::find(std::cbegin(supportedExtensions), std::cend(supportedExtensions), extension) != std::cend(supportedExtensions)); return (std::find(std::cbegin(supportedExtensions), std::cend(supportedExtensions), extension) != std::cend(supportedExtensions));
} }
bool isPathInRootPath(const std::filesystem::path& path, const std::filesystem::path& rootPath, const std::filesystem::path* excludeDirFileName) bool isPathInRootPath(const std::filesystem::path& path, const std::filesystem::path& rootPathArg, const std::filesystem::path* excludeDirFileName)
{ {
std::filesystem::path curPath = path; std::filesystem::path curPath{ path };
std::filesystem::path rootPath{ rootPathArg.has_filename() ? rootPathArg : rootPathArg.parent_path() };
while (curPath.parent_path() != curPath) while (true)
{ {
curPath = curPath.parent_path();
if (excludeDirFileName && !excludeDirFileName->empty()) if (excludeDirFileName && !excludeDirFileName->empty())
{ {
assert(!excludeDirFileName->has_parent_path()); assert(!excludeDirFileName->has_parent_path());
@@ -158,6 +157,11 @@ namespace PathUtils
if (curPath == rootPath) if (curPath == rootPath)
return true; return true;
if (curPath == curPath.root_path())
break;
curPath = curPath.parent_path();
} }
return false; return false;
src/libs/utils/include/utils/Path.hpp
+1
View File
@@ -44,6 +44,7 @@ namespace PathUtils
bool hasFileAnyExtension(const std::filesystem::path& file, const std::vector<std::filesystem::path>& extensions); bool hasFileAnyExtension(const std::filesystem::path& file, const std::vector<std::filesystem::path>& extensions);
// Check if a path is within a directory (excludeDirFileName is a relative can be used to exclude a whole directory and its subdirectory, must not have parent_path) // Check if a path is within a directory (excludeDirFileName is a relative can be used to exclude a whole directory and its subdirectory, must not have parent_path)
// Caller responsibility to call with normalized paths
bool isPathInRootPath(const std::filesystem::path& path, const std::filesystem::path& rootPath, const std::filesystem::path* excludeDirFileName = {}); bool isPathInRootPath(const std::filesystem::path& path, const std::filesystem::path& rootPath, const std::filesystem::path* excludeDirFileName = {});
std::filesystem::path getLongestCommonPath(const std::filesystem::path& path1, const std::filesystem::path& path2); std::filesystem::path getLongestCommonPath(const std::filesystem::path& path1, const std::filesystem::path& path2);
src/libs/utils/test/Path.cpp
+32
View File
@@ -77,3 +77,35 @@ TEST(Path, getLongestCommonPathIterator)
EXPECT_EQ(PathUtils::getLongestCommonPath(std::cbegin(test.paths), std::cend(test.paths)), test.expectedCommonPath); EXPECT_EQ(PathUtils::getLongestCommonPath(std::cbegin(test.paths), std::cend(test.paths)), test.expectedCommonPath);
} }
} }
TEST(Path, isPathInRootPath)
{
using namespace PathUtils;
struct TestCase
{
std::filesystem::path path;
std::filesystem::path rootPath;
bool expectedResult;
};
TestCase tests[]
{
{"/file.txt", "/", true},
{"/root/folder/file.txt", "/root", true},
{"/root/file.txt", "/root", true},
{"/root/file.txt", "/root/", true},
{"/root", "/root", true},
{"/root", "/root/", true},
{"/root/", "/root", true},
{"/root/", "/root/", true},
{"/folder/file.txt", "/root", false},
{"/folder/file.txt", "/root/", false},
{"", "/root", false},
};
for (const TestCase& test : tests)
{
EXPECT_EQ(PathUtils::isPathInRootPath(test.path, test.rootPath), test.expectedResult) << "Failed: path = " << test.path << ", rootPath = " << test.rootPath;
}
}
src/lms/CMakeLists.txt
+4 -3
View File
@@ -11,12 +11,13 @@ add_executable(lms
ui/PlayQueue.cpp ui/PlayQueue.cpp
ui/SettingsView.cpp ui/SettingsView.cpp
ui/Utils.cpp ui/Utils.cpp
ui/admin/DatabaseSettingsView.cpp
ui/admin/ScannerController.cpp
ui/admin/InitWizardView.cpp ui/admin/InitWizardView.cpp
ui/admin/MediaLibrariesView.cpp
ui/admin/MediaLibraryModal.cpp
ui/admin/ScannerController.cpp
ui/admin/ScanSettingsView.cpp
ui/admin/UserView.cpp ui/admin/UserView.cpp
ui/admin/UsersView.cpp ui/admin/UsersView.cpp
ui/common/DirectoryValidator.cpp
ui/common/DoubleValidator.cpp ui/common/DoubleValidator.cpp
ui/common/InfiniteScrollingContainer.cpp ui/common/InfiniteScrollingContainer.cpp
ui/common/LoadingIndicator.cpp ui/common/LoadingIndicator.cpp
src/lms/main.cpp
+9
View File
@@ -161,6 +161,15 @@ namespace
}); });
} }; } };
scanner.getEvents().scanAborted.connect([&]
{
postAll(server, []
{
LmsApp->getScannerEvents().scanAborted.emit();
LmsApp->triggerUpdate();
});
});
scanner.getEvents().scanStarted.connect([&] scanner.getEvents().scanStarted.connect([&]
{ {
postAll(server, [] postAll(server, []
src/lms/ui/LmsApplication.cpp
+31 -20
View File
@@ -42,15 +42,16 @@
#include "utils/String.hpp" #include "utils/String.hpp"
#include "admin/InitWizardView.hpp" #include "admin/InitWizardView.hpp"
#include "admin/DatabaseSettingsView.hpp" #include "admin/MediaLibrariesView.hpp"
#include "admin/ScanSettingsView.hpp"
#include "admin/UserView.hpp" #include "admin/UserView.hpp"
#include "admin/UsersView.hpp" #include "admin/UsersView.hpp"
#include "admin/ScannerController.hpp"
#include "common/Template.hpp" #include "common/Template.hpp"
#include "explore/Explore.hpp" #include "explore/Explore.hpp"
#include "explore/Filters.hpp" #include "explore/Filters.hpp"
#include "resource/AudioFileResource.hpp" #include "resource/AudioFileResource.hpp"
#include "resource/AudioTranscodingResource.hpp" #include "resource/AudioTranscodingResource.hpp"
#include "resource/DownloadResource.hpp"
#include "resource/CoverResource.hpp" #include "resource/CoverResource.hpp"
#include "Auth.hpp" #include "Auth.hpp"
#include "LmsApplicationException.hpp" #include "LmsApplicationException.hpp"
@@ -73,9 +74,11 @@ namespace UserInterface
const std::string appRoot{ Wt::WApplication::appRoot() }; const std::string appRoot{ Wt::WApplication::appRoot() };
auto res{ std::make_shared<Wt::WMessageResourceBundle>() }; auto res{ std::make_shared<Wt::WMessageResourceBundle>() };
res->use(appRoot + "admin-database");
res->use(appRoot + "admin-initwizard"); res->use(appRoot + "admin-initwizard");
res->use(appRoot + "admin-medialibraries");
res->use(appRoot + "admin-medialibrary");
res->use(appRoot + "admin-scannercontroller"); res->use(appRoot + "admin-scannercontroller");
res->use(appRoot + "admin-scansettings");
res->use(appRoot + "admin-user"); res->use(appRoot + "admin-user");
res->use(appRoot + "admin-users"); res->use(appRoot + "admin-users");
res->use(appRoot + "artist"); res->use(appRoot + "artist");
@@ -111,7 +114,9 @@ namespace UserInterface
IdxExplore = 0, IdxExplore = 0,
IdxPlayQueue, IdxPlayQueue,
IdxSettings, IdxSettings,
IdxAdminDatabase, IdxAdminLibraries,
IdxAdminScanSettings,
IdxAdminScanner,
IdxAdminUsers, IdxAdminUsers,
IdxAdminUser, IdxAdminUser,
}; };
@@ -126,19 +131,21 @@ namespace UserInterface
std::optional<Wt::WString> title; std::optional<Wt::WString> title;
} views[] = } views[] =
{ {
{ "/artists", IdxExplore, false, Wt::WString::tr("Lms.Explore.artists") }, { "/artists", IdxExplore, false, Wt::WString::tr("Lms.Explore.artists") },
{ "/artist", IdxExplore, false, std::nullopt }, { "/artist", IdxExplore, false, std::nullopt },
{ "/releases", IdxExplore, false, Wt::WString::tr("Lms.Explore.releases") }, { "/releases", IdxExplore, false, Wt::WString::tr("Lms.Explore.releases") },
{ "/release", IdxExplore, false, std::nullopt }, { "/release", IdxExplore, false, std::nullopt },
{ "/search", IdxExplore, false, Wt::WString::tr("Lms.Explore.search") }, { "/search", IdxExplore, false, Wt::WString::tr("Lms.Explore.search") },
{ "/tracks", IdxExplore, false, Wt::WString::tr("Lms.Explore.tracks") }, { "/tracks", IdxExplore, false, Wt::WString::tr("Lms.Explore.tracks") },
{ "/tracklists", IdxExplore, false, Wt::WString::tr("Lms.Explore.tracklists") }, { "/tracklists", IdxExplore, false, Wt::WString::tr("Lms.Explore.tracklists") },
{ "/tracklist", IdxExplore, false, std::nullopt }, { "/tracklist", IdxExplore, false, std::nullopt },
{ "/playqueue", IdxPlayQueue, false, Wt::WString::tr("Lms.PlayQueue.playqueue") }, { "/playqueue", IdxPlayQueue, false, Wt::WString::tr("Lms.PlayQueue.playqueue") },
{ "/settings", IdxSettings, false, Wt::WString::tr("Lms.Settings.settings") }, { "/settings", IdxSettings, false, Wt::WString::tr("Lms.Settings.settings") },
{ "/admin/database", IdxAdminDatabase, true, Wt::WString::tr("Lms.Admin.Database.database") }, { "/admin/libraries", IdxAdminLibraries, true, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries") },
{ "/admin/users", IdxAdminUsers, true, Wt::WString::tr("Lms.Admin.Users.users") }, { "/admin/scan-settings", IdxAdminScanSettings, true, Wt::WString::tr("Lms.Admin.Database.scan-settings") },
{ "/admin/user", IdxAdminUser, true, std::nullopt }, { "/admin/scanner", IdxAdminScanner, true, Wt::WString::tr("Lms.Admin.ScannerController.scanner") },
{ "/admin/users", IdxAdminUsers, true, Wt::WString::tr("Lms.Admin.Users.users") },
{ "/admin/user", IdxAdminUser, true, std::nullopt },
}; };
LMS_LOG(UI, DEBUG, "Internal path changed to '" << wApp->internalPath() << "'"); LMS_LOG(UI, DEBUG, "Internal path changed to '" << wApp->internalPath() << "'");
@@ -425,8 +432,10 @@ namespace UserInterface
if (LmsApp->getUserType() == Database::UserType::ADMIN) if (LmsApp->getUserType() == Database::UserType::ADMIN)
{ {
navbar->setCondition("if-is-admin", true); navbar->setCondition("if-is-admin", true);
navbar->bindNew<Wt::WAnchor>("database", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/database" }, Wt::WString::tr("Lms.Admin.Database.menu-database")); navbar->bindNew<Wt::WAnchor>("media-libraries", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/libraries" }, Wt::WString::tr("Lms.Admin.menu-media-libraries"));
navbar->bindNew<Wt::WAnchor>("users", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/users" }, Wt::WString::tr("Lms.Admin.Users.menu-users")); navbar->bindNew<Wt::WAnchor>("scan-settings", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/scan-settings" }, Wt::WString::tr("Lms.Admin.menu-scan-settings"));
navbar->bindNew<Wt::WAnchor>("scanner", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/scanner" }, Wt::WString::tr("Lms.Admin.menu-scanner"));
navbar->bindNew<Wt::WAnchor>("users", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/users" }, Wt::WString::tr("Lms.Admin.menu-users"));
} }
// Contents // Contents
@@ -453,7 +462,9 @@ namespace UserInterface
// Admin stuff // Admin stuff
if (getUserType() == Database::UserType::ADMIN) if (getUserType() == Database::UserType::ADMIN)
{ {
mainStack->addNew<DatabaseSettingsView>(); mainStack->addNew<MediaLibrariesView>();
mainStack->addNew<ScanSettingsView>();
mainStack->addNew<ScannerController>();
mainStack->addNew<UsersView>(); mainStack->addNew<UsersView>();
mainStack->addNew<UserView>(); mainStack->addNew<UserView>();
} }
src/lms/ui/LmsApplication.hpp
+69 -68
View File
@@ -27,96 +27,97 @@
#include "database/UserId.hpp" #include "database/UserId.hpp"
#include "database/Types.hpp" #include "database/Types.hpp"
#include "services/scanner/ScannerEvents.hpp" #include "services/scanner/ScannerEvents.hpp"
#include "admin/ScannerController.hpp"
#include "Notification.hpp" #include "Notification.hpp"
namespace Database namespace Database
{ {
class Db; class Db;
class Session; class Session;
class User; class User;
} }
namespace UserInterface { namespace UserInterface
class CoverResource;
class LmsApplicationException;
class MediaPlayer;
class PlayQueue;
class LmsApplicationManager;
class NotificationContainer;
class ModalManager;
class LmsApplication : public Wt::WApplication
{ {
public: class CoverResource;
LmsApplication(const Wt::WEnvironment& env, Database::Db& db, LmsApplicationManager& appManager, std::optional<Database::UserId> userId = std::nullopt); class LmsApplicationException;
~LmsApplication(); class MediaPlayer;
class PlayQueue;
class LmsApplicationManager;
class NotificationContainer;
class ModalManager;
static std::unique_ptr<Wt::WApplication> create(const Wt::WEnvironment& env, Database::Db& db, LmsApplicationManager& appManager); class LmsApplication : public Wt::WApplication
static LmsApplication* instance(); {
public:
LmsApplication(const Wt::WEnvironment& env, Database::Db& db, LmsApplicationManager& appManager, std::optional<Database::UserId> userId = std::nullopt);
~LmsApplication();
// Session application data static std::unique_ptr<Wt::WApplication> create(const Wt::WEnvironment& env, Database::Db& db, LmsApplicationManager& appManager);
std::shared_ptr<CoverResource> getCoverResource() { return _coverResource; } static LmsApplication* instance();
Database::Db& getDb();
Database::Session& getDbSession(); // always thread safe
Database::ObjectPtr<Database::User> getUser(); // Session application data
Database::UserId getUserId(); std::shared_ptr<CoverResource> getCoverResource() { return _coverResource; }
bool isUserAuthStrong() const; // user must be logged in prior this call Database::Db& getDb();
Database::UserType getUserType(); // user must be logged in prior this call Database::Session& getDbSession(); // always thread safe
std::string getUserLoginName(); // user must be logged in prior this call
// Proxified scanner events Database::ObjectPtr<Database::User> getUser();
Scanner::Events& getScannerEvents() { return _scannerEvents; } Database::UserId getUserId();
bool isUserAuthStrong() const; // user must be logged in prior this call
Database::UserType getUserType(); // user must be logged in prior this call
std::string getUserLoginName(); // user must be logged in prior this call
// Utils // Proxified scanner events
void post(std::function<void()> func); Scanner::Events& getScannerEvents() { return _scannerEvents; }
void setTitle(const Wt::WString& title = "");
// Used to classify the message sent to the user // Utils
void notifyMsg(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration = std::chrono::milliseconds {5000}); void post(std::function<void()> func);
void setTitle(const Wt::WString& title = "");
MediaPlayer& getMediaPlayer() const { return *_mediaPlayer; } // Used to classify the message sent to the user
PlayQueue& getPlayQueue() const { return *_playQueue; } void notifyMsg(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration = std::chrono::milliseconds{ 5000 });
ModalManager& getModalManager() const { return *_modalManager; }
// Signal emitted just before the session ends (user may already be logged out) MediaPlayer& getMediaPlayer() const { return *_mediaPlayer; }
Wt::Signal<>& preQuit() { return _preQuit; } PlayQueue& getPlayQueue() const { return *_playQueue; }
ModalManager& getModalManager() const { return *_modalManager; }
private: // Signal emitted just before the session ends (user may already be logged out)
void init(); Wt::Signal<>& preQuit() { return _preQuit; }
void processPasswordAuth();
void handleException(LmsApplicationException& e);
void goHomeAndQuit();
// Signal slots private:
void logoutUser(); void init();
void onUserLoggedIn(); void processPasswordAuth();
void handleException(LmsApplicationException& e);
void goHomeAndQuit();
void notify(const Wt::WEvent& event) override; // Signal slots
void finalize() override; void logoutUser();
void onUserLoggedIn();
void createHome(); void notify(const Wt::WEvent& event) override;
void finalize() override;
Database::Db& _db; void createHome();
Wt::Signal<> _preQuit;
LmsApplicationManager& _appManager; Database::Db& _db;
Scanner::Events _scannerEvents; Wt::Signal<> _preQuit;
struct UserAuthInfo LmsApplicationManager& _appManager;
{ Scanner::Events _scannerEvents;
Database::UserId userId; struct UserAuthInfo
bool strongAuth {}; {
}; Database::UserId userId;
std::optional<UserAuthInfo> _authenticatedUser; bool strongAuth{};
std::shared_ptr<CoverResource> _coverResource; };
MediaPlayer* _mediaPlayer {}; std::optional<UserAuthInfo> _authenticatedUser;
PlayQueue* _playQueue {}; std::shared_ptr<CoverResource> _coverResource;
NotificationContainer* _notificationContainer {}; MediaPlayer* _mediaPlayer{};
ModalManager* _modalManager {}; PlayQueue* _playQueue{};
}; NotificationContainer* _notificationContainer{};
ModalManager* _modalManager{};
};
// Helper to get session instance // Helper to get session instance
#define LmsApp ::UserInterface::LmsApplication::instance() #define LmsApp ::UserInterface::LmsApplication::instance()
} // namespace UserInterface } // namespace UserInterface
src/lms/ui/PlayQueue.cpp
-1
View File
@@ -717,7 +717,6 @@ namespace UserInterface
}); });
} }
// Create TrackList // Create TrackList
Wt::WTemplateFormView* createTrackList{ contentStack->addNew<Wt::WTemplateFormView>(Wt::WString::tr("Lms.PlayQueue.template.save-as-tracklist.create-tracklist")) }; Wt::WTemplateFormView* createTrackList{ contentStack->addNew<Wt::WTemplateFormView>(Wt::WString::tr("Lms.PlayQueue.template.save-as-tracklist.create-tracklist")) };
auto createTrackListModel{ std::make_shared<CreateTrackListModel>() }; auto createTrackListModel{ std::make_shared<CreateTrackListModel>() };
src/lms/ui/SettingsView.cpp
+1 -1
View File
@@ -551,7 +551,7 @@ namespace UserInterface
scrobblingBackendRaw->activated().connect([=] { updateListenBrainzTokenField();}); scrobblingBackendRaw->activated().connect([=] { updateListenBrainzTokenField();});
// Buttons // Buttons
Wt::WPushButton* saveBtn{ t->bindWidget("apply-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.apply"))) }; Wt::WPushButton* saveBtn{ t->bindWidget("save-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.save"))) };
Wt::WPushButton* discardBtn{ t->bindWidget("discard-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.discard"))) }; Wt::WPushButton* discardBtn{ t->bindWidget("discard-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.discard"))) };
saveBtn->clicked().connect([=] saveBtn->clicked().connect([=]
src/lms/ui/admin/DatabaseSettingsView.cpp
-257
View File
@@ -1,257 +0,0 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DatabaseSettingsView.hpp"
#include <Wt/WComboBox.h>
#include <Wt/WFormModel.h>
#include <Wt/WLineEdit.h>
#include <Wt/WPushButton.h>
#include <Wt/WString.h>
#include <Wt/WTemplateFormView.h>
#include "database/Cluster.hpp"
#include "database/ScanSettings.hpp"
#include "database/Session.hpp"
#include "services/recommendation/IRecommendationService.hpp"
#include "services/scanner/IScannerService.hpp"
#include "utils/ILogger.hpp"
#include "utils/Service.hpp"
#include "utils/String.hpp"
#include "common/DirectoryValidator.hpp"
#include "common/MandatoryValidator.hpp"
#include "common/UppercaseValidator.hpp"
#include "common/ValueStringModel.hpp"
#include "ScannerController.hpp"
#include "LmsApplication.hpp"
namespace UserInterface
{
using namespace Database;
class DatabaseSettingsModel : public Wt::WFormModel
{
public:
// Associate each field with a unique string literal.
static inline constexpr Field MediaDirectoryField{ "media-directory" };
static inline constexpr Field UpdatePeriodField{ "update-period" };
static inline constexpr Field UpdateStartTimeField{ "update-start-time" };
static inline constexpr Field SimilarityEngineTypeField{ "similarity-engine-type" };
static inline constexpr Field ExtraTagsField{ "extra-tags-to-scan" };
using UpdatePeriodModel = ValueStringModel<ScanSettings::UpdatePeriod>;
static inline constexpr std::string_view extraTagsDelimiter{ ";" };
DatabaseSettingsModel()
{
initializeModels();
addField(MediaDirectoryField);
addField(UpdatePeriodField);
addField(UpdateStartTimeField);
addField(SimilarityEngineTypeField);
addField(ExtraTagsField);
auto dirValidator{ createDirectoryValidator() };
dirValidator->setMandatory(true);
setValidator(MediaDirectoryField, std::move(dirValidator));
setValidator(UpdatePeriodField, createMandatoryValidator());
setValidator(UpdateStartTimeField, createMandatoryValidator());
setValidator(SimilarityEngineTypeField, createMandatoryValidator());
setValidator(ExtraTagsField, createUppercaseValidator());
// populate the model with initial data
loadData();
}
std::shared_ptr<UpdatePeriodModel> updatePeriodModel() { return _updatePeriodModel; }
std::shared_ptr<Wt::WAbstractItemModel> updateStartTimeModel() { return _updateStartTimeModel; }
std::shared_ptr<Wt::WAbstractItemModel> similarityEngineTypeModel() { return _similarityEngineTypeModel; }
void loadData()
{
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
const ScanSettings::pointer scanSettings{ ScanSettings::get(LmsApp->getDbSession()) };
setValue(MediaDirectoryField, scanSettings->getMediaDirectory().string());
auto periodRow{ _updatePeriodModel->getRowFromValue(scanSettings->getUpdatePeriod()) };
if (periodRow)
setValue(UpdatePeriodField, _updatePeriodModel->getString(*periodRow));
auto startTimeRow{ _updateStartTimeModel->getRowFromValue(scanSettings->getUpdateStartTime()) };
if (startTimeRow)
setValue(UpdateStartTimeField, _updateStartTimeModel->getString(*startTimeRow));
if (scanSettings->getUpdatePeriod() == ScanSettings::UpdatePeriod::Hourly
|| scanSettings->getUpdatePeriod() == ScanSettings::UpdatePeriod::Never)
{
setReadOnly(DatabaseSettingsModel::UpdateStartTimeField, true);
}
auto similarityEngineTypeRow{ _similarityEngineTypeModel->getRowFromValue(scanSettings->getSimilarityEngineType()) };
if (similarityEngineTypeRow)
setValue(SimilarityEngineTypeField, _similarityEngineTypeModel->getString(*similarityEngineTypeRow));
auto extraTags{ scanSettings->getExtraTagsToScan() };
setValue(ExtraTagsField, StringUtils::joinStrings(scanSettings->getExtraTagsToScan(), extraTagsDelimiter));
}
void saveData()
{
auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
ScanSettings::pointer scanSettings{ ScanSettings::get(LmsApp->getDbSession()) };
scanSettings.modify()->setMediaDirectory(valueText(MediaDirectoryField).toUTF8());
auto updatePeriodRow{ _updatePeriodModel->getRowFromString(valueText(UpdatePeriodField)) };
if (updatePeriodRow)
scanSettings.modify()->setUpdatePeriod(_updatePeriodModel->getValue(*updatePeriodRow));
auto startTimeRow{ _updateStartTimeModel->getRowFromString(valueText(UpdateStartTimeField)) };
if (startTimeRow)
scanSettings.modify()->setUpdateStartTime(_updateStartTimeModel->getValue(*startTimeRow));
auto similarityEngineTypeRow{ _similarityEngineTypeModel->getRowFromString(valueText(SimilarityEngineTypeField)) };
if (similarityEngineTypeRow)
scanSettings.modify()->setSimilarityEngineType(_similarityEngineTypeModel->getValue(*similarityEngineTypeRow));
scanSettings.modify()->setExtraTagsToScan(StringUtils::splitString(valueText(ExtraTagsField).toUTF8(), extraTagsDelimiter));
}
private:
void initializeModels()
{
_updatePeriodModel = std::make_shared<ValueStringModel<ScanSettings::UpdatePeriod>>();
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.never"), ScanSettings::UpdatePeriod::Never);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.hourly"), ScanSettings::UpdatePeriod::Hourly);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.daily"), ScanSettings::UpdatePeriod::Daily);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.weekly"), ScanSettings::UpdatePeriod::Weekly);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.monthly"), ScanSettings::UpdatePeriod::Monthly);
_updateStartTimeModel = std::make_shared<ValueStringModel<Wt::WTime>>();
for (std::size_t i = 0; i < 24; ++i)
{
Wt::WTime time{ static_cast<int>(i), 0 };
_updateStartTimeModel->add(time.toString(), time);
}
_similarityEngineTypeModel = std::make_shared<ValueStringModel<ScanSettings::SimilarityEngineType>>();
_similarityEngineTypeModel->add(Wt::WString::tr("Lms.Admin.Database.similarity-engine-type.clusters"), ScanSettings::SimilarityEngineType::Clusters);
_similarityEngineTypeModel->add(Wt::WString::tr("Lms.Admin.Database.similarity-engine-type.none"), ScanSettings::SimilarityEngineType::None);
}
std::shared_ptr<UpdatePeriodModel> _updatePeriodModel;
std::shared_ptr<ValueStringModel<Wt::WTime>> _updateStartTimeModel;
std::shared_ptr<ValueStringModel<ScanSettings::SimilarityEngineType>> _similarityEngineTypeModel;
};
DatabaseSettingsView::DatabaseSettingsView()
{
wApp->internalPathChanged().connect(this, [this]
{
refreshView();
});
refreshView();
}
void DatabaseSettingsView::refreshView()
{
if (!wApp->internalPathMatches("/admin/database"))
return;
clear();
auto t{ addNew<Wt::WTemplateFormView>(Wt::WString::tr("Lms.Admin.Database.template")) };
auto model{ std::make_shared<DatabaseSettingsModel>() };
// Media Directory
t->setFormWidget(DatabaseSettingsModel::MediaDirectoryField, std::make_unique<Wt::WLineEdit>());
// Update Period
auto updatePeriod{ std::make_unique<Wt::WComboBox>() };
updatePeriod->setModel(model->updatePeriodModel());
updatePeriod->activated().connect([=](int row)
{
const ScanSettings::UpdatePeriod period{ model->updatePeriodModel()->getValue(row) };
model->setReadOnly(DatabaseSettingsModel::UpdateStartTimeField, period == ScanSettings::UpdatePeriod::Hourly || period == ScanSettings::UpdatePeriod::Never);
t->updateModel(model.get());
t->updateView(model.get());
});
t->setFormWidget(DatabaseSettingsModel::UpdatePeriodField, std::move(updatePeriod));
// Update Start Time
auto updateStartTime{ std::make_unique<Wt::WComboBox>() };
updateStartTime->setModel(model->updateStartTimeModel());
t->setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, std::move(updateStartTime));
// Similarity engine type
auto similarityEngineType{ std::make_unique<Wt::WComboBox>() };
similarityEngineType->setModel(model->similarityEngineTypeModel());
t->setFormWidget(DatabaseSettingsModel::SimilarityEngineTypeField, std::move(similarityEngineType));
// Clusters
t->setFormWidget(DatabaseSettingsModel::ExtraTagsField, std::make_unique<Wt::WLineEdit>());
// Buttons
Wt::WPushButton* saveBtn = t->bindWidget("apply-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.apply")));
Wt::WPushButton* discardBtn = t->bindWidget("discard-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.discard")));
Wt::WPushButton* immScanBtn = t->bindWidget("immediate-scan-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.Admin.Database.immediate-scan")));
t->bindNew<ScannerController>("scanner-controller");
saveBtn->clicked().connect([=]
{
t->updateModel(model.get());
if (model->validate())
{
model->saveData();
Service<Recommendation::IRecommendationService>::get()->load();
Service<Scanner::IScannerService>::get()->requestImmediateScan(false);
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.Admin.Database.settings-saved"));
}
// Udate the view: Delete any validation message in the view, etc.
t->updateView(model.get());
});
discardBtn->clicked().connect([=]
{
model->loadData();
model->validate();
t->updateView(model.get());
});
immScanBtn->clicked().connect([=]
{
Service<Scanner::IScannerService>::get()->requestImmediateScan(false);
});
t->updateView(model.get());
}
} // namespace UserInterface
src/lms/ui/admin/MediaLibrariesView.cpp
+173
View File
@@ -0,0 +1,173 @@
/*
* Copyright (C) 2024 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "MediaLibrariesView.hpp"
#include <Wt/WPushButton.h>
#include "database/MediaLibrary.hpp"
#include "database/Session.hpp"
#include "services/scanner/IScannerService.hpp"
#include "utils/Service.hpp"
#include "MediaLibraryModal.hpp"
#include "LmsApplication.hpp"
#include "ModalManager.hpp"
namespace UserInterface
{
MediaLibrariesView::MediaLibrariesView()
: Wt::WTemplate{ Wt::WString::tr("Lms.Admin.MediaLibraries.template") }
{
addFunction("tr", &Wt::WTemplate::Functions::tr);
_libraries = bindNew<Wt::WContainerWidget>("libraries");
Wt::WPushButton* addBtn{ bindNew<Wt::WPushButton>("add-btn", Wt::WString::tr("Lms.add")) };
addBtn->clicked().connect(this, [this]
{
auto mediaLibraryModal{ std::make_unique<MediaLibraryModal>(Database::MediaLibraryId{}) };
MediaLibraryModal* mediaLibraryModalPtr{ mediaLibraryModal.get() };
mediaLibraryModalPtr->saved().connect(this, [=](Database::MediaLibraryId newMediaLibraryId)
{
Wt::WTemplate* entry{ addEntry() };
updateEntry(newMediaLibraryId, entry);
// No need to stop the current scan if we add stuff
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.Admin.MediaLibrary.library-created"));
LmsApp->getModalManager().dispose(mediaLibraryModalPtr);
});
mediaLibraryModalPtr->cancelled().connect(this, [=]
{
LmsApp->getModalManager().dispose(mediaLibraryModalPtr);
});
LmsApp->getModalManager().show(std::move(mediaLibraryModal));
});
wApp->internalPathChanged().connect(this, [this]
{
refreshView();
});
refreshView();
}
void MediaLibrariesView::refreshView()
{
if (!wApp->internalPathMatches("/admin/libraries"))
return;
_libraries->clear();
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
Database::MediaLibrary::find(LmsApp->getDbSession(), [&](const Database::MediaLibrary::pointer& mediaLibrary)
{
const Database::MediaLibraryId mediaLibraryId{ mediaLibrary->getId() };
Wt::WTemplate* entry{ addEntry() };
updateEntry(mediaLibraryId, entry);
});
}
void MediaLibrariesView::showDeleteLibraryModal(Database::MediaLibraryId mediaLibraryId, Wt::WTemplate* libraryEntry)
{
using namespace Database;
auto modal{ std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Admin.MediaLibraries.template.delete-library")) };
modal->addFunction("tr", &Wt::WTemplate::Functions::tr);
Wt::WWidget* modalPtr{ modal.get() };
auto* delBtn{ modal->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.delete")) };
delBtn->clicked().connect([=]
{
{
auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
Database::MediaLibrary::pointer mediaLibrary{ MediaLibrary::find(LmsApp->getDbSession(), mediaLibraryId) };
if (mediaLibrary)
mediaLibrary.remove();
}
// Don't want the scanner to go on with wrong settings
Service<Scanner::IScannerService>::get()->requestStop();
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.Admin.MediaLibrary.library-deleted"));
_libraries->removeWidget(libraryEntry);
LmsApp->getModalManager().dispose(modalPtr);
});
auto* cancelBtn{ modal->bindNew<Wt::WPushButton>("cancel-btn", Wt::WString::tr("Lms.cancel")) };
cancelBtn->clicked().connect([=]
{
LmsApp->getModalManager().dispose(modalPtr);
});
LmsApp->getModalManager().show(std::move(modal));
}
Wt::WTemplate* MediaLibrariesView::addEntry()
{
return _libraries->addNew<Wt::WTemplate>(Wt::WString::tr("Lms.Admin.MediaLibraries.template.entry"));
}
void MediaLibrariesView::updateEntry(Database::MediaLibraryId mediaLibraryId, Wt::WTemplate* entry)
{
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
Database::MediaLibrary::pointer mediaLibrary{ Database::MediaLibrary::find(LmsApp->getDbSession(), mediaLibraryId) };
entry->bindString("name", std::string{ mediaLibrary->getName() }, Wt::TextFormat::Plain);
entry->bindString("path", std::string{ mediaLibrary->getPath() }, Wt::TextFormat::Plain);
Wt::WPushButton* editBtn{ entry->bindNew<Wt::WPushButton>("edit-btn", Wt::WString::tr("Lms.template.edit-btn"), Wt::TextFormat::XHTML) };
editBtn->setToolTip(Wt::WString::tr("Lms.edit"));
editBtn->clicked().connect([=]
{
auto mediaLibraryModal{ std::make_unique<MediaLibraryModal>(mediaLibraryId) };
MediaLibraryModal* mediaLibraryModalPtr{ mediaLibraryModal.get() };
mediaLibraryModalPtr->saved().connect(this, [=](Database::MediaLibraryId newMediaLibraryId)
{
updateEntry(newMediaLibraryId, entry);
// Don't want the scanner to go on with wrong settings
Service<Scanner::IScannerService>::get()->requestStop();
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.settings-saved"));
LmsApp->getModalManager().dispose(mediaLibraryModalPtr);
});
mediaLibraryModalPtr->cancelled().connect(this, [=]
{
LmsApp->getModalManager().dispose(mediaLibraryModalPtr);
});
LmsApp->getModalManager().show(std::move(mediaLibraryModal));
});
Wt::WPushButton* delBtn{ entry->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.template.trash-btn"), Wt::TextFormat::XHTML) };
delBtn->setToolTip(Wt::WString::tr("Lms.delete"));
delBtn->clicked().connect([=]
{
showDeleteLibraryModal(mediaLibraryId, entry);
});
}
}
src/lms/ui/admin/MediaLibrariesView.hpp
+42
View File
@@ -0,0 +1,42 @@
/*
* Copyright (C) 2024 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <Wt/WTemplate.h>
#include <Wt/WContainerWidget.h>
#include "database/MediaLibraryId.hpp"
namespace UserInterface
{
class MediaLibrariesView : public Wt::WTemplate
{
public:
MediaLibrariesView();
private:
void refreshView();
void showDeleteLibraryModal(Database::MediaLibraryId library, Wt::WTemplate* libraryEntry);
void updateEntry(Database::MediaLibraryId library, Wt::WTemplate* libraryEntry);
Wt::WTemplate* addEntry();
Wt::WContainerWidget* _libraries{};
};
}
src/lms/ui/admin/MediaLibraryModal.cpp
+212
View File
@@ -0,0 +1,212 @@
/*
* Copyright (C) 2024 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "MediaLibraryModal.hpp"
#include <Wt/WFormModel.h>
#include <Wt/WLineEdit.h>
#include <Wt/WPushButton.h>
#include <Wt/WTemplateFormView.h>
#include "database/MediaLibrary.hpp"
#include "database/Session.hpp"
#include "utils/Path.hpp"
#include "utils/String.hpp"
#include "LmsApplication.hpp"
namespace UserInterface
{
using namespace Database;
namespace
{
class LibraryNameValidator : public Wt::WValidator
{
public:
LibraryNameValidator(MediaLibraryId libraryId) : _libraryId{ libraryId } {}
private:
Wt::WValidator::Result validate(const Wt::WString& input) const override
{
if (input.empty())
return Wt::WValidator::validate(input);
Wt::WValidator::Result result{ Wt::ValidationState::Valid };
const std::string name{ input.toUTF8() };
auto& session{ LmsApp->getDbSession() };
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
Database::MediaLibrary::find(session, [&](const Database::MediaLibrary::pointer library)
{
if (library->getId() == _libraryId)
return;
if (StringUtils::stringCaseInsensitiveEqual(name, library->getName()))
result = Wt::WValidator::Result{ Wt::ValidationState::Invalid, Wt::WString::tr("Lms.Admin.MediaLibrary.name-already-exists") };
});
return result;
}
const MediaLibraryId _libraryId;
};
class LibraryRootPathValidator : public Wt::WValidator
{
public:
LibraryRootPathValidator(MediaLibraryId libraryId) : _libraryId{ libraryId } {}
private:
Wt::WValidator::Result validate(const Wt::WString& input) const override
{
if (input.empty())
return Wt::WValidator::validate(input);
const std::filesystem::path p{ input.toUTF8() };
std::error_code ec;
if (p.is_relative())
return Wt::WValidator::Result(Wt::ValidationState::Invalid, Wt::WString::tr("Lms.Admin.MediaLibrary.path-must-be-absolute"));
// TODO check and translate rights issues
bool res{ std::filesystem::is_directory(p, ec) };
if (ec)
return Wt::WValidator::Result(Wt::ValidationState::Invalid, ec.message()); // TODO translate common errors
else if (!res)
return Wt::WValidator::Result(Wt::ValidationState::Invalid, Wt::WString::tr("Lms.Admin.MediaLibrary.path-must-be-existing-directory"));
auto& session{ LmsApp->getDbSession() };
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
Wt::WValidator::Result result{ Wt::ValidationState::Valid };
const std::filesystem::path rootPath{ std::filesystem::path{input.toUTF8()}.lexically_normal() };
Database::MediaLibrary::find(session, [&](const Database::MediaLibrary::pointer library)
{
if (library->getId() == _libraryId)
return;
const std::filesystem::path libraryRootPath{ library->getPath().lexically_normal() };
if (PathUtils::isPathInRootPath(rootPath, libraryRootPath)
|| PathUtils::isPathInRootPath(libraryRootPath, rootPath))
{
result = Wt::WValidator::Result{ Wt::ValidationState::Invalid, Wt::WString::tr("Lms.Admin.MediaLibrary.path-must-not-overlap") };
}
});
return result;
}
const MediaLibraryId _libraryId;
};
class MediaLibraryModel : public Wt::WFormModel
{
public:
static inline constexpr Field NameField{ "name" };
static inline constexpr Field DirectoryField{ "directory" };
MediaLibraryModel(MediaLibraryId libraryId)
: _libraryId{ libraryId }
{
addField(NameField);
addField(DirectoryField);
{
auto nameValidator{ std::make_shared<LibraryNameValidator>(libraryId) };
nameValidator->setMandatory(true);
setValidator(NameField, std::move(nameValidator));
}
{
auto directoryValidator{ std::make_shared<LibraryRootPathValidator>(libraryId) };
directoryValidator->setMandatory(true);
setValidator(DirectoryField, std::move(directoryValidator));
}
if (libraryId.isValid())
loadData();
}
MediaLibraryId saveData()
{
auto& session{ LmsApp->getDbSession() };
auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
MediaLibrary::pointer library;
if (_libraryId.isValid())
library = MediaLibrary::find(session, _libraryId);
else
library = session.create<MediaLibrary>();
library.modify()->setName(valueText(NameField).toUTF8());
library.modify()->setPath(valueText(DirectoryField).toUTF8());
return library->getId();
}
private:
void loadData()
{
auto& session{ LmsApp->getDbSession() };
auto transaction{ session.createReadTransaction() };
const MediaLibrary::pointer library{ MediaLibrary::find(session, _libraryId) };
setValue(NameField, std::string{ library->getName() });
setValue(DirectoryField, library->getPath().string());
}
const MediaLibraryId _libraryId;
};
}
MediaLibraryModal::MediaLibraryModal(MediaLibraryId mediaLibraryId)
: Wt::WTemplateFormView{ Wt::WString::tr("Lms.Admin.MediaLibrary.template") }
{
auto model{ std::make_shared<MediaLibraryModel>(mediaLibraryId) };
bindString("title", Wt::WString::tr(mediaLibraryId.isValid() ? "Lms.Admin.MediaLibrary.edit-library" : "Lms.Admin.MediaLibrary.create-library"));
setFormWidget(MediaLibraryModel::NameField, std::make_unique<Wt::WLineEdit>());
setFormWidget(MediaLibraryModel::DirectoryField, std::make_unique<Wt::WLineEdit>());
Wt::WPushButton* saveBtn{ bindNew<Wt::WPushButton>("save-btn", Wt::WString::tr(mediaLibraryId.isValid() ? "Lms.save" : "Lms.create")) };
saveBtn->clicked().connect(this, [=]
{
updateModel(model.get());
if (model->validate())
{
Database::MediaLibraryId mediaLibraryId{ model->saveData() };
saved().emit(mediaLibraryId);
}
else
{
updateView(model.get());
}
});
Wt::WPushButton* cancelBtn{ bindNew<Wt::WPushButton>("cancel-btn", Wt::WString::tr("Lms.cancel")) };
cancelBtn->clicked().connect(this, [=] {cancelled().emit();});
updateView(model.get());
}
}
src/lms/ui/admin/MediaLibraryModal.hpp
+40
View File
@@ -0,0 +1,40 @@
/*
* Copyright (C) 2024 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <Wt/WSignal.h>
#include <Wt/WTemplateFormView.h>
#include "database/MediaLibraryId.hpp"
namespace UserInterface
{
class MediaLibraryModal : public Wt::WTemplateFormView
{
public:
MediaLibraryModal(Database::MediaLibraryId mediaLibaryId);
Wt::Signal<Database::MediaLibraryId>& saved() { return _saved; };
Wt::Signal<>& cancelled() { return _cancelled; }
private:
Wt::Signal<Database::MediaLibraryId> _saved;
Wt::Signal<> _cancelled;
};
}
src/lms/ui/admin/ScanSettingsView.cpp
+236
View File
@@ -0,0 +1,236 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ScanSettingsView.hpp"
#include <Wt/WComboBox.h>
#include <Wt/WFormModel.h>
#include <Wt/WLineEdit.h>
#include <Wt/WPushButton.h>
#include <Wt/WString.h>
#include <Wt/WTemplateFormView.h>
#include "database/ScanSettings.hpp"
#include "database/Session.hpp"
#include "services/recommendation/IRecommendationService.hpp"
#include "services/scanner/IScannerService.hpp"
#include "utils/ILogger.hpp"
#include "utils/Service.hpp"
#include "utils/String.hpp"
#include "common/MandatoryValidator.hpp"
#include "common/UppercaseValidator.hpp"
#include "common/ValueStringModel.hpp"
#include "LmsApplication.hpp"
namespace UserInterface
{
using namespace Database;
namespace
{
class DatabaseSettingsModel : public Wt::WFormModel
{
public:
static inline constexpr Field UpdatePeriodField{ "update-period" };
static inline constexpr Field UpdateStartTimeField{ "update-start-time" };
static inline constexpr Field SimilarityEngineTypeField{ "similarity-engine-type" };
static inline constexpr Field ExtraTagsField{ "extra-tags-to-scan" };
using UpdatePeriodModel = ValueStringModel<ScanSettings::UpdatePeriod>;
static inline constexpr std::string_view extraTagsDelimiter{ ";" };
DatabaseSettingsModel()
{
initializeModels();
addField(UpdatePeriodField);
addField(UpdateStartTimeField);
addField(SimilarityEngineTypeField);
addField(ExtraTagsField);
setValidator(UpdatePeriodField, createMandatoryValidator());
setValidator(UpdateStartTimeField, createMandatoryValidator());
setValidator(SimilarityEngineTypeField, createMandatoryValidator());
setValidator(ExtraTagsField, createUppercaseValidator());
// populate the model with initial data
loadData();
}
std::shared_ptr<UpdatePeriodModel> updatePeriodModel() { return _updatePeriodModel; }
std::shared_ptr<Wt::WAbstractItemModel> updateStartTimeModel() { return _updateStartTimeModel; }
std::shared_ptr<Wt::WAbstractItemModel> similarityEngineTypeModel() { return _similarityEngineTypeModel; }
void loadData()
{
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
const ScanSettings::pointer scanSettings{ ScanSettings::get(LmsApp->getDbSession()) };
auto periodRow{ _updatePeriodModel->getRowFromValue(scanSettings->getUpdatePeriod()) };
if (periodRow)
setValue(UpdatePeriodField, _updatePeriodModel->getString(*periodRow));
auto startTimeRow{ _updateStartTimeModel->getRowFromValue(scanSettings->getUpdateStartTime()) };
if (startTimeRow)
setValue(UpdateStartTimeField, _updateStartTimeModel->getString(*startTimeRow));
if (scanSettings->getUpdatePeriod() == ScanSettings::UpdatePeriod::Hourly
|| scanSettings->getUpdatePeriod() == ScanSettings::UpdatePeriod::Never)
{
setReadOnly(DatabaseSettingsModel::UpdateStartTimeField, true);
}
auto similarityEngineTypeRow{ _similarityEngineTypeModel->getRowFromValue(scanSettings->getSimilarityEngineType()) };
if (similarityEngineTypeRow)
setValue(SimilarityEngineTypeField, _similarityEngineTypeModel->getString(*similarityEngineTypeRow));
auto extraTags{ scanSettings->getExtraTagsToScan() };
setValue(ExtraTagsField, StringUtils::joinStrings(scanSettings->getExtraTagsToScan(), extraTagsDelimiter));
}
void saveData()
{
auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
ScanSettings::pointer scanSettings{ ScanSettings::get(LmsApp->getDbSession()) };
auto updatePeriodRow{ _updatePeriodModel->getRowFromString(valueText(UpdatePeriodField)) };
if (updatePeriodRow)
scanSettings.modify()->setUpdatePeriod(_updatePeriodModel->getValue(*updatePeriodRow));
auto startTimeRow{ _updateStartTimeModel->getRowFromString(valueText(UpdateStartTimeField)) };
if (startTimeRow)
scanSettings.modify()->setUpdateStartTime(_updateStartTimeModel->getValue(*startTimeRow));
auto similarityEngineTypeRow{ _similarityEngineTypeModel->getRowFromString(valueText(SimilarityEngineTypeField)) };
if (similarityEngineTypeRow)
scanSettings.modify()->setSimilarityEngineType(_similarityEngineTypeModel->getValue(*similarityEngineTypeRow));
scanSettings.modify()->setExtraTagsToScan(StringUtils::splitString(valueText(ExtraTagsField).toUTF8(), extraTagsDelimiter));
}
private:
void initializeModels()
{
_updatePeriodModel = std::make_shared<ValueStringModel<ScanSettings::UpdatePeriod>>();
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.never"), ScanSettings::UpdatePeriod::Never);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.hourly"), ScanSettings::UpdatePeriod::Hourly);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.daily"), ScanSettings::UpdatePeriod::Daily);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.weekly"), ScanSettings::UpdatePeriod::Weekly);
_updatePeriodModel->add(Wt::WString::tr("Lms.Admin.Database.monthly"), ScanSettings::UpdatePeriod::Monthly);
_updateStartTimeModel = std::make_shared<ValueStringModel<Wt::WTime>>();
for (std::size_t i = 0; i < 24; ++i)
{
Wt::WTime time{ static_cast<int>(i), 0 };
_updateStartTimeModel->add(time.toString(), time);
}
_similarityEngineTypeModel = std::make_shared<ValueStringModel<ScanSettings::SimilarityEngineType>>();
_similarityEngineTypeModel->add(Wt::WString::tr("Lms.Admin.Database.similarity-engine-type.clusters"), ScanSettings::SimilarityEngineType::Clusters);
_similarityEngineTypeModel->add(Wt::WString::tr("Lms.Admin.Database.similarity-engine-type.none"), ScanSettings::SimilarityEngineType::None);
}
std::shared_ptr<UpdatePeriodModel> _updatePeriodModel;
std::shared_ptr<ValueStringModel<Wt::WTime>> _updateStartTimeModel;
std::shared_ptr<ValueStringModel<ScanSettings::SimilarityEngineType>> _similarityEngineTypeModel;
};
}
ScanSettingsView::ScanSettingsView()
{
wApp->internalPathChanged().connect(this, [this]()
{
refreshView();
});
refreshView();
}
void ScanSettingsView::refreshView()
{
if (!wApp->internalPathMatches("/admin/scan-settings"))
return;
clear();
auto t{ addNew<Wt::WTemplateFormView>(Wt::WString::tr("Lms.Admin.Database.template")) };
auto model{ std::make_shared<DatabaseSettingsModel>() };
// Update Period
auto updatePeriod{ std::make_unique<Wt::WComboBox>() };
updatePeriod->setModel(model->updatePeriodModel());
updatePeriod->activated().connect([=](int row)
{
const ScanSettings::UpdatePeriod period{ model->updatePeriodModel()->getValue(row) };
model->setReadOnly(DatabaseSettingsModel::UpdateStartTimeField, period == ScanSettings::UpdatePeriod::Hourly || period == ScanSettings::UpdatePeriod::Never);
t->updateModel(model.get());
t->updateView(model.get());
});
t->setFormWidget(DatabaseSettingsModel::UpdatePeriodField, std::move(updatePeriod));
// Update Start Time
auto updateStartTime{ std::make_unique<Wt::WComboBox>() };
updateStartTime->setModel(model->updateStartTimeModel());
t->setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, std::move(updateStartTime));
// Similarity engine type
auto similarityEngineType{ std::make_unique<Wt::WComboBox>() };
similarityEngineType->setModel(model->similarityEngineTypeModel());
t->setFormWidget(DatabaseSettingsModel::SimilarityEngineTypeField, std::move(similarityEngineType));
// Extra tags
t->setFormWidget(DatabaseSettingsModel::ExtraTagsField, std::make_unique<Wt::WLineEdit>());
// Buttons
Wt::WPushButton* saveBtn = t->bindWidget("save-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.save")));
Wt::WPushButton* discardBtn = t->bindWidget("discard-btn", std::make_unique<Wt::WPushButton>(Wt::WString::tr("Lms.discard")));
saveBtn->clicked().connect([=]
{
t->updateModel(model.get());
if (model->validate())
{
model->saveData();
Service<Recommendation::IRecommendationService>::get()->load();
// Don't want the scanner to go on with wrong settings
Service<Scanner::IScannerService>::get()->requestStop();
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.settings-saved"));
}
// Udate the view: Delete any validation message in the view, etc.
t->updateView(model.get());
});
discardBtn->clicked().connect([=]
{
model->loadData();
model->validate();
t->updateView(model.get());
});
t->updateView(model.get());
}
} // namespace UserInterface
src/lms/ui/admin/DatabaseSettingsView.hpp → src/lms/ui/admin/ScanSettingsView.hpp
+8 -11
View File
@@ -21,17 +21,14 @@
#include <Wt/WContainerWidget.h> #include <Wt/WContainerWidget.h>
namespace UserInterface { namespace UserInterface
class DatabaseSettingsView : public Wt::WContainerWidget
{ {
public: class ScanSettingsView : public Wt::WContainerWidget
DatabaseSettingsView(); {
public:
private: ScanSettingsView();
void refreshView();
};
private:
void refreshView();
};
} // namespace UserInterface } // namespace UserInterface
src/lms/ui/admin/ScannerController.cpp
+201 -203
View File
@@ -32,252 +32,250 @@
#include "utils/Service.hpp" #include "utils/Service.hpp"
#include "LmsApplication.hpp" #include "LmsApplication.hpp"
namespace UserInterface { namespace UserInterface
static
std::string
durationToString(const Wt::WDateTime& begin, const Wt::WDateTime& end)
{ {
const auto secs {std::chrono::duration_cast<std::chrono::seconds>(end.toTimePoint() - begin.toTimePoint()).count()}; namespace
{
std::string durationToString(const Wt::WDateTime& begin, const Wt::WDateTime& end)
{
const auto secs{ std::chrono::duration_cast<std::chrono::seconds>(end.toTimePoint() - begin.toTimePoint()).count() };
std::ostringstream oss; std::ostringstream oss;
if (secs >= 3600) if (secs >= 3600)
oss << secs/3600 << "h"; oss << secs / 3600 << "h";
if (secs >= 60) if (secs >= 60)
oss << std::setw(2) << std::setfill('0') << (secs % 3600) / 60 << "m"; oss << std::setw(2) << std::setfill('0') << (secs % 3600) / 60 << "m";
oss << std::setw(2) << std::setfill('0') << (secs % 60) << "s"; oss << std::setw(2) << std::setfill('0') << (secs % 60) << "s";
return oss.str(); return oss.str();
} }
}
class ReportResource : public Wt::WResource
{
public:
ReportResource()
{
suggestFileName("report.txt");
}
class ReportResource : public Wt::WResource ~ReportResource()
{ {
public: beingDeleted();
ReportResource() }
{
suggestFileName("report.txt");
}
~ReportResource() void setScanStats(const Scanner::ScanStats& stats)
{ {
beingDeleted(); if (!_stats)
} _stats = std::make_unique<Scanner::ScanStats>();
void setScanStats(const Scanner::ScanStats& stats) *_stats = stats;
{ }
if (!_stats)
_stats = std::make_unique<Scanner::ScanStats>();
*_stats = stats; void handleRequest(const Wt::Http::Request&, Wt::Http::Response& response)
} {
if (!_stats)
return;
void handleRequest(const Wt::Http::Request&, Wt::Http::Response& response) response.out() << Wt::WString::tr("Lms.Admin.ScannerController.errors-header").arg(_stats->errors.size()).toUTF8() << std::endl;
{
if (!_stats)
return;
response.out() << Wt::WString::tr("Lms.Admin.ScannerController.errors-header").arg(_stats->errors.size()).toUTF8() << std::endl; for (const auto& error : _stats->errors)
{
response.out() << error.file.string() << " - " << errorTypeToWString(error.error).toUTF8();
if (!error.systemError.empty())
response.out() << ": " << error.systemError;
response.out() << std::endl;
}
for (const auto& error : _stats->errors) response.out() << std::endl;
{
response.out() << error.file.string() << " - " << errorTypeToWString(error.error).toUTF8();
if (!error.systemError.empty())
response.out() << ": " << error.systemError;
response.out() << std::endl;
}
response.out() << std::endl; response.out() << Wt::WString::tr("Lms.Admin.ScannerController.duplicates-header").arg(_stats->duplicates.size()).toUTF8() << std::endl;
response.out() << Wt::WString::tr("Lms.Admin.ScannerController.duplicates-header").arg(_stats->duplicates.size()).toUTF8() << std::endl; {
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
{ for (const auto& duplicate : _stats->duplicates)
auto transaction {LmsApp->getDbSession().createReadTransaction()}; {
const auto& track{ Database::Track::find(LmsApp->getDbSession(), duplicate.trackId) };
if (!track)
continue;
for (const auto& duplicate : _stats->duplicates) response.out() << track->getPath().string();
{ if (auto mbid{ track->getTrackMBID() })
const auto& track {Database::Track::find(LmsApp->getDbSession(), duplicate.trackId)}; response.out() << " (Track MBID " << mbid->getAsString() << ")";
if (!track)
continue;
response.out() << track->getPath().string(); response.out() << " - " << duplicateReasonToWString(duplicate.reason).toUTF8() << '\n';
if (auto mbid {track->getTrackMBID()}) }
response.out() << " (Track MBID " << mbid->getAsString() << ")"; }
}
response.out() << " - " << duplicateReasonToWString(duplicate.reason).toUTF8() << '\n'; private:
} static Wt::WString errorTypeToWString(Scanner::ScanErrorType error)
} {
} switch (error)
{
case Scanner::ScanErrorType::CannotReadFile: return Wt::WString::tr("Lms.Admin.ScannerController.cannot-read-file");
case Scanner::ScanErrorType::CannotParseFile: return Wt::WString::tr("Lms.Admin.ScannerController.cannot-parse-file");
case Scanner::ScanErrorType::NoAudioTrack: return Wt::WString::tr("Lms.Admin.ScannerController.no-audio-track");
case Scanner::ScanErrorType::BadDuration: return Wt::WString::tr("Lms.Admin.ScannerController.bad-duration");
}
return "?";
}
private: static Wt::WString duplicateReasonToWString(Scanner::DuplicateReason reason)
{
switch (reason)
{
case Scanner::DuplicateReason::SameHash: return Wt::WString::tr("Lms.Admin.ScannerController.same-hash");
case Scanner::DuplicateReason::SameTrackMBID: return Wt::WString::tr("Lms.Admin.ScannerController.same-mbid");
}
return "?";
}
static Wt::WString errorTypeToWString(Scanner::ScanErrorType error) std::unique_ptr<Scanner::ScanStats> _stats;
{ };
switch (error)
{
case Scanner::ScanErrorType::CannotReadFile: return Wt::WString::tr("Lms.Admin.ScannerController.cannot-read-file");
case Scanner::ScanErrorType::CannotParseFile: return Wt::WString::tr("Lms.Admin.ScannerController.cannot-parse-file");
case Scanner::ScanErrorType::NoAudioTrack: return Wt::WString::tr("Lms.Admin.ScannerController.no-audio-track");
case Scanner::ScanErrorType::BadDuration: return Wt::WString::tr("Lms.Admin.ScannerController.bad-duration");
}
return "?";
}
static Wt::WString duplicateReasonToWString(Scanner::DuplicateReason reason) ScannerController::ScannerController()
{ : WTemplate{ Wt::WString::tr("Lms.Admin.ScannerController.template") }
switch (reason) {
{ addFunction("tr", &Wt::WTemplate::Functions::tr);
case Scanner::DuplicateReason::SameHash: return Wt::WString::tr("Lms.Admin.ScannerController.same-hash"); addFunction("id", &Wt::WTemplate::Functions::id);
case Scanner::DuplicateReason::SameTrackMBID: return Wt::WString::tr("Lms.Admin.ScannerController.same-mbid");
}
return "?";
}
std::unique_ptr<Scanner::ScanStats> _stats; using namespace Scanner;
};
{
_reportBtn = bindNew<Wt::WPushButton>("report-btn", Wt::WString::tr("Lms.Admin.ScannerController.get-report"));
ScannerController::ScannerController() auto reportResource{ std::make_shared<ReportResource>() };
: WTemplate {Wt::WString::tr("Lms.Admin.ScannerController.template")} reportResource->setTakesUpdateLock(true);
{ _reportResource = reportResource.get();
addFunction("tr", &Wt::WTemplate::Functions::tr);
addFunction("id", &Wt::WTemplate::Functions::id);
using namespace Scanner; Wt::WLink link{ reportResource };
link.setTarget(Wt::LinkTarget::NewWindow);
_reportBtn->setLink(link);
}
{ Wt::WPushButton* scanBtn{ bindNew<Wt::WPushButton>("scan-btn", Wt::WString::tr("Lms.Admin.ScannerController.scan-now")) };
_reportBtn = bindNew<Wt::WPushButton>("report-btn", Wt::WString::tr("Lms.Admin.ScannerController.get-report")); scanBtn->clicked().connect([]
{
Service<Scanner::IScannerService>::get()->requestImmediateScan(false);
});
auto reportResource {std::make_shared<ReportResource>()}; Wt::WPushButton* fullScanBtn{ bindNew<Wt::WPushButton>("full-scan-btn", Wt::WString::tr("Lms.Admin.ScannerController.force-scan-now")) };
reportResource->setTakesUpdateLock(true); fullScanBtn->clicked().connect([]
_reportResource = reportResource.get(); {
Service<Scanner::IScannerService>::get()->requestImmediateScan(true);
});
Wt::WLink link {reportResource}; _lastScanStatus = bindNew<Wt::WLineEdit>("last-scan");
link.setTarget(Wt::LinkTarget::NewWindow); _lastScanStatus->setReadOnly(true);
_reportBtn->setLink(link);
}
Wt::WPushButton* scanBtn {bindNew<Wt::WPushButton>("scan-btn", Wt::WString::tr("Lms.Admin.ScannerController.scan-now"))}; _status = bindNew<Wt::WLineEdit>("status");
scanBtn->clicked().connect([] _status->setReadOnly(true);
{
Service<Scanner::IScannerService>::get()->requestImmediateScan(false);
});
Wt::WPushButton* fullScanBtn {bindNew<Wt::WPushButton>("full-scan-btn", Wt::WString::tr("Lms.Admin.ScannerController.force-scan-now"))}; _stepStatus = bindNew<Wt::WLineEdit>("step-status");
fullScanBtn->clicked().connect([] _stepStatus->setReadOnly(true);
{
Service<Scanner::IScannerService>::get()->requestImmediateScan(true);
});
_lastScanStatus = bindNew<Wt::WLineEdit>("last-scan"); auto onDbEvent{ [&]() { refreshContents(); } };
_lastScanStatus->setReadOnly(true);
_status = bindNew<Wt::WLineEdit>("status"); LmsApp->getScannerEvents().scanAborted.connect(this, []
_status->setReadOnly(true); {
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.Admin.Database.scan-aborted"));
});
LmsApp->getScannerEvents().scanStarted.connect(this, []
{
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.Admin.Database.scan-launched"));
});
LmsApp->getScannerEvents().scanComplete.connect(this, onDbEvent);
LmsApp->getScannerEvents().scanInProgress.connect(this, onDbEvent);
LmsApp->getScannerEvents().scanScheduled.connect(this, onDbEvent);
_stepStatus = bindNew<Wt::WLineEdit>("step-status"); refreshContents();
_stepStatus->setReadOnly(true); }
auto onDbEvent {[&]() { refreshContents(); }}; void ScannerController::refreshContents()
{
using namespace Scanner;
LmsApp->getScannerEvents().scanStarted.connect(this, [] const IScannerService::Status status{ Service<IScannerService>::get()->getStatus() };
{ if (status.lastCompleteScanStats)
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.Admin.Database.scan-launched")); {
}); _lastScanStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.last-scan-status")
LmsApp->getScannerEvents().scanComplete.connect(this, onDbEvent); .arg(status.lastCompleteScanStats->nbFiles())
LmsApp->getScannerEvents().scanInProgress.connect(this, onDbEvent); .arg(durationToString(status.lastCompleteScanStats->startTime, status.lastCompleteScanStats->stopTime))
LmsApp->getScannerEvents().scanScheduled.connect(this, onDbEvent); .arg(status.lastCompleteScanStats->stopTime.toString())
.arg(status.lastCompleteScanStats->errors.size())
.arg(status.lastCompleteScanStats->duplicates.size())
);
refreshContents(); _reportResource->setScanStats(*status.lastCompleteScanStats);
} _reportBtn->setEnabled(true);
void }
ScannerController::refreshContents() else
{ {
using namespace Scanner; _lastScanStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.last-scan-not-available"));
_reportBtn->setEnabled(false);
}
const IScannerService::Status status {Service<IScannerService>::get()->getStatus()}; switch (status.currentState)
if (status.lastCompleteScanStats) {
{ case IScannerService::State::NotScheduled:
_lastScanStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.last-scan-status") _status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-not-scheduled"));
.arg(status.lastCompleteScanStats->nbFiles()) _stepStatus->setText("");
.arg(durationToString(status.lastCompleteScanStats->startTime, status.lastCompleteScanStats->stopTime)) break;
.arg(status.lastCompleteScanStats->stopTime.toString()) case IScannerService::State::Scheduled:
.arg(status.lastCompleteScanStats->errors.size()) _status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-scheduled")
.arg(status.lastCompleteScanStats->duplicates.size()) .arg(status.nextScheduledScan.toString()));
); _stepStatus->setText("");
break;
case IScannerService::State::InProgress:
_status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-in-progress")
.arg(static_cast<int>(status.currentScanStepStats->currentStep) + 1)
.arg(Scanner::ScanProgressStepCount));
_reportResource->setScanStats(*status.lastCompleteScanStats); switch (status.currentScanStepStats->currentStep)
_reportBtn->setEnabled(true); {
case Scanner::ScanStep::CheckingForDuplicateFiles:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-checking-for-duplicate-files")
.arg(status.currentScanStepStats->processedElems));
break;
} case Scanner::ScanStep::ChekingForMissingFiles:
else _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-checking-for-missing-files")
{ .arg(status.currentScanStepStats->progress()));
_lastScanStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.last-scan-not-available")); break;
_reportBtn->setEnabled(false);
}
case Scanner::ScanStep::DiscoveringFiles:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-discovering-files")
.arg(status.currentScanStepStats->processedElems));
break;
switch (status.currentState) case Scanner::ScanStep::ScanningFiles:
{ _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-scanning-files")
case IScannerService::State::NotScheduled: .arg(status.currentScanStepStats->processedElems)
_status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-not-scheduled")); .arg(status.currentScanStepStats->totalElems)
_stepStatus->setText(""); .arg(status.currentScanStepStats->progress()));
break; break;
case IScannerService::State::Scheduled:
_status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-scheduled")
.arg(status.nextScheduledScan.toString()));
_stepStatus->setText("");
break;
case IScannerService::State::InProgress:
_status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-in-progress")
.arg(static_cast<int>(status.currentScanStepStats->currentStep) + 1)
.arg(Scanner::ScanProgressStepCount));
switch (status.currentScanStepStats->currentStep) case Scanner::ScanStep::FetchingTrackFeatures:
{ _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-fetching-track-features")
case Scanner::ScanStep::CheckingForDuplicateFiles: .arg(status.currentScanStepStats->processedElems)
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-checking-for-duplicate-files") .arg(status.currentScanStepStats->totalElems)
.arg(status.currentScanStepStats->processedElems)); .arg(status.currentScanStepStats->progress()));
break; break;
case Scanner::ScanStep::ChekingForMissingFiles: case Scanner::ScanStep::ReloadingSimilarityEngine:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-checking-for-missing-files") _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-reloading-similarity-engine")
.arg(status.currentScanStepStats->progress())); .arg(status.currentScanStepStats->progress()));
break; break;
case Scanner::ScanStep::DiscoveringFiles:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-discovering-files")
.arg(status.currentScanStepStats->processedElems));
break;
case Scanner::ScanStep::ScanningFiles:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-scanning-files")
.arg(status.currentScanStepStats->processedElems)
.arg(status.currentScanStepStats->totalElems)
.arg(status.currentScanStepStats->progress()));
break;
case Scanner::ScanStep::FetchingTrackFeatures:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-fetching-track-features")
.arg(status.currentScanStepStats->processedElems)
.arg(status.currentScanStepStats->totalElems)
.arg(status.currentScanStepStats->progress()));
break;
case Scanner::ScanStep::ReloadingSimilarityEngine:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-reloading-similarity-engine")
.arg(status.currentScanStepStats->progress()));
break;
case Scanner::ScanStep::ComputeClusterStats:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-compute-cluster-stats")
.arg(status.currentScanStepStats->progress()));
}
break;
}
}
case Scanner::ScanStep::ComputeClusterStats:
_stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-compute-cluster-stats")
.arg(status.currentScanStepStats->progress()));
}
break;
}
}
} // namespace UserInterface } // namespace UserInterface
src/lms/ui/admin/ScannerController.hpp
+12 -15
View File
@@ -25,21 +25,18 @@
namespace UserInterface namespace UserInterface
{ {
class ScannerController : public Wt::WTemplate
{
public:
ScannerController();
class ScannerController : public Wt::WTemplate private:
{ void refreshContents();
public:
ScannerController();
private:
void refreshContents();
Wt::WPushButton* _reportBtn;
Wt::WLineEdit* _lastScanStatus;
Wt::WLineEdit* _status;
Wt::WLineEdit* _stepStatus;
class ReportResource* _reportResource;
};
Wt::WPushButton* _reportBtn;
Wt::WLineEdit* _lastScanStatus;
Wt::WLineEdit* _status;
Wt::WLineEdit* _stepStatus;
class ReportResource* _reportResource;
};
} // namespace DatabaseStatus } // namespace DatabaseStatus
src/lms/ui/admin/UserView.cpp
+182 -185
View File
@@ -41,236 +41,233 @@
#include "LmsApplication.hpp" #include "LmsApplication.hpp"
#include "LmsApplicationException.hpp" #include "LmsApplicationException.hpp"
namespace UserInterface { namespace UserInterface
using namespace Database;
class UserModel : public Wt::WFormModel
{ {
public: using namespace Database;
static inline const Field LoginField {"login"};
static inline const Field PasswordField {"password"};
static inline const Field DemoField {"demo"};
UserModel(std::optional<UserId> userId, ::Auth::IPasswordService* authPasswordService) class UserModel : public Wt::WFormModel
: _userId {userId} {
, _authPasswordService {authPasswordService} public:
{ static inline const Field LoginField{ "login" };
if (!_userId) static inline const Field PasswordField{ "password" };
{ static inline const Field DemoField{ "demo" };
addField(LoginField);
setValidator(LoginField, createLoginNameValidator());
}
if (authPasswordService) UserModel(std::optional<UserId> userId, ::Auth::IPasswordService* authPasswordService)
{ : _userId{ userId }
addField(PasswordField); , _authPasswordService{ authPasswordService }
setValidator(PasswordField, createPasswordStrengthValidator([this] { return ::Auth::PasswordValidationContext {getLoginName(), getUserType()}; })); {
if (!userId) if (!_userId)
validator(PasswordField)->setMandatory(true); {
} addField(LoginField);
addField(DemoField); setValidator(LoginField, createLoginNameValidator());
}
loadData(); if (authPasswordService)
} {
addField(PasswordField);
setValidator(PasswordField, createPasswordStrengthValidator([this] { return ::Auth::PasswordValidationContext{ getLoginName(), getUserType() }; }));
if (!userId)
validator(PasswordField)->setMandatory(true);
}
addField(DemoField);
void saveData() loadData();
{ }
auto transaction {LmsApp->getDbSession().createWriteTransaction()};
if (_userId) void saveData()
{ {
// Update user auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
User::pointer user {User::find(LmsApp->getDbSession(), *_userId)};
if (!user)
throw UserNotFoundException {};
if (_authPasswordService && !valueText(PasswordField).empty()) if (_userId)
_authPasswordService->setPassword(user->getId(), valueText(PasswordField).toUTF8()); {
} // Update user
else User::pointer user{ User::find(LmsApp->getDbSession(), *_userId) };
{ if (!user)
// Check races with other endpoints (subsonic API...) throw UserNotFoundException{};
User::pointer user {User::find(LmsApp->getDbSession(), valueText(LoginField).toUTF8())};
if (user)
throw UserNotAllowedException {};
// Create user if (_authPasswordService && !valueText(PasswordField).empty())
user = LmsApp->getDbSession().create<User>(valueText(LoginField).toUTF8()); _authPasswordService->setPassword(user->getId(), valueText(PasswordField).toUTF8());
}
else
{
// Check races with other endpoints (subsonic API...)
User::pointer user{ User::find(LmsApp->getDbSession(), valueText(LoginField).toUTF8()) };
if (user)
throw UserNotAllowedException{};
if (Wt::asNumber(value(DemoField))) // Create user
user.modify()->setType(UserType::DEMO); user = LmsApp->getDbSession().create<User>(valueText(LoginField).toUTF8());
if (_authPasswordService) if (Wt::asNumber(value(DemoField)))
_authPasswordService->setPassword(user->getId(), valueText(PasswordField).toUTF8()); user.modify()->setType(UserType::DEMO);
}
}
private: if (_authPasswordService)
void loadData() _authPasswordService->setPassword(user->getId(), valueText(PasswordField).toUTF8());
{ }
if (!_userId) }
return;
auto transaction {LmsApp->getDbSession().createReadTransaction()}; private:
void loadData()
{
if (!_userId)
return;
const User::pointer user {User::find(LmsApp->getDbSession(), *_userId)}; auto transaction{ LmsApp->getDbSession().createReadTransaction() };
if (!user)
throw UserNotFoundException {};
else if (user == LmsApp->getUser())
throw UserNotAllowedException {};
}
UserType getUserType() const const User::pointer user{ User::find(LmsApp->getDbSession(), *_userId) };
{ if (!user)
if (_userId) throw UserNotFoundException{};
{ else if (user == LmsApp->getUser())
auto transaction {LmsApp->getDbSession().createReadTransaction()}; throw UserNotAllowedException{};
}
const User::pointer user {User::find(LmsApp->getDbSession(), *_userId)}; UserType getUserType() const
return user->getType(); {
} if (_userId)
{
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
return Wt::asNumber(value(DemoField)) ? UserType::DEMO : UserType::REGULAR; const User::pointer user{ User::find(LmsApp->getDbSession(), *_userId) };
} return user->getType();
}
std::string getLoginName() const return Wt::asNumber(value(DemoField)) ? UserType::DEMO : UserType::REGULAR;
{ }
if (_userId)
{
auto transaction {LmsApp->getDbSession().createReadTransaction()};
const User::pointer user {User::find(LmsApp->getDbSession(), *_userId)}; std::string getLoginName() const
return user->getLoginName(); {
} if (_userId)
{
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
return valueText(LoginField).toUTF8(); const User::pointer user{ User::find(LmsApp->getDbSession(), *_userId) };
} return user->getLoginName();
}
bool validateField(Field field) return valueText(LoginField).toUTF8();
{ }
Wt::WString error;
if (field == LoginField) bool validateField(Field field)
{ {
auto transaction {LmsApp->getDbSession().createReadTransaction()}; Wt::WString error;
const User::pointer user {User::find(LmsApp->getDbSession(), valueText(LoginField).toUTF8())}; if (field == LoginField)
if (user) {
error = Wt::WString::tr("Lms.Admin.User.user-already-exists"); auto transaction{ LmsApp->getDbSession().createReadTransaction() };
}
else if (field == DemoField)
{
auto transaction {LmsApp->getDbSession().createReadTransaction()};
if (Wt::asNumber(value(DemoField)) && User::findDemoUser(LmsApp->getDbSession())) const User::pointer user{ User::find(LmsApp->getDbSession(), valueText(LoginField).toUTF8()) };
error = Wt::WString::tr("Lms.Admin.User.demo-account-already-exists"); if (user)
} error = Wt::WString::tr("Lms.Admin.User.user-already-exists");
}
else if (field == DemoField)
{
auto transaction{ LmsApp->getDbSession().createReadTransaction() };
if (error.empty()) if (Wt::asNumber(value(DemoField)) && User::findDemoUser(LmsApp->getDbSession()))
return Wt::WFormModel::validateField(field); error = Wt::WString::tr("Lms.Admin.User.demo-account-already-exists");
}
setValidation(field, Wt::WValidator::Result {Wt::ValidationState::Invalid, error}); if (error.empty())
return Wt::WFormModel::validateField(field);
return false; setValidation(field, Wt::WValidator::Result{ Wt::ValidationState::Invalid, error });
}
std::optional<UserId> _userId; return false;
::Auth::IPasswordService* _authPasswordService {}; }
};
UserView::UserView() std::optional<UserId> _userId;
{ ::Auth::IPasswordService* _authPasswordService{};
wApp->internalPathChanged().connect(this, [this]() };
{
refreshView();
});
refreshView(); UserView::UserView()
} {
wApp->internalPathChanged().connect(this, [this]()
{
refreshView();
});
void refreshView();
UserView::refreshView() }
{
if (!wApp->internalPathMatches("/admin/user"))
return;
const std::optional<UserId> userId {StringUtils::readAs<UserId::ValueType>(wApp->internalPathNextPart("/admin/user/"))}; void UserView::refreshView()
{
if (!wApp->internalPathMatches("/admin/user"))
return;
clear(); const std::optional<UserId> userId{ StringUtils::readAs<UserId::ValueType>(wApp->internalPathNextPart("/admin/user/")) };
Wt::WTemplateFormView* t {addNew<Wt::WTemplateFormView>(Wt::WString::tr("Lms.Admin.User.template"))}; clear();
auto* authPasswordService {Service<::Auth::IPasswordService>::get()}; Wt::WTemplateFormView* t{ addNew<Wt::WTemplateFormView>(Wt::WString::tr("Lms.Admin.User.template")) };
if (authPasswordService && !authPasswordService->canSetPasswords())
authPasswordService = nullptr;
auto model {std::make_shared<UserModel>(userId, authPasswordService)}; auto* authPasswordService{ Service<::Auth::IPasswordService>::get() };
if (authPasswordService && !authPasswordService->canSetPasswords())
authPasswordService = nullptr;
if (userId) auto model{ std::make_shared<UserModel>(userId, authPasswordService) };
{
auto transaction {LmsApp->getDbSession().createReadTransaction()};
const User::pointer user {User::find(LmsApp->getDbSession(), *userId)}; if (userId)
if (!user) {
throw UserNotFoundException {}; auto transaction{ LmsApp->getDbSession().createReadTransaction() };
const Wt::WString title {Wt::WString::tr("Lms.Admin.User.user-edit").arg(user->getLoginName())}; const User::pointer user{ User::find(LmsApp->getDbSession(), *userId) };
LmsApp->setTitle(title); if (!user)
throw UserNotFoundException{};
t->bindString("title", title, Wt::TextFormat::Plain); const Wt::WString title{ Wt::WString::tr("Lms.Admin.User.user-edit").arg(user->getLoginName()) };
t->setCondition("if-has-last-login", true); LmsApp->setTitle(title);
t->bindString("last-login", user->getLastLogin().toString(), Wt::TextFormat::Plain);
}
else
{
const Wt::WString title {Wt::WString::tr("Lms.Admin.User.user-create")};
LmsApp->setTitle(title);
// Login t->bindString("title", title, Wt::TextFormat::Plain);
t->setCondition("if-has-login", true); t->setCondition("if-has-last-login", true);
t->setFormWidget(UserModel::LoginField, std::make_unique<Wt::WLineEdit>()); t->bindString("last-login", user->getLastLogin().toString(), Wt::TextFormat::Plain);
t->bindString("title", title); }
} else
{
const Wt::WString title{ Wt::WString::tr("Lms.Admin.User.user-create") };
LmsApp->setTitle(title);
if (authPasswordService) // Login
{ t->setCondition("if-has-login", true);
t->setCondition("if-has-password", true); t->setFormWidget(UserModel::LoginField, std::make_unique<Wt::WLineEdit>());
t->bindString("title", title);
}
// Password if (authPasswordService)
auto passwordEdit = std::make_unique<Wt::WLineEdit>(); {
passwordEdit->setEchoMode(Wt::EchoMode::Password); t->setCondition("if-has-password", true);
passwordEdit->setAttributeValue("autocomplete", "off");
t->setFormWidget(UserModel::PasswordField, std::move(passwordEdit));
}
// Demo account // Password
t->setFormWidget(UserModel::DemoField, std::make_unique<Wt::WCheckBox>()); auto passwordEdit = std::make_unique<Wt::WLineEdit>();
if (!userId && Service<IConfig>::get()->getBool("demo", false)) passwordEdit->setEchoMode(Wt::EchoMode::Password);
t->setCondition("if-demo", true); passwordEdit->setAttributeValue("autocomplete", "off");
t->setFormWidget(UserModel::PasswordField, std::move(passwordEdit));
}
Wt::WPushButton* saveBtn {t->bindNew<Wt::WPushButton>("save-btn", Wt::WString::tr(userId ? "Lms.save" : "Lms.create"))}; // Demo account
saveBtn->clicked().connect([=]() t->setFormWidget(UserModel::DemoField, std::make_unique<Wt::WCheckBox>());
{ if (!userId && Service<IConfig>::get()->getBool("demo", false))
t->updateModel(model.get()); t->setCondition("if-demo", true);
if (model->validate()) Wt::WPushButton* saveBtn{ t->bindNew<Wt::WPushButton>("save-btn", Wt::WString::tr(userId ? "Lms.save" : "Lms.create")) };
{ saveBtn->clicked().connect([=]()
model->saveData(); {
LmsApp->notifyMsg(Notification::Type::Info, t->updateModel(model.get());
Wt::WString::tr("Lms.Admin.Users.users"),
Wt::WString::tr(userId ? "Lms.Admin.User.user-updated" : "Lms.Admin.User.user-created"));
LmsApp->setInternalPath("/admin/users", true);
}
else
{
t->updateView(model.get());
}
});
t->updateView(model.get()); if (model->validate())
} {
model->saveData();
LmsApp->notifyMsg(Notification::Type::Info,
Wt::WString::tr("Lms.Admin.Users.users"),
Wt::WString::tr(userId ? "Lms.Admin.User.user-updated" : "Lms.Admin.User.user-created"));
LmsApp->setInternalPath("/admin/users", true);
}
else
{
t->updateView(model.get());
}
});
t->updateView(model.get());
}
} // namespace UserInterface } // namespace UserInterface
src/lms/ui/admin/UsersView.cpp
+78 -82
View File
@@ -32,109 +32,105 @@
#include "LmsApplication.hpp" #include "LmsApplication.hpp"
#include "ModalManager.hpp" #include "ModalManager.hpp"
namespace UserInterface { namespace UserInterface
using namespace Database;
UsersView::UsersView()
: Wt::WTemplate {Wt::WString::tr("Lms.Admin.Users.template")}
{ {
addFunction("tr", &Wt::WTemplate::Functions::tr); using namespace Database;
_container = bindNew<Wt::WContainerWidget>("users"); UsersView::UsersView()
: Wt::WTemplate{ Wt::WString::tr("Lms.Admin.Users.template") }
{
addFunction("tr", &Wt::WTemplate::Functions::tr);
if (Service<::Auth::IPasswordService>::get() && Service<::Auth::IPasswordService>::get()->canSetPasswords()) _container = bindNew<Wt::WContainerWidget>("users");
{
setCondition("if-can-create-user", true);
Wt::WPushButton* addBtn = bindNew<Wt::WPushButton>("add-btn", Wt::WString::tr("Lms.Admin.Users.add")); if (Service<::Auth::IPasswordService>::get() && Service<::Auth::IPasswordService>::get()->canSetPasswords())
addBtn->clicked().connect([] {
{ setCondition("if-can-create-user", true);
LmsApp->setInternalPath("/admin/user", true);
});
}
wApp->internalPathChanged().connect(this, [this]() Wt::WPushButton* addBtn = bindNew<Wt::WPushButton>("add-btn", Wt::WString::tr("Lms.Admin.Users.add"));
{ addBtn->clicked().connect([]
refreshView(); {
}); LmsApp->setInternalPath("/admin/user", true);
});
}
refreshView(); wApp->internalPathChanged().connect(this, [this]()
} {
refreshView();
});
void refreshView();
UsersView::refreshView() }
{
if (!wApp->internalPathMatches("/admin/users"))
return;
_container->clear(); void UsersView::refreshView()
{
if (!wApp->internalPathMatches("/admin/users"))
return;
auto transaction {LmsApp->getDbSession().createReadTransaction()}; _container->clear();
const User::IdType currentUserId {LmsApp->getUser()}; auto transaction{ LmsApp->getDbSession().createReadTransaction() };
for (const UserId userId : User::find(LmsApp->getDbSession(), User::FindParameters {}).results)
{
const User::pointer user {User::find(LmsApp->getDbSession(), userId)};
Wt::WTemplate* entry {_container->addNew<Wt::WTemplate>(Wt::WString::tr("Lms.Admin.Users.template.entry"))}; const User::IdType currentUserId{ LmsApp->getUser() };
for (const UserId userId : User::find(LmsApp->getDbSession(), User::FindParameters{}).results)
{
const User::pointer user{ User::find(LmsApp->getDbSession(), userId) };
entry->bindString("name", user->getLoginName(), Wt::TextFormat::Plain); Wt::WTemplate* entry{ _container->addNew<Wt::WTemplate>(Wt::WString::tr("Lms.Admin.Users.template.entry")) };
// Create tag entry->bindString("name", user->getLoginName(), Wt::TextFormat::Plain);
if (user->isAdmin() || user->isDemo())
{
entry->setCondition("if-tag", true);
entry->bindString("tag", Wt::WString::tr(user->isAdmin() ? "Lms.Admin.Users.admin" : "Lms.Admin.Users.demo"));
}
// Don't edit ourself this way // Create tag
if (user->getId() == currentUserId) if (user->isAdmin() || user->isDemo())
continue; {
entry->setCondition("if-tag", true);
entry->bindString("tag", Wt::WString::tr(user->isAdmin() ? "Lms.Admin.Users.admin" : "Lms.Admin.Users.demo"));
}
entry->setCondition("if-edit", true); // Don't edit ourself this way
Wt::WPushButton* editBtn = entry->bindNew<Wt::WPushButton>("edit-btn", Wt::WString::tr("Lms.template.edit-btn"), Wt::TextFormat::XHTML); if (user->getId() == currentUserId)
editBtn->setToolTip(Wt::WString::tr("Lms.edit")); continue;
editBtn->clicked().connect([=]()
{
LmsApp->setInternalPath("/admin/user/" + userId.toString(), true);
});
Wt::WPushButton* delBtn = entry->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.template.delete-btn"), Wt::TextFormat::XHTML); entry->setCondition("if-edit", true);
delBtn->setToolTip(Wt::WString::tr("Lms.delete")); Wt::WPushButton* editBtn = entry->bindNew<Wt::WPushButton>("edit-btn", Wt::WString::tr("Lms.template.edit-btn"), Wt::TextFormat::XHTML);
delBtn->clicked().connect([=] editBtn->setToolTip(Wt::WString::tr("Lms.edit"));
{ editBtn->clicked().connect([=]()
auto modal {std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Admin.Users.template.delete-user"))}; {
modal->addFunction("tr", &Wt::WTemplate::Functions::tr); LmsApp->setInternalPath("/admin/user/" + userId.toString(), true);
Wt::WWidget* modalPtr {modal.get()}; });
auto* delBtn {modal->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.delete"))}; Wt::WPushButton* delBtn = entry->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.template.trash-btn"), Wt::TextFormat::XHTML);
delBtn->clicked().connect([=] delBtn->setToolTip(Wt::WString::tr("Lms.delete"));
{ delBtn->clicked().connect([=]
{ {
auto transaction {LmsApp->getDbSession().createWriteTransaction()}; auto modal{ std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Admin.Users.template.delete-user")) };
modal->addFunction("tr", &Wt::WTemplate::Functions::tr);
Wt::WWidget* modalPtr{ modal.get() };
User::pointer user {User::find(LmsApp->getDbSession(), userId)}; auto* delBtn{ modal->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.delete")) };
if (user) delBtn->clicked().connect([=]
user.remove(); {
} {
auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
_container->removeWidget(entry); User::pointer user{ User::find(LmsApp->getDbSession(), userId) };
if (user)
user.remove();
}
LmsApp->getModalManager().dispose(modalPtr); _container->removeWidget(entry);
});
auto* cancelBtn {modal->bindNew<Wt::WPushButton>("cancel-btn", Wt::WString::tr("Lms.cancel"))}; LmsApp->getModalManager().dispose(modalPtr);
cancelBtn->clicked().connect([=] });
{
LmsApp->getModalManager().dispose(modalPtr);
});
LmsApp->getModalManager().show(std::move(modal)); auto* cancelBtn{ modal->bindNew<Wt::WPushButton>("cancel-btn", Wt::WString::tr("Lms.cancel")) };
}); cancelBtn->clicked().connect([=]
} {
} LmsApp->getModalManager().dispose(modalPtr);
});
LmsApp->getModalManager().show(std::move(modal));
});
}
}
} // namespace UserInterface } // namespace UserInterface
src/lms/ui/common/DirectoryValidator.cpp
-57
View File
@@ -1,57 +0,0 @@
/*
* Copyright (C) 2021 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DirectoryValidator.hpp"
#include <filesystem>
namespace UserInterface
{
class DirectoryValidator : public Wt::WValidator
{
private:
Wt::WValidator::Result validate(const Wt::WString& input) const override;
std::string javaScriptValidate() const override { return {}; }
};
Wt::WValidator::Result
DirectoryValidator::validate(const Wt::WString& input) const
{
if (input.empty())
return Wt::WValidator::validate(input);
const std::filesystem::path p {input.toUTF8()};
std::error_code ec;
// TODO check rights
bool res = std::filesystem::is_directory(p, ec);
if (ec)
return Wt::WValidator::Result(Wt::ValidationState::Invalid, ec.message()); // TODO translate common errors
else if (res)
return Wt::WValidator::Result(Wt::ValidationState::Valid);
else
return Wt::WValidator::Result(Wt::ValidationState::Invalid, Wt::WString::tr("Lms.not-a-directory"));
}
std::unique_ptr<Wt::WValidator>
createDirectoryValidator()
{
return std::make_unique<DirectoryValidator>();
}
} // namespace UserInterface
src/lms/ui/common/UppercaseValidator.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>. * along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "DirectoryValidator.hpp" #include "UppercaseValidator.hpp"
#include <string> #include <string>
#include <string_view> #include <string_view>
src/lms/ui/explore/ArtistCollector.cpp
+18 -2
View File
@@ -61,12 +61,28 @@ namespace UserInterface
} }
case Mode::RecentlyPlayed: case Mode::RecentlyPlayed:
artists = scrobblingService.getRecentArtists(LmsApp->getUserId(), getFilters().getClusterIds(), _linkType, range); {
Scrobbling::IScrobblingService::ArtistFindParameters params;
params.setUser(LmsApp->getUserId());
params.setClusters(getFilters().getClusterIds());
params.setLinkType(_linkType);
params.setRange(range);
artists = scrobblingService.getRecentArtists(params);
break; break;
}
case Mode::MostPlayed: case Mode::MostPlayed:
artists = scrobblingService.getTopArtists(LmsApp->getUserId(), getFilters().getClusterIds(), _linkType, range); {
Scrobbling::IScrobblingService::ArtistFindParameters params;
params.setUser(LmsApp->getUserId());
params.setClusters(getFilters().getClusterIds());
params.setLinkType(_linkType);
params.setRange(range);
artists = scrobblingService.getTopArtists(params);
break; break;
}
case Mode::RecentlyAdded: case Mode::RecentlyAdded:
{ {
src/lms/ui/explore/ReleaseCollector.cpp
+16 -2
View File
@@ -58,12 +58,26 @@ namespace UserInterface
} }
case ReleaseCollector::Mode::RecentlyPlayed: case ReleaseCollector::Mode::RecentlyPlayed:
releases = scrobblingService.getRecentReleases(LmsApp->getUserId(), getFilters().getClusterIds(), range); {
Scrobbling::IScrobblingService::FindParameters params;
params.setUser(LmsApp->getUserId());
params.setClusters(getFilters().getClusterIds());
params.setRange(range);
releases = scrobblingService.getRecentReleases(params);
break; break;
}
case Mode::MostPlayed: case Mode::MostPlayed:
releases = scrobblingService.getTopReleases(LmsApp->getUserId(), getFilters().getClusterIds(), range); {
Scrobbling::IScrobblingService::FindParameters params;
params.setUser(LmsApp->getUserId());
params.setClusters(getFilters().getClusterIds());
params.setRange(range);
releases = scrobblingService.getTopReleases(params);
break; break;
}
case Mode::RecentlyAdded: case Mode::RecentlyAdded:
{ {
src/lms/ui/explore/TrackCollector.cpp
+16 -2
View File
@@ -61,12 +61,26 @@ namespace UserInterface
} }
case TrackCollector::Mode::RecentlyPlayed: case TrackCollector::Mode::RecentlyPlayed:
tracks = scrobblingService.getRecentTracks(LmsApp->getUserId(), getFilters().getClusterIds(), range); {
Scrobbling::IScrobblingService::FindParameters params;
params.setUser(LmsApp->getUserId());
params.setClusters(getFilters().getClusterIds());
params.setRange(range);
tracks = scrobblingService.getRecentTracks(params);
break; break;
}
case Mode::MostPlayed: case Mode::MostPlayed:
tracks = scrobblingService.getTopTracks(LmsApp->getUserId(), getFilters().getClusterIds(), range); {
Scrobbling::IScrobblingService::FindParameters params;
params.setUser(LmsApp->getUserId());
params.setClusters(getFilters().getClusterIds());
params.setRange(range);
tracks = scrobblingService.getTopTracks(params);
break; break;
}
case Mode::RecentlyAdded: case Mode::RecentlyAdded:
{ {