Add initial web interface to modify json db

bot.go

@@ -5,10 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/antonholmquist/jason"
 	"github.com/jasonlvhit/gocron"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"regexp"
@@ -73,51 +71,21 @@ func addSong(title string, week int, author string, song string) (bool, error) {
 	return false, errors.New("Could not find matching section")
 }
 
-type SongsFile struct {
-	Songs []*struct {
-		Week   int
-		Title  string
-		Artist string
-		URL    string
-		Sync   bool
-	}
-}
-
 func songSynced(syncedWeek int) error {
-	var v SongsFile
-	f, err := os.Open("songs.json")
+	v, err := loadDb()
 	if err != nil {
 		return err
 	}
-	defer f.Close()
-
-	if err != nil {
-		log.Fatal(err)
-		return nil
-	}
-	dec := json.NewDecoder(f)
-	dec.UseNumber()
-	for {
-		if err := dec.Decode(&v); err == io.EOF {
-			break
-		} else if err != nil {
-			log.Fatal(err)
-			return err
-		}
-	}
 
 	synced := false
 	for _, song := range v.Songs {
 		if song.Week == syncedWeek {
 			song.Sync = true
 			synced = true
-			jsonValue, err := json.Marshal(v)
+			err := saveDb(v)
 			if err != nil {
-				log.Fatal(err)
 				return err
 			}
-			err = ioutil.WriteFile("songs.json", jsonValue, 0644)
-			return err
 		}
 	}
 	if !synced {
@@ -127,49 +95,18 @@ func songSynced(syncedWeek int) error {
 }
 
 func getSongs() (SongPriorityQueue, error) {
-	f, err := os.Open("songs.json")
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	v, err := jason.NewObjectFromReader(f)
+	dbSongs, err := loadDb()
 	if err != nil {
 		return nil, err
 	}
-	songsArr, err := v.GetObjectArray("Songs")
-	if err != nil {
-		return nil, err
-	}
-
-	yearStart, _ := time.Parse(time.RFC3339, "2018-01-01T00:00:00+02:00")
-
-	songs := make(SongPriorityQueue, len(songsArr))
-	for index, songObj := range songsArr {
-		title, err := songObj.GetString("Title")
-		if err != nil {
-			return nil, err
-		}
-		artist, err := songObj.GetString("Artist")
-		if err != nil {
-			return nil, err
-		}
-		url, err := songObj.GetString("URL")
-		if err != nil {
-			return nil, err
-		}
-		week64, err := songObj.GetInt64("Week")
-		if err != nil {
-			return nil, err
-		}
-		week := int(week64)
-		sync, _ := songObj.GetBoolean("Sync")
 
-		target := yearStart.AddDate(0, 0, (week-1)*7)
+	songs := make(SongPriorityQueue, len(dbSongs.Songs))
+	for index, songObj := range dbSongs.Songs {
 		songs[index] = &Song{
-			time:  target,
-			song:  "[" + url + " " + artist + " - " + title + "]",
-			week:  week,
-			sync:  sync,
+			time:  targetTime(songObj),
+			song:  songEntryWikiText(songObj),
+			week:  songObj.Week,
+			sync:  songObj.Sync,
 			index: index,
 		}
 	}
@@ -221,6 +158,20 @@ func initCreds() error {
 	return nil
 }
 
+func targetTime(entry *SongEntry) time.Time {
+	yearStart, _ := time.Parse(time.RFC3339, "2018-01-01T00:00:00+02:00")
+	target := yearStart.AddDate(0, 0, (entry.Week-1)*7)
+	return target
+}
+
+func songEntryWikiText(entry *SongEntry) string {
+	return songWikiText(entry.URL, entry.Artist, entry.Title)
+}
+
+func songWikiText(url string, artist string, title string) string {
+	return "[" + url + " " + artist + " - " + title + "]"
+}
+
 func main() {
 	err := initCreds()
 	if err != nil {
@@ -230,6 +181,42 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
+
+	modifiedSongChan := make(chan *SongEntry)
+
+	go func() {
+		webStart(modifiedSongChan)
+	}()
+
+	go func() {
+		for {
+			newSong := <-modifiedSongChan
+			matched := false
+			for _, song := range songs {
+				if song.week == newSong.Week {
+					song.song = songEntryWikiText(newSong)
+					song.sync = newSong.Sync
+					matched = true
+					log.Printf("Updated song for week %d, artist: %s, title: %s, URL: %s, time: %v",
+						newSong.Week, newSong.Artist, newSong.Title, newSong.URL, song.time)
+				}
+			}
+			if !matched {
+				song := &Song{
+					time:  targetTime(newSong),
+					song:  songEntryWikiText(newSong),
+					week:  newSong.Week,
+					sync:  newSong.Sync,
+					index: len(songs),
+				}
+				heap.Push(&songs, song)
+				log.Printf("Added song for week %d, artist: %s, title: %s, URL: %s, time: %v",
+					newSong.Week, newSong.Artist, newSong.Title, newSong.URL, song.time)
+			}
+		}
+	}()
+
 	gocron.Every(1).Second().Do(task)
 	<-gocron.Start()
+
 }

db.go

@@ -0,0 +1,53 @@
+package main
+
+import (
+	"encoding/json"
+	"io"
+	"io/ioutil"
+	"os"
+)
+
+type SongsFile struct {
+	Songs []*SongEntry
+}
+
+type SongEntry struct {
+	Week   int
+	Title  string
+	Artist string
+	URL    string
+	Sync   bool
+}
+
+func loadDb() (SongsFile, error) {
+
+	var v SongsFile
+	f, err := os.Open("songs.json")
+	if err != nil {
+		return v, err
+	}
+	defer f.Close()
+
+	if err != nil {
+		return v, err
+	}
+	dec := json.NewDecoder(f)
+	dec.UseNumber()
+	for {
+		if err := dec.Decode(&v); err == io.EOF {
+			break
+		} else if err != nil {
+			return v, err
+		}
+	}
+	return v, nil
+}
+
+func saveDb(v SongsFile) error {
+	jsonValue, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile("songs.json", jsonValue, 0644)
+	return err
+}

web.go

@@ -0,0 +1,115 @@
+package main
+
+import (
+	"html/template"
+	"net/http"
+	"strconv"
+)
+
+var (
+	cachedTemplates = template.Must(template.ParseFiles("web/index.html"))
+	songsChan       chan *SongEntry
+)
+
+func indexHandler(w http.ResponseWriter, r *http.Request) {
+	if r.URL.Path != "/" {
+		http.Error(w, "Not Found", http.StatusNotFound)
+		return
+	}
+
+	songs, err := loadDb()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	alsoEmptySongs := SongsFile{
+		Songs: make([]*SongEntry, 52),
+	}
+	for week := 1; week <= 52; week++ {
+		alsoEmptySongs.Songs[week-1] = &SongEntry{Week: week}
+	}
+	for _, song := range songs.Songs {
+		alsoEmptySongs.Songs[song.Week-1] = song
+	}
+
+	var templates = cachedTemplates
+	if true {
+		templates = template.Must(template.ParseFiles("web/index.html"))
+	}
+	err = templates.ExecuteTemplate(w, "index.html", alsoEmptySongs)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+}
+
+func updateHandler(w http.ResponseWriter, r *http.Request) {
+	if r.URL.Path != "/update" {
+		http.Error(w, "Forbidden", http.StatusForbidden)
+		return
+	}
+	err := r.ParseForm()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	week, err := strconv.Atoi(r.Form.Get("week"))
+	if err != nil {
+		http.Error(w, "week parameter not provided", http.StatusBadRequest)
+		return
+	}
+	artist := r.Form.Get("artist")
+	title := r.Form.Get("title")
+	url := r.Form.Get("url")
+	sync := r.Form.Get("sync")
+
+	songs, err := loadDb()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	matched := false
+	for _, song := range songs.Songs {
+		if song.Week == week {
+			song.Artist = artist
+			song.Title = title
+			song.URL = url
+			if song.Sync && sync != "on" {
+				song.Sync = false
+			}
+			songsChan <- song
+			matched = true
+		}
+	}
+	if !matched {
+		song := &SongEntry{
+			Artist: artist,
+			Title:  title,
+			URL:    url,
+			Week:   week,
+		}
+		songs.Songs = append(songs.Songs, song)
+		songsChan <- song
+	}
+
+	err = saveDb(songs)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
+}
+
+func webStart(modifiedSongChan chan *SongEntry) {
+	songsChan = modifiedSongChan
+
+	fs := http.FileServer(http.Dir("web"))
+	http.Handle("/css/", fs)
+	http.Handle("/fonts/", fs)
+	http.Handle("/js/", fs)
+	http.Handle("/favicon.ico", fs)
+	http.HandleFunc("/", indexHandler)
+	http.HandleFunc("/update", updateHandler)
+
+	http.ListenAndServe("localhost:8080", nil)
+}

web/css/jumbotron.css

@@ -0,0 +1,4 @@
+/* Move down content because we have a fixed navbar that is 50px tall */
+body {
+  padding-top: 2rem;
+}

web/index.html

@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="favicon.ico">
+
+    <title>LevyraatiBot</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="css/jumbotron.css" rel="stylesheet">
+  </head>
+
+  <body>
+
+    <nav class="navbar navbar-toggleable-md navbar-inverse fixed-top bg-inverse">
+      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <a class="navbar-brand" href="#"></a>
+
+      <div class="collapse navbar-collapse" id="navbarsExampleDefault">
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item active">
+            <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Link</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link disabled" href="#">Disabled</a>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="http://example.com" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a>
+            <div class="dropdown-menu" aria-labelledby="dropdown01">
+              <a class="dropdown-item" href="#">Action</a>
+              <a class="dropdown-item" href="#">Another action</a>
+              <a class="dropdown-item" href="#">Something else here</a>
+            </div>
+          </li>
+        </ul>
+        <form class="form-inline my-2 my-lg-0">
+          <input class="form-control mr-sm-2" type="text" placeholder="Search">
+          <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
+        </form>
+      </div>
+    </nav>
+
+    <!-- Main jumbotron for a primary marketing message or call to action -->
+    <div class="jumbotron">
+      <div class="container">
+        <h1 class="display-3">Hello Lamperi!</h1>
+        <p>Please fill in the songs for year 2018.</p>
+      </div>
+    </div>
+
+    <div class="container">
+        {{range .Songs }}
+        <div class="row">
+            <small style="width: 70px">Week {{ .Week }}</small>
+            <form class="form-inline" method="post" action="/update">
+                <label class="sr-only" for="artist">Artist</label>
+                <input class="form-control mb-2 mr-sm-2" name="artist" placeholder="Enter Artist"  value="{{ .Artist }}">
+                
+                <label class="sr-only" for="title">Track title</label>
+                <input class="form-control mb-2 mr-sm-2" name="title" placeholder="Enter Track title"  value="{{ .Title }}">
+                
+                <label class="sr-only" for="url">Track URL</label>
+                <input class="form-control mb-2 mr-sm-2" name="url" placeholder="Enter Track title" value="{{ .URL }}">
+                
+                <div class="form-check mb-2 mr-sm-2">
+                    <input class="form-check-input" style="width: 100px" type="checkbox" name="synced" {{ if .Sync }} checked {{ else }} disabled {{ end }}>
+                    <label class="form-check-label" for="synced">Track is synced</label>
+                </div>
+                
+                <input type="hidden" name="week" value="{{ .Week }}">
+                <button type="submit" class="btn btn-primary mb-2">Update track</button>
+            </form>
+            
+        </div>
+        {{end}}
+
+      <hr>
+
+      <footer>
+        <p>&copy; Lamperi 2018</p>
+      </footer>
+    </div> <!-- /container -->
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
+    <script src="js/vendor/bootstrap.min.js"></script>
+  </body>
+</html>