Merge branch 'master' into ldap_auth

.golangci.yml

@@ -45,7 +45,6 @@ linters:
     - makezero
     - mirror
     - misspell
-    - musttag
     - nakedret
     - nestif
     - nilerr

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18 AS builder-taglib
+FROM alpine:3.19 AS builder-taglib
 WORKDIR /tmp
 COPY alpine/taglib/APKBUILD .
 RUN apk update && \
@@ -26,7 +26,7 @@ RUN go mod download
 COPY . .
 RUN GOOS=linux go build -o gonic cmd/gonic/gonic.go
 
-FROM alpine:3.18
+FROM alpine:3.19
 LABEL org.opencontainers.image.source https://github.com/sentriz/gonic
 RUN apk add -U --no-cache \
     ffmpeg \

README.md

@@ -67,7 +67,7 @@ password can then be changed from the web interface
 | `GONIC_JUKEBOX_ENABLED`          | `-jukebox-enabled`          | **optional** whether the subsonic [jukebox api](https://airsonic.github.io/docs/jukebox/) should be enabled                                                                                                                                                                       |
 | `GONIC_JUKEBOX_MPV_EXTRA_ARGS`   | `-jukebox-mpv-extra-args`   | **optional** extra command line arguments to pass to the jukebox mpv daemon                                                                                                                                                                                                       |
 | `GONIC_PODCAST_PURGE_AGE`        | `-podcast-purge-age`        | **optional** age (in days) to purge podcast episodes if not accessed                                                                                                                                                                                                              |
-| `GONIC_EXCLUDE_PATTERN`          | `-exclude-pattern`          | **optional** files matching this regex pattern will not be imported                                                                                                                                                                                                               |
+| `GONIC_EXCLUDE_PATTERN`          | `-exclude-pattern`          | **optional** files matching this regex pattern will not be imported. eg <code>@eaDir\|[aA]rtwork\|[cC]overs\|[sS]cans\|[sS]pectrals</code>                                                                                                                                        |
 | `GONIC_MULTI_VALUE_GENRE`        | `-multi-value-genre`        | **optional** setting for multi-valued genre tags when scanning ([see more](#multi-valued-tags-v016))                                                                                                                                                                              |
 | `GONIC_MULTI_VALUE_ARTIST`       | `-multi-value-artist`       | **optional** setting for multi-valued artist tags when scanning ([see more](#multi-valued-tags-v016))                                                                                                                                                                             |
 | `GONIC_MULTI_VALUE_ALBUM_ARTIST` | `-multi-value-album-artist` | **optional** setting for multi-valued album artist tags when scanning ([see more](#multi-valued-tags-v016))                                                                                                                                                                       |
@@ -97,7 +97,7 @@ the available modes are:
 
 gonic supports multiple music folders. this can be handy if you have your music separated by albums, compilations, singles. or maybe 70s, 80s, 90s. whatever.
 
-on top of that - if you don't decide your folder names, or simply do not want the same name in your subsonic client, 
+on top of that - if you don't decide your folder names, or simply do not want the same name in your subsonic client,
 gonic can parse aliases for the folder names with the optional `ALIAS->PATH` syntax
 
 if you're running gonic with the command line, stack the `-music-path` arg

alpine/taglib/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Leo <[email protected]>
 # Maintainer: Natanael Copa <[email protected]>
 pkgname=taglib2
-pkgver=2.0
+pkgver=2.0.1
 pkgrel=0
 pkgdesc="Library for reading and editing metadata of several popular audio formats"
 url="https://taglib.github.io/"
@@ -30,10 +30,11 @@ build() {
         -DCMAKE_BUILD_TYPE=MinSizeRel \
         -DWITH_ZLIB=ON \
         -DBUILD_SHARED_LIBS=ON \
-        -DBUILD_EXAMPLES=ON \
+        -DBUILD_EXAMPLES=OFF \
         -DBUILD_TESTING="$(want_check && echo ON || echo OFF)" \
         -DVISIBILITY_HIDDEN=ON
-    cmake --build build
+    CPLUS_INCLUDE_PATH="/usr/include/utf8cpp" \
+        cmake --build build
 }
 
 check() {
@@ -51,5 +52,5 @@ _lib() {
 }
 
 sha512sums="
-099d02b2eab033f5702a8cb03e70752d7523c6f8c2f3eebdd0bcd939eafbdca3f2a6c82452983904b5822cfa45f2707ed866c3419508df9d43bf5c0b3a476f6c  taglib-2.0.tar.gz
+25ee89293a96d7f8dca6276f822bdaef01fd98503b78c20ffeac8e1d9821de7273a5127146aa798d304c6a995cb2b7229a205aff1cc261b5d4fa9e499dda0439  taglib-2.0.1.tar.gz
 "

cmd/gonic/gonic.go

@@ -292,7 +292,7 @@ func main() {
 	mux.Handle("/admin/", http.StripPrefix("/admin", chain(ctrlAdmin)))
 	mux.Handle("/rest/", http.StripPrefix("/rest", chain(trim(ctrlSubsonic))))
 	mux.Handle("/ping", chain(handlerutil.Message("ok")))
-	mux.Handle("/", chain(handlerutil.Redirect(resolveProxyPath("/admin/home"))))
+	mux.Handle("/", chain(http.RedirectHandler(resolveProxyPath("/admin/home"), http.StatusSeeOther)))
 
 	if *confExpvar {
 		mux.Handle("/debug/vars", expvar.Handler())

db/db.go

@@ -235,9 +235,15 @@ type Track struct {
 	TagTrackNumber int       `sql:"default: null"`
 	TagDiscNumber  int       `sql:"default: null"`
 	TagBrainzID    string    `sql:"default: null"`
-	TrackStar      *TrackStar
-	TrackRating    *TrackRating
-	AverageRating  float64 `sql:"default: null"`
+
+	ReplayGainTrackGain float32
+	ReplayGainTrackPeak float32
+	ReplayGainAlbumGain float32
+	ReplayGainAlbumPeak float32
+
+	TrackStar     *TrackStar
+	TrackRating   *TrackRating
+	AverageRating float64 `sql:"default: null"`
 }
 
 func (t *Track) AudioLength() int  { return t.Length }

db/migrations.go

@@ -72,6 +72,7 @@ func (db *DB) Migrate(ctx MigrationContext) error {
 		construct(ctx, "202311072309", migrateAlbumInfo),
 		construct(ctx, "202311082304", migrateTemporaryDisplayAlbumArtist),
 		construct(ctx, "202312110003", migrateAddExtraIndexes),
+		construct(ctx, "202405301140", migrateAddReplayGainFields),
 	}
 
 	return gormigrate.
@@ -813,3 +814,7 @@ func migrateAddExtraIndexes(tx *gorm.DB, _ MigrationContext) error {
 		CREATE INDEX idx_artist_appearances_album_id ON "artist_appearances" (album_id);
 	`).Error
 }
+
+func migrateAddReplayGainFields(tx *gorm.DB, _ MigrationContext) error {
+	return tx.AutoMigrate(Track{}).Error
+}

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/andybalholm/cascadia v1.3.2
 	github.com/dexterlb/mpvipc v0.0.0-20230829142118-145d6eabdc37
 	github.com/disintegration/imaging v1.6.2
+	github.com/djherbis/times v1.6.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fatih/structs v1.1.0
 	github.com/fsnotify/fsnotify v1.7.0
@@ -16,20 +17,20 @@ require (
 	github.com/gorilla/securecookie v1.1.2
 	github.com/gorilla/sessions v1.2.2
 	github.com/jinzhu/gorm v1.9.17-0.20211120011537-5c235b72a414
-	github.com/josephburnett/jd v1.7.1
+	github.com/josephburnett/jd v1.8.1
 	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mmcdole/gofeed v1.3.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/philippta/go-template v0.0.0-20220911145045-4556aca435e4
 	github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be
-	github.com/sentriz/audiotags v0.0.0-20240305214804-7a32981c18f8
+	github.com/sentriz/audiotags v0.0.0-20240401192409-5a8ac2a2974f
 	github.com/sentriz/gormstore v0.0.0-20220105134332-64e31f7f6981
-	github.com/stretchr/testify v1.8.4
-	go.senan.xyz/flagconf v0.1.7
-	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
-	golang.org/x/net v0.22.0
-	golang.org/x/sync v0.6.0
+	github.com/stretchr/testify v1.9.0
+	go.senan.xyz/flagconf v0.1.8
+	golang.org/x/net v0.24.0
+	golang.org/x/sync v0.7.0
+	golang.org/x/sys v0.19.0
 	gopkg.in/gormigrate.v1 v1.6.0
 	jaytaylor.com/html2text v0.0.0-20230321000545-74c2419ad056
 )
@@ -40,9 +41,8 @@ require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/PuerkitoBio/goquery v1.9.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
-	github.com/go-openapi/jsonpointer v0.20.0 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -62,9 +62,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
 	golang.org/x/image v0.15.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect