fix: untar file error (#37)

* fix: untar file error * fix: untar file error * add codecov token
shipengqi · Sep 6, 2023 · a603fe4 · a603fe4
1 parent 71dc75a
commit a603fe4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -24,6 +24,7 @@ jobs:
     - name: codecov
       uses: codecov/codecov-action@v3
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         flags: unittests
         fail_ci_if_error: true
         files: coverage.out
diff --git a/fsutil/tar.go b/fsutil/tar.go
@@ -103,7 +103,7 @@ func untar(reader io.Reader, dst string) error {
 	for {
 		header, err := tr.Next()
 		if err != nil {
-			if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
+			if errors.Is(err, io.EOF) {
 				break
 			}
 			return err
@@ -114,6 +114,11 @@ func untar(reader io.Reader, dst string) error {
 			continue
 		}
 		dstPath := filepath.Join(dst, header.Name)
+		baseDir := filepath.Dir(dstPath)
+		if err = MkDirAll(baseDir); err != nil {
+			return err
+		}
+
 		switch header.Typeflag {
 		case tar.TypeDir: // directory
 			if err = MkDirAll(dstPath); err != nil {

diff --git a/fsutil/tar_test.go b/fsutil/tar_test.go
@@ -21,6 +21,20 @@ func TestTar(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+func TestTarFile(t *testing.T) {
+	src := "testdata/src/subdir/c.txt"
+	dst := "testdata/dst.tar"
+	defer func() { _ = os.RemoveAll(dst) }()
+	err := Tar(src, dst)
+	assert.NoError(t, err)
+
+	unsrc := dst
+	undst := "testdata/src2"
+	defer func() { _ = os.RemoveAll(undst) }()
+	err = UnTar(unsrc, undst)
+	assert.NoError(t, err)
+}
+
 func TestCompress(t *testing.T) {
 	src := "testdata/src"
 	dst := "testdata/dst.tar.gz"