Commit f1d320ed authored by Grzegorz Bizon's avatar Grzegorz Bizon

Refactor function that generates artifacts metadata

parent 3353d2e7
......@@ -9,6 +9,7 @@ import (
"os"
"path"
"strconv"
"strings"
"time"
)
......@@ -21,7 +22,7 @@ type metadata struct {
Comment string `json:"comment,omitempty"`
}
type zipFileMap map[string]*zip.File
type zipDirMap map[string]*zip.File
const MetadataHeaderPrefix = "\x00\x00\x00&" // length of string below, encoded properly
const MetadataHeader = "GitLab Build Artifacts Metadata 0.0.2\n"
......@@ -47,20 +48,40 @@ func (m metadata) writeEncoded(output io.Writer) error {
}
func writeZipEntryMetadata(output io.Writer, entry *zip.File) error {
err := writeString(output, entry.Name)
if err != nil {
if err := writeString(output, entry.Name); err != nil {
return err
}
err = newMetadata(entry).writeEncoded(output)
if err != nil {
if err := newMetadata(entry).writeEncoded(output); err != nil {
return err
}
return nil
}
func handleZipEntryMetadata(output io.Writer, entry *zip.File, fileMap zipFileMap) error {
var dirNodes []string
func generateZipMetadata(output io.Writer, archive *zip.Reader) error {
// Write metadata header
if err := writeString(output, MetadataHeader); err != nil {
return err
}
// Write empty error header
if err := writeString(output, "{}"); err != nil {
return err
}
// Create map od directories in zip archive
dirMap := make(zipDirMap, len(archive.File))
for _, entry := range archive.File {
if strings.HasSuffix(entry.Name, "/") {
dirMap[entry.Name] = entry
}
}
// Add missing entries
var missingEntries []*zip.File
for _, entry := range archive.File {
entryPath := entry.Name
for {
......@@ -68,50 +89,25 @@ func handleZipEntryMetadata(output io.Writer, entry *zip.File, fileMap zipFileMa
if entryPath == "." || entryPath == "/" {
break
}
dirNodes = append([]string{entryPath + "/"}, dirNodes...)
}
for _, d := range dirNodes {
if _, ok := fileMap[d]; !ok {
if _, ok := dirMap[entryPath]; !ok {
var missingHeader zip.FileHeader
missingHeader.Name = d
missingHeader.Name = entryPath
missingHeader.SetModTime(time.Now())
missingHeader.SetMode(os.FileMode(uint32(0755)))
missingEntry := &zip.File{FileHeader: missingHeader}
fileMap[d] = missingEntry
writeZipEntryMetadata(output, missingEntry)
dirMap[entryPath] = missingEntry
missingEntries = append(missingEntries, missingEntry)
}
}
err := writeZipEntryMetadata(output, entry)
return err
}
func generateZipFileMap(zipEntries []*zip.File) zipFileMap {
fileMap := make(zipFileMap, len(zipEntries))
for _, entry := range zipEntries {
fileMap[entry.Name] = entry
}
return fileMap
}
func generateZipMetadata(output io.Writer, archive *zip.Reader) error {
if err := writeString(output, MetadataHeader); err != nil {
return err
}
// Write empty error string
if err := writeString(output, "{}"); err != nil {
return err
}
archive.File = append(archive.File, missingEntries...)
fileMap := generateZipFileMap(archive.File)
// Write all files
for _, entry := range archive.File {
if err := handleZipEntryMetadata(output, entry, fileMap); err != nil {
if err := writeZipEntryMetadata(output, entry); err != nil {
return err
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment