Update code with latest changes

This commit is contained in:
Evan Su 2022-04-18 18:09:12 -04:00 committed by GitHub
parent e3a7cdf63c
commit c46de2a398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions

View file

@ -1359,7 +1359,7 @@ func work() {
return
}
}
if i == 1113976 && done+1<<20/128*136 >= int(total) && padded {
if i == 1113976 && done+1114112 >= int(total) && padded {
tmp = unpad(tmp)
}
src = append(src, tmp...)
@ -1413,16 +1413,16 @@ func work() {
// Update stats
if mode == "decrypt" && reedsolo {
done += 1 << 20 / 128 * 136
done += 1<<20/128*136
} else {
done += 1 << 20
done += 1<<20
}
counterDone += 1 << 20
counterDone += 1<<20
counter++
progress = float32(done) / float32(total)
elapsed := float64(time.Since(startTime)) / (1 << 20) / 1000
elapsed := float64(time.Since(startTime)) / (1<<20) / 1000
speed := float64(done) / elapsed / (1 << 20)
eta := int(math.Floor(float64(total-int64(done)) / (speed * (1 << 20))))
eta := int(math.Floor(float64(total-int64(done)) / (speed * (1<<20))))
progress = float32(math.Min(float64(progress), 1)) // Cap progress to 100%
progressInfo = fmt.Sprintf("%.2f%%", progress*100)
popupStatus = fmt.Sprintf("Working at %.2f MiB/s (ETA: %s)", speed, humanize(eta))

View file

@ -6,7 +6,7 @@ require (
github.com/HACKERALERT/clipboard v0.1.5-0.20211215214929-7345ba96aeca
github.com/HACKERALERT/crypto v0.0.0-20220412024110-ba8732acd7e7
github.com/HACKERALERT/dialog v0.0.0-20220415015354-cd2cf9c423ec
github.com/HACKERALERT/giu v0.5.7-0.20220418211504-32988b007704
github.com/HACKERALERT/giu v0.5.7-0.20220418220352-faeb0afe91f6
github.com/HACKERALERT/infectious v0.0.0-20220412021528-bb1303403749
github.com/HACKERALERT/serpent v0.0.0-20210716182301-293b29869c66
github.com/HACKERALERT/zxcvbn-go v0.0.0-20210927200100-f131a4666ad5
@ -14,8 +14,8 @@ require (
require (
github.com/HACKERALERT/gl v0.0.0-20220417032545-0e093e3300ba // indirect
github.com/HACKERALERT/glfw/v3.3/glfw v0.0.0-20220418211004-bfe86c8a6804 // indirect
github.com/HACKERALERT/imgui-go v1.12.1-0.20220418211401-490889e6f8b6 // indirect
github.com/HACKERALERT/glfw/v3.3/glfw v0.0.0-20220418220159-8c0b01dff26c // indirect
github.com/HACKERALERT/imgui-go v1.12.1-0.20220418220320-02c1bb51b992 // indirect
github.com/HACKERALERT/mainthread v0.0.0-20211027212305-2ec9e701cc14 // indirect
github.com/HACKERALERT/sys v0.0.0-20220412020404-2e09c491f471 // indirect
github.com/HACKERALERT/w32 v0.0.0-20211215215707-4b84c2675d8d // indirect

View file

@ -4,14 +4,14 @@ github.com/HACKERALERT/crypto v0.0.0-20220412024110-ba8732acd7e7 h1:vOy0zRm74+1h
github.com/HACKERALERT/crypto v0.0.0-20220412024110-ba8732acd7e7/go.mod h1:XjuRsuBwllqVRs7DqJrbpPeUsT3qebqANdKSBJnNn0s=
github.com/HACKERALERT/dialog v0.0.0-20220415015354-cd2cf9c423ec h1:BT5dOJ3xggkQOHAJTko58Fjs7/QuyBP6o3PKYWZ8N+M=
github.com/HACKERALERT/dialog v0.0.0-20220415015354-cd2cf9c423ec/go.mod h1:GxPIEf2nKp6Gx+sdpjwTdFIGmW5kj6Jta7rRO50TgpU=
github.com/HACKERALERT/giu v0.5.7-0.20220418211504-32988b007704 h1:k7R+pk5W2aNtK51zBlf1nTrLeSNT4cHh07uF9zugzS8=
github.com/HACKERALERT/giu v0.5.7-0.20220418211504-32988b007704/go.mod h1:8b1hTZsUiy0j1LqbRSPksiUnP0AISeMGouhqXcOXLP0=
github.com/HACKERALERT/giu v0.5.7-0.20220418220352-faeb0afe91f6 h1:fd40jkfxT/22nlxJmez2Q18SyB0SUuvX/5vhQtoqV8E=
github.com/HACKERALERT/giu v0.5.7-0.20220418220352-faeb0afe91f6/go.mod h1:DILkSV0XbP/X4wwUobcWSo4P7DbIpg0q2B6p57xI6fk=
github.com/HACKERALERT/gl v0.0.0-20220417032545-0e093e3300ba h1:AGAO9HNDmj3Rx/zsnmeqmZSs/d6Sm3bW9FYqgHTXmAw=
github.com/HACKERALERT/gl v0.0.0-20220417032545-0e093e3300ba/go.mod h1:ZUosVzfEKNGLMLk6aj9yo0FSAhWWsbTMjuzeIUXniB0=
github.com/HACKERALERT/glfw/v3.3/glfw v0.0.0-20220418211004-bfe86c8a6804 h1:KnV8GLNQDt2oLnvYU0e3sPOJ2vhsJDzF3JazJ5Dnj6A=
github.com/HACKERALERT/glfw/v3.3/glfw v0.0.0-20220418211004-bfe86c8a6804/go.mod h1:aP+FSN9tk1W3UsQisFWxRLQ4WOF7T3niq68UYw0B150=
github.com/HACKERALERT/imgui-go v1.12.1-0.20220418211401-490889e6f8b6 h1:qLaFTxyT3r+oiZNuNxlY5ep/MAGX7JpSOaoYufk+5J8=
github.com/HACKERALERT/imgui-go v1.12.1-0.20220418211401-490889e6f8b6/go.mod h1:h8m2AFVQUhwB6Ygp98H7av+3n3X5vWsiWriGCL9SanQ=
github.com/HACKERALERT/glfw/v3.3/glfw v0.0.0-20220418220159-8c0b01dff26c h1:uQK+OMiHS0S8Ovye1PeRbej19X60SIRq6y+EnOtAEgw=
github.com/HACKERALERT/glfw/v3.3/glfw v0.0.0-20220418220159-8c0b01dff26c/go.mod h1:aP+FSN9tk1W3UsQisFWxRLQ4WOF7T3niq68UYw0B150=
github.com/HACKERALERT/imgui-go v1.12.1-0.20220418220320-02c1bb51b992 h1:0SDSJVa2JbVBlvWFd8jkS30ada8dNVPQinVgAOVL8Bg=
github.com/HACKERALERT/imgui-go v1.12.1-0.20220418220320-02c1bb51b992/go.mod h1:XdQUE5swH88IF/sA6lb0z/l7vu6EJw80u5dp7DmAnh4=
github.com/HACKERALERT/infectious v0.0.0-20220412021528-bb1303403749 h1:uZMOuYhLopMYH1E5JC4gMqWsp3aVhxUnOgvCH6cGMqo=
github.com/HACKERALERT/infectious v0.0.0-20220412021528-bb1303403749/go.mod h1:LInDG9bntPYtji6J+OLDZvv1OTWA5XpqXv19MBsWJrA=
github.com/HACKERALERT/mainthread v0.0.0-20211027212305-2ec9e701cc14 h1:DwWXverhu/dEsPM/GPykuHGh4SxW69DaGZL5t3fANG4=