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

move get funcs to db

Browse Source
This commit is contained in:
sentriz
2019-07-05 17:10:11 +01:00
parent 1ab24db5d7
commit b6b3043765
13 changed files with 79 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/handler/handler.go
View File

@@ -3,10 +3,9 @@ package handler
import (
"html/template"
"github.com/jinzhu/gorm"
"github.com/wader/gormstore"
"github.com/sentriz/gonic/model"
"github.com/sentriz/gonic/db"
)
type contextKey int
@@ -17,35 +16,8 @@ const (
)
type Controller struct {
DB *gorm.DB
DB *db.DB
SessDB *gormstore.Store
Templates map[string]*template.Template
MusicPath string
}
func (c *Controller) GetSetting(key string) string {
setting := &model.Setting{}
c.DB.
Where("key = ?", key).
First(setting)
return setting.Value
}
func (c *Controller) SetSetting(key, value string) {
c.DB.
Where(model.Setting{Key: key}).
Assign(model.Setting{Value: value}).
FirstOrCreate(&model.Setting{})
}
func (c *Controller) GetUserFromName(name string) *model.User {
user := &model.User{}
err := c.DB.
Where("name = ?", name).
First(user).
Error
if gorm.IsRecordNotFoundError(err) {
return nil
}
return user
}

16
server/handler/handler_admin.go
View File

@@ -27,7 +27,7 @@ func (c *Controller) ServeLoginDo(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, r.Header.Get("Referer"), http.StatusSeeOther)
return
}
user := c.GetUserFromName(username)
user := c.DB.GetUserFromName(username)
if user == nil || password != user.Password {
session.AddFlash("invalid username / password")
sessionLogSave(w, r, session)
@@ -60,7 +60,7 @@ func (c *Controller) ServeHome(w http.ResponseWriter, r *http.Request) {
Order("updated_at DESC").
Limit(8).
Find(&data.RecentFolders)
data.CurrentLastFMAPIKey = c.GetSetting("lastfm_api_key")
data.CurrentLastFMAPIKey = c.DB.GetSetting("lastfm_api_key")
scheme := firstExisting(
"http", // fallback
r.Header.Get("X-Forwarded-Proto"),
@@ -104,8 +104,8 @@ func (c *Controller) ServeLinkLastFMDo(w http.ResponseWriter, r *http.Request) {
return
}
sessionKey, err := lastfm.GetSession(
c.GetSetting("lastfm_api_key"),
c.GetSetting("lastfm_secret"),
c.DB.GetSetting("lastfm_api_key"),
c.DB.GetSetting("lastfm_secret"),
token,
)
session := r.Context().Value(contextSessionKey).(*sessions.Session)
@@ -240,8 +240,8 @@ func (c *Controller) ServeCreateUserDo(w http.ResponseWriter, r *http.Request) {
func (c *Controller) ServeUpdateLastFMAPIKey(w http.ResponseWriter, r *http.Request) {
data := &templateData{}
data.CurrentLastFMAPIKey = c.GetSetting("lastfm_api_key")
data.CurrentLastFMAPISecret = c.GetSetting("lastfm_secret")
data.CurrentLastFMAPIKey = c.DB.GetSetting("lastfm_api_key")
data.CurrentLastFMAPISecret = c.DB.GetSetting("lastfm_secret")
renderTemplate(w, r, c.Templates["update_lastfm_api_key.tmpl"], data)
}
@@ -256,8 +256,8 @@ func (c *Controller) ServeUpdateLastFMAPIKeyDo(w http.ResponseWriter, r *http.Re
http.Redirect(w, r, r.Header.Get("Referer"), http.StatusSeeOther)
return
}
c.SetSetting("lastfm_api_key", apiKey)
c.SetSetting("lastfm_secret", secret)
c.DB.SetSetting("lastfm_api_key", apiKey)
c.DB.SetSetting("lastfm_secret", secret)
http.Redirect(w, r, "/admin/home", http.StatusSeeOther)
}

2
server/handler/handler_sub_by_folder.go
View File

@@ -107,7 +107,7 @@ func (c *Controller) GetAlbumList(w http.ResponseWriter, r *http.Request) {
respondError(w, r, 10, "please provide a `type` parameter")
return
}
q := c.DB
q := c.DB.DB
switch listType {
case "alphabeticalByArtist":
q = q.Joins(`

2
server/handler/handler_sub_by_tags.go
View File

@@ -103,7 +103,7 @@ func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
respondError(w, r, 10, "please provide a `type` parameter")
return
}
q := c.DB
q := c.DB.DB
switch listType {
case "alphabeticalByArtist":
q = q.Joins(`

4
server/handler/handler_sub_common.go
View File

@@ -129,8 +129,8 @@ func (c *Controller) Scrobble(w http.ResponseWriter, r *http.Request) {
First(track, id)
// scrobble with above info
err = lastfm.Scrobble(
c.GetSetting("lastfm_api_key"),
c.GetSetting("lastfm_secret"),
c.DB.GetSetting("lastfm_api_key"),
c.DB.GetSetting("lastfm_secret"),
user.LastFMSession,
track,
// clients will provide time in miliseconds, so use that or

2
server/handler/middleware_admin.go
View File

@@ -31,7 +31,7 @@ func (c *Controller) WithUserSession(next http.HandlerFunc) http.HandlerFunc {
return
}
// take username from sesion and add the user row to the context
user := c.GetUserFromName(username)
user := c.DB.GetUserFromName(username)
if user == nil {
// the username in the client's session no longer relates to a
// user in the database (maybe the user was deleted)

2
server/handler/middleware_sub.go
View File

@@ -58,7 +58,7 @@ func (c *Controller) WithValidSubsonicArgs(next http.HandlerFunc) http.HandlerFu
"please provide parameters `t` and `s`, or just `p`")
return
}
user := c.GetUserFromName(username)
user := c.DB.GetUserFromName(username)
if user == nil {
respondError(w, r, 40, "invalid username `%s`", username)
return

34
server/handler/respond_admin.go
View File

@@ -11,31 +11,35 @@ import (
)
type templateData struct {
AlbumCount int
AllUsers []*model.User
ArtistCount int
// common
Flashes []interface{}
User *model.User
// home
AlbumCount int
ArtistCount int
TrackCount int
RequestRoot string
RecentFolders []*model.Album
AllUsers []*model.User
//
CurrentLastFMAPIKey string
CurrentLastFMAPISecret string
Flashes []interface{}
RecentFolders []*model.Album
RequestRoot string
SelectedUser *model.User
TrackCount int
User *model.User
}
func renderTemplate(w http.ResponseWriter, r *http.Request,
tmpl *template.Template, data *templateData) {
session := r.Context().Value(contextSessionKey).(*sessions.Session)
func renderTemplate(
w http.ResponseWriter,
r *http.Request,
tmpl *template.Template,
data *templateData,
) {
if data == nil {
data = &templateData{}
}
session := r.Context().Value(contextSessionKey).(*sessions.Session)
data.Flashes = session.Flashes()
sessionLogSave(w, r, session)
user, ok := r.Context().Value(contextUserKey).(*model.User)
if ok {
data.User = user
}
data.User = r.Context().Value(contextUserKey).(*model.User)
err := tmpl.Execute(w, data)
if err != nil {
log.Printf("error executing template: %v\n", err)