Revert "Update Picocrypt.go"

This reverts commit a4ebbb5da9.
This commit is contained in:
Evan Su 2021-09-28 20:34:52 -04:00
parent 8ece351a7a
commit 433e095dc7
1 changed files with 150 additions and 9 deletions

View File

@ -25,16 +25,20 @@ import (
"image/color" "image/color"
"image/png" "image/png"
"io" "io"
"io/ioutil"
"math" "math"
"math/big" "math/big"
"net/http" "net/http"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"regexp" "regexp"
"runtime" "runtime"
"runtime/debug" "runtime/debug"
"strconv" "strconv"
"strings" "strings"
"sync"
"syscall"
"time" "time"
// Cryptography // Cryptography
@ -73,6 +77,9 @@ var icon []byte
//go:embed font.ttf //go:embed font.ttf
var font []byte var font []byte
//go:embed sdelete64.exe
var sdelete64bytes []byte
//go:embed strings.json //go:embed strings.json
var localeBytes []byte var localeBytes []byte
@ -100,6 +107,7 @@ var mode string
var working bool var working bool
var recombine bool var recombine bool
var fill float32 = -0.0000001 var fill float32 = -0.0000001
var sdelete64path string
// Three variables store the input files // Three variables store the input files
var onlyFiles []string var onlyFiles []string
@ -949,9 +957,7 @@ func onDrop(names []string) {
return return
} }
if tab == 2 { if tab == 2 {
namesCopy := make([]string, len(names)) go shred(names, true)
copy(namesCopy, names)
go doShred(namesCopy, true)
return return
} }
@ -1888,7 +1894,7 @@ func work() {
if shredTemp { if shredTemp {
progressInfo = "" progressInfo = ""
popupStatus = s("Shredding temporary files...") popupStatus = s("Shredding temporary files...")
doShred([]string{inputFile + ".pcv"}, false) shred([]string{inputFile + ".pcv"}, false)
} else { } else {
os.Remove(inputFile + ".pcv") os.Remove(inputFile + ".pcv")
} }
@ -1905,7 +1911,7 @@ func work() {
progressInfo = "" progressInfo = ""
popupStatus = s("Shredding temporary files...") popupStatus = s("Shredding temporary files...")
giu.Update() giu.Update()
doShred([]string{inputFile}, false) shred([]string{inputFile}, false)
} else { } else {
os.Remove(inputFile) os.Remove(inputFile)
} }
@ -2074,7 +2080,7 @@ func generateChecksums(file string) {
} }
// Recursively shred all file(s) and folder(s) passed in as 'names' // Recursively shred all file(s) and folder(s) passed in as 'names'
func doShred(names []string, separate bool) { func shred(names []string, separate bool) {
stopShredding = false stopShredding = false
shredTotal = 0 shredTotal = 0
shredDone = 0 shredDone = 0
@ -2100,7 +2106,133 @@ func doShred(names []string, separate bool) {
for _, name := range names { for _, name := range names {
shredding = name shredding = name
shred(1, false, name, &shredding)
// Linux and macOS need a command with similar syntax and usage, so they're combined
if runtime.GOOS == "linux" || runtime.GOOS == "darwin" {
stat, _ := os.Stat(name)
if stat.IsDir() {
var coming []string
// Walk the folder recursively
filepath.Walk(name, func(path string, _ os.FileInfo, err error) error {
if err != nil {
return nil
}
if stopShredding {
return nil
}
stat, _ := os.Stat(path)
if !stat.IsDir() {
if len(coming) == 128 {
// Use a WaitGroup to parallelize shredding
var wg sync.WaitGroup
for i, j := range coming {
wg.Add(1)
go func(wg *sync.WaitGroup, id int, j string) {
defer wg.Done()
shredding = j
var cmd *exec.Cmd
if runtime.GOOS == "linux" {
cmd = exec.Command("shred", "-ufvz", "-n", strconv.Itoa(int(shredPasses)), j)
} else {
cmd = exec.Command("rm", "-rfP", j)
}
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.Run()
shredDone++
shredUpdate(separate)
giu.Update()
}(&wg, i, j)
}
wg.Wait()
coming = nil
} else {
coming = append(coming, path)
}
}
return nil
})
for _, i := range coming {
if stopShredding {
break
}
go func(i string) {
shredding = i
var cmd *exec.Cmd
if runtime.GOOS == "linux" {
cmd = exec.Command("shred", "-ufvz", "-n", strconv.Itoa(int(shredPasses)), i)
} else {
cmd = exec.Command("rm", "-rfP", i)
}
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.Run()
shredDone++
shredUpdate(separate)
giu.Update()
}(i)
}
if !stopShredding {
os.RemoveAll(name)
}
} else { // The path is a file, not a directory, so just shred it
shredding = name
var cmd *exec.Cmd
if runtime.GOOS == "linux" {
cmd = exec.Command("shred", "-ufvz", "-n", strconv.Itoa(int(shredPasses)), name)
} else {
cmd = exec.Command("rm", "-rfP", name)
}
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.Run()
shredDone++
shredUpdate(separate)
}
} else if runtime.GOOS == "windows" {
stat, _ := os.Stat(name)
if stat.IsDir() {
// Walk the folder recursively
filepath.Walk(name, func(path string, _ os.FileInfo, err error) error {
if err != nil {
return nil
}
stat, _ := os.Stat(path)
if stat.IsDir() {
if stopShredding {
return nil
}
t := 0
files, _ := ioutil.ReadDir(path)
for _, f := range files {
if !f.IsDir() {
t++
}
}
shredDone += float32(t)
shredUpdate(separate)
shredding = strings.ReplaceAll(path, "\\", "/") + "/*"
cmd := exec.Command(sdelete64path, "*", "-p", strconv.Itoa(int(shredPasses)))
cmd.Dir = path
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.Run()
giu.Update()
}
return nil
})
if !stopShredding {
// sdelete64 doesn't delete the empty folder, so I'll do it manually
os.RemoveAll(name)
}
} else {
shredding = name
cmd := exec.Command(sdelete64path, name, "-p", strconv.Itoa(int(shredPasses)))
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.Run()
shredDone++
shredUpdate(separate)
}
}
giu.Update() giu.Update()
if stopShredding { if stopShredding {
return return
@ -2289,8 +2421,14 @@ func main() {
} }
} }
cleanup := initializeShred() // Create a temporary file to store sdelete64.exe
defer cleanup() sdelete64, _ := os.CreateTemp("", "sdelete64.*.exe")
sdelete64path = sdelete64.Name()
sdelete64.Write(sdelete64bytes)
sdelete64.Close()
cmd := exec.Command(sdelete64path, "/accepteula")
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.Run()
// Set a universal font // Set a universal font
giu.SetDefaultFontFromBytes(font, 18) giu.SetDefaultFontFromBytes(font, 18)
@ -2330,4 +2468,7 @@ func main() {
// Start the UI // Start the UI
window.Run(draw) window.Run(draw)
// Window closed, clean up
os.Remove(sdelete64path)
} }