From fa12cb41503809332be9c44061d1922eee07bebd Mon Sep 17 00:00:00 2001 From: sentriz Date: Sat, 18 Jan 2020 17:42:19 +0000 Subject: [PATCH] rename server options struct --- cmd/gonic/main.go | 2 +- server/server.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/gonic/main.go b/cmd/gonic/main.go index f7d2e6c..12d00ee 100644 --- a/cmd/gonic/main.go +++ b/cmd/gonic/main.go @@ -42,7 +42,7 @@ func main() { log.Fatalf("error opening database: %v\n", err) } defer db.Close() - serverOptions := server.ServerOptions{ + serverOptions := server.Options{ DB: db, MusicPath: *musicPath, ListenAddr: *listenAddr, diff --git a/server/server.go b/server/server.go index 63c8bf3..7d9a374 100644 --- a/server/server.go +++ b/server/server.go @@ -18,7 +18,7 @@ import ( "senan.xyz/g/gonic/server/ctrlsubsonic" ) -type ServerOptions struct { +type Options struct { DB *db.DB MusicPath string ListenAddr string @@ -29,10 +29,10 @@ type Server struct { *http.Server router *mux.Router ctrlBase *ctrlbase.Controller - opts ServerOptions + opts Options } -func New(opts ServerOptions) *Server { +func New(opts Options) *Server { opts.MusicPath = filepath.Clean(opts.MusicPath) ctrlBase := &ctrlbase.Controller{ DB: opts.DB,