Skip to content

Commit 809e8de

Browse files
committed
[rget]fix error procedure
1 parent 1765566 commit 809e8de

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

Diff for: kadai3/imura81gt/rget/cmd/rget/main.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,9 @@ func main() {
2727

2828
option.URL = urls[0]
2929
fmt.Println(option)
30-
rget.Run(option)
30+
err := rget.Run(option)
31+
if err != nil {
32+
fmt.Fprintf(os.Stderr, "err: %s", err)
33+
os.Exit(1)
34+
}
3135
}

Diff for: kadai3/imura81gt/rget/rget.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,33 @@ func (u *Unit) Write(data []byte) (int, error) {
3838

3939
type Units []Unit
4040

41-
func Run(option Option) {
41+
func Run(option Option) error {
4242
fmt.Printf("%+v\n", option)
4343
err := option.checkingHeaders()
4444
if err != nil {
45-
fmt.Errorf("%s", err)
45+
return fmt.Errorf("%s", err)
4646
}
4747

4848
option.divide()
4949

5050
tmpDir, err := ioutil.TempDir("", "rget")
5151
if err != nil {
52-
fmt.Errorf("%s", err)
52+
return fmt.Errorf("%s", err)
5353
}
5454
defer os.RemoveAll(tmpDir)
5555
fmt.Println(tmpDir)
5656

5757
err = option.parallelDownload(tmpDir)
5858
if err != nil {
59-
fmt.Errorf("%s", err)
59+
return fmt.Errorf("%s", err)
6060
}
6161

6262
err = option.combine(tmpDir)
6363
if err != nil {
64-
fmt.Errorf("%s", err)
64+
return fmt.Errorf("%s", err)
6565
}
6666

67+
return nil
6768
}
6869

6970
func (o *Option) checkingHeaders() error {

0 commit comments

Comments
 (0)