Compare commits

...

35 Commits

Author SHA1 Message Date
Rob Emery
949dbb1597
Merge 6f560c7bee8cf8173d0728f88cfd547c1b2d84cf into e86dc03619ffb8477083de23bb4daed567ef0a2c 2025-11-02 12:05:17 -05:00
Rob Emery
6f560c7bee
Merge branch 'navidrome:master' into msi-insights-detection 2025-07-11 20:46:16 +01:00
Rob Emery
861390e541
Merge branch 'master' into msi-insights-detection 2025-07-01 19:25:05 +01:00
Rob Emery
65e363c8e7
Merge branch 'master' into msi-insights-detection 2025-05-22 19:16:50 -01:00
Rob Emery
114f870f02 Merge branch 'master' into msi-insights-detection 2025-05-21 19:14:22 +01:00
Rob Emery
62acfd491b
Merge branch 'master' into msi-insights-detection 2025-05-17 13:00:05 -01:00
Rob Emery
98b53d9cea
Merge branch 'master' into msi-insights-detection 2025-05-14 15:43:25 -01:00
Rob Emery
598b80e7be Merge branch 'master' into msi-insights-detection 2025-04-19 10:19:58 +01:00
Rob Emery
cd2d87a6d1
Merge branch 'master' into msi-insights-detection 2025-04-13 17:22:14 -01:00
Rob Emery
aab958f2ed
Merge branch 'master' into msi-insights-detection 2025-04-12 13:54:55 -01:00
Rob Emery
eb19ee497d That was not deliberately removed 2025-04-02 08:49:02 +01:00
Rob Emery
f932f80848
Merge branch 'master' into msi-insights-detection 2025-04-01 06:40:26 -01:00
Rob Emery
7b373191b6 Need to add into the root directory for this to work 2025-03-29 14:15:35 +00:00
Rob Emery
e911ca8da8 Merge branch 'master' into msi-insights-detection 2025-03-29 13:45:23 +00:00
Rob Emery
409a43599b Need to reference the installed file and I think Id's don't require [] 2025-03-29 13:42:19 +00:00
Rob Emery
9b432cdeb3
Merge branch 'master' into msi-insights-detection 2025-03-23 18:12:57 -01:00
Rob Emery
61339689b0 Should be able to reuse this mechanism with deb and rpm, I think
it would be nice to know which specific one it is without guessing
based on /etc/debian_version or something; but it doesn't look like
that is exposed by goreleaser into an env or anything :/
2025-03-23 19:11:06 +00:00
Deluan
b091bf9eb7 fix(scanner): elapsed time for folder processing is wrong in the logs
Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan
0c81fe4938 chore: remove more outdated TODOs
Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan
a316340eb1 chore: remove some BFR-related TODOs that are not valid anymore
Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan Quintão
dd63e5a465 feat(server): custom ArtistJoiner config (#3873)
* feat(server): custom ArtistJoiner config

Signed-off-by: Deluan <deluan@navidrome.org>

* refactor(ui): organize ArtistLinkField, add tests

Signed-off-by: Deluan <deluan@navidrome.org>

* feat(ui): use display artist

* feat(ui): use display artist

Signed-off-by: Deluan <deluan@navidrome.org>

---------

Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan
c86816d21e feat(docker): automatically loads a navidrome.toml file from /data, if available
Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan
dcb69bcf81 fix(server): don't break if the ND_CONFIGFILE does not exist
Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan
ae801d772c feat(ui): show bitDepth in song info dialog
Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan
f8b902d6ae fix(scanner): support ID3v2 embedded images in WAV files
Fix #3867

Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Deluan
82face2dbd fix(scanner): better log message when AutoImportPlaylists is disabled
Fix #3861

Signed-off-by: Deluan <deluan@navidrome.org>
2025-03-23 19:11:06 +00:00
Rob Emery
3b06214361 package to .package and moving to the datadir 2025-03-23 19:11:06 +00:00
Deluan Quintão
d342a9a225
Merge branch 'master' into msi-insights-detection 2025-03-22 12:43:09 -04:00
Rob Emery
3b0fb4851d OK this doesn't exist, need to find another way to do it 2025-03-19 08:58:40 +00:00
Rob Emery
4d29121560 MSI should copy the package into place for us, it's not a KeyPath
as older versions won't have it, so it's presence doesn't indicate
the installed status of the package
2025-03-19 08:58:40 +00:00
Rob Emery
198f05ba08 Using a file we should be able to add support for linux like this
also
2025-03-19 08:58:40 +00:00
Rob Emery
74e8f5c444 wixl currently doesn't support <Environment> so I'm swapping out
to a file next-door to the configuration file, we should be
able to reuse this for deb/rpm as well
2025-03-19 08:58:40 +00:00
Rob Emery
4512cc6096 Packaged implies a bool, this is a description so it should
be packaging or just package imo
2025-03-19 08:58:40 +00:00
Rob Emery
93e3590465 Renaming to be ND_PACKAGE_TYPE so we can reuse this for the
.deb/.rpm stats as well
2025-03-19 08:58:40 +00:00
Rob Emery
9aa81eb4e0 Adding environmental variable so that navidrome can detect
if its running as an MSI install for insights
2025-03-19 08:58:40 +00:00
5 changed files with 24 additions and 0 deletions

View File

@ -6,6 +6,7 @@ import (
"encoding/json"
"math"
"net/http"
"os"
"path/filepath"
"runtime"
"runtime/debug"
@ -160,6 +161,13 @@ var staticData = sync.OnceValue(func() insights.Data {
data.Build.Settings, data.Build.GoVersion = buildInfo()
data.OS.Containerized = consts.InContainer
// Install info
packageFilename := filepath.Join(conf.Server.DataFolder, ".package")
packageFileData, err := os.ReadFile(packageFilename)
if err == nil {
data.OS.Package = string(packageFileData)
}
// OS info
data.OS.Type = runtime.GOOS
data.OS.Arch = runtime.GOARCH

View File

@ -16,6 +16,7 @@ type Data struct {
Containerized bool `json:"containerized"`
Arch string `json:"arch"`
NumCPU int `json:"numCPU"`
Package string `json:"package,omitempty"`
} `json:"os"`
Mem struct {
Alloc uint64 `json:"alloc"`

View File

@ -14,6 +14,11 @@ if [ ! -f /etc/navidrome/navidrome.toml ]; then
fi
postinstall_flag="/var/lib/navidrome/.installed"
package_file="/var/lib/navidrome/.package"
if [ ! -f "$package_file" ]; then
echo "deb/rpm" > "$package_file";
fi
if [ ! -f "$postinstall_flag" ]; then
# The primary reason why this would fail is if the service was already installed AND

View File

@ -49,6 +49,9 @@ cp "${DOWNLOAD_FOLDER}"/extracted_ffmpeg/${FFMPEG_FILE}/bin/ffmpeg.exe "$MSI_OUT
cp "$WORKSPACE"/LICENSE "$WORKSPACE"/README.md "$MSI_OUTPUT_DIR"
cp "$BINARY" "$MSI_OUTPUT_DIR"
# package type indicator file
echo "msi" > "$MSI_OUTPUT_DIR/.package"
# workaround for wixl WixVariable not working to override bmp locations
cp "$WORKSPACE"/release/wix/bmp/banner.bmp /usr/share/wixl-*/ext/ui/bitmaps/bannrbmp.bmp
cp "$WORKSPACE"/release/wix/bmp/dialogue.bmp /usr/share/wixl-*/ext/ui/bitmaps/dlgbmp.bmp

View File

@ -69,6 +69,12 @@
</Directory>
</Directory>
<Directory Id="ND_DATAFOLDER" name="[ND_DATAFOLDER]">
<Component Id='PackageFile' Guid='9eec0697-803c-4629-858f-20dc376c960b' Win64="$(var.Win64)">
<File Id='package' Name='.package' DiskId='1' Source='.package' KeyPath='no' />
</Component>
</Directory>
</Directory>
<InstallUISequence>
@ -81,6 +87,7 @@
<ComponentRef Id='Configuration'/>
<ComponentRef Id='MainExecutable' />
<ComponentRef Id='FFMpegExecutable' />
<ComponentRef Id='PackageFile' />
</Feature>
</Product>
</Wix>