heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move models into db package

Browse Source
This commit is contained in:
sentriz
2020-02-19 20:08:37 +00:00
parent e67588623b
commit a42edc3441
23 changed files with 133 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scanner/scanner.go
View File

@@ -17,7 +17,6 @@ import (
"senan.xyz/g/gonic/db"
"senan.xyz/g/gonic/mime"
"senan.xyz/g/gonic/model"
"senan.xyz/g/gonic/scanner/stack"
"senan.xyz/g/gonic/scanner/tags"
)
@@ -106,7 +105,7 @@ func (s *Scanner) Start() error {
var deleted uint
// delete tracks not on filesystem
s.db.WithTx(func(tx *gorm.DB) {
var tracks []*model.Track
var tracks []*db.Track
tx.
Select("id").
Find(&tracks)
@@ -120,7 +119,7 @@ func (s *Scanner) Start() error {
})
// delete folders not on filesystem
s.db.WithTx(func(tx *gorm.DB) {
var folders []*model.Album
var folders []*db.Album
tx.
Select("id").
Find(&folders)
@@ -268,7 +267,7 @@ func (s *Scanner) handleFolder(it *item) error {
s.trTx.Commit()
s.trTxOpen = false
}
folder := &model.Album{}
folder := &db.Album{}
defer func() {
// folder's id will come from early return
// or save at the end
@@ -277,7 +276,7 @@ func (s *Scanner) handleFolder(it *item) error {
}()
err := s.db.
Select("id, updated_at").
Where(model.Album{
Where(db.Album{
LeftPath: it.directory,
RightPath: it.filename,
}).
@@ -304,10 +303,10 @@ func (s *Scanner) handleTrack(it *item) error {
}
//
// set track basics
track := &model.Track{}
track := &db.Track{}
err := s.trTx.
Select("id, updated_at").
Where(model.Track{
Where(db.Track{
AlbumID: s.curFolders.PeekID(),
Filename: it.filename,
}).
@@ -350,7 +349,7 @@ func (s *Scanner) handleTrack(it *item) error {
}
return "Unknown Artist"
}()
artist := &model.Artist{}
artist := &db.Artist{}
err = s.trTx.
Select("id").
Where("name = ?", artistName).

10
scanner/stack/stack.go
View File

@@ -4,11 +4,11 @@ import (
"fmt"
"strings"
"senan.xyz/g/gonic/model"
"senan.xyz/g/gonic/db"
)
type item struct {
value *model.Album
value *db.Album
next *item
}
@@ -17,7 +17,7 @@ type Stack struct {
len uint
}
func (s *Stack) Push(v *model.Album) {
func (s *Stack) Push(v *db.Album) {
s.top = &item{
value: v,
next: s.top,
@@ -25,7 +25,7 @@ func (s *Stack) Push(v *model.Album) {
s.len++
}
func (s *Stack) Pop() *model.Album {
func (s *Stack) Pop() *db.Album {
if s.len == 0 {
return nil
}
@@ -35,7 +35,7 @@ func (s *Stack) Pop() *model.Album {
return v
}
func (s *Stack) Peek() *model.Album {
func (s *Stack) Peek() *db.Album {
if s.len == 0 {
return nil
}

20
scanner/stack/stack_test.go
View File

@@ -3,15 +3,15 @@ package stack
import (
"testing"
"senan.xyz/g/gonic/model"
"senan.xyz/g/gonic/db"
)
func TestFolderStack(t *testing.T) {
sta := &Stack{}
sta.Push(&model.Album{ID: 3})
sta.Push(&model.Album{ID: 4})
sta.Push(&model.Album{ID: 5})
sta.Push(&model.Album{ID: 6})
sta.Push(&db.Album{ID: 3})
sta.Push(&db.Album{ID: 4})
sta.Push(&db.Album{ID: 5})
sta.Push(&db.Album{ID: 6})
expected := "[6, 5, 4, 3, ]"
actual := sta.String()
if expected != actual {
@@ -20,12 +20,12 @@ func TestFolderStack(t *testing.T) {
}
//
sta = &Stack{}
sta.Push(&model.Album{ID: 27})
sta.Push(&model.Album{ID: 4})
sta.Push(&db.Album{ID: 27})
sta.Push(&db.Album{ID: 4})
sta.Peek()
sta.Push(&model.Album{ID: 5})
sta.Push(&model.Album{ID: 6})
sta.Push(&model.Album{ID: 7})
sta.Push(&db.Album{ID: 5})
sta.Push(&db.Album{ID: 6})
sta.Push(&db.Album{ID: 7})
sta.Pop()
expected = "[6, 5, 4, 27, ]"
actual = sta.String()