Mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaced zstd with archiver and limit reader to speed up metadata ejection and remove windows incompatible dependency

Browse Source
This commit is contained in:
dancheg97 2023-06-21 14:05:25 +03:00
parent 6328a92c0b
commit 808a7aed67
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -15,7 +15,6 @@ require (
gitea.com/lunny/levelqueue v0.4.2-0.20220729054728-f020868cc2f7 gitea.com/lunny/levelqueue v0.4.2-0.20220729054728-f020868cc2f7
github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
github.com/DataDog/zstd v1.4.5
github.com/NYTimes/gziphandler v1.1.1 github.com/NYTimes/gziphandler v1.1.1
github.com/ProtonMail/gopenpgp/v2 v2.7.1 github.com/ProtonMail/gopenpgp/v2 v2.7.1
github.com/PuerkitoBio/goquery v1.8.1 github.com/PuerkitoBio/goquery v1.8.1
@ -133,6 +132,7 @@ require (
git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect
github.com/ClickHouse/ch-go v0.55.0 // indirect github.com/ClickHouse/ch-go v0.55.0 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.9.1 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.9.1 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect

15
modules/packages/arch/metadata.go
View File

@ -4,11 +4,13 @@
package arch package arch
import ( import (
"bytes"
"crypto/md5" "crypto/md5"
"crypto/sha256" "crypto/sha256"
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
"io"
"io/fs" "io/fs"
"os" "os"
"path" "path"
@ -16,7 +18,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/DataDog/zstd"
"github.com/mholt/archiver/v3" "github.com/mholt/archiver/v3"
) )
@ -50,11 +51,15 @@ type Metadata struct {
// Function that recieves arch package archive data and returns it's metadata. // Function that recieves arch package archive data and returns it's metadata.
func EjectMetadata(filename, domain string, pkg []byte) (*Metadata, error) { func EjectMetadata(filename, domain string, pkg []byte) (*Metadata, error) {
d, err := zstd.Decompress(nil, pkg) pkgreader := io.LimitReader(bytes.NewReader(pkg), 250000)
var buf bytes.Buffer
err := archiver.DefaultZstd.Decompress(pkgreader, &buf)
if err != nil { if err != nil {
return nil, err if !errors.Is(err, io.ErrUnexpectedEOF) {
return nil, err
}
} }
splt := strings.Split(string(d), "PKGINFO") splt := strings.Split(buf.String(), "PKGINFO")
if len(splt) < 2 { if len(splt) < 2 {
return nil, errors.New("unable to eject .PKGINFO from archive") return nil, errors.New("unable to eject .PKGINFO from archive")
} }
@ -87,7 +92,7 @@ func EjectMetadata(filename, domain string, pkg []byte) (*Metadata, error) {
MakeDepends: ejectStrings(raw, "makedepend"), MakeDepends: ejectStrings(raw, "makedepend"),
CheckDepends: ejectStrings(raw, "checkdepend"), CheckDepends: ejectStrings(raw, "checkdepend"),
Backup: ejectStrings(raw, "backup"), Backup: ejectStrings(raw, "backup"),
}, err }, nil
} }
func ejectString(raw, field string) string { func ejectString(raw, field string) string {