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

4
server/ctrlsubsonic/spec/construct.go
View File

@@ -1,8 +1,8 @@
package spec
import "senan.xyz/g/gonic/model"
import "senan.xyz/g/gonic/db"
func NewPlaylist(p *model.Playlist) *Playlist {
func NewPlaylist(p *db.Playlist) *Playlist {
return &Playlist{
ID: p.ID,
Name: p.Name,

12
server/ctrlsubsonic/spec/construct_by_folder.go
View File

@@ -3,10 +3,10 @@ package spec
import (
"path"
"senan.xyz/g/gonic/model"
"senan.xyz/g/gonic/db"
)
func NewAlbumByFolder(f *model.Album) *Album {
func NewAlbumByFolder(f *db.Album) *Album {
a := &Album{
Artist: f.Parent.RightPath,
ID: f.ID,
@@ -21,7 +21,7 @@ func NewAlbumByFolder(f *model.Album) *Album {
return a
}
func NewTCAlbumByFolder(f *model.Album) *TrackChild {
func NewTCAlbumByFolder(f *db.Album) *TrackChild {
trCh := &TrackChild{
ID: f.ID,
IsDir: true,
@@ -35,7 +35,7 @@ func NewTCAlbumByFolder(f *model.Album) *TrackChild {
return trCh
}
func NewTCTrackByFolder(t *model.Track, parent *model.Album) *TrackChild {
func NewTCTrackByFolder(t *db.Track, parent *db.Album) *TrackChild {
trCh := &TrackChild{
ID: t.ID,
ContentType: t.MIME(),
@@ -66,7 +66,7 @@ func NewTCTrackByFolder(t *model.Track, parent *model.Album) *TrackChild {
return trCh
}
func NewArtistByFolder(f *model.Album) *Artist {
func NewArtistByFolder(f *db.Album) *Artist {
return &Artist{
ID: f.ID,
Name: f.RightPath,
@@ -74,7 +74,7 @@ func NewArtistByFolder(f *model.Album) *Artist {
}
}
func NewDirectoryByFolder(f *model.Album, children []*TrackChild) *Directory {
func NewDirectoryByFolder(f *db.Album, children []*TrackChild) *Directory {
dir := &Directory{
ID: f.ID,
Name: f.RightPath,

8
server/ctrlsubsonic/spec/construct_by_tags.go
View File

@@ -3,10 +3,10 @@ package spec
import (
"path"
"senan.xyz/g/gonic/model"
"senan.xyz/g/gonic/db"
)
func NewAlbumByTags(a *model.Album, artist *model.Artist) *Album {
func NewAlbumByTags(a *db.Album, artist *db.Artist) *Album {
ret := &Album{
Created: a.ModifiedAt,
ID: a.ID,
@@ -23,7 +23,7 @@ func NewAlbumByTags(a *model.Album, artist *model.Artist) *Album {
return ret
}
func NewTrackByTags(t *model.Track, album *model.Album) *TrackChild {
func NewTrackByTags(t *db.Track, album *db.Album) *TrackChild {
ret := &TrackChild{
ID: t.ID,
ContentType: t.MIME(),
@@ -55,7 +55,7 @@ func NewTrackByTags(t *model.Track, album *model.Album) *TrackChild {
return ret
}
func NewArtistByTags(a *model.Artist) *Artist {
func NewArtistByTags(a *db.Artist) *Artist {
return &Artist{
ID: a.ID,
Name: a.Name,