meta4-check workability again

[meta4ra.git] / cmd / meta4-create / main.go

diff --git a/cmd/meta4-create/main.go b/cmd/meta4-create/main.go
index 1c799af9bbe1d3c7e8cfb6d865b5cc9b8f6e21fc..f5d8b5ca4c98858ea3bc6812806534c944c34ec4 100644 (file)
--- a/cmd/meta4-create/main.go
+++ b/cmd/meta4-create/main.go
@@ -20,93 +20,24 @@ package main
 
 import (
        "bufio"
-       "crypto/sha256"
-       "crypto/sha512"
-       "encoding/hex"
        "encoding/xml"
        "flag"
-       "hash"
        "io"
        "log"
        "os"
        "path"
-       "sync"
+       "strings"
        "time"
 
-       "go.cypherpunks.ru/gogost/v5/gost34112012256"
-       "go.cypherpunks.ru/gogost/v5/gost34112012512"
        "go.stargrave.org/meta4ra"
-       "golang.org/x/crypto/sha3"
 )
 
-type MultiHasher struct {
-       sha256h      hash.Hash
-       sha512h      hash.Hash
-       streebog256h hash.Hash
-       streebog512h hash.Hash
-       shake128h    sha3.ShakeHash
-       shake256h    sha3.ShakeHash
-       g            sync.WaitGroup
-}
-
-func NewMultiHasher() *MultiHasher {
-       return &MultiHasher{
-               sha256h:      sha256.New(),
-               sha512h:      sha512.New(),
-               streebog256h: gost34112012256.New(),
-               streebog512h: gost34112012512.New(),
-               shake128h:    sha3.NewShake128(),
-               shake256h:    sha3.NewShake256(),
-       }
-}
-
-func (h *MultiHasher) Write(p []byte) (n int, err error) {
-       h.g.Add(6)
-       go func() {
-               if _, err := h.sha256h.Write(p); err != nil {
-                       panic(err)
-               }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.sha512h.Write(p); err != nil {
-                       panic(err)
-               }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.streebog256h.Write(p); err != nil {
-                       panic(err)
-               }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.streebog512h.Write(p); err != nil {
-                       panic(err)
-               }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.shake128h.Write(p); err != nil {
-                       panic(err)
-               }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.shake256h.Write(p); err != nil {
-                       panic(err)
-               }
-               h.g.Done()
-       }()
-       h.g.Wait()
-       return len(p), nil
-}
-
 func main() {
        fn := flag.String("fn", "", "Filename")
        mtime := flag.String("mtime", "", "Take that file's mtime as a Published date")
        desc := flag.String("desc", "", "Description")
        sig := flag.String("sig", "", "Path to signature file")
+       hashes := flag.String("hashes", strings.Join(meta4ra.HashesDefault, ","), "hash-name:command-s")
        torrent := flag.String("torrent", "", "Torrent URL")
        log.SetFlags(log.Lshortfile)
        flag.Parse()
@@ -117,34 +48,20 @@ func main() {
        for _, u := range flag.Args() {
                urls = append(urls, meta4ra.URL{URL: u})
        }
+       h := meta4ra.NewHasher(*hashes)
+       h.Start()
        br := bufio.NewReaderSize(os.Stdin, 1<<20)
        buf := make([]byte, 1<<20)
-       h := NewMultiHasher()
        size, err := io.CopyBuffer(h, br, buf)
        if err != nil {
                log.Fatalln(err)
        }
-       shake128 := make([]byte, 32)
-       if _, err = io.ReadFull(h.shake128h, shake128); err != nil {
-               panic(err)
-       }
-       shake256 := make([]byte, 64)
-       if _, err = io.ReadFull(h.shake256h, shake256); err != nil {
-               panic(err)
-       }
        f := meta4ra.File{
                Name:        path.Base(*fn),
                Description: *desc,
                Size:        uint64(size),
                URLs:        urls,
-               Hashes: []meta4ra.Hash{
-                       {Type: meta4ra.HashSHA256, Hash: hex.EncodeToString(h.sha256h.Sum(nil))},
-                       {Type: meta4ra.HashSHA512, Hash: hex.EncodeToString(h.sha512h.Sum(nil))},
-                       {Type: meta4ra.HashStreebog256, Hash: hex.EncodeToString(h.streebog256h.Sum(nil))},
-                       {Type: meta4ra.HashStreebog512, Hash: hex.EncodeToString(h.streebog512h.Sum(nil))},
-                       {Type: meta4ra.HashSHAKE128, Hash: hex.EncodeToString(shake128)},
-                       {Type: meta4ra.HashSHAKE256, Hash: hex.EncodeToString(shake256)},
-               },
+               Hashes:      h.Sums(),
        }
        if *sig != "" {
                sigData, err := os.ReadFile(*sig)