rollback github.com/mholt/archives to github.com/mholt/archiver/v3

Author: 武斌

fileutils/fileutils.go

@@ -2,11 +2,10 @@ package fileutils
 
 import (
 	"bufio"
-	"context"
 	"io"
 	"os"
 
-	"github.com/mholt/archives"
+	"github.com/mholt/archiver/v3"
 	"github.com/pkg/errors"
 )
 
@@ -50,37 +49,5 @@ func LinesFromReader(r io.Reader) ([]string, error) {
 }
 
 func Archive(output string, sources ...string) error {
-	ctx := context.Background()
-
-	// 通过文件扩展名自动识别格式
-	format, _, err := archives.Identify(ctx, output, nil)
-	if err != nil {
-		return err
-	}
-
-	archiver, ok := format.(archives.Archiver)
-	if !ok {
-		return errors.New("不支持的归档格式")
-	}
-
-	// 创建输出文件
-	out, err := os.Create(output)
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-
-	// 准备源文件映射和文件列表
-	filesMap := make(map[string]string)
-	for _, source := range sources {
-		filesMap[source] = ""
-	}
-
-	files, err := archives.FilesFromDisk(ctx, nil, filesMap)
-	if err != nil {
-		return err
-	}
-
-	// 创建归档
-	return archiver.Archive(ctx, out, files)
+	return archiver.Archive(sources, output)
 }

fileutils/fileutils_test.go

@@ -1,15 +1,8 @@
 package fileutils
 
 import (
-	"context"
-	"os"
-	"path/filepath"
 	"testing"
 
-	"github.com/mholt/archives"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/unionj-cloud/toolkit/pathutils"
 )
 
@@ -47,90 +40,3 @@ func TestCreateDirectory(t *testing.T) {
 		})
 	}
 }
-
-func TestArchive(t *testing.T) {
-	// 创建临时目录
-	tempDir, err := os.MkdirTemp("", "archive-test")
-	require.NoError(t, err)
-	defer os.RemoveAll(tempDir)
-
-	// 创建测试文件
-	testFile1 := filepath.Join(tempDir, "test1.txt")
-	err = os.WriteFile(testFile1, []byte("测试内容1"), 0644)
-	require.NoError(t, err)
-
-	// 创建测试目录及其中的文件
-	testSubDir := filepath.Join(tempDir, "subdir")
-	err = os.Mkdir(testSubDir, 0755)
-	require.NoError(t, err)
-
-	testFile2 := filepath.Join(testSubDir, "test2.txt")
-	err = os.WriteFile(testFile2, []byte("测试内容2"), 0644)
-	require.NoError(t, err)
-
-	tests := []struct {
-		name       string
-		outputName string
-	}{
-		{
-			name:       "Zip归档",
-			outputName: "archive.zip",
-		},
-		{
-			name:       "Tar归档",
-			outputName: "archive.tar",
-		},
-		{
-			name:       "TarGz归档",
-			outputName: "archive.tar.gz",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// 设置输出文件路径
-			outputPath := filepath.Join(tempDir, tt.outputName)
-
-			// 调用Archive函数
-			err := Archive(outputPath, testFile1, testSubDir)
-			require.NoError(t, err)
-
-			// 验证归档文件存在
-			_, err = os.Stat(outputPath)
-			assert.NoError(t, err)
-
-			// 验证归档文件内容
-			validateArchive(t, outputPath, []string{"test1.txt", "subdir/test2.txt"})
-		})
-	}
-}
-
-// 验证归档文件内容
-func validateArchive(t *testing.T, archivePath string, expectedPaths []string) {
-	// 打开归档文件
-	f, err := os.Open(archivePath)
-	require.NoError(t, err)
-	defer f.Close()
-
-	// 识别归档格式
-	format, reader, err := archives.Identify(context.Background(), archivePath, f)
-	require.NoError(t, err)
-
-	extractor, ok := format.(archives.Extractor)
-	require.True(t, ok, "格式无法用于提取")
-
-	// 提取文件并验证
-	foundPaths := make(map[string]bool)
-	err = extractor.Extract(context.Background(), reader, func(ctx context.Context, file archives.FileInfo) error {
-		if !file.IsDir() {
-			foundPaths[file.NameInArchive] = true
-		}
-		return nil
-	})
-	require.NoError(t, err)
-
-	// 检查是否找到所有期望的文件
-	for _, expectedPath := range expectedPaths {
-		assert.True(t, foundPaths[expectedPath], "在归档中未找到文件: %s", expectedPath)
-	}
-}

go.mod

@@ -39,7 +39,7 @@ require (
 	github.com/goccy/go-reflect v1.2.0
 	github.com/hashicorp/go-sockaddr v1.0.2
 	github.com/hazelcast/hazelcast-go-client v1.4.1
-	github.com/mholt/archives v0.1.2
+	github.com/mholt/archiver/v3 v3.5.1
 	github.com/morkid/gocache v1.0.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/proullon/ramsql v0.1.4
@@ -58,11 +58,7 @@ require (
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
-	github.com/STARRY-S/zip v0.2.1 // indirect
 	github.com/apache/thrift v0.16.0 // indirect
-	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.6.0 // indirect
-	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 // indirect
@@ -80,25 +76,21 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/minio/minlz v1.0.0 // indirect
-	github.com/nwaples/rardecode/v2 v2.1.0 // indirect
+	github.com/nwaples/rardecode v1.1.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pegasus-kv/thrift v0.13.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.23.12 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/sorairolake/lzip-go v0.3.5 // indirect
-	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	go.uber.org/goleak v1.3.0 // indirect
-	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
 	golang.org/x/arch v0.1.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect