Add flags for handling features of advanced logs

cmd/addons_logs.go

@@ -27,6 +27,16 @@ Allowing you to look at the log output generated by a Home Assistant add-on.
 		section := "addons"
 		command := "{slug}/logs"
 
+		boot, _ := cmd.Flags().GetString("boot")
+		if len(boot) > 0 {
+			command += "/boots/{boot}"
+		}
+
+		follow, _ := cmd.Flags().GetBool("follow")
+		if follow {
+			command += "/follow"
+		}
+
 		url, err := helper.URLHelper(section, command)
 
 		if err != nil {
@@ -35,15 +45,31 @@ Allowing you to look at the log output generated by a Home Assistant add-on.
 			return
 		}
 
-		request := helper.GetRequest()
+		accept := "text/plain"
+		verbose, _ := cmd.Flags().GetBool("verbose")
+		if verbose {
+			accept = "text/x-log"
+		}
+
+		/* Disable timeouts to allow following forever */
+		request := helper.GetRequestTimeout(0).SetHeader("Accept", accept).SetDoNotParseResponse(true)
+
+		lines, _ := cmd.Flags().GetInt32("lines")
+		if lines > 0 {
+			rangeHeader := fmt.Sprintf("entries=:%d:", -(lines - 1))
+			log.WithField("value", rangeHeader).Debug("Range header")
+			request.SetHeader("Range", rangeHeader)
+		}
+
+		request.SetPathParam("boot", boot)
 
 		slug := args[0]
 
 		request.SetPathParams(map[string]string{
 			"slug": slug,
 		})
 
-		resp, err := request.SetHeader("Accept", "text/plain").Get(url)
+		resp, err := request.Get(url)
 
 		// returns 200 OK or 400, everything else is wrong
 		if err == nil && resp.StatusCode() != 200 && resp.StatusCode() != 400 {
@@ -54,12 +80,20 @@ Allowing you to look at the log output generated by a Home Assistant add-on.
 		if err != nil {
 			fmt.Println(err)
 			ExitWithError = true
-		} else {
-			fmt.Println(string(resp.Body()))
+			return
 		}
+
+		ExitWithError = !helper.StreamTextResponse(resp)
 	},
 }
 
 func init() {
+	addonsLogsCmd.Flags().BoolP("follow", "f", false, "Continuously print new log entries")
+	addonsLogsCmd.Flags().Int32P("lines", "n", 0, "Number of log entries to show")
+	addonsLogsCmd.Flags().StringP("boot", "b", "", "Logs of particular boot ID")
+	addonsLogsCmd.Flags().BoolP("verbose", "v", false, "Return logs in verbose format")
+	addonsLogsCmd.Flags().Lookup("follow").NoOptDefVal = "true"
+	addonsLogsCmd.Flags().Lookup("verbose").NoOptDefVal = "true"
+
 	addonsCmd.AddCommand(addonsLogsCmd)
 }

cmd/audio_logs.go

@@ -25,25 +25,60 @@ running on your Home Assistant system.`,
 		section := "audio"
 		command := "logs"
 
+		boot, _ := cmd.Flags().GetString("boot")
+		if len(boot) > 0 {
+			command += "/boots/{boot}"
+		}
+
+		follow, _ := cmd.Flags().GetBool("follow")
+		if follow {
+			command += "/follow"
+		}
+
 		url, err := helper.URLHelper(section, command)
 		if err != nil {
 			fmt.Printf("Error: %v", err)
 			ExitWithError = true
 			return
 		}
 
-		request := helper.GetRequest()
-		resp, err := request.SetHeader("Accept", "text/plain").Get(url)
+		accept := "text/plain"
+		verbose, _ := cmd.Flags().GetBool("verbose")
+		if verbose {
+			accept = "text/x-log"
+		}
+
+		/* Disable timeouts to allow following forever */
+		request := helper.GetRequestTimeout(0).SetHeader("Accept", accept).SetDoNotParseResponse(true)
+
+		lines, _ := cmd.Flags().GetInt32("lines")
+		if lines > 0 {
+			rangeHeader := fmt.Sprintf("entries=:%d:", -(lines - 1))
+			log.WithField("value", rangeHeader).Debug("Range header")
+			request.SetHeader("Range", rangeHeader)
+		}
+
+		request.SetPathParam("boot", boot)
+
+		resp, err := request.Get(url)
 
 		if err != nil {
 			fmt.Println(err)
 			ExitWithError = true
-		} else {
-			fmt.Println(resp.String())
+			return
 		}
+
+		ExitWithError = !helper.StreamTextResponse(resp)
 	},
 }
 
 func init() {
+	audioLogsCmd.Flags().BoolP("follow", "f", false, "Continuously print new log entries")
+	audioLogsCmd.Flags().Int32P("lines", "n", 0, "Number of log entries to show")
+	audioLogsCmd.Flags().StringP("boot", "b", "", "Logs of particular boot ID")
+	audioLogsCmd.Flags().BoolP("verbose", "v", false, "Return logs in verbose format")
+	audioLogsCmd.Flags().Lookup("follow").NoOptDefVal = "true"
+	audioLogsCmd.Flags().Lookup("verbose").NoOptDefVal = "true"
+
 	audioCmd.AddCommand(audioLogsCmd)
 }

cmd/core_logs.go

@@ -25,25 +25,60 @@ running on your Home Assistant system.`,
 		section := "core"
 		command := "logs"
 
+		boot, _ := cmd.Flags().GetString("boot")
+		if len(boot) > 0 {
+			command += "/boots/{boot}"
+		}
+
+		follow, _ := cmd.Flags().GetBool("follow")
+		if follow {
+			command += "/follow"
+		}
+
 		url, err := helper.URLHelper(section, command)
 		if err != nil {
 			fmt.Printf("Error: %v", err)
 			ExitWithError = true
 			return
 		}
 
-		request := helper.GetRequest()
-		resp, err := request.SetHeader("Accept", "text/plain").Get(url)
+		accept := "text/plain"
+		verbose, _ := cmd.Flags().GetBool("verbose")
+		if verbose {
+			accept = "text/x-log"
+		}
+
+		/* Disable timeouts to allow following forever */
+		request := helper.GetRequestTimeout(0).SetHeader("Accept", accept).SetDoNotParseResponse(true)
+
+		lines, _ := cmd.Flags().GetInt32("lines")
+		if lines > 0 {
+			rangeHeader := fmt.Sprintf("entries=:%d:", -(lines - 1))
+			log.WithField("value", rangeHeader).Debug("Range header")
+			request.SetHeader("Range", rangeHeader)
+		}
+
+		request.SetPathParam("boot", boot)
+
+		resp, err := request.Get(url)
 
 		if err != nil {
 			fmt.Println(err)
 			ExitWithError = true
-		} else {
-			fmt.Println(resp.String())
+			return
 		}
+
+		ExitWithError = !helper.StreamTextResponse(resp)
 	},
 }
 
 func init() {
+	coreLogsCmd.Flags().BoolP("follow", "f", false, "Continuously print new log entries")
+	coreLogsCmd.Flags().Int32P("lines", "n", 0, "Number of log entries to show")
+	coreLogsCmd.Flags().StringP("boot", "b", "", "Logs of particular boot ID")
+	coreLogsCmd.Flags().BoolP("verbose", "v", false, "Return logs in verbose format")
+	coreLogsCmd.Flags().Lookup("follow").NoOptDefVal = "true"
+	coreLogsCmd.Flags().Lookup("verbose").NoOptDefVal = "true"
+
 	coreCmd.AddCommand(coreLogsCmd)
 }

cmd/dns_logs.go

@@ -26,24 +26,59 @@ Allowing you to look at the log output generated by the Home Assistant DNS serve
 		section := "dns"
 		command := "logs"
 
+		boot, _ := cmd.Flags().GetString("boot")
+		if len(boot) > 0 {
+			command += "/boots/{boot}"
+		}
+
+		follow, _ := cmd.Flags().GetBool("follow")
+		if follow {
+			command += "/follow"
+		}
+
 		url, err := helper.URLHelper(section, command)
 		if err != nil {
 			fmt.Printf("Error: %v", err)
 			return
 		}
 
-		request := helper.GetRequest()
-		resp, err := request.SetHeader("Accept", "text/plain").Get(url)
+		accept := "text/plain"
+		verbose, _ := cmd.Flags().GetBool("verbose")
+		if verbose {
+			accept = "text/x-log"
+		}
+
+		/* Disable timeouts to allow following forever */
+		request := helper.GetRequestTimeout(0).SetHeader("Accept", accept).SetDoNotParseResponse(true)
+
+		lines, _ := cmd.Flags().GetInt32("lines")
+		if lines > 0 {
+			rangeHeader := fmt.Sprintf("entries=:%d:", -(lines - 1))
+			log.WithField("value", rangeHeader).Debug("Range header")
+			request.SetHeader("Range", rangeHeader)
+		}
+
+		request.SetPathParam("boot", boot)
+
+		resp, err := request.Get(url)
 
 		if err != nil {
 			fmt.Println(err)
 			ExitWithError = true
-		} else {
-			fmt.Println(resp.String())
+			return
 		}
+
+		ExitWithError = !helper.StreamTextResponse(resp)
 	},
 }
 
 func init() {
+	dnsLogsCmd.Flags().BoolP("follow", "f", false, "Continuously print new log entries")
+	dnsLogsCmd.Flags().Int32P("lines", "n", 0, "Number of log entries to show")
+	dnsLogsCmd.Flags().StringP("boot", "b", "", "Logs of particular boot ID")
+	dnsLogsCmd.Flags().BoolP("verbose", "v", false, "Return logs in verbose format")
+	dnsLogsCmd.Flags().Lookup("follow").NoOptDefVal = "true"
+	dnsLogsCmd.Flags().Lookup("verbose").NoOptDefVal = "true"
+
 	dnsCmd.AddCommand(dnsLogsCmd)
 }

cmd/host_logs.go

@@ -49,8 +49,14 @@ across services and boots.
 			return
 		}
 
+		accept := "text/plain"
+		verbose, _ := cmd.Flags().GetBool("verbose")
+		if verbose {
+			accept = "text/x-log"
+		}
+
 		/* Disable timeouts to allow following forever */
-		request := helper.GetRequestTimeout(0).SetHeader("Accept", "text/plain").SetDoNotParseResponse(true)
+		request := helper.GetRequestTimeout(0).SetHeader("Accept", accept).SetDoNotParseResponse(true)
 
 		lines, _ := cmd.Flags().GetInt32("lines")
 		if lines > 0 {
@@ -85,7 +91,9 @@ func init() {
 	hostLogsCmd.Flags().Int32P("lines", "n", 0, "Number of log entries to show")
 	hostLogsCmd.Flags().StringP("identifier", "t", "", "Show entries with the specified syslog identifier")
 	hostLogsCmd.Flags().StringP("boot", "b", "", "Logs of particular boot ID")
+	hostLogsCmd.Flags().BoolP("verbose", "v", false, "Return logs in verbose format")
 	hostLogsCmd.Flags().Lookup("follow").NoOptDefVal = "true"
+	hostLogsCmd.Flags().Lookup("verbose").NoOptDefVal = "true"
 
 	hostCmd.AddCommand(hostLogsCmd)
 }

cmd/multicast_logs.go

@@ -26,24 +26,59 @@ Allowing you to look at the log output generated by the Home Assistant Multicast
 		section := "multicast"
 		command := "logs"
 
+		boot, _ := cmd.Flags().GetString("boot")
+		if len(boot) > 0 {
+			command += "/boots/{boot}"
+		}
+
+		follow, _ := cmd.Flags().GetBool("follow")
+		if follow {
+			command += "/follow"
+		}
+
 		url, err := helper.URLHelper(section, command)
 		if err != nil {
 			fmt.Printf("Error: %v", err)
 			return
 		}
 
-		request := helper.GetRequest()
-		resp, err := request.SetHeader("Accept", "text/plain").Get(url)
+		accept := "text/plain"
+		verbose, _ := cmd.Flags().GetBool("verbose")
+		if verbose {
+			accept = "text/x-log"
+		}
+
+		/* Disable timeouts to allow following forever */
+		request := helper.GetRequestTimeout(0).SetHeader("Accept", accept).SetDoNotParseResponse(true)
+
+		lines, _ := cmd.Flags().GetInt32("lines")
+		if lines > 0 {
+			rangeHeader := fmt.Sprintf("entries=:%d:", -(lines - 1))
+			log.WithField("value", rangeHeader).Debug("Range header")
+			request.SetHeader("Range", rangeHeader)
+		}
+
+		request.SetPathParam("boot", boot)
+
+		resp, err := request.Get(url)
 
 		if err != nil {
 			fmt.Println(err)
 			ExitWithError = true
-		} else {
-			fmt.Println(resp.String())
+			return
 		}
+
+		ExitWithError = !helper.StreamTextResponse(resp)
 	},
 }
 
 func init() {
+	multicastLogsCmd.Flags().BoolP("follow", "f", false, "Continuously print new log entries")
+	multicastLogsCmd.Flags().Int32P("lines", "n", 0, "Number of log entries to show")
+	multicastLogsCmd.Flags().StringP("boot", "b", "", "Logs of particular boot ID")
+	multicastLogsCmd.Flags().BoolP("verbose", "v", false, "Return logs in verbose format")
+	multicastLogsCmd.Flags().Lookup("follow").NoOptDefVal = "true"
+	multicastLogsCmd.Flags().Lookup("verbose").NoOptDefVal = "true"
+
 	multicastCmd.AddCommand(multicastLogsCmd)
 }