StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor compressWholeFile to take a zipEntry

Browse Source 
Test: m -j vts; compare android-vts.zip
Test: soong_zip -C ./ -f short_test.sh -f log -o test.zip
Change-Id: I9a843c6f8436ecfacc7948915e50f25c04497057
This commit is contained in:
Dan Willemsen
2017-03-15 21:49:26 -07:00
parent 10462b3fd5
commit a8b5502773
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/soong_zip/soong_zip.go
View File

@@ -450,7 +450,7 @@ func (z *zipWriter) writeFile(rel, file string) error {
f.Close() f.Close()
}(wg, r) }(wg, r)
} else { } else {
go z.compressWholeFile(rel, r, executable, exec, compressChan) go z.compressWholeFile(ze, r, exec, compressChan)
} }
return nil return nil
@@ -519,29 +519,19 @@ func (z *zipWriter) compressBlock(r io.Reader, dict []byte, last bool) (*bytes.B
return buf, nil return buf, nil
} }
func (z *zipWriter) compressWholeFile(rel string, r *os.File, executable bool, exec Execution, compressChan chan *zipEntry) { func (z *zipWriter) compressWholeFile(ze *zipEntry, r *os.File, exec Execution, compressChan chan *zipEntry) {
var bufSize int var bufSize int
defer r.Close() defer r.Close()
fileHeader := &zip.FileHeader{
Name: rel,
Method: zip.Deflate,
}
fileHeader.SetModTime(z.time)
if executable {
fileHeader.SetMode(0700)
}
crc := crc32.NewIEEE() crc := crc32.NewIEEE()
count, err := io.Copy(crc, r) _, err := io.Copy(crc, r)
if err != nil { if err != nil {
z.errors <- err z.errors <- err
return return
} }
fileHeader.CRC32 = crc.Sum32() ze.fh.CRC32 = crc.Sum32()
fileHeader.UncompressedSize64 = uint64(count)
_, err = r.Seek(0, 0) _, err = r.Seek(0, 0)
if err != nil { if err != nil {
@@ -551,10 +541,7 @@ func (z *zipWriter) compressWholeFile(rel string, r *os.File, executable bool, e
compressed, err := z.compressBlock(r, nil, true) compressed, err := z.compressBlock(r, nil, true)
ze := &zipEntry{ ze.futureReaders = make(chan chan io.Reader, 1)
fh: fileHeader,
futureReaders: make(chan chan io.Reader, 1),
}
futureReader := make(chan io.Reader, 1) futureReader := make(chan io.Reader, 1)
ze.futureReaders <- futureReader ze.futureReaders <- futureReader
close(ze.futureReaders) close(ze.futureReaders)