use filepath.Join to append db filename.

Author: mswift42

cl/cl.go

@@ -3,6 +3,7 @@ package cl
 import (
 	"fmt"
 	"os/exec"
+	"path/filepath"
 	"runtime"
 	"strconv"
 
@@ -30,7 +31,7 @@ func extractIndex(c *cli.Context) (int, error) {
 // and sets up the command line commands.
 func InitCli() *cli.App {
 	dbpath := tv.DBPath()
-	db, err := tv.RestoreProgrammeDB(dbpath + tv.NipDB)
+	db, err := tv.RestoreProgrammeDB(filepath.Join(dbpath, tv.NipDB))
 	if err != nil {
 		panic(err)
 	}

tv/db.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -284,13 +285,12 @@ func RefreshDB(filename string) {
 
 func init() {
 	dbpath := DBPath()
-	filename := NipDB
-	pdb, err := RestoreProgrammeDB(dbpath + filename)
+	pdb, err := RestoreProgrammeDB(filepath.Join(dbpath, NipDB))
 	if err != nil {
-		RefreshDB(dbpath + filename)
+		RefreshDB(filepath.Join(dbpath, NipDB))
 	} else {
 		if pdb.sixHoursLater(time.Now()) || len(pdb.Categories) == 0 {
-			RefreshDB(dbpath + filename)
+			RefreshDB(filepath.Join(dbpath, NipDB))
 		}
 	}
 	tobedel := pdb.toBeDeletedProgrammes()

tv/tv.go

@@ -341,13 +341,13 @@ func DBPath() string {
 	}
 	path = filepath.Join(path, "nip")
 	fmt.Println(path)
-	if _, err := os.Stat(path + NipDB); os.IsNotExist(err) {
+	if _, err := os.Stat(filepath.Join(path, NipDB)); os.IsNotExist(err) {
 		err := os.MkdirAll(path, os.ModePerm)
 		if err != nil {
 			log.Fatal(err)
 		}
 		pdb := &ProgrammeDB{[]*Category{}, time.Now(), []*SavedProgramme{}}
-		if err := pdb.Save(path + NipDB); err != nil {
+		if err := pdb.Save(filepath.Join(path, NipDB)); err != nil {
 			log.Fatal(err)
 		}
 	}