erki/ss13_se
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not expose the database at instance.DB anymore.

Browse Source
This commit is contained in:
A. Svensson 2016-06-19 15:32:18 +02:00
parent d2af505b0c
commit 3fb5a6a3e9
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/models.go
View File

@ -11,11 +11,10 @@ import (
type D map[string]interface{} type D map[string]interface{}
type Instance struct { type Instance struct {
Debug bool
DB *DB
Config *Config Config *Config
Debug bool
addr string db *DB
router *mux.Router router *mux.Router
tmpls *template.Template tmpls *template.Template
} }

4
src/updater.go
View File

@ -18,7 +18,7 @@ type RawServerData struct {
func (i *Instance) UpdateServers() { func (i *Instance) UpdateServers() {
reset() reset()
tx := i.DB.NewTransaction() tx := i.db.NewTransaction()
if i.Debug { if i.Debug {
fmt.Println("\nPolling servers...") fmt.Println("\nPolling servers...")
@ -76,7 +76,7 @@ func isupdated(title string) bool {
func (i *Instance) get_old_servers() []*RawServerData { func (i *Instance) get_old_servers() []*RawServerData {
var tmp []*RawServerData var tmp []*RawServerData
for _, old := range i.DB.GetOldServers(Now()) { for _, old := range i.db.GetOldServers(Now()) {
s := RawServerData{ s := RawServerData{
Title: old.Title, Title: old.Title,
Game_url: old.GameUrl, Game_url: old.GameUrl,

13
src/web.go
View File

@ -25,9 +25,10 @@ func New(debug bool, path string) (*Instance, error) {
db.InitSchema() db.InitSchema()
i := Instance{ i := Instance{
Debug: debug,
DB: db,
Config: c, Config: c,
Debug: debug,
db: db,
} }
return &i, nil return &i, nil
@ -114,7 +115,7 @@ func (i *Instance) page_404(w http.ResponseWriter, r *http.Request) {
} }
func (i *Instance) page_index(w http.ResponseWriter, r *http.Request) { func (i *Instance) page_index(w http.ResponseWriter, r *http.Request) {
servers := i.DB.AllServers() servers := i.db.AllServers()
i.tmpls.ExecuteTemplate(w, "page_index.html", D{ i.tmpls.ExecuteTemplate(w, "page_index.html", D{
"pagetitle": "Index", "pagetitle": "Index",
"servers": servers, "servers": servers,
@ -132,7 +133,7 @@ func (i *Instance) page_server(w http.ResponseWriter, r *http.Request) {
return return
} }
s, err := i.DB.GetServer(int(id)) s, err := i.db.GetServer(int(id))
if err != nil { if err != nil {
i.page_404(w, r) i.page_404(w, r)
return return
@ -153,8 +154,8 @@ func (i *Instance) page_server(w http.ResponseWriter, r *http.Request) {
i.tmpls.ExecuteTemplate(w, "page_server.html", D{ i.tmpls.ExecuteTemplate(w, "page_server.html", D{
"pagetitle": s.Title, "pagetitle": s.Title,
"server": s, "server": s,
"weekhistory": i.DB.GetServerPopulation(int(id), time.Duration(7*24+12)*time.Hour), "weekhistory": i.db.GetServerPopulation(int(id), time.Duration(7*24+12)*time.Hour),
"monthhistory": i.DB.GetServerPopulation(int(id), time.Duration(31*24)*time.Hour), "monthhistory": i.db.GetServerPopulation(int(id), time.Duration(31*24)*time.Hour),
"weekdayavg": weekdayavg, "weekdayavg": weekdayavg,
}) })
} }