Add favorite to file

cmd/add.go

@@ -8,6 +8,7 @@ import (
 	"gopkg.in/dixonwille/wmenu.v4"
 
 	"islas/db"
+	"islas/fav"
 )
 
 func init() {
@@ -96,7 +97,12 @@ func addFavoriteStep3(conn *db.DB, line db.Line, direction db.Direction) {
 		stop := opts[0].Value.(db.Stop)
 		fmt.Printf("\nSelected stop %s on line %s to %s\n", stop.Name, line.Number, direction.Label)
 
-		return nil
+		newFav := fav.Favorite{
+			LineID:      line.ID,
+			DirectionID: direction.ID,
+			StopID:      stop.ID,
+		}
+		return fav.AddToFile(newFav)
 	})
 	if err := menu.Run(); err != nil {
 		log.WithError(err).Fatal("Menu error")

db/stop.go

@@ -25,7 +25,8 @@ func (db *DB) GetStops(lineID, directionID int) ([]Stop, error) {
 		INNER JOIN LIGNE AS l
 			ON l.LIGNO = la.LIGNO
 		INNER JOIN LIGNE_SENS AS ls
-			ON ls.sens = la.sens
+			ON ls.SENS = la.SENS
+			AND ls.LIGNO = l.LIGNO
 		WHERE l.LIGNO = ? AND ls.SENS = ?
 		ORDER BY la.ALIORDRE`,
 		lineID, directionID)
@@ -44,7 +45,8 @@ func (db *DB) GetStop(lineID, directionID, stopID int) (Stop, error) {
 		INNER JOIN LIGNE AS l
 			ON l.LIGNO = la.LIGNO
 		INNER JOIN LIGNE_SENS AS ls
-			ON ls.sens = la.sens
+			ON ls.SENS = la.SENS
+			AND ls.LIGNO = l.LIGNO
 		WHERE l.LIGNO = ? AND ls.SENS = ? AND pa.PTANO = ?`,
 		lineID, directionID, stopID)
 	return stop, err

fav/common.go

@@ -0,0 +1,24 @@
+package fav
+
+import (
+	"github.com/casimir/xdg-go"
+
+	"islas/db"
+)
+
+// GetPath returns the path to the favorites file.
+func GetPath() string {
+	return xdg.ConfigPath("favorites.yml")
+}
+
+// Favorite stores everything about a bus/tramway stop.
+type Favorite struct {
+	StopID      int
+	LineID      int
+	DirectionID int
+}
+
+// AsStop returns the DB stop that corresponds to this favorite.
+func (fav *Favorite) AsStop(conn *db.DB) (db.Stop, error) {
+	return conn.GetStop(fav.LineID, fav.DirectionID, fav.StopID)
+}

fav/read.go

@@ -0,0 +1,26 @@
+package fav
+
+import (
+	"os"
+
+	"gopkg.in/yaml.v2"
+)
+
+// FromFile reads a list of favorites from a YAML file.
+func FromFile() ([]Favorite, error) {
+	favs := []Favorite{}
+
+	path := GetPath()
+	favFile, err := os.Open(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return favs, nil
+		}
+		return nil, err
+	}
+	defer favFile.Close()
+
+	dec := yaml.NewDecoder(favFile)
+	err = dec.Decode(&favs)
+	return favs, err
+}

fav/write.go

@@ -0,0 +1,42 @@
+package fav
+
+import (
+	"os"
+	"path"
+
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v2"
+)
+
+// AddToFile adds the given favorite to the favorites YAML file.
+func AddToFile(newFav Favorite) error {
+	// Read the current ones
+	favs, err := FromFile()
+	if err != nil {
+		return err
+	}
+
+	// Is it already in the list?
+	for _, fav := range favs {
+		if fav.StopID == newFav.StopID && fav.LineID == newFav.LineID && fav.DirectionID == newFav.DirectionID {
+			return nil
+		}
+	}
+
+	// Nope: add it!
+	favs = append(favs, newFav)
+
+	// And save the file…
+	favPath := GetPath()
+	if err := os.MkdirAll(path.Dir(favPath), 0700); err != nil {
+		log.WithError(err).Fatal("Cannot create the favorites file parent directory")
+	}
+	favFile, err := os.Create(favPath)
+	if err != nil {
+		return err
+	}
+	defer favFile.Close()
+
+	enc := yaml.NewEncoder(favFile)
+	return enc.Encode(favs)
+}