Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8b55027 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Refactor compressWholeFile to take a zipEntry 

Test: m -j vts; compare android-vts.zip
Test: soong_zip -C ./ -f short_test.sh -f log -o test.zip
Change-Id: I9a843c6f8436ecfacc7948915e50f25c04497057
parent 10462b3f

cmd/soong_zip/soong_zip.go

+5 −18
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ func (z *zipWriter) writeFile(rel, file string) error { 
			f.Close()

		}(wg, r)

	} else {

		go z.compressWholeFile(rel, r, executable, exec, compressChan)

		go z.compressWholeFile(ze, r, exec, compressChan)

	}



	return nil
@@ -519,29 +519,19 @@ func (z *zipWriter) compressBlock(r io.Reader, dict []byte, last bool) (*bytes.B 
	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



	defer r.Close()



	fileHeader := &zip.FileHeader{

		Name:   rel,

		Method: zip.Deflate,

	}

	fileHeader.SetModTime(z.time)

	if executable {

		fileHeader.SetMode(0700)

	}



	crc := crc32.NewIEEE()

	count, err := io.Copy(crc, r)

	_, err := io.Copy(crc, r)

	if err != nil {

		z.errors <- err

		return

	}



	fileHeader.CRC32 = crc.Sum32()

	fileHeader.UncompressedSize64 = uint64(count)

	ze.fh.CRC32 = crc.Sum32()



	_, err = r.Seek(0, 0)

	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)



	ze := &zipEntry{

		fh:            fileHeader,

		futureReaders: make(chan chan io.Reader, 1),

	}

	ze.futureReaders = make(chan chan io.Reader, 1)

	futureReader := make(chan io.Reader, 1)

	ze.futureReaders <- futureReader

	close(ze.futureReaders)