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