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