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