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

Use structs lib to map models to DB. Fix #1266

Browse source
This commit is contained in:
Deluan 2021-08-01 01:21:20 -04:00
parent 344d7a4392
commit c831dc4cdf
22 changed files with 207 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

1
go.mod
View file

@ -16,6 +16,7 @@ require (
github.com/disintegration/imaging v1.6.2 github.com/disintegration/imaging v1.6.2
github.com/djherbis/fscache v0.10.2-0.20201024185917-a0daa9e52747 github.com/djherbis/fscache v0.10.2-0.20201024185917-a0daa9e52747
github.com/dustin/go-humanize v1.0.0 github.com/dustin/go-humanize v1.0.0
github.com/fatih/structs v1.1.0
github.com/go-chi/chi/v5 v5.0.3 github.com/go-chi/chi/v5 v5.0.3
github.com/go-chi/cors v1.2.0 github.com/go-chi/cors v1.2.0
github.com/go-chi/httprate v0.5.1 github.com/go-chi/httprate v0.5.1

2
go.sum
View file

@ -204,6 +204,8 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc= github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=
github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

64
model/album.go
View file

@ -3,39 +3,39 @@ package model
import "time" import "time"
type Album struct { type Album struct {
Annotations Annotations `structs:"-"`
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
CoverArtPath string `json:"coverArtPath"` CoverArtPath string `structs:"cover_art_path" json:"coverArtPath"`
CoverArtId string `json:"coverArtId"` CoverArtId string `structs:"cover_art_id" json:"coverArtId"`
ArtistID string `json:"artistId" orm:"column(artist_id)"` ArtistID string `structs:"artist_id" json:"artistId" orm:"column(artist_id)"`
Artist string `json:"artist"` Artist string `structs:"artist" json:"artist"`
AlbumArtistID string `json:"albumArtistId" orm:"column(album_artist_id)"` AlbumArtistID string `structs:"album_artist_id" json:"albumArtistId" orm:"column(album_artist_id)"`
AlbumArtist string `json:"albumArtist"` AlbumArtist string `structs:"album_artist" json:"albumArtist"`
AllArtistIDs string `json:"allArtistIds" orm:"column(all_artist_ids)"` AllArtistIDs string `structs:"all_artist_ids" json:"allArtistIds" orm:"column(all_artist_ids)"`
MaxYear int `json:"maxYear"` MaxYear int `structs:"max_year" json:"maxYear"`
MinYear int `json:"minYear"` MinYear int `structs:"min_year" json:"minYear"`
Compilation bool `json:"compilation"` Compilation bool `structs:"compilation" json:"compilation"`
Comment string `json:"comment,omitempty"` Comment string `structs:"comment" json:"comment,omitempty"`
SongCount int `json:"songCount"` SongCount int `structs:"song_count" json:"songCount"`
Duration float32 `json:"duration"` Duration float32 `structs:"duration" json:"duration"`
Size int64 `json:"size"` Size int64 `structs:"size" json:"size"`
Genre string `json:"genre"` Genre string `structs:"genre" json:"genre"`
Genres Genres `json:"genres"` Genres Genres `structs:"-" json:"genres"`
FullText string `json:"fullText"` FullText string `structs:"full_text" json:"fullText"`
SortAlbumName string `json:"sortAlbumName,omitempty"` SortAlbumName string `structs:"sort_album_name" json:"sortAlbumName,omitempty"`
SortArtistName string `json:"sortArtistName,omitempty"` SortArtistName string `structs:"sort_artist_name" json:"sortArtistName,omitempty"`
SortAlbumArtistName string `json:"sortAlbumArtistName,omitempty"` SortAlbumArtistName string `structs:"sort_album_artist_name" json:"sortAlbumArtistName,omitempty"`
OrderAlbumName string `json:"orderAlbumName"` OrderAlbumName string `structs:"order_album_name" json:"orderAlbumName"`
OrderAlbumArtistName string `json:"orderAlbumArtistName"` OrderAlbumArtistName string `structs:"order_album_artist_name" json:"orderAlbumArtistName"`
CatalogNum string `json:"catalogNum,omitempty"` CatalogNum string `structs:"catalog_num" json:"catalogNum,omitempty"`
MbzAlbumID string `json:"mbzAlbumId,omitempty" orm:"column(mbz_album_id)"` MbzAlbumID string `structs:"mbz_album_id" json:"mbzAlbumId,omitempty" orm:"column(mbz_album_id)"`
MbzAlbumArtistID string `json:"mbzAlbumArtistId,omitempty" orm:"column(mbz_album_artist_id)"` MbzAlbumArtistID string `structs:"mbz_album_artist_id" json:"mbzAlbumArtistId,omitempty" orm:"column(mbz_album_artist_id)"`
MbzAlbumType string `json:"mbzAlbumType,omitempty"` MbzAlbumType string `structs:"mbz_album_type" json:"mbzAlbumType,omitempty"`
MbzAlbumComment string `json:"mbzAlbumComment,omitempty"` MbzAlbumComment string `structs:"mbz_album_comment" json:"mbzAlbumComment,omitempty"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `structs:"created_at" json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
} }
type Albums []Album type Albums []Album

14
model/annotation.go
View file

@ -3,11 +3,11 @@ package model
import "time" import "time"
type Annotations struct { type Annotations struct {
PlayCount int64 `json:"playCount"` PlayCount int64 `structs:"-" json:"playCount"`
PlayDate time.Time `json:"playDate"` PlayDate time.Time `structs:"-" json:"playDate" `
Rating int `json:"rating"` Rating int `structs:"-" json:"rating" `
Starred bool `json:"starred"` Starred bool `structs:"-" json:"starred" `
StarredAt time.Time `json:"starredAt"` StarredAt time.Time `structs:"-" json:"starredAt"`
} }
type AnnotatedModel interface { type AnnotatedModel interface {
@ -19,7 +19,3 @@ type AnnotatedRepository interface {
SetStar(starred bool, itemIDs ...string) error SetStar(starred bool, itemIDs ...string) error
SetRating(rating int, itemID string) error SetRating(rating int, itemID string) error
} }
// While I can't find a better way to make these fields optional in the models, I keep this list here
// to be used in other packages
var AnnotationFields = []string{"playCount", "playDate", "rating", "starred", "starredAt"}

36
model/artist.go
View file

@ -3,25 +3,25 @@ package model
import "time" import "time"
type Artist struct { type Artist struct {
Annotations Annotations `structs:"-"`
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
AlbumCount int `json:"albumCount"` AlbumCount int `structs:"album_count" json:"albumCount"`
SongCount int `json:"songCount"` SongCount int `structs:"song_count" json:"songCount"`
Genres Genres `json:"genres"` Genres Genres `structs:"-" json:"genres"`
FullText string `json:"fullText"` FullText string `structs:"full_text" json:"fullText"`
SortArtistName string `json:"sortArtistName,omitempty"` SortArtistName string `structs:"sort_artist_name" json:"sortArtistName,omitempty"`
OrderArtistName string `json:"orderArtistName"` OrderArtistName string `structs:"order_artist_name" json:"orderArtistName"`
Size int64 `json:"size"` Size int64 `structs:"size" json:"size"`
MbzArtistID string `json:"mbzArtistId,omitempty" orm:"column(mbz_artist_id)"` MbzArtistID string `structs:"mbz_artist_id" json:"mbzArtistId,omitempty" orm:"column(mbz_artist_id)"`
Biography string `json:"biography,omitempty"` Biography string `structs:"biography" json:"biography,omitempty"`
SmallImageUrl string `json:"smallImageUrl,omitempty"` SmallImageUrl string `structs:"small_image_url" json:"smallImageUrl,omitempty"`
MediumImageUrl string `json:"mediumImageUrl,omitempty"` MediumImageUrl string `structs:"medium_image_url" json:"mediumImageUrl,omitempty"`
LargeImageUrl string `json:"largeImageUrl,omitempty"` LargeImageUrl string `structs:"large_image_url" json:"largeImageUrl,omitempty"`
ExternalUrl string `json:"externalUrl,omitempty" orm:"column(external_url)"` ExternalUrl string `structs:"external_url" json:"externalUrl,omitempty" orm:"column(external_url)"`
SimilarArtists Artists `json:"-" orm:"-"` SimilarArtists Artists `structs:"-" json:"-" orm:"-"`
ExternalInfoUpdatedAt time.Time `json:"externalInfoUpdatedAt"` ExternalInfoUpdatedAt time.Time `structs:"external_info_updated_at" json:"externalInfoUpdatedAt"`
} }
func (a Artist) ArtistImageUrl() string { func (a Artist) ArtistImageUrl() string {

18
model/bookmark.go
View file

@ -3,7 +3,7 @@ package model
import "time" import "time"
type Bookmarkable struct { type Bookmarkable struct {
BookmarkPosition int64 `json:"bookmarkPosition"` BookmarkPosition int64 `structs:"-" json:"bookmarkPosition"`
} }
type BookmarkableRepository interface { type BookmarkableRepository interface {
@ -13,16 +13,12 @@ type BookmarkableRepository interface {
} }
type Bookmark struct { type Bookmark struct {
Item MediaFile `json:"item"` Item MediaFile `structs:"item" json:"item"`
Comment string `json:"comment"` Comment string `structs:"comment" json:"comment"`
Position int64 `json:"position"` Position int64 `structs:"position" json:"position"`
ChangedBy string `json:"changed_by"` ChangedBy string `structs:"changed_by" json:"changed_by"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `structs:"created_at" json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
} }
type Bookmarks []Bookmark type Bookmarks []Bookmark
// While I can't find a better way to make these fields optional in the models, I keep this list here
// to be used in other packages
var BookmarkFields = []string{"bookmarkPosition"}

8
model/genre.go
View file

@ -1,10 +1,10 @@
package model package model
type Genre struct { type Genre struct {
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
SongCount int `json:"-"` SongCount int `structs:"-" json:"-"`
AlbumCount int `json:"-"` AlbumCount int `structs:"-" json:"-"`
} }
type Genres []Genre type Genres []Genre

86
model/mediafile.go
View file

@ -6,50 +6,50 @@ import (
) )
type MediaFile struct { type MediaFile struct {
Annotations Annotations `structs:"-"`
Bookmarkable Bookmarkable `structs:"-"`
ID string `json:"id" orm:"pk;column(id)"` ID string `structs:"id" json:"id" orm:"pk;column(id)"`
Path string `json:"path"` Path string `structs:"path" json:"path"`
Title string `json:"title"` Title string `structs:"title" json:"title"`
Album string `json:"album"` Album string `structs:"album" json:"album"`
ArtistID string `json:"artistId" orm:"pk;column(artist_id)"` ArtistID string `structs:"artist_id" json:"artistId" orm:"pk;column(artist_id)"`
Artist string `json:"artist"` Artist string `structs:"artist" json:"artist"`
AlbumArtistID string `json:"albumArtistId" orm:"pk;column(album_artist_id)"` AlbumArtistID string `structs:"album_artist_id" json:"albumArtistId" orm:"pk;column(album_artist_id)"`
AlbumArtist string `json:"albumArtist"` AlbumArtist string `structs:"album_artist" json:"albumArtist"`
AlbumID string `json:"albumId" orm:"pk;column(album_id)"` AlbumID string `structs:"album_id" json:"albumId" orm:"pk;column(album_id)"`
HasCoverArt bool `json:"hasCoverArt"` HasCoverArt bool `structs:"has_cover_art" json:"hasCoverArt"`
TrackNumber int `json:"trackNumber"` TrackNumber int `structs:"track_number" json:"trackNumber"`
DiscNumber int `json:"discNumber"` DiscNumber int `structs:"disc_number" json:"discNumber"`
DiscSubtitle string `json:"discSubtitle,omitempty"` DiscSubtitle string `structs:"disc_subtitle" json:"discSubtitle,omitempty"`
Year int `json:"year"` Year int `structs:"year" json:"year"`
Size int64 `json:"size"` Size int64 `structs:"size" json:"size"`
Suffix string `json:"suffix"` Suffix string `structs:"suffix" json:"suffix"`
Duration float32 `json:"duration"` Duration float32 `structs:"duration" json:"duration"`
BitRate int `json:"bitRate"` BitRate int `structs:"bit_rate" json:"bitRate"`
Genre string `json:"genre"` Genre string `structs:"genre" json:"genre"`
Genres Genres `json:"genres"` Genres Genres `structs:"-" json:"genres"`
FullText string `json:"fullText"` FullText string `structs:"full_text" json:"fullText"`
SortTitle string `json:"sortTitle,omitempty"` SortTitle string `structs:"sort_title" json:"sortTitle,omitempty"`
SortAlbumName string `json:"sortAlbumName,omitempty"` SortAlbumName string `structs:"sort_album_name" json:"sortAlbumName,omitempty"`
SortArtistName string `json:"sortArtistName,omitempty"` SortArtistName string `structs:"sort_artist_name" json:"sortArtistName,omitempty"`
SortAlbumArtistName string `json:"sortAlbumArtistName,omitempty"` SortAlbumArtistName string `structs:"sort_album_artist_name" json:"sortAlbumArtistName,omitempty"`
OrderAlbumName string `json:"orderAlbumName"` OrderAlbumName string `structs:"order_album_name" json:"orderAlbumName"`
OrderArtistName string `json:"orderArtistName"` OrderArtistName string `structs:"order_artist_name" json:"orderArtistName"`
OrderAlbumArtistName string `json:"orderAlbumArtistName"` OrderAlbumArtistName string `structs:"order_album_artist_name" json:"orderAlbumArtistName"`
Compilation bool `json:"compilation"` Compilation bool `structs:"compilation" json:"compilation"`
Comment string `json:"comment,omitempty"` Comment string `structs:"comment" json:"comment,omitempty"`
Lyrics string `json:"lyrics,omitempty"` Lyrics string `structs:"lyrics" json:"lyrics,omitempty"`
Bpm int `json:"bpm,omitempty"` Bpm int `structs:"bpm" json:"bpm,omitempty"`
CatalogNum string `json:"catalogNum,omitempty"` CatalogNum string `structs:"catalog_num" json:"catalogNum,omitempty"`
MbzTrackID string `json:"mbzTrackId,omitempty" orm:"column(mbz_track_id)"` MbzTrackID string `structs:"mbz_track_id" json:"mbzTrackId,omitempty" orm:"column(mbz_track_id)"`
MbzAlbumID string `json:"mbzAlbumId,omitempty" orm:"column(mbz_album_id)"` MbzAlbumID string `structs:"mbz_album_id" json:"mbzAlbumId,omitempty" orm:"column(mbz_album_id)"`
MbzArtistID string `json:"mbzArtistId,omitempty" orm:"column(mbz_artist_id)"` MbzArtistID string `structs:"mbz_artist_id" json:"mbzArtistId,omitempty" orm:"column(mbz_artist_id)"`
MbzAlbumArtistID string `json:"mbzAlbumArtistId,omitempty" orm:"column(mbz_album_artist_id)"` MbzAlbumArtistID string `structs:"mbz_album_artist_id" json:"mbzAlbumArtistId,omitempty" orm:"column(mbz_album_artist_id)"`
MbzAlbumType string `json:"mbzAlbumType,omitempty"` MbzAlbumType string `structs:"mbz_album_type" json:"mbzAlbumType,omitempty"`
MbzAlbumComment string `json:"mbzAlbumComment,omitempty"` MbzAlbumComment string `structs:"mbz_album_comment" json:"mbzAlbumComment,omitempty"`
CreatedAt time.Time `json:"createdAt"` // Time this entry was created in the DB CreatedAt time.Time `structs:"created_at" json:"createdAt"` // Time this entry was created in the DB
UpdatedAt time.Time `json:"updatedAt"` // Time of file last update (mtime) UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"` // Time of file last update (mtime)
} }
func (mf *MediaFile) ContentType() string { func (mf *MediaFile) ContentType() string {

22
model/player.go
View file

@ -5,17 +5,17 @@ import (
) )
type Player struct { type Player struct {
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
UserAgent string `json:"userAgent"` UserAgent string `structs:"user_agent" json:"userAgent"`
UserName string `json:"userName"` UserName string `structs:"user_name" json:"userName"`
Client string `json:"client"` Client string `structs:"client" json:"client"`
IPAddress string `json:"ipAddress"` IPAddress string `structs:"ip_address" json:"ipAddress"`
LastSeen time.Time `json:"lastSeen"` LastSeen time.Time `structs:"last_seen" json:"lastSeen"`
TranscodingId string `json:"transcodingId"` TranscodingId string `structs:"transcoding_id" json:"transcodingId"`
MaxBitRate int `json:"maxBitRate"` MaxBitRate int `structs:"max_bit_rate" json:"maxBitRate"`
ReportRealPath bool `json:"reportRealPath"` ReportRealPath bool `structs:"report_real_path" json:"reportRealPath"`
ScrobbleEnabled bool `json:"scrobbleEnabled"` ScrobbleEnabled bool `structs:"scrobble_enabled" json:"scrobbleEnabled"`
} }
type Players []Player type Players []Player

26
model/playlist.go
View file

@ -5,19 +5,19 @@ import (
) )
type Playlist struct { type Playlist struct {
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
Comment string `json:"comment"` Comment string `structs:"comment" json:"comment"`
Duration float32 `json:"duration"` Duration float32 `structs:"duration" json:"duration"`
Size int64 `json:"size"` Size int64 `structs:"size" json:"size"`
SongCount int `json:"songCount"` SongCount int `structs:"song_count" json:"songCount"`
Owner string `json:"owner"` Owner string `structs:"owner" json:"owner"`
Public bool `json:"public"` Public bool `structs:"public" json:"public"`
Tracks MediaFiles `json:"tracks,omitempty"` Tracks MediaFiles `structs:"-" json:"tracks,omitempty"`
Path string `json:"path"` Path string `structs:"path" json:"path"`
Sync bool `json:"sync"` Sync bool `structs:"sync" json:"sync"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `structs:"created_at" json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
} }
type Playlists []Playlist type Playlists []Playlist

16
model/playqueue.go
View file

@ -5,14 +5,14 @@ import (
) )
type PlayQueue struct { type PlayQueue struct {
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
UserID string `json:"userId" orm:"column(user_id)"` UserID string `structs:"user_id" json:"userId" orm:"column(user_id)"`
Current string `json:"current"` Current string `structs:"current" json:"current"`
Position int64 `json:"position"` Position int64 `structs:"position" json:"position"`
ChangedBy string `json:"changedBy"` ChangedBy string `structs:"changed_by" json:"changedBy"`
Items MediaFiles `json:"items,omitempty"` Items MediaFiles `structs:"-" json:"items,omitempty"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `structs:"created_at" json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
} }
type PlayQueues []PlayQueue type PlayQueues []PlayQueue

2
model/scrobble_buffer.go
View file

@ -5,7 +5,7 @@ import "time"
type ScrobbleEntry struct { type ScrobbleEntry struct {
MediaFile MediaFile
Service string Service string
UserID string `json:"user_id" orm:"column(user_id)"` UserID string `structs:"user_id" orm:"column(user_id)"`
PlayTime time.Time PlayTime time.Time
EnqueueTime time.Time EnqueueTime time.Time
} }

18
model/share.go
View file

@ -5,15 +5,15 @@ import (
) )
type Share struct { type Share struct {
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
Description string `json:"description"` Description string `structs:"description" json:"description"`
ExpiresAt time.Time `json:"expiresAt"` ExpiresAt time.Time `structs:"expires_at" json:"expiresAt"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `structs:"created_at" json:"createdAt"`
LastVisitedAt time.Time `json:"lastVisitedAt"` LastVisitedAt time.Time `structs:"last_visited_at" json:"lastVisitedAt"`
ResourceIDs string `json:"resourceIds" orm:"column(resource_ids)"` ResourceIDs string `structs:"resource_ids" json:"resourceIds" orm:"column(resource_ids)"`
ResourceType string `json:"resourceType"` ResourceType string `structs:"resource_type" json:"resourceType"`
VisitCount int `json:"visitCount"` VisitCount int `structs:"visit_count" json:"visitCount"`
} }
type Shares []Share type Shares []Share

10
model/transcoding.go
View file

@ -1,11 +1,11 @@
package model package model
type Transcoding struct { type Transcoding struct {
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
TargetFormat string `json:"targetFormat"` TargetFormat string `structs:"target_format" json:"targetFormat"`
Command string `json:"command"` Command string `structs:"command" json:"command"`
DefaultBitRate int `json:"defaultBitRate"` DefaultBitRate int `structs:"default_bit_rate" json:"defaultBitRate"`
} }
type Transcodings []Transcoding type Transcodings []Transcoding

24
model/user.go
View file

@ -3,23 +3,23 @@ package model
import "time" import "time"
type User struct { type User struct {
ID string `json:"id" orm:"column(id)"` ID string `structs:"id" json:"id" orm:"column(id)"`
UserName string `json:"userName"` UserName string `structs:"user_name" json:"userName"`
Name string `json:"name"` Name string `structs:"name" json:"name"`
Email string `json:"email"` Email string `structs:"email" json:"email"`
IsAdmin bool `json:"isAdmin"` IsAdmin bool `structs:"is_admin" json:"isAdmin"`
LastLoginAt *time.Time `json:"lastLoginAt"` LastLoginAt time.Time `structs:"last_login_at" json:"lastLoginAt"`
LastAccessAt *time.Time `json:"lastAccessAt"` LastAccessAt time.Time `structs:"last_access_at" json:"lastAccessAt"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `structs:"created_at" json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
// This is only available on the backend, and it is never sent over the wire // This is only available on the backend, and it is never sent over the wire
Password string `json:"-"` Password string `structs:"-" json:"-"`
// This is used to set or change a password when calling Put. If it is empty, the password is not changed. // This is used to set or change a password when calling Put. If it is empty, the password is not changed.
// It is received from the UI with the name "password" // It is received from the UI with the name "password"
NewPassword string `json:"password,omitempty"` NewPassword string `structs:"password,omitempty" json:"password,omitempty"`
// If changing the password, this is also required // If changing the password, this is also required
CurrentPassword string `json:"currentPassword,omitempty"` CurrentPassword string `structs:"current_password,omitempty" json:"currentPassword,omitempty"`
} }
type Users []User type Users []User

5
persistence/album_repository.go
View file

@ -110,14 +110,11 @@ func (r *albumRepository) Get(id string) (*model.Album, error) {
} }
func (r *albumRepository) Put(m *model.Album) error { func (r *albumRepository) Put(m *model.Album) error {
genres := m.Genres
m.Genres = nil
defer func() { m.Genres = genres }()
_, err := r.put(m.ID, m) _, err := r.put(m.ID, m)
if err != nil { if err != nil {
return err return err
} }
return r.updateGenres(m.ID, r.tableName, genres) return r.updateGenres(m.ID, r.tableName, m.Genres)
} }
func (r *albumRepository) GetAll(options ...model.QueryOptions) (model.Albums, error) { func (r *albumRepository) GetAll(options ...model.QueryOptions) (model.Albums, error) {

9
persistence/artist_repository.go
View file

@ -23,8 +23,8 @@ type artistRepository struct {
} }
type dbArtist struct { type dbArtist struct {
model.Artist model.Artist `structs:",flatten"`
SimilarArtists string `json:"similarArtists"` SimilarArtists string `structs:"similar_artists" json:"similarArtists"`
} }
func NewArtistRepository(ctx context.Context, o orm.Ormer) model.ArtistRepository { func NewArtistRepository(ctx context.Context, o orm.Ormer) model.ArtistRepository {
@ -60,16 +60,13 @@ func (r *artistRepository) Exists(id string) (bool, error) {
} }
func (r *artistRepository) Put(a *model.Artist) error { func (r *artistRepository) Put(a *model.Artist) error {
genres := a.Genres
a.Genres = nil
defer func() { a.Genres = genres }()
a.FullText = getFullText(a.Name, a.SortArtistName) a.FullText = getFullText(a.Name, a.SortArtistName)
dba := r.fromModel(a) dba := r.fromModel(a)
_, err := r.put(dba.ID, dba) _, err := r.put(dba.ID, dba)
if err != nil { if err != nil {
return err return err
} }
return r.updateGenres(a.ID, r.tableName, genres) return r.updateGenres(a.ID, r.tableName, a.Genres)
} }
func (r *artistRepository) Get(id string) (*model.Artist, error) { func (r *artistRepository) Get(id string) (*model.Artist, error) {

31
persistence/helpers.go
View file

@ -2,38 +2,29 @@ package persistence
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"regexp" "regexp"
"strings" "strings"
"time"
"github.com/navidrome/navidrome/consts"
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/fatih/structs"
"github.com/navidrome/navidrome/consts"
"github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/utils"
) )
func toSqlArgs(rec interface{}) (map[string]interface{}, error) { func toSqlArgs(rec interface{}) (map[string]interface{}, error) {
// Convert to JSON... m := structs.Map(rec)
b, err := json.Marshal(rec) for k, v := range m {
if err != nil { if t, ok := v.(time.Time); ok {
return nil, err m[k] = t.Format(time.RFC3339Nano)
} }
if t, ok := v.(*time.Time); ok && t != nil {
// ... then convert to map m[k] = t.Format(time.RFC3339Nano)
var m map[string]interface{}
err = json.Unmarshal(b, &m)
r := make(map[string]interface{}, len(m))
for f, v := range m {
isAnnotationField := utils.StringInSlice(f, model.AnnotationFields)
isBookmarkField := utils.StringInSlice(f, model.BookmarkFields)
if !isAnnotationField && !isBookmarkField && v != nil {
r[toSnakeCase(f)] = v
} }
} }
return r, err return m, nil
} }
var matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)") var matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)")

27
persistence/helpers_test.go
View file

@ -26,31 +26,26 @@ var _ = Describe("Helpers", func() {
}) })
}) })
Describe("toSqlArgs", func() { Describe("toSqlArgs", func() {
type Embed struct{}
type Model struct { type Model struct {
ID string `json:"id"` Embed `structs:"-"`
AlbumId string `json:"albumId"` ID string `structs:"id" json:"id"`
PlayCount int `json:"playCount"` AlbumId string `structs:"album_id" json:"albumId"`
CreatedAt *time.Time PlayCount int `structs:"play_count" json:"playCount"`
UpdatedAt *time.Time `structs:"updated_at"`
CreatedAt time.Time `structs:"created_at"`
} }
It("returns a map with snake_case keys", func() { It("returns a map with snake_case keys", func() {
now := time.Now() now := time.Now()
m := &Model{ID: "123", AlbumId: "456", CreatedAt: &now, PlayCount: 2} m := &Model{ID: "123", AlbumId: "456", CreatedAt: now, UpdatedAt: &now, PlayCount: 2}
args, err := toSqlArgs(m) args, err := toSqlArgs(m)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(args).To(HaveKeyWithValue("id", "123")) Expect(args).To(HaveKeyWithValue("id", "123"))
Expect(args).To(HaveKeyWithValue("album_id", "456")) Expect(args).To(HaveKeyWithValue("album_id", "456"))
Expect(args).To(HaveKey("created_at")) Expect(args).To(HaveKeyWithValue("updated_at", now.Format(time.RFC3339Nano)))
Expect(args).To(HaveLen(3)) Expect(args).To(HaveKeyWithValue("created_at", now.Format(time.RFC3339Nano)))
}) Expect(args).ToNot(HaveKey("Embed"))
It("remove null fields", func() {
m := &Model{ID: "123", AlbumId: "456"}
args, err := toSqlArgs(m)
Expect(err).To(BeNil())
Expect(args).To(HaveKey("id"))
Expect(args).To(HaveKey("album_id"))
Expect(args).To(HaveLen(2))
}) })
}) })

5
persistence/mediafile_repository.go
View file

@ -51,14 +51,11 @@ func (r *mediaFileRepository) Exists(id string) (bool, error) {
func (r *mediaFileRepository) Put(m *model.MediaFile) error { func (r *mediaFileRepository) Put(m *model.MediaFile) error {
m.FullText = getFullText(m.Title, m.Album, m.Artist, m.AlbumArtist, m.FullText = getFullText(m.Title, m.Album, m.Artist, m.AlbumArtist,
m.SortTitle, m.SortAlbumName, m.SortArtistName, m.SortAlbumArtistName, m.DiscSubtitle) m.SortTitle, m.SortAlbumName, m.SortArtistName, m.SortAlbumArtistName, m.DiscSubtitle)
genres := m.Genres
m.Genres = nil
defer func() { m.Genres = genres }()
_, err := r.put(m.ID, m) _, err := r.put(m.ID, m)
if err != nil { if err != nil {
return err return err
} }
return r.updateGenres(m.ID, r.tableName, genres) return r.updateGenres(m.ID, r.tableName, m.Genres)
} }
func (r *mediaFileRepository) selectMediaFile(options ...model.QueryOptions) SelectBuilder { func (r *mediaFileRepository) selectMediaFile(options ...model.QueryOptions) SelectBuilder {

16
persistence/playqueue_repository.go
View file

@ -25,14 +25,14 @@ func NewPlayQueueRepository(ctx context.Context, o orm.Ormer) model.PlayQueueRep
} }
type playQueue struct { type playQueue struct {
ID string `orm:"column(id)"` ID string `structs:"id" orm:"column(id)"`
UserID string `orm:"column(user_id)"` UserID string `structs:"user_id" orm:"column(user_id)"`
Current string Current string `structs:"current"`
Position int64 Position int64 `structs:"position"`
ChangedBy string ChangedBy string `structs:"changed_by"`
Items string Items string `structs:"items"`
CreatedAt time.Time CreatedAt time.Time `structs:"created_at"`
UpdatedAt time.Time UpdatedAt time.Time `structs:"updated_at"`
} }
func (r *playQueueRepository) Store(q *model.PlayQueue) error { func (r *playQueueRepository) Store(q *model.PlayQueue) error {

2
server/auth.go
View file

@ -142,7 +142,7 @@ func createAdminUser(ctx context.Context, ds model.DataStore, username, password
Email: "", Email: "",
NewPassword: password, NewPassword: password,
IsAdmin: true, IsAdmin: true,
LastLoginAt: &now, LastLoginAt: now,
} }
err := ds.User(ctx).Put(&initialUser) err := ds.User(ctx).Put(&initialUser)
if err != nil { if err != nil {