Code refactoring

Author: andyone

gz/gz.go

@@ -44,7 +44,7 @@ var (
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
-// Unpacks file to given directory
+// Unpack unpacks archive file to given directory
 func Unpack(file, dir string, options Options) error {
 	switch {
 	case file == "":

lz4/lz4.go

@@ -78,11 +78,6 @@ func Read(r io.Reader, output string) error {
 	defer fd.Close()
 
 	cr := lz4.NewReader(r)
-
-	if err != nil {
-		return err
-	}
-
 	bw := bufio.NewWriter(fd)
 	_, err = io.Copy(bw, cr)
 

tar/tar.go

@@ -30,6 +30,7 @@ const DEFAULT_DIR_MODE os.FileMode = 0750
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
+// Options is reader options
 type Options struct {
 	// MaxReadLimit is the maximum read limit for decompression bomb
 	// protection (default: 1GB)
@@ -154,25 +155,17 @@ func createDir(h *tar.Header, path string, options Options) error {
 
 // createFile creates new file
 func createFile(h *tar.Header, r io.Reader, path string, options Options) error {
-	dir := filepath.Dir(path)
-	_, err := os.Stat(dir)
-
 	mode := options.DirMode
+	dir := filepath.Dir(path)
 
 	if mode == 0 {
 		mode = DEFAULT_DIR_MODE
 	}
 
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return err
-		}
+	err := os.MkdirAll(dir, mode)
 
-		err = os.MkdirAll(dir, mode)
-
-		if err != nil {
-			return err
-		}
+	if err != nil {
+		return err
 	}
 
 	fd, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, h.FileInfo().Mode())

utils/utils.go

@@ -49,21 +49,22 @@ func Join(root string, elem ...string) (string, error) {
 		}
 	}
 
-	if IsExternalPath(root, result) {
+	if isExternalPath(root, result) {
 		return "", fmt.Errorf("final destination (%s) is outside root (%s)", result, root)
 	}
 
 	return result, nil
 }
 
-// IsExternalPath returns true if given path is outside of root
-func IsExternalPath(root, path string) bool {
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+// isExternalPath returns true if given path is outside of root
+func isExternalPath(root, path string) bool {
 	rel, err := filepath.Rel(root, path)
 	return err != nil || strings.HasPrefix(rel, "..")
 }
 
-// ////////////////////////////////////////////////////////////////////////////////// //
-
+// isLink returns true if given object is symlink
 func isLink(path string) bool {
 	fi, err := os.Lstat(path)
 	return err == nil && fi.Mode()&os.ModeSymlink != 0

zip/zip.go

@@ -71,7 +71,7 @@ func Read(r io.ReaderAt, size int64, dir string, options Options) error {
 	case dir == "":
 		return ErrEmptyOutput
 	case size <= 0:
-		return fmt.Errorf("invalid data size (%d < 0)", size)
+		return fmt.Errorf("invalid data size (%d ≤ 0)", size)
 	}
 
 	zr, err := zip.NewReader(r, size)