Skip to content

Commit 2c38c5f

Browse files
macdylanmacdylan
committed
multi progress bar
1 parent 578e464 commit 2c38c5f

File tree

7 files changed

+83
-288
lines changed

7 files changed

+83
-288
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.py
22
dist/
3+
.vscode/

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ linux-arm6: $(SRC)
2727

2828
win64: $(SRC)
2929
GOOS=windows GOARCH=amd64 \
30-
$(CMD) -o $(DIST)$(PROJNAME)-$@ $^
30+
$(CMD) -o $(DIST)$(PROJNAME)-$@.exe $^
3131

3232
win32: $(SRC)
3333
GOOS=windows GOARCH=386 \
34-
$(CMD) -o $(DIST)$(PROJNAME)-$@ $^
34+
$(CMD) -o $(DIST)$(PROJNAME)-$@.exe $^
3535

3636
all: darwin-arm64 darwin-amd64 linux-amd64 linux-arm7 linux-arm6 win64 win32
3737
@true

‎connector.go

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"errors"
55
"fmt"
6+
"io"
67
"net"
7-
"os"
88
"time"
99

1010
"github.com/imroc/req/v3"
@@ -35,14 +35,12 @@ const (
3535
)
3636

3737
type Connector struct {
38-
Target *Machine
39-
State chan ConnectorState
40-
Error error // last error
41-
UploadCallback func(req.UploadInfo)
42-
PrintCallback func()
43-
ToolHead int
44-
client *req.Client
45-
cancel chan bool
38+
Target *Machine
39+
State chan ConnectorState
40+
Error error // last error
41+
ToolHead int
42+
client *req.Client
43+
cancel chan bool
4644
}
4745

4846
func NewConnector() *Connector {
@@ -54,12 +52,11 @@ func NewConnector() *Connector {
5452
// client.EnableDumpAll()
5553

5654
return &Connector{
57-
State: make(chan ConnectorState, 1),
58-
Target: nil,
59-
Error: nil,
60-
UploadCallback: nil,
61-
client: client,
62-
cancel: make(chan bool, 1),
55+
State: make(chan ConnectorState, 1),
56+
Target: nil,
57+
Error: nil,
58+
client: client,
59+
cancel: make(chan bool, 1),
6360
}
6461
}
6562

@@ -123,17 +120,21 @@ func (conn *Connector) Discover(timeout time.Duration) <-chan *Machine {
123120
}
124121

125122
func (conn *Connector) request(timeout ...int) *req.Request {
123+
conn.Error = nil // reset
124+
126125
t := 0
127126
if len(timeout) > 0 {
128127
t = timeout[0]
129128
}
129+
params := map[string]string{
130+
"token": conn.Target.Token,
131+
"_": fmt.Sprintf("%d", time.Now().Unix()),
132+
}
130133
req := conn.client.SetTimeout(time.Duration(t) * time.Second).R()
131-
// for POST
132-
req.SetFormData(map[string]string{"token": conn.Target.Token})
133134
// for GET
134-
req.SetQueryParam("token", conn.Target.Token)
135-
// no cache
136-
req.SetQueryParam("_", fmt.Sprintf("%d", time.Now().Unix()))
135+
req.SetQueryParams(params)
136+
// for POST
137+
req.SetFormData(params)
137138
return req
138139
}
139140

@@ -209,7 +210,7 @@ func (conn *Connector) startHeartbeat() {
209210
case 204:
210211
conn.setState(ConnectorStateWaiting)
211212
default:
212-
conn.broken("Machine was not connected")
213+
conn.broken("Disconnected from Snapmaker 2.")
213214
return
214215
}
215216

@@ -222,19 +223,18 @@ func (conn *Connector) startHeartbeat() {
222223
}
223224
}
224225

225-
func (conn *Connector) Upload(name string, file *os.File) {
226+
func (conn *Connector) Upload(name string, file io.Reader) {
226227
url := conn.Target.URL("/upload")
227-
r := conn.request(60)
228-
r.SetUploadCallback(conn.UploadCallback)
229-
r.SetFileReader("file", name, file)
228+
r := conn.request(300).SetFileReader("file", name, file)
230229
conn.do(r.Post, url, ConnectorStateUploaded)
231230
}
232231

232+
/*
233233
func (conn *Connector) PreparePrint(name string, file *os.File) {
234234
url := conn.Target.URL("/prepare_print")
235235
r := conn.request(60)
236236
r.SetFormData(map[string]string{"type": "3DP"})
237-
r.SetUploadCallback(conn.UploadCallback)
237+
r.SetUploadCallbackWithInterval(conn.UploadCallback, 50*time.Millisecond)
238238
r.SetFileReader("file", name, file)
239239
conn.do(r.Post, url, ConnectorStatePrintingPrepared)
240240
}
@@ -248,6 +248,7 @@ func (conn *Connector) StopPrint() {
248248
url := conn.Target.URL("/stop_print")
249249
conn.do(conn.request(5).Post, url, ConnectorStatePrintStopped)
250250
}
251+
*/
251252

252253
func (conn *Connector) do(req func(string) (*req.Response, error), url string, state ConnectorState) {
253254
if resp, err := req(url); err != nil {

‎go.mod

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@ module github.com/macdylan/sm2uploader
33
go 1.18
44

55
require (
6-
github.com/imroc/req/v3 v3.11.0
6+
github.com/imroc/req/v3 v3.11.4
77
github.com/manifoldco/promptui v0.9.0
8-
github.com/schollz/progressbar/v3 v3.8.6
9-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
8+
github.com/vbauerster/mpb/v7 v7.4.2
9+
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

1212
require (
13-
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
14-
github.com/hashicorp/errwrap v1.0.0 // indirect
13+
github.com/VividCortex/ewma v1.2.0 // indirect
14+
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
15+
github.com/chzyer/readline v1.5.0 // indirect
16+
github.com/hashicorp/errwrap v1.1.0 // indirect
1517
github.com/hashicorp/go-multierror v1.1.1 // indirect
1618
github.com/mattn/go-runewidth v0.0.13 // indirect
17-
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
1819
github.com/rivo/uniseg v0.2.0 // indirect
19-
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
20-
golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect
21-
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
22-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
20+
golang.org/x/net v0.0.0-20220526153639-5463443f8c37 // indirect
21+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
2322
golang.org/x/text v0.3.7 // indirect
2423
)

‎go.sum

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,46 @@
1-
github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
1+
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
2+
github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
3+
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
4+
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
25
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
3-
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
6+
github.com/chzyer/logex v1.2.0 h1:+eqR0HfOetur4tgnC8ftU5imRnhi4te+BadWS95c5AM=
7+
github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
48
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
5-
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
9+
github.com/chzyer/readline v1.5.0 h1:lSwwFrbNviGePhkewF1az4oLmcwqCZijQ2/Wi3BGHAI=
10+
github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
611
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
7-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
9-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
10-
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
12+
github.com/chzyer/test v0.0.0-20210722231415-061457976a23 h1:dZ0/VyGgQdVGAss6Ju0dt5P0QltE0SFY5Woh6hbIfiQ=
13+
github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
1114
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
15+
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
16+
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
1217
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
1318
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
14-
github.com/imroc/req/v3 v3.11.0 h1:s2+GYIdzd20i4bB1ZWncsRx+x7wcy3f6cpDIbR1P6ro=
15-
github.com/imroc/req/v3 v3.11.0/go.mod h1:G6fkq27P+JcTcgRVxecxY+amHN1xFl8W81eLCfJ151M=
16-
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
19+
github.com/imroc/req/v3 v3.11.4 h1:z5/gQUkpq9gViLmRdT594u/UhJKgEg5P+6L39RSYcYA=
20+
github.com/imroc/req/v3 v3.11.4/go.mod h1:G6fkq27P+JcTcgRVxecxY+amHN1xFl8W81eLCfJ151M=
1721
github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
1822
github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
19-
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
2023
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
2124
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
22-
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
23-
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
24-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
25-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2625
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
2726
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
28-
github.com/schollz/progressbar/v3 v3.8.6 h1:QruMUdzZ1TbEP++S1m73OqRJk20ON11m6Wqv4EoGg8c=
29-
github.com/schollz/progressbar/v3 v3.8.6/go.mod h1:W5IEwbJecncFGBvuEh4A7HT1nZZ6WNIL2i3qbnI0WKY=
30-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
31-
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
32-
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
33-
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE=
34-
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
35-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
36-
golang.org/x/net v0.0.0-20220111093109-d55c255bac03 h1:0FB83qp0AzVJm+0wcIlauAjJ+tNdh7jLuacRYCIVv7s=
27+
github.com/vbauerster/mpb/v7 v7.4.2 h1:n917F4d8EWdUKc9c81wFkksyG6P6Mg7IETfKCE1Xqng=
28+
github.com/vbauerster/mpb/v7 v7.4.2/go.mod h1:UmOiIUI8aPqWXIps0ciik3RKMdzx7+ooQpq+fBcXwBA=
3729
golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
30+
golang.org/x/net v0.0.0-20220526153639-5463443f8c37 h1:lUkvobShwKsOesNfWWlCS5q7fnbG1MEliIzwu886fn8=
31+
golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
3832
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3933
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4034
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
41-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
42-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
43-
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo=
44-
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35+
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
36+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
37+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4538
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
46-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
47-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
4839
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
4940
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
5041
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
5142
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
5243
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5344
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
54-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
55-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
45+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
46+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎sm2uploader.go

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"syscall"
1010
"time"
1111

12-
"github.com/imroc/req/v3"
1312
"github.com/manifoldco/promptui"
14-
"github.com/schollz/progressbar/v3"
13+
"github.com/vbauerster/mpb/v7"
14+
"github.com/vbauerster/mpb/v7/decor"
1515
)
1616

1717
var (
@@ -60,17 +60,31 @@ func loop() {
6060
uploading = true
6161
defer func() { uploading = false }()
6262

63-
for _, p := range _Payloads {
63+
pbar := mpb.New(mpb.WithRefreshRate(100 * time.Millisecond))
64+
bar := make([]*mpb.Bar, len(_Payloads))
65+
names := make([]string, len(_Payloads))
66+
for n, p := range _Payloads {
6467
st, _ := p.Stat()
6568
name := st.Name()
6669
if name == "stdin" {
6770
name = fmt.Sprintf("%d.gcode", time.Now().Unix())
6871
}
69-
pbar := progressbar.DefaultBytes(st.Size(), name)
70-
_Conn.UploadCallback = func(i req.UploadInfo) { pbar.Set64(i.UploadedSize) }
71-
_Conn.Upload(name, p)
72-
pbar.Finish()
72+
bar[n] = pbar.AddBar(st.Size(),
73+
mpb.BarFillerClearOnComplete(),
74+
mpb.PrependDecorators(
75+
decor.Name(name),
76+
decor.CountersKibiByte("% .2f / % .2f", decor.WCSyncSpace),
77+
),
78+
mpb.AppendDecorators(
79+
decor.OnComplete(decor.Percentage(decor.WCSyncSpace), ""),
80+
),
81+
)
82+
names[n] = name
7383
}
84+
for n, p := range _Payloads {
85+
_Conn.Upload(names[n], bar[n].ProxyReader(p))
86+
}
87+
pbar.Wait()
7488
}()
7589

7690
case state := <-_Conn.State:

0 commit comments

Comments
 (0)