diff --git a/.github/workflows/build-freebsd-basic.yml b/.github/workflows/build-freebsd-basic.yml index 2393e5201..81ff53679 100644 --- a/.github/workflows/build-freebsd-basic.yml +++ b/.github/workflows/build-freebsd-basic.yml @@ -6,7 +6,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build - uses: vmactions/freebsd-vm@v1.2.1 + uses: vmactions/freebsd-vm@v1.5.9 with: usesh: true prepare: | diff --git a/.github/workflows/build-macos-basic.yml b/.github/workflows/build-macos-basic.yml index aaea7672b..dd77fb2bb 100644 --- a/.github/workflows/build-macos-basic.yml +++ b/.github/workflows/build-macos-basic.yml @@ -18,7 +18,7 @@ jobs: - name: Build and install Wt run: | - WT_VERSION=4.12.1 + WT_VERSION=4.15.0 git clone https://github.com/emweb/wt.git /tmp/wt cd /tmp/wt git checkout ${WT_VERSION} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d51d8b2b8..8ca35140f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -29,7 +29,7 @@ jobs: run: | sudo apt-get update sudo apt-get install --yes build-essential cmake libarchive-dev libavcodec-dev libavformat-dev libavutil-dev libboost-all-dev libconfig++-dev libgtest-dev libpam0g-dev libpugixml-dev libssl-dev libstb-dev libtag-dev libxxhash-dev - export WT_VERSION=4.11.3 + export WT_VERSION=4.15.0 export WT_INSTALL_PREFIX=/usr git clone https://github.com/emweb/wt.git /tmp/wt pushd /tmp/wt diff --git a/CMakeLists.txt b/CMakeLists.txt index d84a678f3..be02032c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12) -project(lms VERSION 3.81.0) +project(lms VERSION 3.82.0) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules/) diff --git a/Dockerfile-build-alpine b/Dockerfile-build-alpine index f815419e3..e052e6942 100644 --- a/Dockerfile-build-alpine +++ b/Dockerfile-build-alpine @@ -1,5 +1,5 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx -FROM --platform=$BUILDPLATFORM alpine:3.24 +FROM --platform=$BUILDPLATFORM alpine:3.24.3 ARG BUILD_PACKAGES="\ clang \ diff --git a/Dockerfile-release b/Dockerfile-release index 5ea53f106..ca86ccb72 100644 --- a/Dockerfile-release +++ b/Dockerfile-release @@ -1,4 +1,4 @@ -FROM alpine:3.24.1 AS build +FROM alpine:3.24.3 AS build WORKDIR /tmp/workdir @@ -80,7 +80,7 @@ RUN \ make -j$(nproc) install # WT -ARG WT_VERSION=4.14.1 +ARG WT_VERSION=4.15.0 ARG WT_DEBUG=OFF RUN \ DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \ @@ -146,7 +146,7 @@ RUN \ rm -rf /tmp/fakeroot/share/Wt/resources/themes ## Release Stage -FROM alpine:3.24.1 AS release +FROM alpine:3.24.3 AS release LABEL maintainer="Emeric Poupon " ARG RUNTIME_PACKAGES=" \ diff --git a/INSTALL.md b/INSTALL.md index e7b82fe79..a37bd6468 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -117,7 +117,7 @@ sqlite3 /var/lms/lms.db ``` Now force reset the password of the admin user to `adminadmin`: ```sqlite3 -UPDATE user SET password_salt="sliIgHUpEoAlBMquivH4VzKXbSzexlvS", password_hash="$2y$07$a0vnQUbGTV/DZyDqOizvbOdCaytNjDhkOPcGoBZup4V0MRKDzOpEG" WHERE id=1; +UPDATE user SET password_salt='sliIgHUpEoAlBMquivH4VzKXbSzexlvS', password_hash='$2y$07$a0vnQUbGTV/DZyDqOizvbOdCaytNjDhkOPcGoBZup4V0MRKDzOpEG' WHERE id=1; .quit ``` ## Deploy on non root path diff --git a/README.md b/README.md index 8dc8f944a..d154e628b 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,8 @@ _LMS_ supports an Artist information folder to manage metadata and images for ar The folder must follow a structure defined by Kodi, as detailed [here](https://kodi.wiki/view/Artist_information_folder). `artist.nfo` files are used to define additional artist information such as biography, sort name, and MusicBrainz ArtistID. See the format [here](https://kodi.wiki/view/NFO_files/Artists). -The canonical artist name used by _LMS_ is the one specified in the `artist.nfo` file; If an `artist.nfo` exists but does not provide a name, the name of the containing folder is used. -If no artist info file is provided, _LMS_ will pick the artist name found on the latest release. +The canonical artist name used by _LMS_ is the one specified in the `artist.nfo` file; If an `artist.nfo` exists but does not provide a name, the name of the containing folder is used. The same goes for the sort name, when the `artist.nfo` file provides one. +Otherwise, _LMS_ picks the artist name and sort name found in the most recent album artist tags, then in the most recent artist tags of any kind, tags matched using a MusicBrainz ArtistID first. Artists without a MusicBrainz ArtistID keep their name, as it is what identifies them. ## Excluding files from scan Place a `.lmsignore` file at the root of a media library to exclude files or directories from scanning. diff --git a/approot/explore.xml b/approot/explore.xml index b97e04310..2749f3557 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -6,19 +6,19 @@ - ${add-filter class="btn btn-sm btn-outline-primary me-2"}${clusters class="d-inline-block align-items-center"} + ${add-filter class="btn btn-sm btn-outline-primary me-2"}${filters class="d-inline-block align-items-center Lms-filters"}