third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-14 03:07:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Deluan 2016-03-24 23:31:54 -04:00
parent ea4d94fa84
commit 06828d8738
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/browsing_test.go
View File

@ -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)
})
})

5
consts/properties.go
View File

@ -1,5 +0,0 @@
package consts
const (
LastScan = "LastScan"
)

3
engine/browser.go
View File

@ -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)

4
engine/properties.go
View File

@ -1,5 +1,9 @@
package engine
const (
PropLastScan = "LastScan"
)
type Property struct {
Id string
Value string

5
scanner/importer.go
View File

@ -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)
}