Merge branch 'develop' for release v3.52.0

epoupon · Apr 21, 2024 · a8b3509 · a8b3509
2 parents 4e5a742 + 2e24cf5
commit a8b3509
Show file tree

Hide file tree

Showing 154 changed files with 3,664 additions and 1,758 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -12,4 +12,6 @@ CheckOptions:
  value: '1'
  - key: cppcoreguidelines-avoid-do-while.IgnoreMacros
  value: '1'
+ - key: performance-unnecessary-value-param.AllowedTypes
+ value: "shared_ptr"
 ...
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Filesystem REQUIRED)
-find_package(Boost REQUIRED COMPONENTS system program_options)
+find_package(Boost REQUIRED COMPONENTS system program_options iostreams)
 find_package(Wt REQUIRED COMPONENTS Wt Dbo DboSqlite3 HTTP)
 pkg_check_modules(Taglib REQUIRED IMPORTED_TARGET taglib)
 pkg_check_modules(Config++ REQUIRED IMPORTED_TARGET libconfig++)

diff --git a/Dockerfile-release b/Dockerfile-release
@@ -31,6 +31,7 @@ ARG BUILD_PACKAGES=" \
  libarchive-dev \
  libconfig-dev \
  taglib-dev \
+ sqlite-dev \
  gtest-dev"
 
 RUN apk add --no-cache --update ${BUILD_PACKAGES}
@@ -86,7 +87,7 @@ RUN \
 
 RUN \
  DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \
- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_EXAMPLES=OFF -DENABLE_LIBWTTEST=OFF -DCONNECTOR_FCGI=OFF && \
+ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_EXAMPLES=OFF -DENABLE_LIBWTTEST=OFF -DCONNECTOR_FCGI=OFF -DUSE_SYSTEM_SQLITE3=ON && \
  make -j$(nproc) && \
  make install
 
@@ -147,11 +148,13 @@ ARG RUNTIME_PACKAGES=" \
  lame-libs \
  zlib \
  boost-filesystem \
+ boost-iostreams \
  boost-program_options \
  boost-system \
  boost-thread \
  libarchive \
  libconfig++ \
+ sqlite-libs \
  taglib"
 
 ARG LMS_USER=lms

diff --git a/SUBSONIC.md b/SUBSONIC.md
@@ -11,6 +11,7 @@ OpenSubsonic is an initiative to patch and extend the legacy Subsonic API. You'l
 ## Extra fields
 The following extra fields are implemented:
 * `Album` response:
+ * `mediaType`
  * `played`
  * `musicBrainzId`
  * `genres`
@@ -22,6 +23,10 @@ The following extra fields are implemented:
  * `isCompilation`
  * `discTitles`: discs with no subtitle are omitted
 * `Child` response:
+ * `bitDepth`
+ * `samplingRate`
+ * `channelCount`
+ * `mediaType`
  * `played`
  * `musicBrainzId`: note this is actually the recording MBID when this response refers to a song
  * `genres`
@@ -33,6 +38,7 @@ The following extra fields are implemented:
  * `moods`
  * `replayGain`
 * `Artist` response:
+ * `mediaType`
  * `musicBrainzId`
  * `sortName`
  * `roles`

diff --git a/approot/admin-scannercontroller.xml b/approot/admin-scannercontroller.xml
@@ -2,42 +2,63 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 
 <message id="Lms.Admin.ScannerController.template">
- <form>
- <legend>${tr:Lms.Admin.ScannerController.scanner}</legend>
- <div class="row g-3">
- <div class="col-lg-6">
- <label class="form-label" for="${id:status}">
- ${tr:Lms.Admin.ScannerController.status}
- </label>
- ${status class="form-control"}
- </div>
- <div class="col-lg-6">
- <label class="form-label" for="${id:step-status}">
- ${tr:Lms.Admin.ScannerController.step-status}
- </label>
- ${step-status class="form-control"}
- </div>
- <div class="col-12">
- <label class="form-label" for="{id:last-scan}">
- ${tr:Lms.Admin.ScannerController.last-scan}
- </label>
- <div class="input-group">
- ${last-scan class="form-control"}
- ${report-btn class="btn btn-outline-info"}
- </div>
+ <legend>${tr:Lms.Admin.ScannerController.scanner}</legend>
+ <div class="row g-3">
+ <div class="col-lg-6">
+ <label class="form-label" for="${id:status}">
+ ${tr:Lms.Admin.ScannerController.status}
+ </label>
+ ${status class="form-control"}
+ </div>
+ <div class="col-lg-6">
+ <label class="form-label" for="${id:step-status}">
+ ${tr:Lms.Admin.ScannerController.step-status}
+ </label>
+ ${step-status class="form-control"}
+ </div>
+ <div class="col-12">
+ <label class="form-label" for="${id:last-scan}">
+ ${tr:Lms.Admin.ScannerController.last-scan}
+ </label>
+ <div class="input-group">
+ ${last-scan class="form-control"}
+ ${report-btn class="btn btn-outline-info"}
  </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 class="col-12">
+ <div class="collapse" id="scanOptions">
+ <div class="card bg-dark">
+ <div class="card-header">
+ ${tr:Lms.Admin.ScannerController.scan-options}
+ </div>
+ <div class="card-body">
+ <div class="form-check mb-1">
+ ${full-scan class="form-check-input"}
+ <label class="form-check-label" for="${id:full-scan}">
+ ${tr:Lms.Admin.ScannerController.full-scan}
+ </label>
+ </div>
+ <div class="form-check mb-1">
+ ${force-optimize class="form-check-input"}
+ <label class="form-check-label" for="${id:force-optimize}">
+ ${tr:Lms.Admin.ScannerController.force-optimize}
+ </label>
+ </div>
+ <div class="form-check">
+ ${compact class="form-check-input"}
+ <label class="form-check-label" for="${id:compact}">
+ ${tr:Lms.Admin.ScannerController.compact}
+ </label>
+ </div>
+ </div>
  </div>
  </div>
  </div>
- </form>
+ <div class="col-12">
+ ${scan-btn class="btn btn-primary me-2"}
+ <button class="btn btn-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#scanOptions" aria-expanded="false" aria-controls="scanOptions">${tr:Lms.Admin.ScannerController.scan-options}</button>
+ </div>
+ </div>
 </message>
 
 </messages>
diff --git a/approot/admin-user.xml b/approot/admin-user.xml
@@ -6,7 +6,7 @@
  <legend>${title}</legend>
  ${<if-has-last-login>}
  <div class="col-lg-6">
- <label class="form-label" for="{id:last-login}">
+ <label class="form-label" for="${id:last-login}">
  ${tr:Lms.Admin.User.last-login}
  </label>
  <input type="text" readonly="readonly" class="form-control" id="status" value="${last-login}"/>

diff --git a/approot/images/unknown-cover.jpg b/approot/images/unknown-cover.jpg
diff --git a/approot/images/unknown-cover.svg b/approot/images/unknown-cover.svg
diff --git a/approot/messages.xml b/approot/messages.xml
@@ -89,9 +89,11 @@
 <message id="Lms.Admin.ScannerController.bad-duration">Cannot get track duration</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">Cannot parse file</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">Cannot read file</message>
+<message id="Lms.Admin.ScannerController.compact">Compact the database. <strong>Caution:</strong> this may take a while and will block the whole application during the compact step!</message>
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} duplicate files:</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} errors:</message>
-<message id="Lms.Admin.ScannerController.force-scan-now">Force full rescan now</message>
+<message id="Lms.Admin.ScannerController.force-optimize">Force database optimization</message>
+<message id="Lms.Admin.ScannerController.full-scan">Rescan all files</message>
 <message id="Lms.Admin.ScannerController.get-report">Get report</message>
 <message id="Lms.Admin.ScannerController.last-scan">Last scan</message>
 <message id="Lms.Admin.ScannerController.last-scan-not-available">Not available</message>
@@ -100,16 +102,19 @@
 <message id="Lms.Admin.ScannerController.same-hash">Duplicated file hash</message>
 <message id="Lms.Admin.ScannerController.same-mbid">Duplicated track MBID</message>
 <message id="Lms.Admin.ScannerController.scan-now">Scan now</message>
+<message id="Lms.Admin.ScannerController.scan-options">Scan options</message>
 <message id="Lms.Admin.ScannerController.scanner">Scanner</message>
 <message id="Lms.Admin.ScannerController.status">Status</message>
 <message id="Lms.Admin.ScannerController.status-not-scheduled">Not scheduled</message>
 <message id="Lms.Admin.ScannerController.status-scheduled">Scheduled on {1}</message>
 <message id="Lms.Admin.ScannerController.status-in-progress">Scanning: step {1}/{2}</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">Checking for duplicate files... {1} files</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-missing-files">Checking files... {1}%</message>
+<message id="Lms.Admin.ScannerController.step-compact">Compacting database...</message>
 <message id="Lms.Admin.ScannerController.step-compute-cluster-stats">Computing stats... {1}%</message>
 <message id="Lms.Admin.ScannerController.step-discovering-files">Discovering files: {1} files</message>
 <message id="Lms.Admin.ScannerController.step-fetching-track-features">Fetching track features from AcousticBrainz: {1}/{2} tracks ({3}%)...</message>
+<message id="Lms.Admin.ScannerController.step-optimize">Optimizing database... {1}/{2} entries ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">Reloading similarity engine: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">Scanning files: {1}/{2} files ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">Step status</message>

diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml
@@ -89,9 +89,11 @@
 <message id="Lms.Admin.ScannerController.bad-duration">Impossible de récupérer la durée de la piste</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">Impossible d'analyser le fichier</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">Impossible de lire le fichier</message>
+<message id="Lms.Admin.ScannerController.compact">Compacter la base de données. <strong>Attention :</strong> cette opération peut prendre du temps et va vérouiller l'application pendant toute l'étape de compactage!</message>
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} fichiers dupliqués :</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} erreurs :</message>
-<message id="Lms.Admin.ScannerController.force-scan-now">Forcer un rescan complet</message>
+<message id="Lms.Admin.ScannerController.force-optimize">Forcer l'optimisation de la base de données</message>
+<message id="Lms.Admin.ScannerController.full-scan">Rescanner tous les fichiers</message>
 <message id="Lms.Admin.ScannerController.get-report">Rapport</message>
 <message id="Lms.Admin.ScannerController.last-scan">Dernier scan</message>
 <message id="Lms.Admin.ScannerController.last-scan-not-available">Non disponible</message>
@@ -100,16 +102,19 @@
 <message id="Lms.Admin.ScannerController.same-hash">Hash dupliqué</message>
 <message id="Lms.Admin.ScannerController.same-mbid">Track MBID dupliqué</message>
 <message id="Lms.Admin.ScannerController.scan-now">Lancer un scan</message>
+<message id="Lms.Admin.ScannerController.scan-options">Options de scan</message>
 <message id="Lms.Admin.ScannerController.scanner">Scanner</message>
 <message id="Lms.Admin.ScannerController.status">Statut</message>
 <message id="Lms.Admin.ScannerController.status-not-scheduled">Non planifié</message>
 <message id="Lms.Admin.ScannerController.status-scheduled">Planifié le {1}</message>
 <message id="Lms.Admin.ScannerController.status-in-progress">En cours de scan : étape {1}/{2}</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">Vérification des fichiers dupliqués... {1} fichiers</message>
 <message id="Lms.Admin.ScannerController.step-checking-for-missing-files">Vérification des fichiers... {1}%</message>
+<message id="Lms.Admin.ScannerController.step-compact">Compactage de la base de données...</message>
 <message id="Lms.Admin.ScannerController.step-compute-cluster-stats">Calcul des statistiques... {1}%</message>
 <message id="Lms.Admin.ScannerController.step-discovering-files">Découverte des fichiers : {1} fichiers</message>
 <message id="Lms.Admin.ScannerController.step-fetching-track-features">Récupération des métadonnées AcousticBrainz : {1}/{2} fichiers ({3}%)...</message>
+<message id="Lms.Admin.ScannerController.step-optimize">Optimisation de la base de données... {1}/{2} entrées ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">Rechargement du moteur de recommandation : {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">Scan des fichiers : {1}/{2} fichiers ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">Statut de l'étape</message>

diff --git a/approot/messages_it.xml b/approot/messages_it.xml
@@ -89,9 +89,11 @@
 <message id="Lms.Admin.ScannerController.bad-duration">Non sono stato in grado di determinare la durata della traccia</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">Non in grado di analizzare il file</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">Non in grado di leggere il file</message>
+<message id="Lms.Admin.ScannerController.compact">Compatta il database. <strong>Attenzione:</strong> ciò potrebbe richiedere del tempo e bloccherà l'intera applicazione durante il passaggio di compattazione!</message>
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} file duplicati:</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} errori:</message>
-<message id="Lms.Admin.ScannerController.force-scan-now">Forza una nuova scansione completa</message>
+<message id="Lms.Admin.ScannerController.force-optimize">Forza l'ottimizzazione del database</message>
+<message id="Lms.Admin.ScannerController.full-scan">Forza la scansione di tutti i file</message>
 <message id="Lms.Admin.ScannerController.get-report">Scarica un resoconto</message>
 <message id="Lms.Admin.ScannerController.last-scan">Ultima scansione</message>
 <message id="Lms.Admin.ScannerController.last-scan-not-available">Non disponibile</message>
@@ -100,6 +102,7 @@
 <message id="Lms.Admin.ScannerController.same-hash">Hash doppio</message>
 <message id="Lms.Admin.ScannerController.same-mbid">Track MBID doppio</message>
 <message id="Lms.Admin.ScannerController.scan-now">Scansiona ora</message>
+<message id="Lms.Admin.ScannerController.scan-options">Opzioni di scansione</message>
 <message id="Lms.Admin.ScannerController.scanner">Scanner</message>
 <message id="Lms.Admin.ScannerController.status">Stato</message>
 <message id="Lms.Admin.ScannerController.status-not-scheduled">Non pianificato</message>
@@ -110,6 +113,7 @@
 <message id="Lms.Admin.ScannerController.step-compute-cluster-stats">Calcolo statistiche... {1}%</message>
 <message id="Lms.Admin.ScannerController.step-discovering-files">File trovati: {1} files</message>
 <message id="Lms.Admin.ScannerController.step-fetching-track-features">Recupero metadati da AcousticBrainz: {1}/{2} tracce ({3}%)...</message>
+<message id="Lms.Admin.ScannerController.step-optimize">Ottimizzazione del database... {1}/{2} voci ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">Ricarica motore di tracce simili: {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">Scansione files: {1}/{2} files ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">Stato passo</message>

diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml
@@ -89,9 +89,11 @@
 <message id="Lms.Admin.ScannerController.bad-duration">无法获得音轨时间</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">无法解析文件</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">无法读取文件</message>
+
 <message id="Lms.Admin.ScannerController.duplicates-header">{1} 个重复文件：</message>
 <message id="Lms.Admin.ScannerController.errors-header">{1} 个错误：</message>
-<message id="Lms.Admin.ScannerController.force-scan-now">立即强制全盘扫描</message>
+
+
 <message id="Lms.Admin.ScannerController.get-report">生成报告</message>
 <message id="Lms.Admin.ScannerController.last-scan">最后扫描</message>
 <message id="Lms.Admin.ScannerController.last-scan-not-available">不可用</message>
@@ -100,6 +102,7 @@
 <message id="Lms.Admin.ScannerController.same-hash">相同文件哈希值</message>
 <message id="Lms.Admin.ScannerController.same-mbid">相同 MBID</message>
 <message id="Lms.Admin.ScannerController.scan-now">立即扫描</message>
+
 <message id="Lms.Admin.ScannerController.scanner">扫描器</message>
 <message id="Lms.Admin.ScannerController.status">状态</message>
 <message id="Lms.Admin.ScannerController.status-not-scheduled">无计划</message>
@@ -108,8 +111,10 @@
 
 <message id="Lms.Admin.ScannerController.step-checking-for-missing-files">检查文件中... {1}%</message>
 
+
 <message id="Lms.Admin.ScannerController.step-discovering-files">检索文件中: {1} 文件</message>
 <message id="Lms.Admin.ScannerController.step-fetching-track-features">从 AcousticBrainz 获取音轨特征: {1}/{2} 音轨 ({3}%)...</message>
+
 <message id="Lms.Admin.ScannerController.step-reloading-similarity-engine">重载相似引擎中 {1}%...</message>
 <message id="Lms.Admin.ScannerController.step-scanning-files">扫描文件中: {1}/{2} 个文件 ({3}%)...</message>
 <message id="Lms.Admin.ScannerController.step-status">当前步骤状态</message>

diff --git a/docroot/css/bootstrap.solar.min.css b/docroot/css/bootstrap.solar.min.css
diff --git a/docroot/js/bootstrap.bundle.min.js b/docroot/js/bootstrap.bundle.min.js