refactor: move CloseAndCheckError and ReadDirContent to go-fs-util (r…

…euse in electron-build-service)

pkg/appimage/appImage.go

@@ -13,6 +13,7 @@ import (
 	"github.com/develar/app-builder/pkg/linuxTools"
 	"github.com/develar/app-builder/pkg/util"
 	"github.com/develar/errors"
+	"github.com/develar/go-fs-util"
 )
 
 type AppImageOptions struct {
@@ -117,7 +118,7 @@ func writeRuntimeData(filePath string, runtimeData []byte) error {
 	}
 
 	_, err = file.WriteAt(runtimeData, 0)
-	return util.CloseAndCheckError(err, file)
+	return fsutil.CloseAndCheckError(err, file)
 }
 
 func createSquashFs(options AppImageOptions, offset int) error {

pkg/download/ActualLocation.go

@@ -8,8 +8,8 @@ import (
 	"os"
 
 	"github.com/apex/log"
-	"github.com/develar/app-builder/pkg/util"
 	"github.com/develar/errors"
+	"github.com/develar/go-fs-util"
 )
 
 // ActualLocation represents server's status 200 or 206 response meta data. It never holds redirect responses
@@ -129,7 +129,7 @@ func (actualLocation *ActualLocation) concatenateParts(expectedSha512 string) er
 		}
 
 		_, err = io.CopyBuffer(totalFile, reader, buf)
-		err = util.CloseAndCheckError(err, partFile)
+		err = fsutil.CloseAndCheckError(err, partFile)
 		if err != nil {
 			return errors.WithStack(err)
 		}

pkg/download/Part.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/develar/app-builder/pkg/util"
+	"github.com/develar/go-fs-util"
 )
 
 type Part struct {
@@ -73,7 +73,7 @@ func (part *Part) download(context context.Context, url string, index int, clien
 			response, err = client.Do(req)
 			if err != nil {
 				if response != nil {
-					err = util.CloseAndCheckError(err, response.Body)
+					err = fsutil.CloseAndCheckError(err, response.Body)
 				}
 				if i == 3 {
 					return err

pkg/fs/copier.go

@@ -23,7 +23,7 @@ type LinkInfo struct {
 
 // go doesn't provide native copy operation (CoW)
 func (fileCopier *FileCopier) copyDir(from string, to string, fromInfo os.FileInfo) error {
-	fileNames, err := ReadDirContent(from)
+	fileNames, err := fsutil.ReadDirContent(from)
 	if err != nil {
 		return errors.WithStack(err)
 	}

pkg/fs/file.go

@@ -7,46 +7,10 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/develar/app-builder/pkg/util"
 	"github.com/develar/errors"
+	"github.com/develar/go-fs-util"
 )
 
-func ReadDirContent(dirPath string) ([]string, error) {
-	dir, err := os.Open(dirPath)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	files, err := dir.Readdirnames(0)
-	return files, util.CloseAndCheckError(err, dir)
-}
-
-func EnsureEmptyDir(dirPath string) error {
-	dir, err := os.Open(dirPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return errors.WithStack(os.MkdirAll(dirPath, 0777))
-		} else {
-			return errors.WithStack(err)
-		}
-	}
-
-	defer dir.Close()
-
-	files, err := dir.Readdirnames(0)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	for _, name := range files {
-		err = os.RemoveAll(filepath.Join(dirPath, name))
-		if err != nil {
-			return errors.WithStack(err)
-		}
-	}
-	return nil
-}
-
 func ReadFile(file string, size int) ([]byte, error) {
 	reader, err := os.Open(file)
 	if err != nil {
@@ -55,7 +19,7 @@ func ReadFile(file string, size int) ([]byte, error) {
 
 	result := make([]byte, size)
 	_, err = reader.Read(result)
-	return result, util.CloseAndCheckError(err, reader)
+	return result, fsutil.CloseAndCheckError(err, reader)
 }
 
 func RemoveByGlob(fileGlob string) error {

pkg/icons/collect-icons.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 
 	"github.com/apex/log"
-	"github.com/develar/app-builder/pkg/fs"
 	"github.com/develar/errors"
+	"github.com/develar/go-fs-util"
 )
 
 func CollectIcons(sourceDir string) ([]IconInfo, string, error) {
-	files, err := fs.ReadDirContent(sourceDir)
+	files, err := fsutil.ReadDirContent(sourceDir)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil, "", errors.Errorf("icon directory %s doesn't exist", sourceDir)

pkg/icons/icns-to-png.go

@@ -9,9 +9,9 @@ import (
 	"runtime"
 
 	"github.com/apex/log"
-	"github.com/develar/app-builder/pkg/fs"
 	"github.com/develar/app-builder/pkg/util"
 	"github.com/develar/errors"
+	"github.com/develar/go-fs-util"
 	"github.com/disintegration/imaging"
 )
 
@@ -31,7 +31,7 @@ var icnsTypeToSize = []Icns2PngMapping{
 }
 
 func ConvertIcnsToPng(inFile string, outDir string) ([]IconInfo, error) {
-	err := fs.EnsureEmptyDir(outDir)
+	err := fsutil.EnsureEmptyDir(outDir)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
@@ -81,7 +81,7 @@ func ConvertIcnsToPngUsingIconUtil(inFile string, outDir string, sizeList *[]int
 		return nil, errors.WithStack(err)
 	}
 
-	iconFileNames, err := fs.ReadDirContent(outDir)
+	iconFileNames, err := fsutil.ReadDirContent(outDir)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}

pkg/icons/icns.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/develar/app-builder/pkg/util"
 	"github.com/develar/errors"
 	"github.com/develar/go-fs-util"
 	"github.com/disintegration/imaging"
@@ -114,15 +113,15 @@ func ConvertToIcns(inputInfo InputFileInfo, outFilePath string) error {
 
 	_, err = outFile.Write(icnsHeader)
 	if err != nil {
-		return errors.WithStack(util.CloseAndCheckError(err, outFile))
+		return errors.WithStack(fsutil.CloseAndCheckError(err, outFile))
 	}
 	_, err = outFile.Write(lengthBytes)
 	if err != nil {
-		return errors.WithStack(util.CloseAndCheckError(err, outFile))
+		return errors.WithStack(fsutil.CloseAndCheckError(err, outFile))
 	}
 
 	_, err = io.Copy(outFile, icns)
-	err = util.CloseAndCheckError(err, outFile)
+	err = fsutil.CloseAndCheckError(err, outFile)
 	if err != nil {
 		return errors.WithStack(err)
 	}

pkg/icons/icnsToPngUsingOpenJpeg.go

@@ -15,6 +15,7 @@ import (
 	"github.com/develar/app-builder/pkg/linuxTools"
 	"github.com/develar/app-builder/pkg/util"
 	"github.com/develar/errors"
+	"github.com/develar/go-fs-util"
 )
 
 var sameSize = map[string]string{
@@ -105,7 +106,7 @@ func ConvertIcnsToPngUsingOpenJpeg(icnsPath string, outDir string) ([]IconInfo,
 		}
 
 		_, err = io.Copy(outWriter, io.LimitReader(reader, int64(subImage.Length)))
-		err = util.CloseAndCheckError(err, outWriter)
+		err = fsutil.CloseAndCheckError(err, outWriter)
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}

pkg/icons/image-util.go

@@ -8,7 +8,6 @@ import (
 	"os"
 
 	"github.com/biessek/golang-ico"
-	"github.com/develar/app-builder/pkg/util"
 	"github.com/develar/errors"
 	"github.com/develar/go-fs-util"
 )
@@ -124,5 +123,5 @@ func SaveImage2(image image.Image, outFile *os.File, format int) error {
 		return err
 	}
 
-	return util.CloseAndCheckError(writer.Flush(), outFile)
+	return fsutil.CloseAndCheckError(writer.Flush(), outFile)
 }

pkg/util/util.go

@@ -2,8 +2,7 @@ package util
 
 import (
 	"encoding/json"
-	"io"
-	"os"
+		"os"
 	"os/exec"
 
 	"github.com/alecthomas/kingpin"
@@ -22,17 +21,6 @@ func ConfigureIsRemoveStageParam(command *kingpin.CmdClause) *bool {
 	return command.Flag("remove-stage", "Whether to remove stage after build.").Default(isRemoveStageDefaultValue).Bool()
 }
 
-func CloseAndCheckError(err error, closable io.Closer) error {
-	closeErr := closable.Close()
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	if closeErr != nil {
-		return errors.WithStack(closeErr)
-	}
-	return nil
-}
-
 func IsDebugEnabled() bool {
 	return getLevel() <= log.DebugLevel
 }