Merge pull request #53 from marcelGoerentz/development

Fix issue where 0 bytes has been read

src/buffer.go

@@ -96,6 +96,9 @@ func HandleByteOutput(stdOut io.ReadCloser, stream *Stream, errorChan chan Error
 			init = false
 		}
 		n, err := reader.Read(buffer)
+		if n == 0 {
+			continue
+		}
 		if err == io.EOF {
 			f.Close()
 			ShowDebug("Buffer reached EOF!", 3)

src/config.go

@@ -118,7 +118,7 @@ func Init() (err error) {
 	// Menü für das Webinterface
 	System.WEB.Menu = []string{"playlist", "xmltv", "filter", "mapping", "users", "settings", "log", "logout"}
 
-	ShowInfo(fmt.Sprintf("Info:For help run: " + getPlatformFile(os.Args[0]) + " -h"))
+	ShowInfo(fmt.Sprintf("Info:For help run: %s %s", getPlatformFile(os.Args[0]), " -h"))
 
 	// Überprüfen ob Threadfin als root läuft
 	if os.Geteuid() == 0 {

src/data.go

@@ -878,11 +878,7 @@ func buildDatabaseDVR() (err error) {
 						if value, ok := s[key]; ok {
 							if len(value) > 0 {
 
-								if _, ok := tmpGroupsM3U[value]; ok {
-									tmpGroupsM3U[value]++
-								} else {
-									tmpGroupsM3U[value] = 1
-								}
+								tmpGroupsM3U[value]++
 
 								groupTitle++
 							}

src/internal/up2date/client/client.go

@@ -15,12 +15,12 @@ import (
 
 // ClientInfo : Information about the key (NAME OS, ARCH, UUID, KEY)
 type ClientInfo struct {
-	Arch   string `json:"arch,required"`
-	Branch string `json:"branch,required"`
+	Arch   string `json:"arch"`
+	Branch string `json:"branch"`
 	CMD    string `json:"cmd,omitempty"`
-	Name   string `json:"name,required"`
-	OS     string `json:"os,required"`
-	URL    string `json:"url,required"`
+	Name   string `json:"name"`
+	OS     string `json:"os"`
+	URL    string `json:"url"`
 
 	Response ServerResponse `json:"response,omitempty"`
 }
@@ -82,7 +82,7 @@ func serverRequest() (err error) {
 		}
 
 		// Check redirect 301 <---> 308
-		redirect, err := http.NewRequest("POST", Updater.URL, nil)
+		redirect, _ := http.NewRequest("POST", Updater.URL, nil)
 
 		client := &http.Client{}
 		client.CheckRedirect = func(redirect *http.Request, via []*http.Request) error {
@@ -101,7 +101,7 @@ func serverRequest() (err error) {
 		}
 		// ---
 
-		req, err := http.NewRequest("POST", Updater.URL, bytes.NewBuffer(jsonByte))
+		req, _ := http.NewRequest("POST", Updater.URL, bytes.NewBuffer(jsonByte))
 		req.Header.Set("Content-Type", "application/json")
 
 		client = &http.Client{}
@@ -113,8 +113,7 @@ func serverRequest() (err error) {
 
 		if resp.StatusCode != http.StatusOK {
 			//fmt.Println(resp.StatusCode, Updater.URL, Updater.CMD)
-			err = fmt.Errorf(fmt.Sprintf("%d: %s (%s)", resp.StatusCode, http.StatusText(resp.StatusCode), Updater.URL))
-			return err
+			return fmt.Errorf("%d: %s (%s)", resp.StatusCode, http.StatusText(resp.StatusCode), Updater.URL)
 		}
 
 		Updater.CMD = ""

src/internal/up2date/client/update.go

@@ -43,7 +43,7 @@ func DoUpdate(fileType, filenameBIN string) (err error) {
 		}
 
 		// Change binary filename to .filename
-		binary, err := os.Executable()
+		binary, _ := os.Executable()
 		var filename = getFilenameFromPath(binary)
 		var path = getPlatformPath(binary)
 		var oldBinary = path + "_old_" + filename
@@ -110,7 +110,7 @@ func DoUpdate(fileType, filenameBIN string) (err error) {
 		}
 
 		// Set the permission
-		err = os.Chmod(binary, 0755)
+		os.Chmod(binary, 0755)
 
 		// Close the new file !Windows
 		out.Close()
@@ -184,15 +184,6 @@ func restorOldBinary(oldBinary, newBinary string) {
 	os.Rename(oldBinary, newBinary)
 }
 
-func getPlatformFile(filename string) string {
-
-	path, file := filepath.Split(filename)
-	var newPath = filepath.Dir(path)
-	var newFileName = newPath + string(os.PathSeparator) + file
-
-	return newFileName
-}
-
 func getFilenameFromPath(path string) string {
 
 	file := filepath.Base(path)

src/screen.go

@@ -326,7 +326,7 @@ func getErrMsg(errCode int) (errMsg string) {
 
 	// Tuner
 	case 2105:
-		errMsg = fmt.Sprintf("The number of tuners has changed, you have to delete " + System.Name + " in Plex / Emby HDHR and set it up again.")
+		errMsg = fmt.Sprintf("The number of tuners has changed, you have to delete %s in Plex / Emby HDHR and set it up again.", System.Name)
 	case 2106:
 		errMsg = "This function is only available with XEPG as EPG source"
 

src/xepg.go

@@ -48,12 +48,7 @@ func buildXEPG(background bool) {
 
 	System.ScanInProgress = 1
 
-	var err error
-
 	Data.Cache.Images = imgcache.NewImageCache(Settings.CacheImages, System.Folder.ImagesCache, System.BaseURL)
-	if err != nil {
-		ShowError(err, 0)
-	}
 
 	if Settings.EpgSource == "XEPG" {
 
@@ -728,7 +723,7 @@ func mapping() (err error) {
 
 					} else {
 
-						ShowError(fmt.Errorf(fmt.Sprintf("Missing EPG data: %s", xepgChannel.Name)), 0)
+						ShowError(fmt.Errorf("missing EPG data: %s", xepgChannel.Name), 0)
 						ShowWarning(2302)
 						// xepgChannel.XActive = false