impl: 优化密码表rw逻辑

Author: Weidows

cmd/wutils/zip/crack.go

@@ -42,26 +42,32 @@ func getHomePasswordFilePath() (string, error) {
 }
 
 func CrackPassword(archivePath string) string {
-	passwordFilePath, err := getHomePasswordFilePath()
-	if err != nil {
-		fmt.Printf("Error: %v\n", err)
-		return ""
-	}
+	return CrackPasswordWithList(archivePath, nil)
+}
 
-	passwords, err := os.ReadFile(passwordFilePath)
-	if err != nil {
-		fmt.Printf("Error: failed to read password file: %v\n", err)
-		return ""
-	}
+func CrackPasswordWithList(archivePath string, passwords []string) string {
+	if passwords == nil {
+		passwordFilePath, err := getHomePasswordFilePath()
+		if err != nil {
+			fmt.Printf("Error: %v\n", err)
+			return ""
+		}
 
-	passwordList := parsePasswords(string(passwords))
-	if len(passwordList) == 0 {
-		fmt.Println("Error: no valid passwords found in dictionary")
-		fmt.Printf("Please add passwords to: %s\n", passwordFilePath)
-		return ""
+		passwordData, err := os.ReadFile(passwordFilePath)
+		if err != nil {
+			fmt.Printf("Error: failed to read password file: %v\n", err)
+			return ""
+		}
+
+		passwords = parsePasswords(string(passwordData))
+		if len(passwords) == 0 {
+			fmt.Println("Error: no valid passwords found in dictionary")
+			fmt.Printf("Please add passwords to: %s\n", passwordFilePath)
+			return ""
+		}
 	}
 
-	result := crackWithWorkers(archivePath, passwordList, defaultMaxWorkers)
+	result := crackWithWorkers(archivePath, passwords, defaultMaxWorkers)
 	if result != "" {
 		fmt.Printf("Password found: %s\n", result)
 	} else {

cmd/wutils/zip/crack_test.go

@@ -1,22 +1,13 @@
 package zip
 
 import (
-	"os"
-	"path/filepath"
 	"testing"
 )
 
 func TestCrackPassword(t *testing.T) {
-	localDictPath := "./password-dict.txt"
-	os.WriteFile(localDictPath, []byte("test\nwrong\n123456"), 0644)
-	defer os.Remove(localDictPath)
-
-	home, _ := os.UserHomeDir()
-	homeDictPath := filepath.Join(home, ".config", "wutils", "password-dict.txt")
-	os.WriteFile(homeDictPath, []byte("test\nwrong\n123456"), 0644)
-
 	type args struct {
 		archivePath string
+		passwords   []string
 	}
 	tests := []struct {
 		name string
@@ -27,13 +18,14 @@ func TestCrackPassword(t *testing.T) {
 			name: "test",
 			args: args{
 				archivePath: "test/test.zip",
+				passwords:   []string{"test", "wrong", "123456"},
 			},
 			want: "test",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := CrackPassword(tt.args.archivePath); got != tt.want {
+			if got := CrackPasswordWithList(tt.args.archivePath, tt.args.passwords); got != tt.want {
 				t.Errorf("CrackPassword() = %v, want %v", got, tt.want)
 			}
 		})