Code refactoring

Author: andyone

action/fs.go

@@ -9,14 +9,15 @@ package action
 
 import (
 	"bytes"
+	"crypto/sha256"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 
 	"github.com/essentialkaos/ek/v13/fsutil"
-	"github.com/essentialkaos/ek/v13/hash"
+	"github.com/essentialkaos/ek/v13/hashutil"
 	"github.com/essentialkaos/ek/v13/strutil"
 	"github.com/essentialkaos/ek/v13/system"
 
@@ -336,7 +337,7 @@ func Checksum(action *recipe.Action) error {
 		return err
 	}
 
-	fileHash := hash.FileHash(file)
+	fileHash := hashutil.File(file, sha256.New())
 
 	switch {
 	case !action.Negative && fileHash != mustHash:
@@ -368,7 +369,7 @@ func ChecksumRead(action *recipe.Action) error {
 		return err
 	}
 
-	hash := hash.FileHash(file)
+	hash := hashutil.File(file, sha256.New())
 
 	return action.Command.Recipe.SetVariable(variable, hash)
 }

action/http.go

@@ -224,10 +224,16 @@ func HTTPJSON(action *recipe.Action) error {
 	}
 
 	querySlice := parseJSONQuery(query)
-	jsonValue, _, _, err := jsonparser.Get(resp.Bytes(), querySlice...)
+	jsonData, err := resp.Bytes()
 
 	if err != nil {
-		return fmt.Errorf("Can't get JSON data: %v", err)
+		return fmt.Errorf("Can't get response data: %w", err)
+	}
+
+	jsonValue, _, _, err := jsonparser.Get(jsonData, querySlice...)
+
+	if err != nil {
+		return fmt.Errorf("Can't get JSON data: %w", err)
 	}
 
 	containsValue := string(jsonValue) == value

cli/barcode.go

@@ -8,12 +8,13 @@ package cli
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
+	"crypto/sha256"
 	"fmt"
 	"os/exec"
 
 	"github.com/essentialkaos/ek/v13/env"
 	"github.com/essentialkaos/ek/v13/fmtutil/barcode"
-	"github.com/essentialkaos/ek/v13/hash"
+	"github.com/essentialkaos/ek/v13/hashutil"
 
 	"github.com/essentialkaos/bibop/recipe"
 )
@@ -28,7 +29,7 @@ func printBarcode(r *recipe.Recipe) {
 		printErrorAndExit(err.Error())
 	}
 
-	recipeCrc := hash.FileHash(r.File)
+	recipeCrc := hashutil.File(r.File, sha256.New())
 
 	if err != nil {
 		printErrorAndExit(err.Error())