2015-03-31 02:20:39 +02:00
|
|
|
// Copyright 2015 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2017-10-12 21:19:14 +02:00
|
|
|
package zip
|
2015-03-31 02:20:39 +02:00
|
|
|
|
|
|
|
import (
|
2016-08-05 00:43:03 +02:00
|
|
|
"bytes"
|
|
|
|
"compress/flate"
|
2017-08-23 02:51:25 +02:00
|
|
|
"errors"
|
2015-03-31 02:20:39 +02:00
|
|
|
"fmt"
|
2016-08-05 00:43:03 +02:00
|
|
|
"hash/crc32"
|
2015-03-31 02:20:39 +02:00
|
|
|
"io"
|
|
|
|
"io/ioutil"
|
2017-03-17 22:04:43 +01:00
|
|
|
"log"
|
2015-03-31 02:20:39 +02:00
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2016-08-05 00:43:03 +02:00
|
|
|
"runtime/pprof"
|
|
|
|
"runtime/trace"
|
2017-08-23 02:51:25 +02:00
|
|
|
"sort"
|
2015-03-31 02:20:39 +02:00
|
|
|
"strings"
|
2016-08-05 00:43:03 +02:00
|
|
|
"sync"
|
2015-03-31 02:20:39 +02:00
|
|
|
"time"
|
Add Respfile support for soong_zip.
Sometime the size of our command line passed to soong_zip go program
exceeds the cmdline size limit. So add an RespFile support with "@" special
character prefix.
The args in the cmdline will be considered together with the
args in RespFile during soong_zip running.
Test: real tests in my local machine, and compare the
res/libphonenumber.jar before and after changes.
./cmd -o test.zip '""'-C -> [./cmd,-o,test.zip,""-C]
./cmd -o test.zip '-C -f -> [./cmd,-o,test.zip,-C -f]
./cmd -o test.zip '\"'-C -f -> [./cmd,-o,test.zip,\"-C -f]
./cmd -o test.zip '\\'-C -f -> [./cmd,-o,test.zip,\\-C -f]
./cmd -o test.zip '\a'-C -f -> [./cmd,-o,test.zip,\a-C -f]
./cmd -o test.zip \'-C -> [./cmd,-o,test.zip,'-C]
./cmd -o test.zip \\-C -> [./cmd,-o,test.zip,\-C]
./cmd -o test.zip \"-C -> [./cmd,-o,test.zip,"-C]
./cmd -o test.zip "'"-C -> [./cmd,-o,test.zip,'-C]
./cmd -o test.zip "\\"-C -f -> [./cmd,-o,test.zip,\a-C -f]
./cmd -o test.zip "\""-C -f -> [./cmd,-o,test.zip,"a-C -f]
Bug: b/72484223
Change-Id: I83c3630b70c8396c8e8a3f266244d868d754c4e8
2018-01-27 03:30:36 +01:00
|
|
|
"unicode"
|
2016-08-05 00:43:03 +02:00
|
|
|
|
2017-11-10 22:11:02 +01:00
|
|
|
"github.com/google/blueprint/pathtools"
|
|
|
|
|
2017-08-23 02:51:25 +02:00
|
|
|
"android/soong/jar"
|
2016-08-05 00:43:03 +02:00
|
|
|
"android/soong/third_party/zip"
|
2015-03-31 02:20:39 +02:00
|
|
|
)
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
// Block size used during parallel compression of a single file.
|
|
|
|
const parallelBlockSize = 1 * 1024 * 1024 // 1MB
|
|
|
|
|
|
|
|
// Minimum file size to use parallel compression. It requires more
|
|
|
|
// flate.Writer allocations, since we can't change the dictionary
|
|
|
|
// during Reset
|
|
|
|
const minParallelFileSize = parallelBlockSize * 6
|
|
|
|
|
|
|
|
// Size of the ZIP compression window (32KB)
|
|
|
|
const windowSize = 32 * 1024
|
|
|
|
|
|
|
|
type nopCloser struct {
|
|
|
|
io.Writer
|
|
|
|
}
|
|
|
|
|
|
|
|
func (nopCloser) Close() error {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-08-24 00:41:35 +02:00
|
|
|
type byteReaderCloser struct {
|
2017-09-13 07:50:46 +02:00
|
|
|
*bytes.Reader
|
2017-08-24 00:41:35 +02:00
|
|
|
io.Closer
|
|
|
|
}
|
|
|
|
|
2017-03-17 22:04:43 +01:00
|
|
|
type pathMapping struct {
|
|
|
|
dest, src string
|
2017-04-26 01:47:45 +02:00
|
|
|
zipMethod uint16
|
|
|
|
}
|
|
|
|
|
|
|
|
type uniqueSet map[string]bool
|
|
|
|
|
|
|
|
func (u *uniqueSet) String() string {
|
|
|
|
return `""`
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *uniqueSet) Set(s string) error {
|
|
|
|
if _, found := (*u)[s]; found {
|
|
|
|
return fmt.Errorf("File %q was specified twice as a file to not deflate", s)
|
|
|
|
} else {
|
|
|
|
(*u)[s] = true
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
type FileArg struct {
|
|
|
|
PathPrefixInZip, SourcePrefixToStrip string
|
|
|
|
SourceFiles []string
|
|
|
|
GlobDir string
|
|
|
|
}
|
|
|
|
|
|
|
|
type FileArgs []FileArg
|
|
|
|
|
|
|
|
type ZipWriter struct {
|
2017-08-31 02:40:21 +02:00
|
|
|
time time.Time
|
|
|
|
createdFiles map[string]string
|
|
|
|
createdDirs map[string]string
|
|
|
|
directories bool
|
2015-04-25 00:08:38 +02:00
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
errors chan error
|
|
|
|
writeOps chan chan *zipEntry
|
|
|
|
|
2017-08-18 06:43:21 +02:00
|
|
|
cpuRateLimiter *CPURateLimiter
|
|
|
|
memoryRateLimiter *MemoryRateLimiter
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
compressorPool sync.Pool
|
|
|
|
compLevel int
|
|
|
|
}
|
|
|
|
|
|
|
|
type zipEntry struct {
|
|
|
|
fh *zip.FileHeader
|
|
|
|
|
|
|
|
// List of delayed io.Reader
|
|
|
|
futureReaders chan chan io.Reader
|
2017-08-18 06:43:21 +02:00
|
|
|
|
|
|
|
// Only used for passing into the MemoryRateLimiter to ensure we
|
|
|
|
// release as much memory as much as we request
|
|
|
|
allocatedSize int64
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
type ZipArgs struct {
|
|
|
|
FileArgs FileArgs
|
|
|
|
OutputFilePath string
|
|
|
|
CpuProfileFilePath string
|
|
|
|
TraceFilePath string
|
|
|
|
EmulateJar bool
|
|
|
|
AddDirectoryEntriesToZip bool
|
|
|
|
CompressionLevel int
|
|
|
|
ManifestSourcePath string
|
|
|
|
NumParallelJobs int
|
|
|
|
NonDeflatedFiles map[string]bool
|
2017-11-10 22:11:02 +01:00
|
|
|
WriteIfChanged bool
|
2017-10-12 21:18:19 +02:00
|
|
|
}
|
2015-03-31 02:20:39 +02:00
|
|
|
|
Add Respfile support for soong_zip.
Sometime the size of our command line passed to soong_zip go program
exceeds the cmdline size limit. So add an RespFile support with "@" special
character prefix.
The args in the cmdline will be considered together with the
args in RespFile during soong_zip running.
Test: real tests in my local machine, and compare the
res/libphonenumber.jar before and after changes.
./cmd -o test.zip '""'-C -> [./cmd,-o,test.zip,""-C]
./cmd -o test.zip '-C -f -> [./cmd,-o,test.zip,-C -f]
./cmd -o test.zip '\"'-C -f -> [./cmd,-o,test.zip,\"-C -f]
./cmd -o test.zip '\\'-C -f -> [./cmd,-o,test.zip,\\-C -f]
./cmd -o test.zip '\a'-C -f -> [./cmd,-o,test.zip,\a-C -f]
./cmd -o test.zip \'-C -> [./cmd,-o,test.zip,'-C]
./cmd -o test.zip \\-C -> [./cmd,-o,test.zip,\-C]
./cmd -o test.zip \"-C -> [./cmd,-o,test.zip,"-C]
./cmd -o test.zip "'"-C -> [./cmd,-o,test.zip,'-C]
./cmd -o test.zip "\\"-C -f -> [./cmd,-o,test.zip,\a-C -f]
./cmd -o test.zip "\""-C -f -> [./cmd,-o,test.zip,"a-C -f]
Bug: b/72484223
Change-Id: I83c3630b70c8396c8e8a3f266244d868d754c4e8
2018-01-27 03:30:36 +01:00
|
|
|
const NOQUOTE = '\x00'
|
|
|
|
|
|
|
|
func ReadRespFile(bytes []byte) []string {
|
|
|
|
var args []string
|
|
|
|
var arg []rune
|
|
|
|
|
|
|
|
isEscaping := false
|
|
|
|
quotingStart := NOQUOTE
|
|
|
|
for _, c := range string(bytes) {
|
|
|
|
switch {
|
|
|
|
case isEscaping:
|
|
|
|
if quotingStart == '"' {
|
|
|
|
if !(c == '"' || c == '\\') {
|
|
|
|
// '\"' or '\\' will be escaped under double quoting.
|
|
|
|
arg = append(arg, '\\')
|
|
|
|
}
|
|
|
|
}
|
|
|
|
arg = append(arg, c)
|
|
|
|
isEscaping = false
|
|
|
|
case c == '\\' && quotingStart != '\'':
|
|
|
|
isEscaping = true
|
|
|
|
case quotingStart == NOQUOTE && (c == '\'' || c == '"'):
|
|
|
|
quotingStart = c
|
|
|
|
case quotingStart != NOQUOTE && c == quotingStart:
|
|
|
|
quotingStart = NOQUOTE
|
|
|
|
case quotingStart == NOQUOTE && unicode.IsSpace(c):
|
|
|
|
// Current character is a space outside quotes
|
|
|
|
if len(arg) != 0 {
|
|
|
|
args = append(args, string(arg))
|
|
|
|
}
|
|
|
|
arg = arg[:0]
|
|
|
|
default:
|
|
|
|
arg = append(arg, c)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(arg) != 0 {
|
|
|
|
args = append(args, string(arg))
|
|
|
|
}
|
|
|
|
|
|
|
|
return args
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func Run(args ZipArgs) (err error) {
|
|
|
|
if args.CpuProfileFilePath != "" {
|
|
|
|
f, err := os.Create(args.CpuProfileFilePath)
|
2016-08-05 00:43:03 +02:00
|
|
|
if err != nil {
|
|
|
|
fmt.Fprintln(os.Stderr, err.Error())
|
|
|
|
os.Exit(1)
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
pprof.StartCPUProfile(f)
|
|
|
|
defer pprof.StopCPUProfile()
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
if args.TraceFilePath != "" {
|
|
|
|
f, err := os.Create(args.TraceFilePath)
|
2016-08-05 00:43:03 +02:00
|
|
|
if err != nil {
|
|
|
|
fmt.Fprintln(os.Stderr, err.Error())
|
|
|
|
os.Exit(1)
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
err = trace.Start(f)
|
|
|
|
if err != nil {
|
|
|
|
fmt.Fprintln(os.Stderr, err.Error())
|
|
|
|
os.Exit(1)
|
|
|
|
}
|
|
|
|
defer trace.Stop()
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
if args.OutputFilePath == "" {
|
|
|
|
return fmt.Errorf("output file path must be nonempty")
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
if args.EmulateJar {
|
|
|
|
args.AddDirectoryEntriesToZip = true
|
2017-08-23 05:05:28 +02:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
w := &ZipWriter{
|
2017-09-13 07:50:46 +02:00
|
|
|
time: jar.DefaultTime,
|
2017-08-31 02:40:21 +02:00
|
|
|
createdDirs: make(map[string]string),
|
|
|
|
createdFiles: make(map[string]string),
|
2017-10-12 21:18:19 +02:00
|
|
|
directories: args.AddDirectoryEntriesToZip,
|
|
|
|
compLevel: args.CompressionLevel,
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
2017-03-17 22:04:43 +01:00
|
|
|
pathMappings := []pathMapping{}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
for _, fa := range args.FileArgs {
|
|
|
|
srcs := fa.SourceFiles
|
|
|
|
if fa.GlobDir != "" {
|
|
|
|
srcs = append(srcs, recursiveGlobFiles(fa.GlobDir)...)
|
2017-08-30 23:12:21 +02:00
|
|
|
}
|
|
|
|
for _, src := range srcs {
|
2017-10-12 21:18:19 +02:00
|
|
|
if err := fillPathPairs(fa.PathPrefixInZip,
|
|
|
|
fa.SourcePrefixToStrip, src, &pathMappings, args.NonDeflatedFiles); err != nil {
|
2017-03-17 22:04:43 +01:00
|
|
|
log.Fatal(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-10 22:11:02 +01:00
|
|
|
buf := &bytes.Buffer{}
|
|
|
|
var out io.Writer = buf
|
|
|
|
|
|
|
|
if !args.WriteIfChanged {
|
|
|
|
f, err := os.Create(args.OutputFilePath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
defer f.Close()
|
|
|
|
defer func() {
|
|
|
|
if err != nil {
|
|
|
|
os.Remove(args.OutputFilePath)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
out = f
|
|
|
|
}
|
|
|
|
|
|
|
|
err = w.write(out, pathMappings, args.ManifestSourcePath, args.EmulateJar, args.NumParallelJobs)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if args.WriteIfChanged {
|
|
|
|
err := pathtools.WriteFileIfChanged(args.OutputFilePath, buf.Bytes(), 0666)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
2017-10-12 21:18:19 +02:00
|
|
|
|
2017-11-10 22:11:02 +01:00
|
|
|
return nil
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func fillPathPairs(prefix, rel, src string, pathMappings *[]pathMapping, nonDeflatedFiles map[string]bool) error {
|
2017-03-17 22:04:43 +01:00
|
|
|
src = strings.TrimSpace(src)
|
|
|
|
if src == "" {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
src = filepath.Clean(src)
|
|
|
|
dest, err := filepath.Rel(rel, src)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
dest = filepath.Join(prefix, dest)
|
|
|
|
|
2017-04-26 01:47:45 +02:00
|
|
|
zipMethod := zip.Deflate
|
|
|
|
if _, found := nonDeflatedFiles[dest]; found {
|
|
|
|
zipMethod = zip.Store
|
|
|
|
}
|
|
|
|
*pathMappings = append(*pathMappings,
|
|
|
|
pathMapping{dest: dest, src: src, zipMethod: zipMethod})
|
2017-03-17 22:04:43 +01:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-08-23 02:51:25 +02:00
|
|
|
func jarSort(mappings []pathMapping) {
|
|
|
|
less := func(i int, j int) (smaller bool) {
|
|
|
|
return jar.EntryNamesLess(mappings[i].dest, mappings[j].dest)
|
|
|
|
}
|
|
|
|
sort.SliceStable(mappings, less)
|
|
|
|
}
|
|
|
|
|
2017-08-24 00:12:48 +02:00
|
|
|
type readerSeekerCloser interface {
|
|
|
|
io.Reader
|
|
|
|
io.ReaderAt
|
|
|
|
io.Closer
|
|
|
|
io.Seeker
|
|
|
|
}
|
|
|
|
|
2017-11-10 22:11:02 +01:00
|
|
|
func (z *ZipWriter) write(f io.Writer, pathMappings []pathMapping, manifest string, emulateJar bool, parallelJobs int) error {
|
2016-08-05 00:43:03 +02:00
|
|
|
z.errors = make(chan error)
|
|
|
|
defer close(z.errors)
|
|
|
|
|
|
|
|
// This channel size can be essentially unlimited -- it's used as a fifo
|
|
|
|
// queue decouple the CPU and IO loads. Directories don't require any
|
|
|
|
// compression time, but still cost some IO. Similar with small files that
|
|
|
|
// can be very fast to compress. Some files that are more difficult to
|
|
|
|
// compress won't take a corresponding longer time writing out.
|
|
|
|
//
|
|
|
|
// The optimum size here depends on your CPU and IO characteristics, and
|
|
|
|
// the the layout of your zip file. 1000 was chosen mostly at random as
|
|
|
|
// something that worked reasonably well for a test file.
|
|
|
|
//
|
|
|
|
// The RateLimit object will put the upper bounds on the number of
|
|
|
|
// parallel compressions and outstanding buffers.
|
|
|
|
z.writeOps = make(chan chan *zipEntry, 1000)
|
2017-10-12 21:18:19 +02:00
|
|
|
z.cpuRateLimiter = NewCPURateLimiter(int64(parallelJobs))
|
2017-08-18 06:43:21 +02:00
|
|
|
z.memoryRateLimiter = NewMemoryRateLimiter(0)
|
|
|
|
defer func() {
|
|
|
|
z.cpuRateLimiter.Stop()
|
|
|
|
z.memoryRateLimiter.Stop()
|
|
|
|
}()
|
2017-08-23 02:51:25 +02:00
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
if manifest != "" && !emulateJar {
|
2017-09-13 07:50:46 +02:00
|
|
|
return errors.New("must specify --jar when specifying a manifest via -m")
|
2017-08-23 02:51:25 +02:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
if emulateJar {
|
2017-09-13 07:50:46 +02:00
|
|
|
// manifest may be empty, in which case addManifest will fill in a default
|
|
|
|
pathMappings = append(pathMappings, pathMapping{jar.ManifestFile, manifest, zip.Deflate})
|
|
|
|
|
2017-08-23 02:51:25 +02:00
|
|
|
jarSort(pathMappings)
|
|
|
|
}
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
go func() {
|
|
|
|
var err error
|
|
|
|
defer close(z.writeOps)
|
|
|
|
|
2017-03-17 22:04:43 +01:00
|
|
|
for _, ele := range pathMappings {
|
2017-10-12 21:18:19 +02:00
|
|
|
if emulateJar && ele.dest == jar.ManifestFile {
|
2017-08-24 00:41:35 +02:00
|
|
|
err = z.addManifest(ele.dest, ele.src, ele.zipMethod)
|
|
|
|
} else {
|
2017-10-12 21:18:19 +02:00
|
|
|
err = z.addFile(ele.dest, ele.src, ele.zipMethod, emulateJar)
|
2017-08-24 00:41:35 +02:00
|
|
|
}
|
2016-08-05 00:43:03 +02:00
|
|
|
if err != nil {
|
|
|
|
z.errors <- err
|
|
|
|
return
|
|
|
|
}
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
2016-08-05 00:43:03 +02:00
|
|
|
}()
|
2015-03-31 02:20:39 +02:00
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
zipw := zip.NewWriter(f)
|
|
|
|
|
|
|
|
var currentWriteOpChan chan *zipEntry
|
|
|
|
var currentWriter io.WriteCloser
|
|
|
|
var currentReaders chan chan io.Reader
|
|
|
|
var currentReader chan io.Reader
|
|
|
|
var done bool
|
|
|
|
|
|
|
|
for !done {
|
|
|
|
var writeOpsChan chan chan *zipEntry
|
|
|
|
var writeOpChan chan *zipEntry
|
|
|
|
var readersChan chan chan io.Reader
|
|
|
|
|
|
|
|
if currentReader != nil {
|
|
|
|
// Only read and process errors
|
|
|
|
} else if currentReaders != nil {
|
|
|
|
readersChan = currentReaders
|
|
|
|
} else if currentWriteOpChan != nil {
|
|
|
|
writeOpChan = currentWriteOpChan
|
|
|
|
} else {
|
|
|
|
writeOpsChan = z.writeOps
|
|
|
|
}
|
|
|
|
|
|
|
|
select {
|
|
|
|
case writeOp, ok := <-writeOpsChan:
|
|
|
|
if !ok {
|
|
|
|
done = true
|
|
|
|
}
|
|
|
|
|
|
|
|
currentWriteOpChan = writeOp
|
|
|
|
|
|
|
|
case op := <-writeOpChan:
|
|
|
|
currentWriteOpChan = nil
|
|
|
|
|
2017-11-10 22:11:02 +01:00
|
|
|
var err error
|
2016-08-05 00:43:03 +02:00
|
|
|
if op.fh.Method == zip.Deflate {
|
|
|
|
currentWriter, err = zipw.CreateCompressedHeader(op.fh)
|
|
|
|
} else {
|
|
|
|
var zw io.Writer
|
2017-08-24 23:11:27 +02:00
|
|
|
|
|
|
|
op.fh.CompressedSize64 = op.fh.UncompressedSize64
|
|
|
|
|
|
|
|
zw, err = zipw.CreateHeaderAndroid(op.fh)
|
2016-08-05 00:43:03 +02:00
|
|
|
currentWriter = nopCloser{zw}
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
currentReaders = op.futureReaders
|
|
|
|
if op.futureReaders == nil {
|
|
|
|
currentWriter.Close()
|
|
|
|
currentWriter = nil
|
|
|
|
}
|
2017-08-18 06:43:21 +02:00
|
|
|
z.memoryRateLimiter.Finish(op.allocatedSize)
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
case futureReader, ok := <-readersChan:
|
|
|
|
if !ok {
|
|
|
|
// Done with reading
|
|
|
|
currentWriter.Close()
|
|
|
|
currentWriter = nil
|
|
|
|
currentReaders = nil
|
|
|
|
}
|
|
|
|
|
|
|
|
currentReader = futureReader
|
|
|
|
|
|
|
|
case reader := <-currentReader:
|
2017-11-10 22:11:02 +01:00
|
|
|
_, err := io.Copy(currentWriter, reader)
|
2016-08-05 00:43:03 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
currentReader = nil
|
|
|
|
|
2017-11-10 22:11:02 +01:00
|
|
|
case err := <-z.errors:
|
2015-03-31 02:20:39 +02:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
// One last chance to catch an error
|
|
|
|
select {
|
2017-11-10 22:11:02 +01:00
|
|
|
case err := <-z.errors:
|
2016-08-05 00:43:03 +02:00
|
|
|
return err
|
|
|
|
default:
|
|
|
|
zipw.Close()
|
|
|
|
return nil
|
|
|
|
}
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
2017-08-24 00:12:48 +02:00
|
|
|
// imports (possibly with compression) <src> into the zip at sub-path <dest>
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar bool) error {
|
2016-08-05 00:43:03 +02:00
|
|
|
var fileSize int64
|
2017-03-16 03:02:51 +01:00
|
|
|
var executable bool
|
2016-08-05 00:43:03 +02:00
|
|
|
|
2017-03-17 22:04:43 +01:00
|
|
|
if s, err := os.Lstat(src); err != nil {
|
2016-08-04 02:47:23 +02:00
|
|
|
return err
|
|
|
|
} else if s.IsDir() {
|
2015-04-25 00:10:32 +02:00
|
|
|
if z.directories {
|
2017-10-12 21:18:19 +02:00
|
|
|
return z.writeDirectory(dest, src, emulateJar)
|
2015-04-25 00:10:32 +02:00
|
|
|
}
|
|
|
|
return nil
|
2016-08-05 00:43:03 +02:00
|
|
|
} else {
|
2017-10-12 21:18:19 +02:00
|
|
|
if err := z.writeDirectory(filepath.Dir(dest), src, emulateJar); err != nil {
|
2017-08-31 02:40:21 +02:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if prev, exists := z.createdDirs[dest]; exists {
|
|
|
|
return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src)
|
|
|
|
}
|
|
|
|
if prev, exists := z.createdFiles[dest]; exists {
|
|
|
|
return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src)
|
|
|
|
}
|
|
|
|
|
|
|
|
z.createdFiles[dest] = src
|
|
|
|
|
|
|
|
if s.Mode()&os.ModeSymlink != 0 {
|
|
|
|
return z.writeSymlink(dest, src)
|
|
|
|
} else if !s.Mode().IsRegular() {
|
|
|
|
return fmt.Errorf("%s is not a file, directory, or symlink", src)
|
|
|
|
}
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
fileSize = s.Size()
|
2017-03-16 03:02:51 +01:00
|
|
|
executable = s.Mode()&0100 != 0
|
2015-04-25 00:10:32 +02:00
|
|
|
}
|
|
|
|
|
2017-08-24 00:12:48 +02:00
|
|
|
r, err := os.Open(src)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
header := &zip.FileHeader{
|
|
|
|
Name: dest,
|
|
|
|
Method: method,
|
|
|
|
UncompressedSize64: uint64(fileSize),
|
|
|
|
}
|
|
|
|
|
|
|
|
if executable {
|
|
|
|
header.SetMode(0700)
|
|
|
|
}
|
|
|
|
|
|
|
|
return z.writeFileContents(header, r)
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) addManifest(dest string, src string, method uint16) error {
|
2017-08-31 02:40:21 +02:00
|
|
|
if prev, exists := z.createdDirs[dest]; exists {
|
|
|
|
return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src)
|
|
|
|
}
|
|
|
|
if prev, exists := z.createdFiles[dest]; exists {
|
|
|
|
return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src)
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
if err := z.writeDirectory(filepath.Dir(dest), src, true); err != nil {
|
2017-09-13 07:50:46 +02:00
|
|
|
return err
|
2017-08-24 00:41:35 +02:00
|
|
|
}
|
|
|
|
|
2017-09-13 07:50:46 +02:00
|
|
|
fh, buf, err := jar.ManifestFileContents(src)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2017-08-24 00:41:35 +02:00
|
|
|
}
|
|
|
|
|
2017-09-13 07:50:46 +02:00
|
|
|
reader := &byteReaderCloser{bytes.NewReader(buf), ioutil.NopCloser(nil)}
|
|
|
|
|
|
|
|
return z.writeFileContents(fh, reader)
|
2017-08-24 00:41:35 +02:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) writeFileContents(header *zip.FileHeader, r readerSeekerCloser) (err error) {
|
2017-08-24 00:12:48 +02:00
|
|
|
|
|
|
|
header.SetModTime(z.time)
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
compressChan := make(chan *zipEntry, 1)
|
|
|
|
z.writeOps <- compressChan
|
|
|
|
|
|
|
|
// Pre-fill a zipEntry, it will be sent in the compressChan once
|
|
|
|
// we're sure about the Method and CRC.
|
|
|
|
ze := &zipEntry{
|
2017-08-24 00:12:48 +02:00
|
|
|
fh: header,
|
2017-03-16 03:02:51 +01:00
|
|
|
}
|
2016-08-05 00:43:03 +02:00
|
|
|
|
2017-08-24 00:12:48 +02:00
|
|
|
ze.allocatedSize = int64(header.UncompressedSize64)
|
2017-08-18 06:43:21 +02:00
|
|
|
z.cpuRateLimiter.Request()
|
|
|
|
z.memoryRateLimiter.Request(ze.allocatedSize)
|
2016-08-05 00:43:03 +02:00
|
|
|
|
2017-08-24 00:12:48 +02:00
|
|
|
fileSize := int64(header.UncompressedSize64)
|
|
|
|
if fileSize == 0 {
|
|
|
|
fileSize = int64(header.UncompressedSize)
|
|
|
|
}
|
|
|
|
|
|
|
|
if header.Method == zip.Deflate && fileSize >= minParallelFileSize {
|
2016-08-05 00:43:03 +02:00
|
|
|
wg := new(sync.WaitGroup)
|
|
|
|
|
|
|
|
// Allocate enough buffer to hold all readers. We'll limit
|
|
|
|
// this based on actual buffer sizes in RateLimit.
|
|
|
|
ze.futureReaders = make(chan chan io.Reader, (fileSize/parallelBlockSize)+1)
|
|
|
|
|
|
|
|
// Calculate the CRC in the background, since reading the entire
|
|
|
|
// file could take a while.
|
|
|
|
//
|
2017-08-24 00:12:48 +02:00
|
|
|
// We could split this up into chunks as well, but it's faster
|
2016-08-05 00:43:03 +02:00
|
|
|
// than the compression. Due to the Go Zip API, we also need to
|
|
|
|
// know the result before we can begin writing the compressed
|
|
|
|
// data out to the zipfile.
|
|
|
|
wg.Add(1)
|
2017-08-18 06:43:21 +02:00
|
|
|
go z.crcFile(r, ze, compressChan, wg)
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
for start := int64(0); start < fileSize; start += parallelBlockSize {
|
|
|
|
sr := io.NewSectionReader(r, start, parallelBlockSize)
|
|
|
|
resultChan := make(chan io.Reader, 1)
|
|
|
|
ze.futureReaders <- resultChan
|
|
|
|
|
2017-08-18 06:43:21 +02:00
|
|
|
z.cpuRateLimiter.Request()
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
last := !(start+parallelBlockSize < fileSize)
|
|
|
|
var dict []byte
|
|
|
|
if start >= windowSize {
|
|
|
|
dict, err = ioutil.ReadAll(io.NewSectionReader(r, start-windowSize, windowSize))
|
2017-08-24 00:12:48 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-08-05 00:43:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
wg.Add(1)
|
2017-08-18 06:43:21 +02:00
|
|
|
go z.compressPartialFile(sr, dict, last, resultChan, wg)
|
2016-08-05 00:43:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
close(ze.futureReaders)
|
|
|
|
|
|
|
|
// Close the file handle after all readers are done
|
2017-08-24 00:12:48 +02:00
|
|
|
go func(wg *sync.WaitGroup, closer io.Closer) {
|
2016-08-05 00:43:03 +02:00
|
|
|
wg.Wait()
|
2017-08-24 00:12:48 +02:00
|
|
|
closer.Close()
|
2016-08-05 00:43:03 +02:00
|
|
|
}(wg, r)
|
|
|
|
} else {
|
2017-08-24 00:12:48 +02:00
|
|
|
go func() {
|
|
|
|
z.compressWholeFile(ze, r, compressChan)
|
|
|
|
r.Close()
|
|
|
|
}()
|
2016-08-05 00:43:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) crcFile(r io.Reader, ze *zipEntry, resultChan chan *zipEntry, wg *sync.WaitGroup) {
|
2016-08-05 00:43:03 +02:00
|
|
|
defer wg.Done()
|
2017-08-18 06:43:21 +02:00
|
|
|
defer z.cpuRateLimiter.Finish()
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
crc := crc32.NewIEEE()
|
|
|
|
_, err := io.Copy(crc, r)
|
|
|
|
if err != nil {
|
|
|
|
z.errors <- err
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
ze.fh.CRC32 = crc.Sum32()
|
|
|
|
resultChan <- ze
|
|
|
|
close(resultChan)
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) compressPartialFile(r io.Reader, dict []byte, last bool, resultChan chan io.Reader, wg *sync.WaitGroup) {
|
2016-08-05 00:43:03 +02:00
|
|
|
defer wg.Done()
|
|
|
|
|
|
|
|
result, err := z.compressBlock(r, dict, last)
|
|
|
|
if err != nil {
|
|
|
|
z.errors <- err
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2017-08-18 06:43:21 +02:00
|
|
|
z.cpuRateLimiter.Finish()
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
resultChan <- result
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) compressBlock(r io.Reader, dict []byte, last bool) (*bytes.Buffer, error) {
|
2016-08-05 00:43:03 +02:00
|
|
|
buf := new(bytes.Buffer)
|
|
|
|
var fw *flate.Writer
|
|
|
|
var err error
|
|
|
|
if len(dict) > 0 {
|
|
|
|
// There's no way to Reset a Writer with a new dictionary, so
|
|
|
|
// don't use the Pool
|
|
|
|
fw, err = flate.NewWriterDict(buf, z.compLevel, dict)
|
|
|
|
} else {
|
|
|
|
var ok bool
|
|
|
|
if fw, ok = z.compressorPool.Get().(*flate.Writer); ok {
|
|
|
|
fw.Reset(buf)
|
|
|
|
} else {
|
|
|
|
fw, err = flate.NewWriter(buf, z.compLevel)
|
|
|
|
}
|
|
|
|
defer z.compressorPool.Put(fw)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = io.Copy(fw, r)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if last {
|
|
|
|
fw.Close()
|
|
|
|
} else {
|
|
|
|
fw.Flush()
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf, nil
|
|
|
|
}
|
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) compressWholeFile(ze *zipEntry, r io.ReadSeeker, compressChan chan *zipEntry) {
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
crc := crc32.NewIEEE()
|
2017-03-16 05:49:26 +01:00
|
|
|
_, err := io.Copy(crc, r)
|
2015-03-31 02:20:39 +02:00
|
|
|
if err != nil {
|
2016-08-05 00:43:03 +02:00
|
|
|
z.errors <- err
|
|
|
|
return
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
2017-03-16 05:49:26 +01:00
|
|
|
ze.fh.CRC32 = crc.Sum32()
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
_, err = r.Seek(0, 0)
|
2015-03-31 02:20:39 +02:00
|
|
|
if err != nil {
|
2016-08-05 00:43:03 +02:00
|
|
|
z.errors <- err
|
|
|
|
return
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
|
|
|
|
2017-08-24 00:12:48 +02:00
|
|
|
readFile := func(reader io.ReadSeeker) ([]byte, error) {
|
|
|
|
_, err := reader.Seek(0, 0)
|
2017-04-26 01:47:45 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2017-08-24 00:12:48 +02:00
|
|
|
buf, err := ioutil.ReadAll(reader)
|
2017-04-26 01:47:45 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf, nil
|
|
|
|
}
|
2016-08-05 00:43:03 +02:00
|
|
|
|
2017-03-16 05:49:26 +01:00
|
|
|
ze.futureReaders = make(chan chan io.Reader, 1)
|
2016-08-05 00:43:03 +02:00
|
|
|
futureReader := make(chan io.Reader, 1)
|
|
|
|
ze.futureReaders <- futureReader
|
|
|
|
close(ze.futureReaders)
|
|
|
|
|
2017-04-26 01:47:45 +02:00
|
|
|
if ze.fh.Method == zip.Deflate {
|
|
|
|
compressed, err := z.compressBlock(r, nil, true)
|
2016-08-05 00:43:03 +02:00
|
|
|
if err != nil {
|
|
|
|
z.errors <- err
|
|
|
|
return
|
|
|
|
}
|
2017-04-26 01:47:45 +02:00
|
|
|
if uint64(compressed.Len()) < ze.fh.UncompressedSize64 {
|
|
|
|
futureReader <- compressed
|
|
|
|
} else {
|
|
|
|
buf, err := readFile(r)
|
|
|
|
if err != nil {
|
|
|
|
z.errors <- err
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ze.fh.Method = zip.Store
|
|
|
|
futureReader <- bytes.NewReader(buf)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
buf, err := readFile(r)
|
2016-08-05 00:43:03 +02:00
|
|
|
if err != nil {
|
|
|
|
z.errors <- err
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ze.fh.Method = zip.Store
|
|
|
|
futureReader <- bytes.NewReader(buf)
|
|
|
|
}
|
2017-04-26 01:47:45 +02:00
|
|
|
|
2017-08-18 06:43:21 +02:00
|
|
|
z.cpuRateLimiter.Finish()
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
close(futureReader)
|
|
|
|
|
|
|
|
compressChan <- ze
|
|
|
|
close(compressChan)
|
2015-03-31 02:20:39 +02:00
|
|
|
}
|
2015-04-25 00:08:38 +02:00
|
|
|
|
2017-08-31 02:40:21 +02:00
|
|
|
// writeDirectory annotates that dir is a directory created for the src file or directory, and adds
|
|
|
|
// the directory entry to the zip file if directories are enabled.
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) writeDirectory(dir string, src string, emulateJar bool) error {
|
2017-08-16 03:05:56 +02:00
|
|
|
// clean the input
|
2017-08-31 02:40:21 +02:00
|
|
|
dir = filepath.Clean(dir)
|
2017-08-16 03:05:56 +02:00
|
|
|
|
|
|
|
// discover any uncreated directories in the path
|
|
|
|
zipDirs := []string{}
|
2017-08-31 02:40:21 +02:00
|
|
|
for dir != "" && dir != "." {
|
|
|
|
if _, exists := z.createdDirs[dir]; exists {
|
|
|
|
break
|
|
|
|
}
|
2016-08-04 02:47:23 +02:00
|
|
|
|
2017-08-31 02:40:21 +02:00
|
|
|
if prev, exists := z.createdFiles[dir]; exists {
|
|
|
|
return fmt.Errorf("destination %q is both a directory %q and a file %q", dir, src, prev)
|
|
|
|
}
|
|
|
|
|
|
|
|
z.createdDirs[dir] = src
|
2017-08-16 03:05:56 +02:00
|
|
|
// parent directories precede their children
|
2017-08-31 02:40:21 +02:00
|
|
|
zipDirs = append([]string{dir}, zipDirs...)
|
2015-04-25 00:08:38 +02:00
|
|
|
|
2017-08-31 02:40:21 +02:00
|
|
|
dir = filepath.Dir(dir)
|
2017-08-16 03:05:56 +02:00
|
|
|
}
|
|
|
|
|
2017-08-31 02:40:21 +02:00
|
|
|
if z.directories {
|
|
|
|
// make a directory entry for each uncreated directory
|
|
|
|
for _, cleanDir := range zipDirs {
|
2017-09-13 07:50:46 +02:00
|
|
|
var dirHeader *zip.FileHeader
|
2015-04-25 00:08:38 +02:00
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
if emulateJar && cleanDir+"/" == jar.MetaDir {
|
2017-09-13 07:50:46 +02:00
|
|
|
dirHeader = jar.MetaDirFileHeader()
|
|
|
|
} else {
|
|
|
|
dirHeader = &zip.FileHeader{
|
|
|
|
Name: cleanDir + "/",
|
|
|
|
}
|
|
|
|
dirHeader.SetMode(0700 | os.ModeDir)
|
2017-08-31 02:40:21 +02:00
|
|
|
}
|
2017-08-23 05:05:28 +02:00
|
|
|
|
2017-09-13 07:50:46 +02:00
|
|
|
dirHeader.SetModTime(z.time)
|
|
|
|
|
2017-08-31 02:40:21 +02:00
|
|
|
ze := make(chan *zipEntry, 1)
|
|
|
|
ze <- &zipEntry{
|
|
|
|
fh: dirHeader,
|
|
|
|
}
|
|
|
|
close(ze)
|
|
|
|
z.writeOps <- ze
|
2015-04-25 00:08:38 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2016-08-04 02:47:23 +02:00
|
|
|
|
2017-10-12 21:18:19 +02:00
|
|
|
func (z *ZipWriter) writeSymlink(rel, file string) error {
|
2016-08-04 02:47:23 +02:00
|
|
|
fileHeader := &zip.FileHeader{
|
|
|
|
Name: rel,
|
|
|
|
}
|
|
|
|
fileHeader.SetModTime(z.time)
|
2018-06-23 01:37:47 +02:00
|
|
|
fileHeader.SetMode(0777 | os.ModeSymlink)
|
2016-08-04 02:47:23 +02:00
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
dest, err := os.Readlink(file)
|
2016-08-04 02:47:23 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2018-06-23 01:37:47 +02:00
|
|
|
fileHeader.UncompressedSize64 = uint64(len(dest))
|
|
|
|
fileHeader.CRC32 = crc32.ChecksumIEEE([]byte(dest))
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
ze := make(chan *zipEntry, 1)
|
|
|
|
futureReaders := make(chan chan io.Reader, 1)
|
|
|
|
futureReader := make(chan io.Reader, 1)
|
|
|
|
futureReaders <- futureReader
|
|
|
|
close(futureReaders)
|
|
|
|
futureReader <- bytes.NewBufferString(dest)
|
|
|
|
close(futureReader)
|
|
|
|
|
|
|
|
ze <- &zipEntry{
|
|
|
|
fh: fileHeader,
|
|
|
|
futureReaders: futureReaders,
|
2016-08-04 02:47:23 +02:00
|
|
|
}
|
2016-08-05 00:43:03 +02:00
|
|
|
close(ze)
|
|
|
|
z.writeOps <- ze
|
2016-08-04 02:47:23 +02:00
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
return nil
|
2016-08-04 02:47:23 +02:00
|
|
|
}
|
2017-08-30 23:12:21 +02:00
|
|
|
|
|
|
|
func recursiveGlobFiles(path string) []string {
|
|
|
|
var files []string
|
|
|
|
filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
|
|
|
|
if !info.IsDir() {
|
|
|
|
files = append(files, path)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
|
|
|
|
return files
|
|
|
|
}
|