diff --git a/api/browsing_test.go b/api/browsing_test.go index 93a847dfd..f6ae04076 100644 --- a/api/browsing_test.go +++ b/api/browsing_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/deluan/gosonic/api/responses" - "github.com/deluan/gosonic/consts" "github.com/deluan/gosonic/domain" "github.com/deluan/gosonic/engine" "github.com/deluan/gosonic/persistence" @@ -46,7 +45,7 @@ func TestGetIndexes(t *testing.T) { mockRepo.SetData("[]", 0) mockRepo.SetError(false) - propRepo.Put(consts.LastScan, "1") + propRepo.Put(engine.PropLastScan, "1") propRepo.SetError(false) Convey("Subject: GetIndexes Endpoint", t, func() { @@ -88,7 +87,7 @@ func TestGetIndexes(t *testing.T) { mockRepo.SetData(`[{"Id": "A","Artists": [ {"ArtistId": "21", "Artist": "Afrolicious"} ]}]`, 2) - propRepo.Put(consts.LastScan, "1") + propRepo.Put(engine.PropLastScan, "1") _, w := Get(AddParams("/rest/getIndexes.view", "ifModifiedSince=2"), "TestGetIndexes") @@ -98,7 +97,7 @@ func TestGetIndexes(t *testing.T) { mockRepo.SetData(`[{"Id": "A","Artists": [ {"ArtistId": "21", "Artist": "Afrolicious"} ]}]`, 2) - propRepo.Put(consts.LastScan, "1") + propRepo.Put(engine.PropLastScan, "1") _, w := Get(AddParams("/rest/getIndexes.view", "ifModifiedSince=1"), "TestGetIndexes") @@ -107,7 +106,7 @@ func TestGetIndexes(t *testing.T) { Reset(func() { mockRepo.SetData("[]", 0) mockRepo.SetError(false) - propRepo.Put(consts.LastScan, "1") + propRepo.Put(engine.PropLastScan, "1") propRepo.SetError(false) }) }) diff --git a/consts/properties.go b/consts/properties.go deleted file mode 100644 index 37f0baebe..000000000 --- a/consts/properties.go +++ /dev/null @@ -1,5 +0,0 @@ -package consts - -const ( - LastScan = "LastScan" -) diff --git a/engine/browser.go b/engine/browser.go index e2dd5e989..21264e1ed 100644 --- a/engine/browser.go +++ b/engine/browser.go @@ -7,7 +7,6 @@ import ( "time" "github.com/astaxie/beego" - "github.com/deluan/gosonic/consts" "github.com/deluan/gosonic/domain" "github.com/deluan/gosonic/utils" ) @@ -37,7 +36,7 @@ func (b *browser) MediaFolders() (domain.MediaFolders, error) { } func (b *browser) Indexes(ifModifiedSince time.Time) (domain.ArtistIndexes, time.Time, error) { - l, err := b.propRepo.DefaultGet(consts.LastScan, "-1") + l, err := b.propRepo.DefaultGet(PropLastScan, "-1") ms, _ := strconv.ParseInt(l, 10, 64) lastModified := utils.ToTime(ms) diff --git a/engine/properties.go b/engine/properties.go index 5a7702e3c..4d58d0fb1 100644 --- a/engine/properties.go +++ b/engine/properties.go @@ -1,5 +1,9 @@ package engine +const ( + PropLastScan = "LastScan" +) + type Property struct { Id string Value string diff --git a/scanner/importer.go b/scanner/importer.go index 718d00978..95ff39532 100644 --- a/scanner/importer.go +++ b/scanner/importer.go @@ -8,7 +8,6 @@ import ( "time" "github.com/astaxie/beego" - "github.com/deluan/gosonic/consts" "github.com/deluan/gosonic/domain" "github.com/deluan/gosonic/engine" "github.com/deluan/gosonic/utils" @@ -116,7 +115,7 @@ func (i *Importer) Run() { } func (i *Importer) lastModifiedSince() time.Time { - ms, err := i.propertyRepo.Get(consts.LastScan) + ms, err := i.propertyRepo.Get(engine.PropLastScan) if err != nil { beego.Warn("Couldn't read LastScan:", err) return time.Time{} @@ -263,7 +262,7 @@ func (i *Importer) importLibrary() (err error) { if err == nil { millis := time.Now().UnixNano() / int64(time.Millisecond) - i.propertyRepo.Put(consts.LastScan, fmt.Sprint(millis)) + i.propertyRepo.Put(engine.PropLastScan, fmt.Sprint(millis)) beego.Debug("LastScan timestamp:", millis) }