diff --git a/src/unstable/Picocrypt.go b/src/unstable/Picocrypt.go index aafa5f5..4f30850 100644 --- a/src/unstable/Picocrypt.go +++ b/src/unstable/Picocrypt.go @@ -77,6 +77,12 @@ var progressInfo = "" var status = "Ready." var _status = "adfs" var _status_color = color.RGBA{0xff,0xff,0xff,255} +var splitUnits = []string{ + "KB", + "MB", + "GB", +} +var splitSelected int32 var items = []string{ "Normal", "Paranoid", @@ -257,7 +263,8 @@ func startUI(){ g.Row( g.Checkbox("Split output into chunks of",&split), g.InputText("##splitSize",&splitSize).Size(30).Flags(g.InputTextFlags_CharsDecimal), - g.Label("MB"), + g.Combo("##splitter",splitUnits[splitSelected],splitUnits,&splitSelected).Size(40), + //g.Label("MB"), ), g.Checkbox("Fast mode (less secure, not as durable)",&fast), @@ -295,7 +302,7 @@ func startUI(){ g.Label("Select a mode below and drop file(s) and folder(s) here."), g.Label("Warning: Anything dropped here will be shredded immediately!"), //g.Dummy(10,0), - g.Combo("##shredder_mode",items[itemSelected],items,&itemSelected).Size(464), + g.Combo("##shredder_mode",items[itemSelected],items,&itemSelected).Size(463), //g.Dummy(10,0), g.ProgressBar(shredProgress).Overlay(shredOverlay).Size(-1,0), g.Label(shredding).Wrapped(true), @@ -1063,7 +1070,7 @@ func work(){ elapsed:= float64(int64(time.Now().Sub(startTime)))/float64(1000000000) speed := (float64(done)/elapsed)/1000000 - eta := float64(total-int64(done))/(speed*1000000) + eta := math.Abs(float64(total-int64(done))/(speed*1000000)) progressInfo = fmt.Sprintf("%.2f%%",progress*100) @@ -1127,7 +1134,14 @@ func work(){ finished := 0 fmt.Println(size) chunkSize,_ := strconv.Atoi(splitSize) - chunkSize *= 1048576 + fmt.Println(splitSelected) + if splitSelected==0{ + chunkSize *= 1024 + }else if splitSelected==1{ + chunkSize *= 1048576 + }else{ + chunkSize *= 1073741824 + } chunks := int(math.Ceil(float64(size)/float64(chunkSize))) fin,_ := os.Open(outputFile) for i:=0;i