From 03175e1a9df2e0260453c8da87cd03c0f9f4c0fe Mon Sep 17 00:00:00 2001 From: certuna <62144283+certuna@users.noreply.github.com> Date: Wed, 1 Nov 2023 21:41:07 +0100 Subject: [PATCH] Use file creation date for Date Added/CreatedAt (#2553) * Update mapping.go CreatedAt = BirthTime * Update metadata.go Add BirthTime() function * Update spread_fs.go Replacing djherbis/atime package with djherbis/times, as times includes the functionality of atime * Update go.mod remove djherbis/atime, add djherbis/times * Update mapping.go time package not used anymore * Update go.sum removed djherbis/atime, added djherbis/times * Update spread_fs.go revert to previous, cannot get rid of /atime after all since it's a dependency of /fscache * Update go.mod djherbis/times 1.6.0 now released * Update go.sum new sums * Update metadata.go Inverted if statement, more readable * Update go.mod format fix * Update go.sum format fix * Update go.sum format fix * Update go.sum format fix * Update metadata.go variable name times -> fileProperties check for errors * Update metadata.go reverse order of error check * Update metadata.go typo * Update metadata.go https://github.com/navidrome/navidrome/pull/2553#issuecomment-1787967615 --- go.mod | 1 + go.sum | 3 +++ scanner/mapping.go | 3 +-- scanner/metadata/metadata.go | 7 +++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 600eb20d6..58ed3461e 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/djherbis/atime v1.1.0 github.com/djherbis/fscache v0.10.2-0.20220222230828-2909c950912d github.com/djherbis/stream v1.4.0 + github.com/djherbis/times v1.6.0 github.com/dustin/go-humanize v1.0.1 github.com/faiface/beep v1.1.0 github.com/fatih/structs v1.1.0 diff --git a/go.sum b/go.sum index ab85375bd..6051f2484 100644 --- a/go.sum +++ b/go.sum @@ -88,6 +88,8 @@ github.com/djherbis/fscache v0.10.2-0.20220222230828-2909c950912d h1:eAikRiT337j github.com/djherbis/fscache v0.10.2-0.20220222230828-2909c950912d/go.mod h1:+uJNKpxCg52qVRGr+srICjiY8QvV0riatTzCGMUuSEY= github.com/djherbis/stream v1.4.0 h1:aVD46WZUiq5kJk55yxJAyw6Kuera6kmC3i2vEQyW/AE= github.com/djherbis/stream v1.4.0/go.mod h1:cqjC1ZRq3FFwkGmUtHwcldbnW8f0Q4YuVsGW1eAFtOk= +github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c= +github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -556,6 +558,7 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/scanner/mapping.go b/scanner/mapping.go index 6ae89a675..610420af4 100644 --- a/scanner/mapping.go +++ b/scanner/mapping.go @@ -6,7 +6,6 @@ import ( "os" "path/filepath" "strings" - "time" "github.com/deluan/sanitize" "github.com/navidrome/navidrome/conf" @@ -76,7 +75,7 @@ func (s mediaFileMapper) toMediaFile(md metadata.Tags) model.MediaFile { mf.Comment = utils.SanitizeText(md.Comment()) mf.Lyrics = utils.SanitizeText(md.Lyrics()) mf.Bpm = md.Bpm() - mf.CreatedAt = time.Now() + mf.CreatedAt = md.BirthTime() mf.UpdatedAt = md.ModificationTime() return *mf diff --git a/scanner/metadata/metadata.go b/scanner/metadata/metadata.go index 9516ef165..1d3b12fd0 100644 --- a/scanner/metadata/metadata.go +++ b/scanner/metadata/metadata.go @@ -10,6 +10,7 @@ import ( "strings" "time" + "github.com/djherbis/times" "github.com/google/uuid" "github.com/navidrome/navidrome/conf" "github.com/navidrome/navidrome/consts" @@ -148,6 +149,12 @@ func (t Tags) ModificationTime() time.Time { return t.fileInfo.ModTime() } func (t Tags) Size() int64 { return t.fileInfo.Size() } func (t Tags) FilePath() string { return t.filePath } func (t Tags) Suffix() string { return strings.ToLower(strings.TrimPrefix(path.Ext(t.filePath), ".")) } +func (t Tags) BirthTime() time.Time { + if ts := times.Get(t.fileInfo); ts.HasBirthTime() { + return ts.BirthTime() + } + return time.Now() +} // Replaygain Properties func (t Tags) RGAlbumGain() float64 { return t.getGainValue("replaygain_album_gain") }