main: remove more unused code and simplify - twitch-go - twitch.tv web application in Go
(HTM) git clone git://git.codemadness.org/twitch-go
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit cf1825798ca90eb1435e127adf470d194d24a588
(DIR) parent c7f5a2ac3da3ff239c2e6294060e94ba1bcabe21
(HTM) Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Sat, 11 Apr 2015 20:52:07 +0200
main: remove more unused code and simplify
Diffstat:
M main.go | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
---
(DIR) diff --git a/main.go b/main.go
@@ -27,7 +27,6 @@ type AppConfig struct {
TemplateThemeDir string
TemplatePageDir string
Pidfile string
- Name string // application name
}
type TwitchToken struct {
@@ -199,10 +198,7 @@ func RenderTemplate(w io.Writer, pagename string, themename string, data interfa
if _, ok := pages[pagename]; !ok {
return errors.New(fmt.Sprintf("page template \"%s\" not found", pagename))
}
- var render *template.Template
- var err error
-
- render, err = pages[pagename].Clone()
+ render, err := pages[pagename].Clone()
if err != nil {
return err
}
@@ -219,9 +215,8 @@ func RenderTemplate(w io.Writer, pagename string, themename string, data interfa
}
func LoadPages(path string) (map[string]*template.Template, error) {
- var err error
m := make(map[string]*template.Template)
- path, err = filepath.Abs(path)
+ path, err := filepath.Abs(path)
if err != nil {
return m, err
}
@@ -234,7 +229,7 @@ func LoadPages(path string) (map[string]*template.Template, error) {
// replace potentially inconsistent paths (Windows).
name = strings.Replace(name, "\\", "/", -1)
name = strings.TrimPrefix(name, "/")
- // read data.
+ // read template data from file..
data, err := ioutil.ReadFile(p)
if err != nil {
return err
@@ -429,23 +424,16 @@ func usage() {
}
func main() {
- var err error
-
appconfig = AppConfig{
TemplateThemeDir: "templates/themes/default",
TemplatePageDir: "templates/pages/",
}
- var arg_pidfile = flag.String("f", "", "PID file")
- var arg_addr = flag.String("l", "127.0.0.1:8080", "listen address")
- var arg_password = flag.String("p", "", "admin password")
- var arg_addrtype = flag.String("t", "tcp4", `listen type: "tcp", "tcp4", "tcp6", "unix" or "unixpacket"`)
+ appconfig.Pidfile = *flag.String("f", "", "PID file")
+ appconfig.Addr = *flag.String("l", "127.0.0.1:8080", "listen address")
+ appconfig.Password = *flag.String("p", "", "admin password")
+ appconfig.AddrType = *flag.String("t", "tcp4", `listen type: "tcp", "tcp4", "tcp6", "unix" or "unixpacket"`)
flag.Parse()
- appconfig.Pidfile = *arg_pidfile
- appconfig.Addr = *arg_addr
- appconfig.AddrType = *arg_addrtype
- appconfig.Password = *arg_password
-
l, err := net.Listen(appconfig.AddrType, appconfig.Addr)
if err != nil {
panic(err)