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