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