diff --git a/OdMediaPickerRelease.exe b/OdMediaPickerRelease.exe deleted file mode 100644 index d759a9a..0000000 Binary files a/OdMediaPickerRelease.exe and /dev/null differ diff --git a/build.sh b/build.sh index 8e1cc14..dd5d0bc 100644 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ -rm -f OdMediaPicker.exe -rm -f OdMediaPickerRelease.exe +rm -f OdImageWidthPicker.exe +rm -f OdImageWidthPickerRelease.exe # build -go build -o OdMediaPicker.exe main.go +go build -o OdImageWidthPicker.exe main.go # upx compress -./upx -o OdMediaPickerRelease.exe OdMediaPicker.exe -rm -f OdMediaPicker.exe +./upx -o OdImageWidthPickerRelease.exe OdImageWidthPicker.exe +rm -f OdImageWidthPicker.exe diff --git a/core/file_scanner.go b/core/file_scanner.go index 8f0e21b..78455e7 100644 --- a/core/file_scanner.go +++ b/core/file_scanner.go @@ -17,7 +17,7 @@ type FileScanner struct { func (FileScanner) DoScan(rootDir string) { fmt.Printf("=== 开始扫描文件 \n") - if err := filepath.Walk(rootDir, visit); err != nil { + if err := filepath.Walk(rootDir, visitFile); err != nil { log.Fatal(err) } doReadFileMimeInfo() @@ -76,9 +76,63 @@ func (FileScanner) DoFilter() { } bar.PrintEnd("=== Finish") } +func countFiles(dir string) (int, error) { + var count int + err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error { + if err != nil { + return err + } + if !info.IsDir() { + count++ + } + return nil + }) + return count, err +} + +func (s FileScanner) DoPickerDir(dir string, fileCnt int) { + if err := filepath.Walk(dir, visitDir); err != nil { + log.Fatal(err) + } + for _, s2 := range vars.GlobalSubDirPathList { + // 是整理过的文件夹 + if strings.Contains(s2, "_图片_") { + cnt, err := countFiles(s2) + // 满足文件数量 + if err == nil && cnt >= fileCnt { + vars.GlobalNeedMoveSubDirPathList = append(vars.GlobalNeedMoveSubDirPathList, s2) + } else { + vars.GlobalNeedReScanSubDirPathList = append(vars.GlobalNeedReScanSubDirPathList, s2) + } + } + } + pathSeparator := string(os.PathSeparator) + pickerOkDir := dir + pathSeparator + "PickerOk" + pickerRescanDir := dir + pathSeparator + "PickerRescanDir" + util.CreateDir(pickerOkDir) + util.CreateDir(pickerRescanDir) + for _, originPath := range vars.GlobalNeedMoveSubDirPathList { + targetPath := pickerOkDir + pathSeparator + filepath.Base(originPath) + os.Rename(originPath, targetPath) + } + for _, originPath := range vars.GlobalNeedReScanSubDirPathList { + targetPath := pickerRescanDir + pathSeparator + filepath.Base(originPath) + os.Rename(originPath, targetPath) + } +} + +func visitDir(currentPath string, info os.FileInfo, err error) error { + if err != nil { + return err // 如果有错误，直接返回 + } + if info.IsDir() { + vars.GlobalSubDirPathList = append(vars.GlobalSubDirPathList, currentPath) + } + return nil +} // 定义walkFn回调函数visit -func visit(currentPath string, info os.FileInfo, err error) error { +func visitFile(currentPath string, info os.FileInfo, err error) error { if err != nil { return err // 如果有错误，直接返回 } diff --git a/core/handle_image.go b/core/handle_image.go index 1a80c24..5a33a6a 100644 --- a/core/handle_image.go +++ b/core/handle_image.go @@ -27,57 +27,18 @@ var supportImageTypes = []string{ } // 水平图片 -var normalImageList []string +var horizontalImageList = make(map[string][]string) var horizontalGifImageList []string -var horizontal2KImageList []string -var horizontal1KImageList []string -var horizontal3KImageList []string -var horizontal4KImageList []string -var horizontal5KImageList []string -var horizontal6KImageList []string -var horizontal7KImageList []string -var horizontal8KImageList []string -var horizontal9KImageList []string -var horizontalHKImageList []string - -// 标准横向图片 -var horizontalStandard720PImageList []string -var horizontalStandard1080PImageList []string -var horizontalStandard4KImageList []string -var horizontalStandard8KImageList []string // 垂直图片 +var verticalImageList = make(map[string][]string) var verticalGifImageList []string -var vertical1KImageList []string -var vertical2KImageList []string -var vertical3KImageList []string -var vertical4KImageList []string -var vertical5KImageList []string -var vertical6KImageList []string -var vertical7KImageList []string -var vertical8KImageList []string -var vertical9KImageList []string -var verticalHKImageList []string // 等比图片 +var squareImageList = make(map[string][]string) var squareGifImageList []string -var square1KImageList []string -var square2KImageList []string -var square3KImageList []string -var square4KImageList []string -var square5KImageList []string -var square6KImageList []string -var square7KImageList []string -var square8KImageList []string -var square9KImageList []string -var squareHKImageList []string - -// 标准等比图片 -var squareStandard720PImageList []string -var squareStandard1080PImageList []string -var squareStandard4KImageList []string -var squareStandard8KImageList []string +// psd var psdImageList []string func DoHandleImage(rootDir string) { @@ -175,7 +136,6 @@ func doPickImageFile(uid string, rootDir string, imagePath2WidthHeightMap map[st } handleSquareImage(currentImagePath, width, height, suffix) } - moveNormalImage(rootDir, uid) moveHorizontalImage(rootDir, uid) moveVerticalImage(rootDir, uid) moveSquareImage(rootDir, uid) @@ -184,59 +144,14 @@ func doPickImageFile(uid string, rootDir string, imagePath2WidthHeightMap map[st func moveSquareImage(rootDir string, uid string) { pathSeparator := string(os.PathSeparator) squareGifImagePath := rootDir + pathSeparator + uid + "_图片_等比_GIF" - square1KImagePath := rootDir + pathSeparator + uid + "_图片_等比_1k" - square2KImagePath := rootDir + pathSeparator + uid + "_图片_等比_2k" - square3KImagePath := rootDir + pathSeparator + uid + "_图片_等比_3k" - square4KImagePath := rootDir + pathSeparator + uid + "_图片_等比_4k" - square5KImagePath := rootDir + pathSeparator + uid + "_图片_等比_5k" - square6KImagePath := rootDir + pathSeparator + uid + "_图片_等比_6k" - square7KImagePath := rootDir + pathSeparator + uid + "_图片_等比_7k" - square8KImagePath := rootDir + pathSeparator + uid + "_图片_等比_8k" - square9KImagePath := rootDir + pathSeparator + uid + "_图片_等比_9k" - squareHKImagePath := rootDir + pathSeparator + uid + "_图片_等比_原图" if len(squareGifImageList) > 0 { util.CreateDir(squareGifImagePath) doMoveFileToDir(squareGifImageList, squareGifImagePath) } - if len(square1KImageList) > 0 { - util.CreateDir(square1KImagePath) - doMoveFileToDir(square1KImageList, square1KImagePath) - } - if len(square2KImageList) > 0 { - util.CreateDir(square2KImagePath) - doMoveFileToDir(square2KImageList, square2KImagePath) - } - if len(square3KImageList) > 0 { - util.CreateDir(square3KImagePath) - doMoveFileToDir(square3KImageList, square3KImagePath) - } - if len(square4KImageList) > 0 { - util.CreateDir(square4KImagePath) - doMoveFileToDir(square4KImageList, square4KImagePath) - } - if len(square5KImageList) > 0 { - util.CreateDir(square5KImagePath) - doMoveFileToDir(square5KImageList, square5KImagePath) - } - if len(square6KImageList) > 0 { - util.CreateDir(square6KImagePath) - doMoveFileToDir(square6KImageList, square6KImagePath) - } - if len(square7KImageList) > 0 { - util.CreateDir(square7KImagePath) - doMoveFileToDir(square7KImageList, square7KImagePath) - } - if len(square8KImageList) > 0 { - util.CreateDir(square8KImagePath) - doMoveFileToDir(square8KImageList, square8KImagePath) - } - if len(square9KImageList) > 0 { - util.CreateDir(square9KImagePath) - doMoveFileToDir(square9KImageList, square9KImagePath) - } - if len(squareHKImageList) > 0 { - util.CreateDir(squareHKImagePath) - doMoveFileToDir(squareHKImageList, squareHKImagePath) + for widthStr, imagePaths := range horizontalImageList { + squareImagePath := rootDir + pathSeparator + uid + "_图片_等比_" + widthStr + util.CreateDir(squareImagePath) + doMoveFileToDir(imagePaths, squareImagePath) } } @@ -245,108 +160,25 @@ func handleSquareImage(currentImagePath string, width int, height int, suffix st squareGifImageList = append(squareGifImageList, currentImagePath) return } - if width < 1000 { - normalImageList = append(normalImageList, currentImagePath) - } else if width >= 1000 && width < 2000 { - // 1280 x 720 -> 720p - if width == 1280 && height == 720 { - squareStandard720PImageList = append(squareStandard720PImageList, currentImagePath) - return - } - // 1920 x 1080 -> 1080p - if width == 1920 && height == 1080 { - squareStandard1080PImageList = append(squareStandard1080PImageList, currentImagePath) - return - } - square1KImageList = append(square1KImageList, currentImagePath) - } else if width >= 2000 && width < 3000 { - square2KImageList = append(square2KImageList, currentImagePath) - } else if width >= 3000 && width < 4000 { - // 3840 x 2160 -> 4k - if width == 3840 && height == 2160 { - squareStandard4KImageList = append(squareStandard4KImageList, currentImagePath) - return - } - square3KImageList = append(square3KImageList, currentImagePath) - } else if width >= 4000 && width < 5000 { - square4KImageList = append(square4KImageList, currentImagePath) - } else if width >= 5000 && width < 6000 { - square5KImageList = append(square5KImageList, currentImagePath) - } else if width >= 6000 && width < 7000 { - square6KImageList = append(square6KImageList, currentImagePath) - } else if width >= 7000 && width < 8000 { - // 7680 x 4320 -> 8k - if width == 7680 && height == 4320 { - squareStandard8KImageList = append(squareStandard8KImageList, currentImagePath) - return - } - square7KImageList = append(square7KImageList, currentImagePath) - } else if width >= 8000 && width < 9000 { - square8KImageList = append(square8KImageList, currentImagePath) - } else if width >= 9000 && width < 10000 { - square9KImageList = append(square9KImageList, currentImagePath) - } else if width >= 10000 { - squareHKImageList = append(squareHKImageList, currentImagePath) + widthStr := fmt.Sprintf("%d", width) + if squareImageList[widthStr] == nil { + squareImageList[widthStr] = make([]string, 0) } + squareImageList[widthStr] = append(squareImageList[widthStr], currentImagePath) } // 移动垂直图片 func moveVerticalImage(rootDir string, uid string) { pathSeparator := string(os.PathSeparator) verticalGifImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_GIF" - vertical1KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_1k" - vertical2KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_2k" - vertical3KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_3k" - vertical4KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_4k" - vertical5KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_5k" - vertical6KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_6k" - vertical7KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_7k" - vertical8KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_8k" - vertical9KImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_9k" - verticalHKImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_原图" if len(verticalGifImageList) > 0 { util.CreateDir(verticalGifImagePath) doMoveFileToDir(verticalGifImageList, verticalGifImagePath) } - if len(vertical1KImageList) > 0 { - util.CreateDir(vertical1KImagePath) - doMoveFileToDir(vertical1KImageList, vertical1KImagePath) - } - if len(vertical2KImageList) > 0 { - util.CreateDir(vertical2KImagePath) - doMoveFileToDir(vertical2KImageList, vertical2KImagePath) - } - if len(vertical3KImageList) > 0 { - util.CreateDir(vertical3KImagePath) - doMoveFileToDir(vertical3KImageList, vertical3KImagePath) - } - if len(vertical4KImageList) > 0 { - util.CreateDir(vertical4KImagePath) - doMoveFileToDir(vertical4KImageList, vertical4KImagePath) - } - if len(vertical5KImageList) > 0 { - util.CreateDir(vertical5KImagePath) - doMoveFileToDir(vertical5KImageList, vertical5KImagePath) - } - if len(vertical6KImageList) > 0 { - util.CreateDir(vertical6KImagePath) - doMoveFileToDir(vertical6KImageList, vertical6KImagePath) - } - if len(vertical7KImageList) > 0 { - util.CreateDir(vertical7KImagePath) - doMoveFileToDir(vertical7KImageList, vertical7KImagePath) - } - if len(vertical8KImageList) > 0 { - util.CreateDir(vertical8KImagePath) - doMoveFileToDir(vertical8KImageList, vertical8KImagePath) - } - if len(vertical9KImageList) > 0 { - util.CreateDir(vertical9KImagePath) - doMoveFileToDir(vertical9KImageList, vertical9KImagePath) - } - if len(verticalHKImageList) > 0 { - util.CreateDir(verticalHKImagePath) - doMoveFileToDir(verticalHKImageList, verticalHKImagePath) + for heightStr, imagePaths := range verticalImageList { + verticalImagePath := rootDir + pathSeparator + uid + "_图片_竖屏_" + heightStr + util.CreateDir(verticalImagePath) + doMoveFileToDir(imagePaths, verticalImagePath) } } @@ -354,89 +186,14 @@ func moveVerticalImage(rootDir string, uid string) { func moveHorizontalImage(rootDir string, uid string) { pathSeparator := string(os.PathSeparator) horizontalGifImagePath := rootDir + pathSeparator + uid + "_图片_横屏_GIF" - horizontal1KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_1k" - horizontal2KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_2k" - horizontal3KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_3k" - horizontal4KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_4k" - horizontal5KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_5k" - horizontal6KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_6k" - horizontal7KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_7k" - horizontal8KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_8k" - horizontal9KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_9k" - horizontalHKImagePath := rootDir + pathSeparator + uid + "_图片_横屏_原图" - horizontalStandard720PImagePath := rootDir + pathSeparator + uid + "_图片_横屏_720P" - horizontalStandard1080PImagePath := rootDir + pathSeparator + uid + "_图片_横屏_1080P" - horizontalStandard4KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_4KP" - horizontalStandard8KImagePath := rootDir + pathSeparator + uid + "_图片_横屏_8KP" if len(horizontalGifImageList) > 0 { util.CreateDir(horizontalGifImagePath) doMoveFileToDir(horizontalGifImageList, horizontalGifImagePath) } - if len(horizontal1KImageList) > 0 { - util.CreateDir(horizontal1KImagePath) - doMoveFileToDir(horizontal1KImageList, horizontal1KImagePath) - } - if len(horizontal2KImageList) > 0 { - util.CreateDir(horizontal2KImagePath) - doMoveFileToDir(horizontal2KImageList, horizontal2KImagePath) - } - if len(horizontal3KImageList) > 0 { - util.CreateDir(horizontal3KImagePath) - doMoveFileToDir(horizontal3KImageList, horizontal3KImagePath) - } - if len(horizontal4KImageList) > 0 { - util.CreateDir(horizontal4KImagePath) - doMoveFileToDir(horizontal4KImageList, horizontal4KImagePath) - } - if len(horizontal5KImageList) > 0 { - util.CreateDir(horizontal5KImagePath) - doMoveFileToDir(horizontal5KImageList, horizontal5KImagePath) - } - if len(horizontal6KImageList) > 0 { - util.CreateDir(horizontal6KImagePath) - doMoveFileToDir(horizontal6KImageList, horizontal6KImagePath) - } - if len(horizontal7KImageList) > 0 { - util.CreateDir(horizontal7KImagePath) - doMoveFileToDir(horizontal7KImageList, horizontal7KImagePath) - } - if len(horizontal8KImageList) > 0 { - util.CreateDir(horizontal8KImagePath) - doMoveFileToDir(horizontal8KImageList, horizontal8KImagePath) - } - if len(horizontal9KImageList) > 0 { - util.CreateDir(horizontal9KImagePath) - doMoveFileToDir(horizontal9KImageList, horizontal9KImagePath) - } - if len(horizontalHKImageList) > 0 { - util.CreateDir(horizontalHKImagePath) - doMoveFileToDir(horizontalHKImageList, horizontalHKImagePath) - } - if len(horizontalStandard720PImageList) > 0 { - util.CreateDir(horizontalStandard720PImagePath) - doMoveFileToDir(horizontalStandard720PImageList, horizontalStandard720PImagePath) - } - if len(horizontalStandard1080PImageList) > 0 { - util.CreateDir(horizontalStandard1080PImagePath) - doMoveFileToDir(horizontalStandard1080PImageList, horizontalStandard1080PImagePath) - } - if len(horizontalStandard4KImageList) > 0 { - util.CreateDir(horizontalStandard4KImagePath) - doMoveFileToDir(horizontalStandard4KImageList, horizontalStandard4KImagePath) - } - if len(horizontalStandard8KImageList) > 0 { - util.CreateDir(horizontalStandard8KImagePath) - doMoveFileToDir(horizontalStandard8KImageList, horizontalStandard8KImagePath) - } -} - -// 移动图片 -func moveNormalImage(rootDir string, uid string) { - pathSeparator := string(os.PathSeparator) - allNormalImagePath := rootDir + pathSeparator + uid + "_图片_普通" - if len(normalImageList) > 0 { - util.CreateDir(allNormalImagePath) - doMoveFileToDir(normalImageList, allNormalImagePath) + for widthStr, imagePaths := range horizontalImageList { + horizontalImagePath := rootDir + pathSeparator + uid + "_图片_横屏_" + widthStr + util.CreateDir(horizontalImagePath) + doMoveFileToDir(imagePaths, horizontalImagePath) } } @@ -446,29 +203,11 @@ func handleVerticalImage(currentImagePath string, height int, suffix string) { verticalGifImageList = append(verticalGifImageList, currentImagePath) return } - if height < 1000 { - normalImageList = append(normalImageList, currentImagePath) - } else if height >= 1000 && height < 2000 { - vertical1KImageList = append(vertical1KImageList, currentImagePath) - } else if height >= 2000 && height < 3000 { - vertical2KImageList = append(vertical2KImageList, currentImagePath) - } else if height >= 3000 && height < 4000 { - vertical3KImageList = append(vertical3KImageList, currentImagePath) - } else if height >= 4000 && height < 5000 { - vertical4KImageList = append(vertical4KImageList, currentImagePath) - } else if height >= 5000 && height < 6000 { - vertical5KImageList = append(vertical5KImageList, currentImagePath) - } else if height >= 6000 && height < 7000 { - vertical6KImageList = append(vertical6KImageList, currentImagePath) - } else if height >= 7000 && height < 8000 { - vertical7KImageList = append(vertical7KImageList, currentImagePath) - } else if height >= 8000 && height < 9000 { - vertical8KImageList = append(vertical8KImageList, currentImagePath) - } else if height >= 9000 && height < 10000 { - vertical9KImageList = append(vertical9KImageList, currentImagePath) - } else if height >= 10000 { - verticalHKImageList = append(verticalHKImageList, currentImagePath) + heightStr := fmt.Sprintf("%d", height) + if verticalImageList[heightStr] == nil { + verticalImageList[heightStr] = make([]string, 0) } + verticalImageList[heightStr] = append(verticalImageList[heightStr], currentImagePath) } // 处理横向图片 @@ -477,49 +216,11 @@ func handleHorizontalImage(currentImagePath string, width int, height int, suffi horizontalGifImageList = append(horizontalGifImageList, currentImagePath) return } - if width < 1000 { - normalImageList = append(normalImageList, currentImagePath) - } else if width >= 1000 && width < 2000 { - // 1280 x 720 -> 720p - if width == 1280 && height == 720 { - horizontalStandard720PImageList = append(horizontalStandard720PImageList, currentImagePath) - return - } - // 1920 x 1080 -> 1080p - if width == 1920 && height == 1080 { - horizontalStandard1080PImageList = append(horizontalStandard1080PImageList, currentImagePath) - return - } - horizontal1KImageList = append(horizontal1KImageList, currentImagePath) - } else if width >= 2000 && width < 3000 { - horizontal2KImageList = append(horizontal2KImageList, currentImagePath) - } else if width >= 3000 && width < 4000 { - // 3840 x 2160 -> 4k - if width == 3840 && height == 2160 { - horizontalStandard4KImageList = append(horizontalStandard4KImageList, currentImagePath) - return - } - horizontal3KImageList = append(horizontal3KImageList, currentImagePath) - } else if width >= 4000 && width < 5000 { - horizontal4KImageList = append(horizontal4KImageList, currentImagePath) - } else if width >= 5000 && width < 6000 { - horizontal5KImageList = append(horizontal5KImageList, currentImagePath) - } else if width >= 6000 && width < 7000 { - horizontal6KImageList = append(horizontal6KImageList, currentImagePath) - } else if width >= 7000 && width < 8000 { - // 7680 x 4320 -> 8k - if width == 7680 && height == 4320 { - horizontalStandard8KImageList = append(horizontalStandard8KImageList, currentImagePath) - return - } - horizontal7KImageList = append(horizontal7KImageList, currentImagePath) - } else if width >= 8000 && width < 9000 { - horizontal8KImageList = append(horizontal8KImageList, currentImagePath) - } else if width >= 9000 && width < 10000 { - horizontal9KImageList = append(horizontal9KImageList, currentImagePath) - } else if width >= 10000 { - horizontalHKImageList = append(horizontalHKImageList, currentImagePath) + widthStr := fmt.Sprintf("%d", width) + if horizontalImageList[widthStr] == nil { + horizontalImageList[widthStr] = make([]string, 0) } + horizontalImageList[widthStr] = append(horizontalImageList[widthStr], currentImagePath) } // 判断是否属于支持的图片文件 diff --git a/main.go b/main.go index 46c9ea8..962b4f3 100644 --- a/main.go +++ b/main.go @@ -2,31 +2,33 @@ package main import ( "OdMediaPicker/core" - "OdMediaPicker/vars" _ "embed" "fmt" _ "image/gif" // 导入gif支持 _ "image/jpeg" // 导入jpeg支持 _ "image/png" // 导入png支持 - "os" "time" ) func main() { - rootDir, err := os.Getwd() - if err != nil { - fmt.Println("=== 获取当前路径异常", err) - return - } + rootDir := "E:\\DGD\\待整理\\hent_pic" + //rootDir, err := os.Getwd() + //if err != nil { + // fmt.Println("=== 获取当前路径异常", err) + // return + //} scanner := core.FileScanner{} - scanner.DoScan(rootDir) - scanner.DoFilter() - if len(vars.GlobalImagePathList) > 0 { - core.DoHandleImage(rootDir) - } - if len(vars.GlobalVideoPathList) > 0 { - core.DoHandleVideo(rootDir) - } - fmt.Println("=== 5s后自动退出") - time.Sleep(time.Second * 5) + //scanner.DoScan(rootDir) + //scanner.DoFilter() + // 整理图片并分组 + //if len(vars.GlobalImagePathList) > 0 { + // core.DoHandleImage(rootDir) + //} + // 挑选文件数大于N的文件夹并转移 + scanner.DoPickerDir(rootDir, 10) + //if len(vars.GlobalVideoPathList) > 0 { + // core.DoHandleVideo(rootDir) + //} + fmt.Println("=== 3s后自动退出") + time.Sleep(time.Second * 3) } diff --git a/vars/init.go b/vars/init.go index 66bc52a..8e47891 100644 --- a/vars/init.go +++ b/vars/init.go @@ -6,3 +6,6 @@ var GlobalFilePath2FileNameMap = make(map[string]string) // 文件路径和文 var GlobalFilePath2FileExtMap = make(map[string]string) // 文件路径和文件扩展名的映射关系 var GlobalVideoPathList []string // 所有视频文件的路径 var GlobalImagePathList []string // 所有图片文件的路径 +var GlobalSubDirPathList []string // 所有子文件夹的路径 +var GlobalNeedMoveSubDirPathList []string // 所有需要移动的子文件夹的路径 +var GlobalNeedReScanSubDirPathList []string // 所有需要重新扫描的子文件夹的路径