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