支持delete,修改err输出为stderr
This commit is contained in:
@@ -16,7 +16,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
blockSizeMin = 10 * 1024 * 1024
|
||||
blockSizeMin = 50 * 1024 * 1024
|
||||
blockSizeMax = 200 * 1024 * 1024
|
||||
)
|
||||
|
||||
@@ -51,7 +51,7 @@ func RunTaskMake(args ...string) error {
|
||||
desc := paramTaskDesc(fs)
|
||||
|
||||
if err := fs.Parse(args); err != nil {
|
||||
fmt.Println("command line parse error", "err", err)
|
||||
fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -62,14 +62,14 @@ func RunTaskMake(args ...string) error {
|
||||
|
||||
blockSizeNum, err := ParseByteSize(*blockSize)
|
||||
if err != nil {
|
||||
fmt.Println("Error parsing block size", "err", err)
|
||||
fmt.Println("Using default 50M")
|
||||
blockSizeNum = 50 * 1024 * 1024
|
||||
fmt.Fprintln(os.Stderr, "Error parsing block size", "err", err)
|
||||
fmt.Fprintln(os.Stderr, "Using default 200M")
|
||||
blockSizeNum = 200 * 1024 * 1024
|
||||
|
||||
}
|
||||
|
||||
if blockSizeNum < blockSizeMin || blockSizeNum > blockSizeMax {
|
||||
fmt.Println("block size error", "min", blockSizeMin, "max", blockSizeMax)
|
||||
fmt.Fprintln(os.Stderr, "block size error", "min", blockSizeMin, "max", blockSizeMax)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -157,7 +157,6 @@ func doTaskMake(makeTaskParams makeTaskParams) error {
|
||||
|
||||
if n > 0 {
|
||||
wg.Add(1)
|
||||
//fmt.Printf("\rhashing file [%v], block [%v]\n", makeTaskParams.sourcePath, index)
|
||||
tasks <- &hashTask{
|
||||
chunk: buffer,
|
||||
index: index,
|
||||
@@ -213,7 +212,6 @@ func hashWorker(tasks <-chan *hashTask, results chan<- *hashTask) {
|
||||
for t := range tasks {
|
||||
h.Write((*t.chunk)[:t.blockSize])
|
||||
t.hash = hex.EncodeToString(h.Sum(nil))
|
||||
//fmt.Printf("\rhashing block [%v]\n", t.index)
|
||||
results <- t
|
||||
h.Reset()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user