X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=cmd%2Fmeta4-create%2Fmain.go;fp=cmd%2Fmeta4-create%2Fmain.go;h=b5d9abac4175411f8079f19ecf5cb37754825cae;hb=ef05102b307068482a6084fee0580a13ee934e92;hp=1c799af9bbe1d3c7e8cfb6d865b5cc9b8f6e21fc;hpb=1df2854b39c97f92d8fc8a77a6f763e5e8752009;p=meta4ra.git

diff --git a/cmd/meta4-create/main.go b/cmd/meta4-create/main.go
index 1c799af..b5d9aba 100644
--- a/cmd/meta4-create/main.go
+++ b/cmd/meta4-create/main.go
@@ -20,86 +20,84 @@ package main
 
 import (
 	"bufio"
-	"crypto/sha256"
-	"crypto/sha512"
-	"encoding/hex"
+	"bytes"
 	"encoding/xml"
 	"flag"
-	"hash"
 	"io"
 	"log"
 	"os"
+	"os/exec"
 	"path"
+	"strings"
 	"sync"
 	"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
+type Hasher struct {
+	names []string
+	cmds  []*exec.Cmd
+	ins   []io.WriteCloser
+	outs  []io.ReadCloser
+	wg    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)
+func NewHasher(hashes string) *Hasher {
+	h := Hasher{}
+	for _, hc := range strings.Split(hashes, ",") {
+		cols := strings.SplitN(hc, ":", 2)
+		name, cmdline := cols[0], cols[1]
+		cmd := exec.Command(cmdline)
+		in, err := cmd.StdinPipe()
+		if err != nil {
+			log.Fatalln(err)
 		}
-		h.g.Done()
-	}()
-	go func() {
-		if _, err := h.sha512h.Write(p); err != nil {
-			panic(err)
+		out, err := cmd.StdoutPipe()
+		if err != nil {
+			log.Fatalln(err)
 		}
-		h.g.Done()
-	}()
-	go func() {
-		if _, err := h.streebog256h.Write(p); err != nil {
-			panic(err)
+		if err = cmd.Start(); err != nil {
+			log.Fatalln(err)
 		}
-		h.g.Done()
-	}()
-	go func() {
-		if _, err := h.streebog512h.Write(p); err != nil {
-			panic(err)
+		h.names = append(h.names, name)
+		h.ins = append(h.ins, in)
+		h.outs = append(h.outs, out)
+		h.cmds = append(h.cmds, cmd)
+	}
+	return &h
+}
+
+func (h *Hasher) Write(p []byte) (n int, err error) {
+	h.wg.Add(len(h.names))
+	for _, in := range h.ins {
+		go func(in io.WriteCloser) {
+			if _, err := io.Copy(in, bytes.NewReader(p)); err != nil {
+				log.Fatalln(err)
+			}
+			h.wg.Done()
+		}(in)
+	}
+	h.wg.Wait()
+	return len(p), nil
+}
+
+func (h *Hasher) Sums() []meta4ra.Hash {
+	sums := make([]meta4ra.Hash, 0, len(h.names))
+	for i, name := range h.names {
+		if err := h.ins[i].Close(); err != nil {
+			log.Fatalln(err)
 		}
-		h.g.Done()
-	}()
-	go func() {
-		if _, err := h.shake128h.Write(p); err != nil {
-			panic(err)
+		dgst, err := io.ReadAll(h.outs[i])
+		if err != nil {
+			log.Fatalln(err)
 		}
-		h.g.Done()
-	}()
-	go func() {
-		if _, err := h.shake256h.Write(p); err != nil {
-			panic(err)
+		sums = append(sums, meta4ra.Hash{Type: name, Hash: string(dgst[:len(dgst)-1])})
+		if err = h.cmds[i].Wait(); err != nil {
+			log.Fatalln(err)
 		}
-		h.g.Done()
-	}()
-	h.g.Wait()
-	return len(p), nil
+	}
+	return sums
 }
 
 func main() {
@@ -107,6 +105,18 @@ func main() {
 	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")
+	hashesDef := []string{
+		"sha-256:sha256",
+		"sha-512:sha512",
+		"shake128:shake128sum",
+		"shake256:shake256sum",
+		"streebog-256:streebog256sum",
+		"streebog-512:streebog512sum",
+		"skein-256:skein256",
+		"skein-512:skein512",
+		"blake3-256:b3sum",
+	}
+	hashes := flag.String("hashes", strings.Join(hashesDef, ","), "hash-name:command-s")
 	torrent := flag.String("torrent", "", "Torrent URL")
 	log.SetFlags(log.Lshortfile)
 	flag.Parse()
@@ -117,34 +127,19 @@ func main() {
 	for _, u := range flag.Args() {
 		urls = append(urls, meta4ra.URL{URL: u})
 	}
+	h := NewHasher(*hashes)
 	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)