diff --git a/SummaryModulesByAOD.exe b/SummaryModulesByAOD.exe index 004eef5..b72ae40 100644 Binary files a/SummaryModulesByAOD.exe and b/SummaryModulesByAOD.exe differ diff --git a/SummaryModulesByAOD.go b/SummaryModulesByAOD.go index 070dd1a..e7bc0ad 100644 --- a/SummaryModulesByAOD.go +++ b/SummaryModulesByAOD.go @@ -60,7 +60,7 @@ func main() { } log.Printf("[MSG] Summary Loacal AODs ...\r\n") - aodInfoList, err = _SummaryFiles(aodPath, aodType) + aodInfoList, err = _SummaryAOD(aodPath, aodType) if err != nil { log.Printf("[ERR] Get AOD List Failed: %s\r\n", err.Error()) os.Exit(1) @@ -68,7 +68,7 @@ func main() { log.Printf("[MSG] Total Local AODs: %d\r\n", len(aodInfoList)) log.Printf("[MSG] Summary Local Modules ...\r\n") - moduleInfoList, err = _SummaryFiles(modPath, "*") + moduleInfoList, err = _SummaryFiles(modPath) if err != nil { log.Printf("[ERR] Get Module List Failed: %s\r\n", err.Error()) os.Exit(1) @@ -170,7 +170,7 @@ func main() { _WriteFileFromStringSlice(".\\NeedlessModules.txt", needlessModuleList) } -func _SummaryFiles(basePath, filter string) ([]FileInfo, error) { +func _SummaryAOD(basePath, filter string) ([]FileInfo, error) { var err error sortInfoList := make([]FileInfo, 0) fileInfoList := make([]FileInfo, 0) @@ -215,6 +215,30 @@ func _SummaryFiles(basePath, filter string) ([]FileInfo, error) { return sortInfoList, nil } +func _SummaryFiles(basePath string) ([]FileInfo, error) { + var err error + fileInfoList := make([]FileInfo, 0) + + err = filepath.Walk(basePath, func(path string, info os.FileInfo, err error) error { + if !info.IsDir() { + var fileInfo FileInfo + fileInfo.FileName = info.Name() + fileInfo.FilePath = path + fileInfo.FileSize = info.Size() + //fileInfo.ModTime = info.ModTime().Format("2006-01-02 15:04:05") + if path == basePath+"\\"+info.Name() { + fileInfoList = append(fileInfoList, fileInfo) + } + } + return nil + }) + if err != nil { + log.Printf("[ERR] Get File List Failed: %s\r\n", err.Error()) + return nil, err + } + return fileInfoList, nil +} + func _RemoveDuplicateElementOfSlice(src []string) []string { dst := make([]string, 0, len(src)) tmp := map[string]struct{}{}