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