Run gofmt tool on source files

This commit is contained in:
gmemstr 2017-09-21 12:10:16 -07:00
parent 4727da5c8a
commit 18267d0362
3 changed files with 65 additions and 66 deletions

View file

@ -7,12 +7,12 @@
package main package main
import ( import (
"net/http"
"fmt" "fmt"
"strings"
"io/ioutil"
"io" "io"
"io/ioutil"
"net/http"
"os" // ioOS? "os" // ioOS?
"strings"
) )
// Write custom CSS to disk or send it back to the client if GET // Write custom CSS to disk or send it back to the client if GET
@ -23,7 +23,7 @@ func CustomCss(w http.ResponseWriter, r *http.Request) {
filename := "custom.css" filename := "custom.css"
err := ioutil.WriteFile("./assets/static/" + filename, []byte(css), 0644) err := ioutil.WriteFile("./assets/static/"+filename, []byte(css), 0644)
if err != nil { if err != nil {
w.Write([]byte("<script>window.location = '/admin#failed';</script>")) w.Write([]byte("<script>window.location = '/admin#failed';</script>"))
@ -32,9 +32,9 @@ func CustomCss(w http.ResponseWriter, r *http.Request) {
w.Write([]byte("<script>window.location = '/admin#cssupdated';</script>")) w.Write([]byte("<script>window.location = '/admin#cssupdated';</script>"))
} }
} else { } else {
css,err := ioutil.ReadFile("./assets/static/custom.css") css, err := ioutil.ReadFile("./assets/static/custom.css")
if err != nil { if err != nil {
panic (err) panic(err)
} else { } else {
w.Write(css) w.Write(css)
} }
@ -57,7 +57,7 @@ func CreateEpisode(w http.ResponseWriter, r *http.Request) {
fmt.Println(description) fmt.Println(description)
// Finish building filenames // Finish building filenames
err := ioutil.WriteFile("./podcasts/" + shownotes, []byte(description), 0644) err := ioutil.WriteFile("./podcasts/"+shownotes, []byte(description), 0644)
if err != nil { if err != nil {
w.Write([]byte("<script>window.location = '/admin#failed';</script>")) w.Write([]byte("<script>window.location = '/admin#failed';</script>"))
fmt.Println(err) fmt.Println(err)
@ -90,7 +90,7 @@ func RemoveEpisode(w http.ResponseWriter, r *http.Request) {
// Remove MP3 first // Remove MP3 first
r.ParseMultipartForm(32 << 20) r.ParseMultipartForm(32 << 20)
episode := strings.Join(r.Form["episode"],"") episode := strings.Join(r.Form["episode"], "")
os.Remove(episode) os.Remove(episode)
sn := strings.Replace(episode, ".mp3", "_SHOWNOTES.md", 2) sn := strings.Replace(episode, ".mp3", "_SHOWNOTES.md", 2)
os.Remove(sn) os.Remove(sn)

View file

@ -63,7 +63,6 @@ func watch() {
<-done <-done
} }
// Called when a file has been created / changed, uses gorilla feeds // Called when a file has been created / changed, uses gorilla feeds
// fork to add items to feed object // fork to add items to feed object
func generate_rss() { func generate_rss() {
@ -84,7 +83,7 @@ func generate_rss() {
Title: viper.GetString("Name"), Title: viper.GetString("Name"),
Link: &feeds.Link{Href: podcasturl}, Link: &feeds.Link{Href: podcasturl},
Description: viper.GetString("Description"), Description: viper.GetString("Description"),
Author: &feeds.Author{Name: viper.GetString("Host"), Email:viper.GetString("Email")}, Author: &feeds.Author{Name: viper.GetString("Host"), Email: viper.GetString("Email")},
Created: now, Created: now,
Image: &feeds.Image{Url: viper.GetString("Image")}, Image: &feeds.Image{Url: viper.GetString("Image")},
} }
@ -94,7 +93,7 @@ func generate_rss() {
s := strings.Split(file.Name(), "_") s := strings.Split(file.Name(), "_")
t := strings.Split(s[1], ".") t := strings.Split(s[1], ".")
title := t[0] title := t[0]
description,err := ioutil.ReadFile("podcasts/" + strings.Replace(file.Name(), ".mp3", "_SHOWNOTES.md", 2)) description, err := ioutil.ReadFile("podcasts/" + strings.Replace(file.Name(), ".mp3", "_SHOWNOTES.md", 2))
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -104,7 +103,7 @@ func generate_rss() {
} }
size := fmt.Sprintf("%d", file.Size()) size := fmt.Sprintf("%d", file.Size())
link := podcasturl + "/download/" + file.Name() link := podcasturl + "/download/" + file.Name()
feed.Add ( feed.Add(
&feeds.Item{ &feeds.Item{
Title: title, Title: title,
Link: &feeds.Link{Href: link, Length: size, Type: "audio/mpeg"}, Link: &feeds.Link{Href: link, Length: size, Type: "audio/mpeg"},

View file

@ -7,11 +7,11 @@
package main package main
import ( import (
"crypto/subtle"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
"crypto/subtle"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/spf13/viper" "github.com/spf13/viper"
@ -43,13 +43,13 @@ func JsonHandler(w http.ResponseWriter, r *http.Request) {
// Serve up homepage // Serve up homepage
func HomeHandler(w http.ResponseWriter, r *http.Request) { func HomeHandler(w http.ResponseWriter, r *http.Request) {
data, err := ioutil.ReadFile("assets/index.html") data, err := ioutil.ReadFile("assets/1index.html")
if err == nil { if err == nil {
w.Write(data) w.Write(data)
} else { } else {
w.WriteHeader(500) w.WriteHeader(500)
w.Write([]byte("500 Something went wrong - " + http.StatusText(500))) w.Write([]byte("Error500 - " + http.StatusText(500)))
} }
} }
@ -60,7 +60,7 @@ func HomeHandler(w http.ResponseWriter, r *http.Request) {
* Code from stackoverflow by user Timmmm * Code from stackoverflow by user Timmmm
* https://stackoverflow.com/questions/21936332/idiomatic-way-of-requiring-http-basic-auth-in-go/39591234#39591234 * https://stackoverflow.com/questions/21936332/idiomatic-way-of-requiring-http-basic-auth-in-go/39591234#39591234
*/ */
func BasicAuth(handler http.HandlerFunc,) http.HandlerFunc { func BasicAuth(handler http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
username := viper.GetString("AdminUsername") username := viper.GetString("AdminUsername")