update to xlib

main.go

@@ -10,66 +10,25 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/softlandia/xlib"
 )
 
-const num int32 = 50
+const num int = 999
-
-func fileTrust(ext, path string, i os.FileInfo) bool {
-	if i.IsDir() { //skip dir
-		return false
-	}
-	if filepath.Ext(path) != ext { //skip files with extention not equal extFileName
-		return false
-	}
-	if !xlib.FileExists(path) {
-		return false
-	}
-	return true
-}
-
-func findFiles(fileList *[]string, path, extFileName string) (int, error) {
-	log.Println("start search")
-	log.Println("start path: " + path)
-	log.Println("file name mask: " + extFileName)
-
-	i := 0 //index founded files
-	err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			log.Printf("prevent panic by handling failure accessing a path %q: %v\n", path, err)
-			return err
-		}
-		if !fileTrust(extFileName, path, info) {
-			//log.Println(">path: " + path)
-			return nil
-		}
-		//file found
-		i++
-		*fileList = append(*fileList, path)
-		return nil
-	})
-	return i, err
-}
 
 func arn(fileList *[]string, extFileName string) (int, error) {
 	log.Println("start rename")
-	r := rand.New(rand.NewSource(int64(time.Now().Second()) + int64(time.Now().Minute())))
-	//	i := 0 //index founded files
 	for _, fn := range *fileList {
 		dir := filepath.Dir(fn)
-		//log.Println(fn)
-		//log.Println(dir)
 		newPath := ""
 		if strings.Contains(fn, "#") {
 			j := strings.Index(fn, "#") + 1
 			fn = fn[j:]
 		}
 		if dir == "." {
-			newPath = fmt.Sprintf("%v#%s", r.Int31n(num), filepath.Base(fn))
+			newPath = fmt.Sprintf("%v#%s", rand.Intn(num), filepath.Base(fn))
 		} else {
-			newPath = fmt.Sprintf("%s\\%v#%s", dir, r.Int31n(num), filepath.Base(fn))
+			newPath = fmt.Sprintf("%s\\%v#%s", dir, rand.Intn(num), filepath.Base(fn))
 		}
 		fmt.Printf("%s\n", newPath)
 		os.Rename(fn, newPath)
@@ -80,7 +39,7 @@ func arn(fileList *[]string, extFileName string) (int, error) {
 func main() {
 	log.Println("program start")
 	if len(os.Args) == 1 {
-		log.Println("> arn \"x:\\music" \".mp3\"")
+		log.Println("> arn 'x:\\music' '.mp3'")
 	}
 	if os.Args[1] == "+" {
 		//тестовый режим, создаём в каталоге os.Args[2] 2400 файлов
@@ -93,7 +52,6 @@ func main() {
 		if err != nil {
 			log.Panic(err)
 		}
-		//i, _ := findFiles(&fileList, os.Args[1], os.Args[2])
 		fmt.Printf("founded :%v files\n", n)
 		log.Println(arn(&fileList, os.Args[2]))
 	}