Merge pull request #20 from essentialkaos/develop

Version 0.3.0

Author: andyone

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+*                     @essentialkaos/go
+/.github/workflows/*  @essentialkaos/devops

.github/dependabot.yml

@@ -12,8 +12,6 @@ updates:
       - "PR • MAINTENANCE"
     assignees:
       - "andyone"
-    reviewers:
-      - "andyone"
     groups:
       all:
         applies-to: version-updates
@@ -32,5 +30,3 @@ updates:
       - "PR • MAINTENANCE"
     assignees:
       - "andyone"
-    reviewers:
-      - "andyone"

Makefile

@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 3.3.1 using next command:
+# This Makefile generated by GoMakeGen 3.3.3 using next command:
 # gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
@@ -123,15 +123,15 @@ clean: ## Remove generated files
 	@rm -f lj
 
 help: ## Show this info
-	@echo -e '\n\033[1mTargets:\033[0m\n'
+	@printf '\n\033[1mTargets:\033[0m\n\n'
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-9s\033[0m  %s\n", $$1, $$2}'
-	@echo -e '\n\033[1mVariables:\033[0m\n'
+	@printf '\n\033[1mVariables:\033[0m\n\n'
 	@grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \
 		| sed 's/ifdef //' \
 		| sort -h \
 		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-11s\033[0m  %s\n", $$1, $$2}'
-	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 3.3.1\033[0m\n'
+	@echo ''
+	@printf '\033[90mGenerated by GoMakeGen 3.3.3\033[0m\n\n'
 
 ################################################################################

README.md

@@ -6,7 +6,7 @@
   <a href="#license"><img src=".github/images/license.svg"/></a>
 </p>
 
-<p align="center"><a href="#installation">Installation</a> • <a href="#command-line-completion">Command-line completion</a> • <a href="#man-documentation">Man documentation</a> • <a href="#usage">Usage</a> • <a href="#ci-status">CI Status</a> • <a href="#contributing">Contributing</a> • <a href="#license">License</a></p>
+<p align="center"><a href="#installation">Installation</a> • <a href="#upgrading">Upgrading</a> • <a href="#usage">Usage</a> • <a href="#ci-status">CI Status</a> • <a href="#license">License</a></p>
 
 <br/>
 
@@ -34,6 +34,23 @@ You can download prebuilt binaries for Linux and macOS from [EK Apps Repository]
 bash <(curl -fsSL https://apps.kaos.st/get) lj
 ```
 
+### Upgrading
+
+Since version `0.3.0` you can update `lj` to the latest release using [self-update feature](https://github.com/essentialkaos/.github/blob/master/APPS-UPDATE.md):
+
+```bash
+lj --update
+```
+
+This command will runs a self-update in interactive mode. If you want to run a quiet update (_no output_), use the following command:
+
+```bash
+lj --update=quiet
+```
+
+> [!NOTE]  
+> Please note that the self-update feature only works with binaries that are downloaded from the [EK Apps Repository](https://apps.kaos.st/lj/latest). Binaries from packages do not have a self-update feature and must be upgraded via the package manager.
+
 ### Command-line completion
 
 You can generate completion for `bash`, `zsh` or `fish` shell.

cli/cli.go

@@ -39,7 +39,7 @@ import (
 // Basic utility info
 const (
 	APP  = "lj"
-	VER  = "0.2.1"
+	VER  = "0.3.0"
 	DESC = "Tool for viewing JSON logs"
 )
 
@@ -55,6 +55,7 @@ const (
 	OPT_HELP     = "h:help"
 	OPT_VER      = "v:version"
 
+	OPT_UPDATE       = "U:update"
 	OPT_VERB_VER     = "vv:verbose-version"
 	OPT_COMPLETION   = "completion"
 	OPT_GENERATE_MAN = "generate-man"
@@ -91,6 +92,7 @@ var optMap = options.Map{
 	OPT_HELP:     {Type: options.BOOL},
 	OPT_VER:      {Type: options.MIXED},
 
+	OPT_UPDATE:       {Type: options.MIXED},
 	OPT_VERB_VER:     {Type: options.BOOL},
 	OPT_COMPLETION:   {},
 	OPT_GENERATE_MAN: {Type: options.BOOL},
@@ -146,12 +148,13 @@ var highlights Highlights
 // Run is main utility function
 func Run(gitRev string, gomod []byte) {
 	preConfigureUI()
+	preConfigureOptions()
 
 	args, errs := options.Parse(optMap)
 
 	if !errs.IsEmpty() {
 		terminal.Error("Options parsing errors:")
-		terminal.Error(errs.Error("- "))
+		terminal.Error(errs.Error(" - "))
 		os.Exit(1)
 	}
 
@@ -172,6 +175,8 @@ func Run(gitRev string, gomod []byte) {
 			WithDeps(deps.Extract(gomod)).
 			Print()
 		os.Exit(0)
+	case withSelfUpdate && options.GetB(OPT_UPDATE):
+		os.Exit(updateBinary())
 	case options.GetB(OPT_HELP) || (!hasStdinData() && len(args) == 0):
 		genUsage().Print()
 		os.Exit(0)
@@ -209,6 +214,11 @@ func preConfigureUI() {
 	options.MergeSymbol = "\n"
 }
 
+// preConfigureOptions preconfigures command-line options based on build tags
+func preConfigureOptions() {
+	optMap.SetIf(withSelfUpdate, OPT_UPDATE, &options.V{Type: options.MIXED})
+}
+
 // configureUI configures user interface
 func configureUI() {
 	if options.GetB(OPT_NO_COLOR) {
@@ -295,7 +305,7 @@ func readDataStream(source *os.File, filters Filters) {
 		line = strings.TrimRight(line, "\r\n")
 
 		if time.Since(lastPrint) > 30*time.Second {
-			fmtutil.Separator(true, timeutil.ShortDuration(time.Since(lastPrint), false))
+			fmtutil.Separator(true, timeutil.Pretty(time.Since(lastPrint)).Short(true))
 		}
 
 		if renderLine(line, filters) {
@@ -513,6 +523,11 @@ func genUsage() *usage.Info {
 	info.AddOption(OPT_FIND, "Find and highlight part of message {s}(repeatable){!}")
 	info.AddOption(OPT_NO_PAGER, "Disable pager")
 	info.AddOption(OPT_NO_COLOR, "Disable colors in output")
+
+	if withSelfUpdate {
+		info.AddOption(OPT_UPDATE, "Update application to the latest version")
+	}
+
 	info.AddOption(OPT_HELP, "Show this help message")
 	info.AddOption(OPT_VER, "Show version")
 

cli/filter.go

@@ -77,7 +77,7 @@ func parseFilter(f string) Filter {
 	}
 
 	if filter.Cond == COND_GREATER || filter.Cond == COND_LESS {
-		fv, _ := strconv.ParseFloat(value, 10)
+		fv, _ := strconv.ParseFloat(value, 64)
 		filter.Value = fv
 	} else {
 		filter.Value = value

cli/with_selfupdate.go

@@ -0,0 +1,63 @@
+//go:build selfupdate
+// +build selfupdate
+
+package cli
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+//                                                                                    //
+//                         Copyright (c) 2025 ESSENTIAL KAOS                          //
+//      Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0>     //
+//                                                                                    //
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+import (
+	"strings"
+
+	"github.com/essentialkaos/ek/v13/fmtc"
+	"github.com/essentialkaos/ek/v13/options"
+	"github.com/essentialkaos/ek/v13/selfupdate"
+	"github.com/essentialkaos/ek/v13/selfupdate/interactive"
+	storage "github.com/essentialkaos/ek/v13/selfupdate/storage/basic"
+	"github.com/essentialkaos/ek/v13/terminal"
+)
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+var withSelfUpdate = true
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+// updateBinary updates current binary to the latest version
+func updateBinary() int {
+	quiet := strings.ToLower(options.GetS(OPT_UPDATE)) == "quiet"
+	updInfo, hasUpdate, err := storage.NewStorage("https://apps.kaos.ws").Check(APP, VER)
+
+	if err != nil {
+		if !quiet {
+			terminal.Error("Can't update binary: %v", err)
+		}
+
+		return 1
+	}
+
+	if !hasUpdate {
+		fmtc.If(!quiet).Println("{g}You are using the latest version of the app{!}")
+		return 0
+	}
+
+	pubKey := "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnYHsOTvrKqeE97dsEt7Ge97+yUcvQJn1++s++FqShDyqwV8CcoKp0E6nDTc8SxInZ5wxwcScxSicfvC9S73OSg=="
+
+	if quiet {
+		err = selfupdate.Run(updInfo, pubKey, nil)
+	} else {
+		err = selfupdate.Run(updInfo, pubKey, interactive.Dispatcher())
+	}
+
+	if err != nil {
+		return 1
+	}
+
+	return 0
+}
+
+// ////////////////////////////////////////////////////////////////////////////////// //

cli/without_selfupdate.go

@@ -0,0 +1,22 @@
+//go:build !selfupdate
+// +build !selfupdate
+
+package cli
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+//                                                                                    //
+//                         Copyright (c) 2025 ESSENTIAL KAOS                          //
+//      Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0>     //
+//                                                                                    //
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+var withSelfUpdate = false
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+// updateBinary updates current binary to the latest version
+func updateBinary() int {
+	return 1
+}
+
+// ////////////////////////////////////////////////////////////////////////////////// //

common/lj.spec

@@ -6,7 +6,7 @@
 
 Summary:        Tool for viewing JSON logs
 Name:           lj
-Version:        0.2.1
+Version:        0.3.0
 Release:        0%{?dist}
 Group:          Applications/System
 License:        Apache License, Version 2.0
@@ -97,6 +97,11 @@ fi
 ################################################################################
 
 %changelog
+* Tue Jun 17 2025 Anton Novojilov <andy@essentialkaos.com> - 0.3.0-0
+- Fixed bug with parsing float numbers for filters
+- Code refactoring
+- Dependencies update
+
 * Fri Apr 11 2025 Anton Novojilov <andy@essentialkaos.com> - 0.2.1-0
 - Use pager by default
 - Improved formatting in no color mode

go.mod

@@ -1,15 +1,15 @@
 module github.com/essentialkaos/lj
 
-go 1.23.7
+go 1.23.8
 
 require (
-	github.com/essentialkaos/ek/v13 v13.24.0
+	github.com/essentialkaos/ek/v13 v13.30.1
 	github.com/tidwall/gjson v1.18.0
 )
 
 require (
 	github.com/essentialkaos/depsy v1.3.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
 )