Update file helpers

Author: deliahu

pkg/lib/files/errors.go

@@ -28,6 +28,7 @@ type ErrorKind int
 const (
 	ErrUnknown ErrorKind = iota
 	ErrCreateDir
+	ErrDeleteDir
 	ErrReadFormFile
 	ErrCreateFile
 	ErrReadDir
@@ -43,6 +44,7 @@ const (
 var _errorKinds = []string{
 	"err_unknown",
 	"err_create_dir",
+	"err_delete_dir",
 	"err_read_form_file",
 	"err_create_file",
 	"err_read_dir",
@@ -107,6 +109,13 @@ func ErrorCreateDir(path string) error {
 	})
 }
 
+func ErrorDeleteDir(path string) error {
+	return errors.WithStack(Error{
+		Kind:    ErrDeleteDir,
+		message: fmt.Sprintf("%s: unable to delete directory", path),
+	})
+}
+
 func ErrorReadFormFile(fileName string) error {
 	return errors.WithStack(Error{
 		Kind:    ErrReadFormFile,

pkg/lib/files/files.go

@@ -65,6 +65,20 @@ func OpenFile(path string, flag int, perm os.FileMode) (*os.File, error) {
 	return file, err
 }
 
+func OpenNewFile(path string) (*os.File, error) {
+	cleanPath, err := EscapeTilde(path)
+	if err != nil {
+		return nil, err
+	}
+
+	file, err := os.Create(cleanPath)
+	if err != nil {
+		return nil, errors.Wrap(err, errors.Message(ErrorCreateFile(path)))
+	}
+
+	return file, nil
+}
+
 func ReadFile(path string) (string, error) {
 	fileBytes, err := ReadFileBytes(path)
 	if err != nil {
@@ -96,18 +110,19 @@ func ReadFileBytesErrPath(path string, errMsgPath string) ([]byte, error) {
 	return fileBytes, nil
 }
 
-func CreateFile(path string) (*os.File, error) {
+func CreateFile(path string) error {
 	cleanPath, err := EscapeTilde(path)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	file, err := os.Create(cleanPath)
 	if err != nil {
-		return nil, errors.Wrap(err, errors.Message(ErrorCreateFile(path)))
+		return errors.Wrap(err, errors.Message(ErrorCreateFile(path)))
 	}
+	defer file.Close()
 
-	return file, nil
+	return nil
 }
 
 func WriteFile(data []byte, path string) error {
@@ -123,19 +138,6 @@ func WriteFile(data []byte, path string) error {
 	return nil
 }
 
-func MkdirAll(path string) error {
-	cleanPath, err := EscapeTilde(path)
-	if err != nil {
-		return err
-	}
-
-	if err := os.MkdirAll(cleanPath, os.ModePerm); err != nil {
-		return errors.Wrap(err, errors.Message(ErrorCreateDir(path)))
-	}
-
-	return nil
-}
-
 // Returns original path if there was an error
 func EscapeTilde(path string) (string, error) {
 	if !(path == "~" || strings.HasPrefix(path, "~/")) {
@@ -256,23 +258,61 @@ func CheckFileErrPath(path string, errMsgPath string) error {
 	return nil
 }
 
-func CreateDirIfMissing(path string) (bool, error) {
+func CreateDir(path string) error {
 	cleanPath, err := EscapeTilde(path)
 	if err != nil {
-		return false, err
+		return err
+	}
+
+	if err := os.MkdirAll(cleanPath, os.ModePerm); err != nil {
+		return errors.Wrap(err, errors.Message(ErrorCreateDir(path)))
 	}
 
-	if err := CheckDir(path); err == nil {
+	return nil
+}
+
+func CreateDirIfMissing(path string) (bool, error) {
+	if IsDir(path) {
 		return false, nil
 	}
 
-	if err := CheckFile(path); err == nil {
+	if IsFile(path) {
 		return false, ErrorFileAlreadyExists(path)
 	}
 
-	err = os.MkdirAll(cleanPath, os.ModePerm)
+	err := CreateDir(path)
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
+
+func DeleteDir(path string) error {
+	cleanPath, err := EscapeTilde(path)
 	if err != nil {
-		return false, errors.Wrap(err, path)
+		return err
+	}
+
+	if err := os.RemoveAll(cleanPath); err != nil {
+		return errors.Wrap(err, errors.Message(ErrorDeleteDir(path)))
+	}
+
+	return nil
+}
+
+func DeleteDirIfPresent(path string) (bool, error) {
+	if IsFile(path) {
+		return false, ErrorFileAlreadyExists(path)
+	}
+
+	if !IsDir(path) {
+		return false, nil
+	}
+
+	err := DeleteDir(path)
+	if err != nil {
+		return false, err
 	}
 
 	return true, nil

pkg/lib/json/json.go

@@ -63,7 +63,7 @@ func WriteJSON(obj interface{}, outPath string) error {
 	if err != nil {
 		return err
 	}
-	if err := files.MkdirAll(filepath.Dir(outPath)); err != nil {
+	if err := files.CreateDir(filepath.Dir(outPath)); err != nil {
 		return err
 	}
 

pkg/lib/zip/zip.go

@@ -121,7 +121,7 @@ func ToWriter(zipInput *Input, writer io.Writer) error {
 }
 
 func ToFile(zipInput *Input, destPath string) error {
-	zipfile, err := files.CreateFile(destPath)
+	zipfile, err := files.OpenNewFile(destPath)
 	if err != nil {
 		return err
 	}
@@ -276,12 +276,12 @@ func UnzipToFile(src string, destPath string) ([]string, error) {
 		filenames = append(filenames, fpath)
 
 		if f.FileInfo().IsDir() {
-			err := files.MkdirAll(fpath)
+			err := files.CreateDir(fpath)
 			if err != nil {
 				return nil, err
 			}
 		} else {
-			err := files.MkdirAll(filepath.Dir(fpath))
+			err := files.CreateDir(filepath.Dir(fpath))
 			if err != nil {
 				return nil, err
 			}