Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 1 | // Copyright 2015 Google Inc. All rights reserved. |
| 2 | // |
| 3 | // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | // you may not use this file except in compliance with the License. |
| 5 | // You may obtain a copy of the License at |
| 6 | // |
| 7 | // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | // |
| 9 | // Unless required by applicable law or agreed to in writing, software |
| 10 | // distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | // See the License for the specific language governing permissions and |
| 13 | // limitations under the License. |
| 14 | |
Jeff Gaston | 11b5c51 | 2017-10-12 12:19:14 -0700 | [diff] [blame] | 15 | package zip |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 16 | |
| 17 | import ( |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 18 | "bytes" |
| 19 | "compress/flate" |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 20 | "errors" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 21 | "fmt" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 22 | "hash/crc32" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 23 | "io" |
| 24 | "io/ioutil" |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 25 | "log" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 26 | "os" |
| 27 | "path/filepath" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 28 | "runtime/pprof" |
| 29 | "runtime/trace" |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 30 | "sort" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 31 | "strings" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 32 | "sync" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 33 | "time" |
Nan Zhang | 674dd93 | 2018-01-26 18:30:36 -0800 | [diff] [blame] | 34 | "unicode" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 35 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 36 | "github.com/google/blueprint/pathtools" |
| 37 | |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 38 | "android/soong/jar" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 39 | "android/soong/third_party/zip" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 40 | ) |
| 41 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 42 | // Block size used during parallel compression of a single file. |
| 43 | const parallelBlockSize = 1 * 1024 * 1024 // 1MB |
| 44 | |
| 45 | // Minimum file size to use parallel compression. It requires more |
| 46 | // flate.Writer allocations, since we can't change the dictionary |
| 47 | // during Reset |
| 48 | const minParallelFileSize = parallelBlockSize * 6 |
| 49 | |
| 50 | // Size of the ZIP compression window (32KB) |
| 51 | const windowSize = 32 * 1024 |
| 52 | |
| 53 | type nopCloser struct { |
| 54 | io.Writer |
| 55 | } |
| 56 | |
| 57 | func (nopCloser) Close() error { |
| 58 | return nil |
| 59 | } |
| 60 | |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 61 | type byteReaderCloser struct { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 62 | *bytes.Reader |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 63 | io.Closer |
| 64 | } |
| 65 | |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 66 | type pathMapping struct { |
| 67 | dest, src string |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 68 | zipMethod uint16 |
| 69 | } |
| 70 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 71 | type FileArg struct { |
| 72 | PathPrefixInZip, SourcePrefixToStrip string |
| 73 | SourceFiles []string |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 74 | JunkPaths bool |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 75 | GlobDir string |
| 76 | } |
| 77 | |
Colin Cross | fe945b4 | 2018-09-27 15:00:07 -0700 | [diff] [blame^] | 78 | type FileArgsBuilder struct { |
| 79 | state FileArg |
| 80 | err error |
| 81 | fs pathtools.FileSystem |
| 82 | |
| 83 | fileArgs []FileArg |
| 84 | } |
| 85 | |
| 86 | func NewFileArgsBuilder() *FileArgsBuilder { |
| 87 | return &FileArgsBuilder{ |
| 88 | fs: pathtools.OsFs, |
| 89 | } |
| 90 | } |
| 91 | |
| 92 | func (b *FileArgsBuilder) JunkPaths(v bool) *FileArgsBuilder { |
| 93 | b.state.JunkPaths = v |
| 94 | b.state.SourcePrefixToStrip = "" |
| 95 | return b |
| 96 | } |
| 97 | |
| 98 | func (b *FileArgsBuilder) SourcePrefixToStrip(prefixToStrip string) *FileArgsBuilder { |
| 99 | b.state.JunkPaths = false |
| 100 | b.state.SourcePrefixToStrip = prefixToStrip |
| 101 | return b |
| 102 | } |
| 103 | |
| 104 | func (b *FileArgsBuilder) PathPrefixInZip(rootPrefix string) *FileArgsBuilder { |
| 105 | b.state.PathPrefixInZip = rootPrefix |
| 106 | return b |
| 107 | } |
| 108 | |
| 109 | func (b *FileArgsBuilder) File(name string) *FileArgsBuilder { |
| 110 | if b.err != nil { |
| 111 | return b |
| 112 | } |
| 113 | |
| 114 | arg := b.state |
| 115 | arg.SourceFiles = []string{name} |
| 116 | b.fileArgs = append(b.fileArgs, arg) |
| 117 | return b |
| 118 | } |
| 119 | |
| 120 | func (b *FileArgsBuilder) Dir(name string) *FileArgsBuilder { |
| 121 | if b.err != nil { |
| 122 | return b |
| 123 | } |
| 124 | |
| 125 | arg := b.state |
| 126 | arg.GlobDir = name |
| 127 | b.fileArgs = append(b.fileArgs, arg) |
| 128 | return b |
| 129 | } |
| 130 | |
| 131 | func (b *FileArgsBuilder) List(name string) *FileArgsBuilder { |
| 132 | if b.err != nil { |
| 133 | return b |
| 134 | } |
| 135 | |
| 136 | f, err := b.fs.Open(name) |
| 137 | if err != nil { |
| 138 | b.err = err |
| 139 | return b |
| 140 | } |
| 141 | defer f.Close() |
| 142 | |
| 143 | list, err := ioutil.ReadAll(f) |
| 144 | if err != nil { |
| 145 | b.err = err |
| 146 | return b |
| 147 | } |
| 148 | |
| 149 | arg := b.state |
| 150 | arg.SourceFiles = strings.Split(string(list), "\n") |
| 151 | b.fileArgs = append(b.fileArgs, arg) |
| 152 | return b |
| 153 | } |
| 154 | |
| 155 | func (b *FileArgsBuilder) Error() error { |
| 156 | if b == nil { |
| 157 | return nil |
| 158 | } |
| 159 | return b.err |
| 160 | } |
| 161 | |
| 162 | func (b *FileArgsBuilder) FileArgs() []FileArg { |
| 163 | if b == nil { |
| 164 | return nil |
| 165 | } |
| 166 | return b.fileArgs |
| 167 | } |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 168 | |
| 169 | type ZipWriter struct { |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 170 | time time.Time |
| 171 | createdFiles map[string]string |
| 172 | createdDirs map[string]string |
| 173 | directories bool |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 174 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 175 | errors chan error |
| 176 | writeOps chan chan *zipEntry |
| 177 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 178 | cpuRateLimiter *CPURateLimiter |
| 179 | memoryRateLimiter *MemoryRateLimiter |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 180 | |
| 181 | compressorPool sync.Pool |
| 182 | compLevel int |
| 183 | } |
| 184 | |
| 185 | type zipEntry struct { |
| 186 | fh *zip.FileHeader |
| 187 | |
| 188 | // List of delayed io.Reader |
| 189 | futureReaders chan chan io.Reader |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 190 | |
| 191 | // Only used for passing into the MemoryRateLimiter to ensure we |
| 192 | // release as much memory as much as we request |
| 193 | allocatedSize int64 |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 194 | } |
| 195 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 196 | type ZipArgs struct { |
Colin Cross | fe945b4 | 2018-09-27 15:00:07 -0700 | [diff] [blame^] | 197 | FileArgs []FileArg |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 198 | OutputFilePath string |
| 199 | CpuProfileFilePath string |
| 200 | TraceFilePath string |
| 201 | EmulateJar bool |
| 202 | AddDirectoryEntriesToZip bool |
| 203 | CompressionLevel int |
| 204 | ManifestSourcePath string |
| 205 | NumParallelJobs int |
| 206 | NonDeflatedFiles map[string]bool |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 207 | WriteIfChanged bool |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 208 | } |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 209 | |
Nan Zhang | 674dd93 | 2018-01-26 18:30:36 -0800 | [diff] [blame] | 210 | const NOQUOTE = '\x00' |
| 211 | |
| 212 | func ReadRespFile(bytes []byte) []string { |
| 213 | var args []string |
| 214 | var arg []rune |
| 215 | |
| 216 | isEscaping := false |
| 217 | quotingStart := NOQUOTE |
| 218 | for _, c := range string(bytes) { |
| 219 | switch { |
| 220 | case isEscaping: |
| 221 | if quotingStart == '"' { |
| 222 | if !(c == '"' || c == '\\') { |
| 223 | // '\"' or '\\' will be escaped under double quoting. |
| 224 | arg = append(arg, '\\') |
| 225 | } |
| 226 | } |
| 227 | arg = append(arg, c) |
| 228 | isEscaping = false |
| 229 | case c == '\\' && quotingStart != '\'': |
| 230 | isEscaping = true |
| 231 | case quotingStart == NOQUOTE && (c == '\'' || c == '"'): |
| 232 | quotingStart = c |
| 233 | case quotingStart != NOQUOTE && c == quotingStart: |
| 234 | quotingStart = NOQUOTE |
| 235 | case quotingStart == NOQUOTE && unicode.IsSpace(c): |
| 236 | // Current character is a space outside quotes |
| 237 | if len(arg) != 0 { |
| 238 | args = append(args, string(arg)) |
| 239 | } |
| 240 | arg = arg[:0] |
| 241 | default: |
| 242 | arg = append(arg, c) |
| 243 | } |
| 244 | } |
| 245 | |
| 246 | if len(arg) != 0 { |
| 247 | args = append(args, string(arg)) |
| 248 | } |
| 249 | |
| 250 | return args |
| 251 | } |
| 252 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 253 | func Run(args ZipArgs) (err error) { |
| 254 | if args.CpuProfileFilePath != "" { |
| 255 | f, err := os.Create(args.CpuProfileFilePath) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 256 | if err != nil { |
| 257 | fmt.Fprintln(os.Stderr, err.Error()) |
| 258 | os.Exit(1) |
| 259 | } |
| 260 | defer f.Close() |
| 261 | pprof.StartCPUProfile(f) |
| 262 | defer pprof.StopCPUProfile() |
| 263 | } |
| 264 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 265 | if args.TraceFilePath != "" { |
| 266 | f, err := os.Create(args.TraceFilePath) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 267 | if err != nil { |
| 268 | fmt.Fprintln(os.Stderr, err.Error()) |
| 269 | os.Exit(1) |
| 270 | } |
| 271 | defer f.Close() |
| 272 | err = trace.Start(f) |
| 273 | if err != nil { |
| 274 | fmt.Fprintln(os.Stderr, err.Error()) |
| 275 | os.Exit(1) |
| 276 | } |
| 277 | defer trace.Stop() |
| 278 | } |
| 279 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 280 | if args.OutputFilePath == "" { |
| 281 | return fmt.Errorf("output file path must be nonempty") |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 282 | } |
| 283 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 284 | if args.EmulateJar { |
| 285 | args.AddDirectoryEntriesToZip = true |
Jeff Gaston | 8edbb3a | 2017-08-22 20:05:28 -0700 | [diff] [blame] | 286 | } |
| 287 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 288 | w := &ZipWriter{ |
Colin Cross | c7feeff | 2018-09-26 21:36:44 +0000 | [diff] [blame] | 289 | time: jar.DefaultTime, |
| 290 | createdDirs: make(map[string]string), |
| 291 | createdFiles: make(map[string]string), |
| 292 | directories: args.AddDirectoryEntriesToZip, |
| 293 | compLevel: args.CompressionLevel, |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 294 | } |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 295 | pathMappings := []pathMapping{} |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 296 | |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 297 | noCompression := args.CompressionLevel == 0 |
| 298 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 299 | for _, fa := range args.FileArgs { |
Colin Cross | 7f33b81 | 2018-09-26 21:36:22 +0000 | [diff] [blame] | 300 | srcs := fa.SourceFiles |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 301 | if fa.GlobDir != "" { |
Colin Cross | 7f33b81 | 2018-09-26 21:36:22 +0000 | [diff] [blame] | 302 | srcs = append(srcs, recursiveGlobFiles(fa.GlobDir)...) |
Colin Cross | 7b10cf1 | 2017-08-30 14:12:21 -0700 | [diff] [blame] | 303 | } |
| 304 | for _, src := range srcs { |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 305 | err := fillPathPairs(fa, src, &pathMappings, args.NonDeflatedFiles, noCompression) |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 306 | if err != nil { |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 307 | log.Fatal(err) |
| 308 | } |
| 309 | } |
| 310 | } |
| 311 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 312 | buf := &bytes.Buffer{} |
| 313 | var out io.Writer = buf |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 314 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 315 | if !args.WriteIfChanged { |
| 316 | f, err := os.Create(args.OutputFilePath) |
| 317 | if err != nil { |
| 318 | return err |
| 319 | } |
| 320 | |
| 321 | defer f.Close() |
| 322 | defer func() { |
| 323 | if err != nil { |
| 324 | os.Remove(args.OutputFilePath) |
| 325 | } |
| 326 | }() |
| 327 | |
| 328 | out = f |
| 329 | } |
| 330 | |
| 331 | err = w.write(out, pathMappings, args.ManifestSourcePath, args.EmulateJar, args.NumParallelJobs) |
| 332 | if err != nil { |
| 333 | return err |
| 334 | } |
| 335 | |
| 336 | if args.WriteIfChanged { |
| 337 | err := pathtools.WriteFileIfChanged(args.OutputFilePath, buf.Bytes(), 0666) |
| 338 | if err != nil { |
| 339 | return err |
| 340 | } |
| 341 | } |
| 342 | |
| 343 | return nil |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 344 | } |
| 345 | |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 346 | func fillPathPairs(fa FileArg, src string, pathMappings *[]pathMapping, |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 347 | nonDeflatedFiles map[string]bool, noCompression bool) error { |
| 348 | |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 349 | src = strings.TrimSpace(src) |
| 350 | if src == "" { |
| 351 | return nil |
| 352 | } |
| 353 | src = filepath.Clean(src) |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 354 | var dest string |
| 355 | |
| 356 | if fa.JunkPaths { |
| 357 | dest = filepath.Base(src) |
| 358 | } else { |
| 359 | var err error |
| 360 | dest, err = filepath.Rel(fa.SourcePrefixToStrip, src) |
| 361 | if err != nil { |
| 362 | return err |
| 363 | } |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 364 | } |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 365 | dest = filepath.Join(fa.PathPrefixInZip, dest) |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 366 | |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 367 | zipMethod := zip.Deflate |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 368 | if _, found := nonDeflatedFiles[dest]; found || noCompression { |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 369 | zipMethod = zip.Store |
| 370 | } |
| 371 | *pathMappings = append(*pathMappings, |
| 372 | pathMapping{dest: dest, src: src, zipMethod: zipMethod}) |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 373 | |
| 374 | return nil |
| 375 | } |
| 376 | |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 377 | func jarSort(mappings []pathMapping) { |
| 378 | less := func(i int, j int) (smaller bool) { |
| 379 | return jar.EntryNamesLess(mappings[i].dest, mappings[j].dest) |
| 380 | } |
| 381 | sort.SliceStable(mappings, less) |
| 382 | } |
| 383 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 384 | type readerSeekerCloser interface { |
| 385 | io.Reader |
| 386 | io.ReaderAt |
| 387 | io.Closer |
| 388 | io.Seeker |
| 389 | } |
| 390 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 391 | func (z *ZipWriter) write(f io.Writer, pathMappings []pathMapping, manifest string, emulateJar bool, parallelJobs int) error { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 392 | z.errors = make(chan error) |
| 393 | defer close(z.errors) |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 394 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 395 | // This channel size can be essentially unlimited -- it's used as a fifo |
| 396 | // queue decouple the CPU and IO loads. Directories don't require any |
| 397 | // compression time, but still cost some IO. Similar with small files that |
| 398 | // can be very fast to compress. Some files that are more difficult to |
| 399 | // compress won't take a corresponding longer time writing out. |
| 400 | // |
| 401 | // The optimum size here depends on your CPU and IO characteristics, and |
| 402 | // the the layout of your zip file. 1000 was chosen mostly at random as |
| 403 | // something that worked reasonably well for a test file. |
| 404 | // |
| 405 | // The RateLimit object will put the upper bounds on the number of |
| 406 | // parallel compressions and outstanding buffers. |
| 407 | z.writeOps = make(chan chan *zipEntry, 1000) |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 408 | z.cpuRateLimiter = NewCPURateLimiter(int64(parallelJobs)) |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 409 | z.memoryRateLimiter = NewMemoryRateLimiter(0) |
| 410 | defer func() { |
| 411 | z.cpuRateLimiter.Stop() |
| 412 | z.memoryRateLimiter.Stop() |
| 413 | }() |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 414 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 415 | if manifest != "" && !emulateJar { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 416 | return errors.New("must specify --jar when specifying a manifest via -m") |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 417 | } |
| 418 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 419 | if emulateJar { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 420 | // manifest may be empty, in which case addManifest will fill in a default |
| 421 | pathMappings = append(pathMappings, pathMapping{jar.ManifestFile, manifest, zip.Deflate}) |
| 422 | |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 423 | jarSort(pathMappings) |
| 424 | } |
| 425 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 426 | go func() { |
| 427 | var err error |
| 428 | defer close(z.writeOps) |
| 429 | |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 430 | for _, ele := range pathMappings { |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 431 | if emulateJar && ele.dest == jar.ManifestFile { |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 432 | err = z.addManifest(ele.dest, ele.src, ele.zipMethod) |
| 433 | } else { |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 434 | err = z.addFile(ele.dest, ele.src, ele.zipMethod, emulateJar) |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 435 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 436 | if err != nil { |
| 437 | z.errors <- err |
| 438 | return |
| 439 | } |
| 440 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 441 | }() |
| 442 | |
| 443 | zipw := zip.NewWriter(f) |
| 444 | |
| 445 | var currentWriteOpChan chan *zipEntry |
| 446 | var currentWriter io.WriteCloser |
| 447 | var currentReaders chan chan io.Reader |
| 448 | var currentReader chan io.Reader |
| 449 | var done bool |
| 450 | |
| 451 | for !done { |
| 452 | var writeOpsChan chan chan *zipEntry |
| 453 | var writeOpChan chan *zipEntry |
| 454 | var readersChan chan chan io.Reader |
| 455 | |
| 456 | if currentReader != nil { |
| 457 | // Only read and process errors |
| 458 | } else if currentReaders != nil { |
| 459 | readersChan = currentReaders |
| 460 | } else if currentWriteOpChan != nil { |
| 461 | writeOpChan = currentWriteOpChan |
| 462 | } else { |
| 463 | writeOpsChan = z.writeOps |
| 464 | } |
| 465 | |
| 466 | select { |
| 467 | case writeOp, ok := <-writeOpsChan: |
| 468 | if !ok { |
| 469 | done = true |
| 470 | } |
| 471 | |
| 472 | currentWriteOpChan = writeOp |
| 473 | |
| 474 | case op := <-writeOpChan: |
| 475 | currentWriteOpChan = nil |
| 476 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 477 | var err error |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 478 | if op.fh.Method == zip.Deflate { |
| 479 | currentWriter, err = zipw.CreateCompressedHeader(op.fh) |
| 480 | } else { |
| 481 | var zw io.Writer |
Jeff Gaston | c5eb66d | 2017-08-24 14:11:27 -0700 | [diff] [blame] | 482 | |
| 483 | op.fh.CompressedSize64 = op.fh.UncompressedSize64 |
| 484 | |
| 485 | zw, err = zipw.CreateHeaderAndroid(op.fh) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 486 | currentWriter = nopCloser{zw} |
| 487 | } |
| 488 | if err != nil { |
| 489 | return err |
| 490 | } |
| 491 | |
| 492 | currentReaders = op.futureReaders |
| 493 | if op.futureReaders == nil { |
| 494 | currentWriter.Close() |
| 495 | currentWriter = nil |
| 496 | } |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 497 | z.memoryRateLimiter.Finish(op.allocatedSize) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 498 | |
| 499 | case futureReader, ok := <-readersChan: |
| 500 | if !ok { |
| 501 | // Done with reading |
| 502 | currentWriter.Close() |
| 503 | currentWriter = nil |
| 504 | currentReaders = nil |
| 505 | } |
| 506 | |
| 507 | currentReader = futureReader |
| 508 | |
| 509 | case reader := <-currentReader: |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 510 | _, err := io.Copy(currentWriter, reader) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 511 | if err != nil { |
| 512 | return err |
| 513 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 514 | |
| 515 | currentReader = nil |
| 516 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 517 | case err := <-z.errors: |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 518 | return err |
| 519 | } |
| 520 | } |
| 521 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 522 | // One last chance to catch an error |
| 523 | select { |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 524 | case err := <-z.errors: |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 525 | return err |
| 526 | default: |
| 527 | zipw.Close() |
| 528 | return nil |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 529 | } |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 530 | } |
| 531 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 532 | // imports (possibly with compression) <src> into the zip at sub-path <dest> |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 533 | func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar bool) error { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 534 | var fileSize int64 |
Dan Willemsen | 10462b3 | 2017-03-15 19:02:51 -0700 | [diff] [blame] | 535 | var executable bool |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 536 | |
Colin Cross | c7feeff | 2018-09-26 21:36:44 +0000 | [diff] [blame] | 537 | if s, err := os.Lstat(src); err != nil { |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 538 | return err |
| 539 | } else if s.IsDir() { |
Colin Cross | 957cc4e | 2015-04-24 15:10:32 -0700 | [diff] [blame] | 540 | if z.directories { |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 541 | return z.writeDirectory(dest, src, emulateJar) |
Colin Cross | 957cc4e | 2015-04-24 15:10:32 -0700 | [diff] [blame] | 542 | } |
| 543 | return nil |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 544 | } else { |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 545 | if err := z.writeDirectory(filepath.Dir(dest), src, emulateJar); err != nil { |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 546 | return err |
| 547 | } |
| 548 | |
| 549 | if prev, exists := z.createdDirs[dest]; exists { |
| 550 | return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src) |
| 551 | } |
| 552 | if prev, exists := z.createdFiles[dest]; exists { |
| 553 | return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src) |
| 554 | } |
| 555 | |
| 556 | z.createdFiles[dest] = src |
| 557 | |
| 558 | if s.Mode()&os.ModeSymlink != 0 { |
| 559 | return z.writeSymlink(dest, src) |
| 560 | } else if !s.Mode().IsRegular() { |
| 561 | return fmt.Errorf("%s is not a file, directory, or symlink", src) |
| 562 | } |
| 563 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 564 | fileSize = s.Size() |
Dan Willemsen | 10462b3 | 2017-03-15 19:02:51 -0700 | [diff] [blame] | 565 | executable = s.Mode()&0100 != 0 |
Colin Cross | 957cc4e | 2015-04-24 15:10:32 -0700 | [diff] [blame] | 566 | } |
| 567 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 568 | r, err := os.Open(src) |
| 569 | if err != nil { |
| 570 | return err |
| 571 | } |
| 572 | |
| 573 | header := &zip.FileHeader{ |
| 574 | Name: dest, |
| 575 | Method: method, |
| 576 | UncompressedSize64: uint64(fileSize), |
| 577 | } |
| 578 | |
| 579 | if executable { |
| 580 | header.SetMode(0700) |
| 581 | } |
| 582 | |
| 583 | return z.writeFileContents(header, r) |
| 584 | } |
| 585 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 586 | func (z *ZipWriter) addManifest(dest string, src string, method uint16) error { |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 587 | if prev, exists := z.createdDirs[dest]; exists { |
| 588 | return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src) |
| 589 | } |
| 590 | if prev, exists := z.createdFiles[dest]; exists { |
| 591 | return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src) |
| 592 | } |
| 593 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 594 | if err := z.writeDirectory(filepath.Dir(dest), src, true); err != nil { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 595 | return err |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 596 | } |
| 597 | |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 598 | fh, buf, err := jar.ManifestFileContents(src) |
| 599 | if err != nil { |
| 600 | return err |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 601 | } |
| 602 | |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 603 | reader := &byteReaderCloser{bytes.NewReader(buf), ioutil.NopCloser(nil)} |
| 604 | |
| 605 | return z.writeFileContents(fh, reader) |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 606 | } |
| 607 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 608 | func (z *ZipWriter) writeFileContents(header *zip.FileHeader, r readerSeekerCloser) (err error) { |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 609 | |
| 610 | header.SetModTime(z.time) |
| 611 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 612 | compressChan := make(chan *zipEntry, 1) |
| 613 | z.writeOps <- compressChan |
| 614 | |
| 615 | // Pre-fill a zipEntry, it will be sent in the compressChan once |
| 616 | // we're sure about the Method and CRC. |
| 617 | ze := &zipEntry{ |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 618 | fh: header, |
Dan Willemsen | 10462b3 | 2017-03-15 19:02:51 -0700 | [diff] [blame] | 619 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 620 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 621 | ze.allocatedSize = int64(header.UncompressedSize64) |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 622 | z.cpuRateLimiter.Request() |
| 623 | z.memoryRateLimiter.Request(ze.allocatedSize) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 624 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 625 | fileSize := int64(header.UncompressedSize64) |
| 626 | if fileSize == 0 { |
| 627 | fileSize = int64(header.UncompressedSize) |
| 628 | } |
| 629 | |
| 630 | if header.Method == zip.Deflate && fileSize >= minParallelFileSize { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 631 | wg := new(sync.WaitGroup) |
| 632 | |
| 633 | // Allocate enough buffer to hold all readers. We'll limit |
| 634 | // this based on actual buffer sizes in RateLimit. |
| 635 | ze.futureReaders = make(chan chan io.Reader, (fileSize/parallelBlockSize)+1) |
| 636 | |
| 637 | // Calculate the CRC in the background, since reading the entire |
| 638 | // file could take a while. |
| 639 | // |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 640 | // We could split this up into chunks as well, but it's faster |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 641 | // than the compression. Due to the Go Zip API, we also need to |
| 642 | // know the result before we can begin writing the compressed |
| 643 | // data out to the zipfile. |
| 644 | wg.Add(1) |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 645 | go z.crcFile(r, ze, compressChan, wg) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 646 | |
| 647 | for start := int64(0); start < fileSize; start += parallelBlockSize { |
| 648 | sr := io.NewSectionReader(r, start, parallelBlockSize) |
| 649 | resultChan := make(chan io.Reader, 1) |
| 650 | ze.futureReaders <- resultChan |
| 651 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 652 | z.cpuRateLimiter.Request() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 653 | |
| 654 | last := !(start+parallelBlockSize < fileSize) |
| 655 | var dict []byte |
| 656 | if start >= windowSize { |
| 657 | dict, err = ioutil.ReadAll(io.NewSectionReader(r, start-windowSize, windowSize)) |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 658 | if err != nil { |
| 659 | return err |
| 660 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 661 | } |
| 662 | |
| 663 | wg.Add(1) |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 664 | go z.compressPartialFile(sr, dict, last, resultChan, wg) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 665 | } |
| 666 | |
| 667 | close(ze.futureReaders) |
| 668 | |
| 669 | // Close the file handle after all readers are done |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 670 | go func(wg *sync.WaitGroup, closer io.Closer) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 671 | wg.Wait() |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 672 | closer.Close() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 673 | }(wg, r) |
| 674 | } else { |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 675 | go func() { |
| 676 | z.compressWholeFile(ze, r, compressChan) |
| 677 | r.Close() |
| 678 | }() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 679 | } |
| 680 | |
| 681 | return nil |
| 682 | } |
| 683 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 684 | func (z *ZipWriter) crcFile(r io.Reader, ze *zipEntry, resultChan chan *zipEntry, wg *sync.WaitGroup) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 685 | defer wg.Done() |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 686 | defer z.cpuRateLimiter.Finish() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 687 | |
| 688 | crc := crc32.NewIEEE() |
| 689 | _, err := io.Copy(crc, r) |
| 690 | if err != nil { |
| 691 | z.errors <- err |
| 692 | return |
| 693 | } |
| 694 | |
| 695 | ze.fh.CRC32 = crc.Sum32() |
| 696 | resultChan <- ze |
| 697 | close(resultChan) |
| 698 | } |
| 699 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 700 | func (z *ZipWriter) compressPartialFile(r io.Reader, dict []byte, last bool, resultChan chan io.Reader, wg *sync.WaitGroup) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 701 | defer wg.Done() |
| 702 | |
| 703 | result, err := z.compressBlock(r, dict, last) |
| 704 | if err != nil { |
| 705 | z.errors <- err |
| 706 | return |
| 707 | } |
| 708 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 709 | z.cpuRateLimiter.Finish() |
| 710 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 711 | resultChan <- result |
| 712 | } |
| 713 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 714 | func (z *ZipWriter) compressBlock(r io.Reader, dict []byte, last bool) (*bytes.Buffer, error) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 715 | buf := new(bytes.Buffer) |
| 716 | var fw *flate.Writer |
| 717 | var err error |
| 718 | if len(dict) > 0 { |
| 719 | // There's no way to Reset a Writer with a new dictionary, so |
| 720 | // don't use the Pool |
| 721 | fw, err = flate.NewWriterDict(buf, z.compLevel, dict) |
| 722 | } else { |
| 723 | var ok bool |
| 724 | if fw, ok = z.compressorPool.Get().(*flate.Writer); ok { |
| 725 | fw.Reset(buf) |
| 726 | } else { |
| 727 | fw, err = flate.NewWriter(buf, z.compLevel) |
| 728 | } |
| 729 | defer z.compressorPool.Put(fw) |
| 730 | } |
| 731 | if err != nil { |
| 732 | return nil, err |
| 733 | } |
| 734 | |
| 735 | _, err = io.Copy(fw, r) |
| 736 | if err != nil { |
| 737 | return nil, err |
| 738 | } |
| 739 | if last { |
| 740 | fw.Close() |
| 741 | } else { |
| 742 | fw.Flush() |
| 743 | } |
| 744 | |
| 745 | return buf, nil |
| 746 | } |
| 747 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 748 | func (z *ZipWriter) compressWholeFile(ze *zipEntry, r io.ReadSeeker, compressChan chan *zipEntry) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 749 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 750 | crc := crc32.NewIEEE() |
Dan Willemsen | a8b5502 | 2017-03-15 21:49:26 -0700 | [diff] [blame] | 751 | _, err := io.Copy(crc, r) |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 752 | if err != nil { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 753 | z.errors <- err |
| 754 | return |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 755 | } |
| 756 | |
Dan Willemsen | a8b5502 | 2017-03-15 21:49:26 -0700 | [diff] [blame] | 757 | ze.fh.CRC32 = crc.Sum32() |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 758 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 759 | _, err = r.Seek(0, 0) |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 760 | if err != nil { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 761 | z.errors <- err |
| 762 | return |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 763 | } |
| 764 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 765 | readFile := func(reader io.ReadSeeker) ([]byte, error) { |
| 766 | _, err := reader.Seek(0, 0) |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 767 | if err != nil { |
| 768 | return nil, err |
| 769 | } |
| 770 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 771 | buf, err := ioutil.ReadAll(reader) |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 772 | if err != nil { |
| 773 | return nil, err |
| 774 | } |
| 775 | |
| 776 | return buf, nil |
| 777 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 778 | |
Dan Willemsen | a8b5502 | 2017-03-15 21:49:26 -0700 | [diff] [blame] | 779 | ze.futureReaders = make(chan chan io.Reader, 1) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 780 | futureReader := make(chan io.Reader, 1) |
| 781 | ze.futureReaders <- futureReader |
| 782 | close(ze.futureReaders) |
| 783 | |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 784 | if ze.fh.Method == zip.Deflate { |
| 785 | compressed, err := z.compressBlock(r, nil, true) |
| 786 | if err != nil { |
| 787 | z.errors <- err |
| 788 | return |
| 789 | } |
| 790 | if uint64(compressed.Len()) < ze.fh.UncompressedSize64 { |
| 791 | futureReader <- compressed |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 792 | } else { |
| 793 | buf, err := readFile(r) |
| 794 | if err != nil { |
| 795 | z.errors <- err |
| 796 | return |
| 797 | } |
| 798 | ze.fh.Method = zip.Store |
| 799 | futureReader <- bytes.NewReader(buf) |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 800 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 801 | } else { |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 802 | buf, err := readFile(r) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 803 | if err != nil { |
| 804 | z.errors <- err |
| 805 | return |
| 806 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 807 | ze.fh.Method = zip.Store |
| 808 | futureReader <- bytes.NewReader(buf) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 809 | } |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 810 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 811 | z.cpuRateLimiter.Finish() |
| 812 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 813 | close(futureReader) |
| 814 | |
| 815 | compressChan <- ze |
| 816 | close(compressChan) |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 817 | } |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 818 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 819 | // writeDirectory annotates that dir is a directory created for the src file or directory, and adds |
| 820 | // the directory entry to the zip file if directories are enabled. |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 821 | func (z *ZipWriter) writeDirectory(dir string, src string, emulateJar bool) error { |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 822 | // clean the input |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 823 | dir = filepath.Clean(dir) |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 824 | |
| 825 | // discover any uncreated directories in the path |
| 826 | zipDirs := []string{} |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 827 | for dir != "" && dir != "." { |
| 828 | if _, exists := z.createdDirs[dir]; exists { |
| 829 | break |
| 830 | } |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 831 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 832 | if prev, exists := z.createdFiles[dir]; exists { |
| 833 | return fmt.Errorf("destination %q is both a directory %q and a file %q", dir, src, prev) |
| 834 | } |
| 835 | |
| 836 | z.createdDirs[dir] = src |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 837 | // parent directories precede their children |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 838 | zipDirs = append([]string{dir}, zipDirs...) |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 839 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 840 | dir = filepath.Dir(dir) |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 841 | } |
| 842 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 843 | if z.directories { |
| 844 | // make a directory entry for each uncreated directory |
| 845 | for _, cleanDir := range zipDirs { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 846 | var dirHeader *zip.FileHeader |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 847 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 848 | if emulateJar && cleanDir+"/" == jar.MetaDir { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 849 | dirHeader = jar.MetaDirFileHeader() |
| 850 | } else { |
| 851 | dirHeader = &zip.FileHeader{ |
| 852 | Name: cleanDir + "/", |
| 853 | } |
| 854 | dirHeader.SetMode(0700 | os.ModeDir) |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 855 | } |
Jeff Gaston | 8edbb3a | 2017-08-22 20:05:28 -0700 | [diff] [blame] | 856 | |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 857 | dirHeader.SetModTime(z.time) |
| 858 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 859 | ze := make(chan *zipEntry, 1) |
| 860 | ze <- &zipEntry{ |
| 861 | fh: dirHeader, |
| 862 | } |
| 863 | close(ze) |
| 864 | z.writeOps <- ze |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 865 | } |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 866 | } |
| 867 | |
| 868 | return nil |
| 869 | } |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 870 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 871 | func (z *ZipWriter) writeSymlink(rel, file string) error { |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 872 | fileHeader := &zip.FileHeader{ |
| 873 | Name: rel, |
| 874 | } |
| 875 | fileHeader.SetModTime(z.time) |
Colin Cross | 297d9bc | 2018-06-22 16:37:47 -0700 | [diff] [blame] | 876 | fileHeader.SetMode(0777 | os.ModeSymlink) |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 877 | |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 878 | dest, err := os.Readlink(file) |
| 879 | if err != nil { |
| 880 | return err |
| 881 | } |
| 882 | |
Colin Cross | 297d9bc | 2018-06-22 16:37:47 -0700 | [diff] [blame] | 883 | fileHeader.UncompressedSize64 = uint64(len(dest)) |
| 884 | fileHeader.CRC32 = crc32.ChecksumIEEE([]byte(dest)) |
| 885 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 886 | ze := make(chan *zipEntry, 1) |
| 887 | futureReaders := make(chan chan io.Reader, 1) |
| 888 | futureReader := make(chan io.Reader, 1) |
| 889 | futureReaders <- futureReader |
| 890 | close(futureReaders) |
| 891 | futureReader <- bytes.NewBufferString(dest) |
| 892 | close(futureReader) |
| 893 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 894 | ze <- &zipEntry{ |
| 895 | fh: fileHeader, |
| 896 | futureReaders: futureReaders, |
| 897 | } |
| 898 | close(ze) |
| 899 | z.writeOps <- ze |
| 900 | |
| 901 | return nil |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 902 | } |
Colin Cross | 7b10cf1 | 2017-08-30 14:12:21 -0700 | [diff] [blame] | 903 | |
| 904 | func recursiveGlobFiles(path string) []string { |
| 905 | var files []string |
| 906 | filepath.Walk(path, func(path string, info os.FileInfo, err error) error { |
| 907 | if !info.IsDir() { |
| 908 | files = append(files, path) |
| 909 | } |
| 910 | return nil |
| 911 | }) |
| 912 | |
| 913 | return files |
| 914 | } |