From b7821d4024fd7246fb64b4130d6c1d687aef6859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=8D=E1=B4=8F=E1=B4=8F=C9=B4D4=CA=80=E1=B4=8B?=
 <moond4rk13@gmail.com>
Date: Tue, 3 May 2022 15:51:10 +0800
Subject: [PATCH] fix: check copy dir with filename suffix

---
 internal/browser/chromium/chromium.go |  5 +----
 internal/utils/fileutil/filetutil.go  | 14 +++++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/internal/browser/chromium/chromium.go b/internal/browser/chromium/chromium.go
index d2c0c1c..bd06594 100644
--- a/internal/browser/chromium/chromium.go
+++ b/internal/browser/chromium/chromium.go
@@ -7,7 +7,6 @@ import (
 
 	"hack-browser-data/internal/browingdata"
 	"hack-browser-data/internal/item"
-	"hack-browser-data/internal/log"
 	"hack-browser-data/internal/utils/fileutil"
 	"hack-browser-data/internal/utils/typeutil"
 )
@@ -70,7 +69,7 @@ func (c *chromium) copyItemToLocal() error {
 				err = fileutil.CopyDir(path, filename, "lock")
 			}
 			if i == item.ChromiumExtension {
-				err = fileutil.CopyDirContains(path, filename, "manifest.json")
+				err = fileutil.CopyDirHasSuffix(path, filename, "manifest.json")
 			}
 		default:
 			err = fileutil.CopyFile(path, filename)
@@ -86,8 +85,6 @@ func (c *chromium) getItemPath(profilePath string, items []item.Item) (map[item.
 	var itemPaths = make(map[item.Item]string)
 	parentDir := fileutil.ParentDir(profilePath)
 	baseDir := fileutil.BaseDir(profilePath)
-	log.Infof("%s profile parentDir: %s", c.name, parentDir)
-	log.Infof("%s profile baseDir: %s", c.name, baseDir)
 	err := filepath.Walk(parentDir, chromiumWalkFunc(items, itemPaths, baseDir))
 	if err != nil {
 		return itemPaths, err
diff --git a/internal/utils/fileutil/filetutil.go b/internal/utils/fileutil/filetutil.go
index 315a122..9f801fa 100644
--- a/internal/utils/fileutil/filetutil.go
+++ b/internal/utils/fileutil/filetutil.go
@@ -38,14 +38,14 @@ func FolderExists(foldername string) bool {
 	return info.IsDir()
 }
 
-// FilesInFolder returns the files contains in the provided folder
+// FilesInFolder returns the filepath contains in the provided folder
 func FilesInFolder(dir, filename string) ([]string, error) {
 	if !FolderExists(dir) {
 		return nil, errors.New(dir + " folder does not exist")
 	}
 	var files []string
 	err := filepath.Walk(dir, func(path string, f os.FileInfo, err error) error {
-		if !f.IsDir() && strings.Contains(path, filename) {
+		if !f.IsDir() && strings.HasSuffix(path, filename) {
 			files = append(files, path)
 		}
 		return err
@@ -63,17 +63,17 @@ func ReadFile(filename string) (string, error) {
 // skip the file if you don't want to copy
 func CopyDir(src, dst, skip string) error {
 	s := cp.Options{Skip: func(src string) (bool, error) {
-		return strings.Contains(strings.ToLower(src), skip), nil
+		return strings.HasSuffix(strings.ToLower(src), skip), nil
 	}}
 	return cp.Copy(src, dst, s)
 }
 
-// CopyDirContains copies the directory from the source to the destination
-// contain is the file if you want to copy
-func CopyDirContains(src, dst, contain string) error {
+// CopyDirHasSuffix copies the directory from the source to the destination
+// contain is the file if you want to copy, and rename copied filename with dir/index_filename
+func CopyDirHasSuffix(src, dst, suffix string) error {
 	var filelist []string
 	err := filepath.Walk(src, func(path string, f os.FileInfo, err error) error {
-		if !f.IsDir() && strings.Contains(strings.ToLower(f.Name()), contain) {
+		if !f.IsDir() && strings.HasSuffix(strings.ToLower(f.Name()), suffix) {
 			filelist = append(filelist, path)
 		}
 		return err