diff --git a/.gitignore b/.gitignore index 30517a6..1720537 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ run.bat run.sh +audio/*.dca diff --git a/audio/readme.txt b/audio/readme.txt new file mode 100644 index 0000000..e6306f8 --- /dev/null +++ b/audio/readme.txt @@ -0,0 +1,3 @@ +Place .dca audio files here. +Naming convention is as follows: command_soundname.dca +This will result in "!command soundname". diff --git a/main.go b/main.go index 2200c4c..d7ed8c0 100644 --- a/main.go +++ b/main.go @@ -82,28 +82,30 @@ var COLLECTIONS []*SoundCollection func createCollections() { files, _ := ioutil.ReadDir("./audio") for _, f := range files { - soundfile := strings.Split(strings.Replace(f.Name(), ".dca", "", -1), "_") - containsPrefix := false - containsSound := false + if strings.Contains(f.Name(), ".dca") { + soundfile := strings.Split(strings.Replace(f.Name(), ".dca", "", -1), "_") + containsPrefix := false + containsSound := false - if len(COLLECTIONS) == 0 { - addNewSoundCollection(soundfile[0], soundfile[1]) - } - for _, c := range COLLECTIONS { - if c.Prefix == soundfile[0] { - containsPrefix = true - for _, sound := range c.Sounds { - if sound.Name == soundfile[1] { - containsSound = true + if len(COLLECTIONS) == 0 { + addNewSoundCollection(soundfile[0], soundfile[1]) + } + for _, c := range COLLECTIONS { + if c.Prefix == soundfile[0] { + containsPrefix = true + for _, sound := range c.Sounds { + if sound.Name == soundfile[1] { + containsSound = true + } + } + if !containsSound { + c.Sounds = append(c.Sounds, createSound(soundfile[1], 1, 250)) } } - if !containsSound { - c.Sounds = append(c.Sounds, createSound(soundfile[1], 1, 250)) - } } - } - if !containsPrefix { - addNewSoundCollection(soundfile[0], soundfile[1]) + if !containsPrefix { + addNewSoundCollection(soundfile[0], soundfile[1]) + } } } } diff --git a/templates/home.html b/templates/home.html index 248a28f..bb29ff8 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,4 +1,3 @@ -{{ define "title"}}Example{{ end }} {{ define "content" }} Login with Discord {{ end }} diff --git a/templates/internal.html b/templates/internal.html new file mode 100644 index 0000000..fff2431 --- /dev/null +++ b/templates/internal.html @@ -0,0 +1,3 @@ +{{ define "content" }} +Logout +{{ end }} diff --git a/templates/layout.html b/templates/layout.html index 81496a3..a0da6bb 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,17 +1,59 @@ {{ define "base" }} + - - - {{template "title" . }} + + + + + + + + + + + Gidbig + -
-

Example

-
-
- {{ template "content" . }} + + +
+ +
+

Gidbig

+

{{ template "content" . }}

+
+
+ + + + {{ end }} diff --git a/webserver.go b/webserver.go index 085926e..746f55f 100644 --- a/webserver.go +++ b/webserver.go @@ -40,6 +40,7 @@ var ( // startWebServer func startWebServer(port string, ci string, cs string, redirectURL string) { tmpls["home.html"] = template.Must(template.ParseFiles(templateDir+"home.html", defaultLayout)) + tmpls["internal.html"] = template.Must(template.ParseFiles(templateDir+"internal.html", defaultLayout)) store = sessions.NewCookieStore([]byte(cs)) discordOauthConfig.ClientID = ci discordOauthConfig.ClientSecret = cs @@ -59,7 +60,7 @@ func startWebServer(port string, ci string, cs string, redirectURL string) { func handleMain(w http.ResponseWriter, r *http.Request) { session, _ := store.Get(r, "session-name") if session.Values["discordUsername"] != nil { - fmt.Fprintf(w, "you are logged in as %s. logout", session.Values["discordUsername"]) + tmpls["internal.html"].ExecuteTemplate(w, "base", map[string]interface{}{}) return } tmpls["home.html"].ExecuteTemplate(w, "base", map[string]interface{}{})