cmd/torrent: Use updated args module

diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index 7763d8e2159c585c01ce9d3e7ccf20a4b4d7934e..06b76f6b52373f9f4211f5e617ed3c6971531b18 100644 (file)
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -219,7 +219,7 @@ func mainErr() error {
        defer envpprof.Stop()
        stdLog.SetFlags(stdLog.Flags() | stdLog.Lshortfile)
        debug := args.Flag(args.FlagOpt{Long: "debug"})
-       p := args.ParseMain(
+       args.ParseMain(
                debug,
                args.Subcommand("metainfo", metainfoCmd),
                args.Subcommand("announce", func(p args.SubCmdCtx) error {
@@ -233,17 +233,21 @@ func mainErr() error {
                        return announceErr(cmd)
                }),
                args.Subcommand("download", func(p args.SubCmdCtx) error {
-                       var dlf DownloadCmd
+                       var dlc DownloadCmd
                        err := p.NewParser().AddParams(
-                               append(args.FromStruct(&dlf), debug)...,
+                               append(args.FromStruct(&dlc), debug)...,
                        ).Parse()
                        if err != nil {
                                return err
                        }
-                       return downloadErr(downloadFlags{
+                       dlf := downloadFlags{
                                Debug:       debug.Bool(),
-                               DownloadCmd: dlf,
+                               DownloadCmd: dlc,
+                       }
+                       p.Defer(func() error {
+                               return downloadErr(dlf)
                        })
+                       return nil
                }),
                args.Subcommand(
                        "spew-bencoding",
@@ -271,16 +275,6 @@ func mainErr() error {
                        return nil
                }),
        )
-       if p.Err != nil {
-               if errors.Is(p.Err, args.ErrHelped) {
-                       return nil
-               }
-               return p.Err
-       }
-       if !p.RanSubCmd {
-               p.PrintChoices(os.Stderr)
-               args.FatalUsage()
-       }
        return nil
 }
 

diff --git a/go.mod b/go.mod
index 662ff999e9496dd5e5aeb8f0b1eada3f8e9063f8..a00591869b5b2c995889875a5e090286704c2728 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
        crawshaw.io/sqlite v0.3.3-0.20210127221821-98b1f83c5508
        github.com/RoaringBitmap/roaring v0.9.4
        github.com/alexflint/go-arg v1.4.2
-       github.com/anacrolix/args v0.1.1-0.20211012231536-d5fb5cc2a270
+       github.com/anacrolix/args v0.1.1-0.20211020052733-53ed238acbd4
        github.com/anacrolix/chansync v0.3.0-0.0.20211007004133-3f72684c4a93
        github.com/anacrolix/confluence v1.8.0 // indirect
        github.com/anacrolix/dht/v2 v2.10.6-0.20211007004332-99263ec9c1c8
@@ -28,7 +28,7 @@ require (
        github.com/dustin/go-humanize v1.0.0
        github.com/edsrzf/mmap-go v1.0.0
        github.com/elliotchance/orderedmap v1.4.0
-       github.com/frankban/quicktest v1.13.1
+       github.com/frankban/quicktest v1.14.0
        github.com/fsnotify/fsnotify v1.5.1
        github.com/google/btree v1.0.1
        github.com/google/go-cmp v0.5.6

diff --git a/go.sum b/go.sum
index e23095ff0f4fff15e9445b74838af17046b4acf2..4ed7c1cbed651aa24ac644d87af2777db0c0b165 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -44,8 +44,8 @@ github.com/alexflint/go-arg v1.4.2/go.mod h1:9iRbDxne7LcR/GSvEr7ma++GLpdIU1zrghf
 github.com/alexflint/go-scalar v1.0.0/go.mod h1:GpHzbCOZXEKMEcygYQ5n/aa4Aq84zbxjy3MxYW0gjYw=
 github.com/alexflint/go-scalar v1.1.0 h1:aaAouLLzI9TChcPXotr6gUhq+Scr8rl0P9P4PnltbhM=
 github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
-github.com/anacrolix/args v0.1.1-0.20211012231536-d5fb5cc2a270 h1:5AxRCDxrVjcIft7G5uXXZwg/O2b+QBIAI5n9krESgTE=
-github.com/anacrolix/args v0.1.1-0.20211012231536-d5fb5cc2a270/go.mod h1:RCPBt2vU1GJn4gG9rL+fuYu7ivnE9tmK2pHm63t3yO0=
+github.com/anacrolix/args v0.1.1-0.20211020052733-53ed238acbd4 h1:s6KNsoIo4VlU5fqoTVczWqDyM163HzyqoPY0hQJS+9U=
+github.com/anacrolix/args v0.1.1-0.20211020052733-53ed238acbd4/go.mod h1:41JBnF8sKExNVLHPkCdL74jkZc3dSxAkGsk1TuKOUFI=
 github.com/anacrolix/chansync v0.0.0-20210524073341-a336ebc2de92/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k=
 github.com/anacrolix/chansync v0.3.0-0.0.20211007004133-3f72684c4a93 h1:sQ8igc3anitrtKPEHRK+RBvuNZP0+DRAa6jskKlq4+k=
 github.com/anacrolix/chansync v0.3.0-0.0.20211007004133-3f72684c4a93/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k=
@@ -237,8 +237,9 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/frankban/quicktest v1.9.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/frankban/quicktest v1.13.1 h1:xVm/f9seEhZFL9+n5kv5XLrGwy6elc4V9v/XFY2vmd8=
 github.com/frankban/quicktest v1.13.1/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
+github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss=
+github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=