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" |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 20 | "crypto/sha256" |
| 21 | "encoding/binary" |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 22 | "errors" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 23 | "fmt" |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 24 | "hash" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 25 | "hash/crc32" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 26 | "io" |
| 27 | "io/ioutil" |
| 28 | "os" |
| 29 | "path/filepath" |
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 | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 33 | "syscall" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 34 | "time" |
Colin Cross | fd708b5 | 2021-03-23 14:16:05 -0700 | [diff] [blame] | 35 | |
| 36 | "android/soong/response" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 37 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 38 | "github.com/google/blueprint/pathtools" |
| 39 | |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 40 | "android/soong/jar" |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 41 | "android/soong/third_party/zip" |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 42 | ) |
| 43 | |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 44 | // Sha256HeaderID is a custom Header ID for the `extra` field in |
| 45 | // the file header to store the SHA checksum. |
| 46 | const Sha256HeaderID = 0x4967 |
| 47 | |
| 48 | // Sha256HeaderSignature is the signature to verify that the extra |
| 49 | // data block is used to store the SHA checksum. |
| 50 | const Sha256HeaderSignature = 0x9514 |
| 51 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 52 | // Block size used during parallel compression of a single file. |
| 53 | const parallelBlockSize = 1 * 1024 * 1024 // 1MB |
| 54 | |
| 55 | // Minimum file size to use parallel compression. It requires more |
| 56 | // flate.Writer allocations, since we can't change the dictionary |
| 57 | // during Reset |
| 58 | const minParallelFileSize = parallelBlockSize * 6 |
| 59 | |
| 60 | // Size of the ZIP compression window (32KB) |
| 61 | const windowSize = 32 * 1024 |
| 62 | |
| 63 | type nopCloser struct { |
| 64 | io.Writer |
| 65 | } |
| 66 | |
| 67 | func (nopCloser) Close() error { |
| 68 | return nil |
| 69 | } |
| 70 | |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 71 | type byteReaderCloser struct { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 72 | *bytes.Reader |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 73 | io.Closer |
| 74 | } |
| 75 | |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 76 | type pathMapping struct { |
| 77 | dest, src string |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 78 | zipMethod uint16 |
| 79 | } |
| 80 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 81 | type FileArg struct { |
| 82 | PathPrefixInZip, SourcePrefixToStrip string |
| 83 | SourceFiles []string |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 84 | JunkPaths bool |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 85 | GlobDir string |
| 86 | } |
| 87 | |
Colin Cross | fe945b4 | 2018-09-27 15:00:07 -0700 | [diff] [blame] | 88 | type FileArgsBuilder struct { |
| 89 | state FileArg |
| 90 | err error |
| 91 | fs pathtools.FileSystem |
| 92 | |
| 93 | fileArgs []FileArg |
| 94 | } |
| 95 | |
| 96 | func NewFileArgsBuilder() *FileArgsBuilder { |
| 97 | return &FileArgsBuilder{ |
| 98 | fs: pathtools.OsFs, |
| 99 | } |
| 100 | } |
| 101 | |
| 102 | func (b *FileArgsBuilder) JunkPaths(v bool) *FileArgsBuilder { |
| 103 | b.state.JunkPaths = v |
| 104 | b.state.SourcePrefixToStrip = "" |
| 105 | return b |
| 106 | } |
| 107 | |
| 108 | func (b *FileArgsBuilder) SourcePrefixToStrip(prefixToStrip string) *FileArgsBuilder { |
| 109 | b.state.JunkPaths = false |
| 110 | b.state.SourcePrefixToStrip = prefixToStrip |
| 111 | return b |
| 112 | } |
| 113 | |
| 114 | func (b *FileArgsBuilder) PathPrefixInZip(rootPrefix string) *FileArgsBuilder { |
| 115 | b.state.PathPrefixInZip = rootPrefix |
| 116 | return b |
| 117 | } |
| 118 | |
| 119 | func (b *FileArgsBuilder) File(name string) *FileArgsBuilder { |
| 120 | if b.err != nil { |
| 121 | return b |
| 122 | } |
| 123 | |
| 124 | arg := b.state |
| 125 | arg.SourceFiles = []string{name} |
| 126 | b.fileArgs = append(b.fileArgs, arg) |
| 127 | return b |
| 128 | } |
| 129 | |
| 130 | func (b *FileArgsBuilder) Dir(name string) *FileArgsBuilder { |
| 131 | if b.err != nil { |
| 132 | return b |
| 133 | } |
| 134 | |
| 135 | arg := b.state |
| 136 | arg.GlobDir = name |
| 137 | b.fileArgs = append(b.fileArgs, arg) |
| 138 | return b |
| 139 | } |
| 140 | |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 141 | // List reads the file names from the given file and adds them to the source files list. |
Colin Cross | fe945b4 | 2018-09-27 15:00:07 -0700 | [diff] [blame] | 142 | func (b *FileArgsBuilder) List(name string) *FileArgsBuilder { |
| 143 | if b.err != nil { |
| 144 | return b |
| 145 | } |
| 146 | |
| 147 | f, err := b.fs.Open(name) |
| 148 | if err != nil { |
| 149 | b.err = err |
| 150 | return b |
| 151 | } |
| 152 | defer f.Close() |
| 153 | |
| 154 | list, err := ioutil.ReadAll(f) |
| 155 | if err != nil { |
| 156 | b.err = err |
| 157 | return b |
| 158 | } |
| 159 | |
| 160 | arg := b.state |
Jiyong Park | 04bbf98 | 2019-11-04 13:18:41 +0900 | [diff] [blame] | 161 | arg.SourceFiles = strings.Fields(string(list)) |
Colin Cross | fe945b4 | 2018-09-27 15:00:07 -0700 | [diff] [blame] | 162 | b.fileArgs = append(b.fileArgs, arg) |
| 163 | return b |
| 164 | } |
| 165 | |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 166 | // RspFile reads the file names from given .rsp file and adds them to the source files list. |
Colin Cross | 053fca1 | 2020-08-19 13:51:47 -0700 | [diff] [blame] | 167 | func (b *FileArgsBuilder) RspFile(name string) *FileArgsBuilder { |
| 168 | if b.err != nil { |
| 169 | return b |
| 170 | } |
| 171 | |
| 172 | f, err := b.fs.Open(name) |
| 173 | if err != nil { |
| 174 | b.err = err |
| 175 | return b |
| 176 | } |
| 177 | defer f.Close() |
| 178 | |
Colin Cross | fd708b5 | 2021-03-23 14:16:05 -0700 | [diff] [blame] | 179 | arg := b.state |
| 180 | arg.SourceFiles, err = response.ReadRspFile(f) |
Colin Cross | 053fca1 | 2020-08-19 13:51:47 -0700 | [diff] [blame] | 181 | if err != nil { |
| 182 | b.err = err |
| 183 | return b |
| 184 | } |
Colin Cross | caf4d4c | 2021-02-03 15:15:14 -0800 | [diff] [blame] | 185 | for i := range arg.SourceFiles { |
| 186 | arg.SourceFiles[i] = pathtools.MatchEscape(arg.SourceFiles[i]) |
| 187 | } |
Colin Cross | 053fca1 | 2020-08-19 13:51:47 -0700 | [diff] [blame] | 188 | b.fileArgs = append(b.fileArgs, arg) |
| 189 | return b |
| 190 | } |
| 191 | |
Colin Cross | fe945b4 | 2018-09-27 15:00:07 -0700 | [diff] [blame] | 192 | func (b *FileArgsBuilder) Error() error { |
| 193 | if b == nil { |
| 194 | return nil |
| 195 | } |
| 196 | return b.err |
| 197 | } |
| 198 | |
| 199 | func (b *FileArgsBuilder) FileArgs() []FileArg { |
| 200 | if b == nil { |
| 201 | return nil |
| 202 | } |
| 203 | return b.fileArgs |
| 204 | } |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 205 | |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 206 | type IncorrectRelativeRootError struct { |
| 207 | RelativeRoot string |
| 208 | Path string |
| 209 | } |
| 210 | |
| 211 | func (x IncorrectRelativeRootError) Error() string { |
| 212 | return fmt.Sprintf("path %q is outside relative root %q", x.Path, x.RelativeRoot) |
| 213 | } |
| 214 | |
Colin Cross | 7ddd08a | 2022-08-15 15:47:41 -0700 | [diff] [blame] | 215 | type ConflictingFileError struct { |
| 216 | Dest string |
| 217 | Prev string |
| 218 | Src string |
| 219 | } |
| 220 | |
| 221 | func (x ConflictingFileError) Error() string { |
| 222 | return fmt.Sprintf("destination %q has two files %q and %q", x.Dest, x.Prev, x.Src) |
| 223 | } |
| 224 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 225 | type ZipWriter struct { |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 226 | time time.Time |
| 227 | createdFiles map[string]string |
| 228 | createdDirs map[string]string |
| 229 | directories bool |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 230 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 231 | errors chan error |
| 232 | writeOps chan chan *zipEntry |
| 233 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 234 | cpuRateLimiter *CPURateLimiter |
| 235 | memoryRateLimiter *MemoryRateLimiter |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 236 | |
| 237 | compressorPool sync.Pool |
| 238 | compLevel int |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 239 | |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 240 | followSymlinks pathtools.ShouldFollowSymlinks |
| 241 | ignoreMissingFiles bool |
Colin Cross | 09f1105 | 2018-09-21 15:12:39 -0700 | [diff] [blame] | 242 | |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 243 | stderr io.Writer |
| 244 | fs pathtools.FileSystem |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 245 | |
| 246 | sha256Checksum bool |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 247 | } |
| 248 | |
| 249 | type zipEntry struct { |
| 250 | fh *zip.FileHeader |
| 251 | |
| 252 | // List of delayed io.Reader |
| 253 | futureReaders chan chan io.Reader |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 254 | |
| 255 | // Only used for passing into the MemoryRateLimiter to ensure we |
| 256 | // release as much memory as much as we request |
| 257 | allocatedSize int64 |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 258 | } |
| 259 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 260 | type ZipArgs struct { |
Colin Cross | fe945b4 | 2018-09-27 15:00:07 -0700 | [diff] [blame] | 261 | FileArgs []FileArg |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 262 | OutputFilePath string |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 263 | EmulateJar bool |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 264 | SrcJar bool |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 265 | AddDirectoryEntriesToZip bool |
| 266 | CompressionLevel int |
| 267 | ManifestSourcePath string |
| 268 | NumParallelJobs int |
| 269 | NonDeflatedFiles map[string]bool |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 270 | WriteIfChanged bool |
Colin Cross | 09f1105 | 2018-09-21 15:12:39 -0700 | [diff] [blame] | 271 | StoreSymlinks bool |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 272 | IgnoreMissingFiles bool |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 273 | Sha256Checksum bool |
Colin Cross | 09f1105 | 2018-09-21 15:12:39 -0700 | [diff] [blame] | 274 | |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 275 | Stderr io.Writer |
Colin Cross | 09f1105 | 2018-09-21 15:12:39 -0700 | [diff] [blame] | 276 | Filesystem pathtools.FileSystem |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 277 | } |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 278 | |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 279 | func zipTo(args ZipArgs, w io.Writer) error { |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 280 | if args.EmulateJar { |
| 281 | args.AddDirectoryEntriesToZip = true |
Jeff Gaston | 8edbb3a | 2017-08-22 20:05:28 -0700 | [diff] [blame] | 282 | } |
| 283 | |
Colin Cross | 09f1105 | 2018-09-21 15:12:39 -0700 | [diff] [blame] | 284 | // Have Glob follow symlinks if they are not being stored as symlinks in the zip file. |
| 285 | followSymlinks := pathtools.ShouldFollowSymlinks(!args.StoreSymlinks) |
| 286 | |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 287 | z := &ZipWriter{ |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 288 | time: jar.DefaultTime, |
| 289 | createdDirs: make(map[string]string), |
| 290 | createdFiles: make(map[string]string), |
| 291 | directories: args.AddDirectoryEntriesToZip, |
| 292 | compLevel: args.CompressionLevel, |
| 293 | followSymlinks: followSymlinks, |
| 294 | ignoreMissingFiles: args.IgnoreMissingFiles, |
| 295 | stderr: args.Stderr, |
| 296 | fs: args.Filesystem, |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 297 | sha256Checksum: args.Sha256Checksum, |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 298 | } |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 299 | |
| 300 | if z.fs == nil { |
| 301 | z.fs = pathtools.OsFs |
| 302 | } |
| 303 | |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 304 | if z.stderr == nil { |
| 305 | z.stderr = os.Stderr |
| 306 | } |
| 307 | |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 308 | pathMappings := []pathMapping{} |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 309 | |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 310 | noCompression := args.CompressionLevel == 0 |
| 311 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 312 | for _, fa := range args.FileArgs { |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 313 | var srcs []string |
| 314 | for _, s := range fa.SourceFiles { |
| 315 | s = strings.TrimSpace(s) |
| 316 | if s == "" { |
| 317 | continue |
| 318 | } |
| 319 | |
Colin Cross | 82ea3fb | 2021-04-05 17:48:26 -0700 | [diff] [blame] | 320 | result, err := z.fs.Glob(s, nil, followSymlinks) |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 321 | if err != nil { |
| 322 | return err |
| 323 | } |
Colin Cross | 82ea3fb | 2021-04-05 17:48:26 -0700 | [diff] [blame] | 324 | if len(result.Matches) == 0 { |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 325 | err := &os.PathError{ |
| 326 | Op: "lstat", |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 327 | Path: s, |
| 328 | Err: os.ErrNotExist, |
| 329 | } |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 330 | if args.IgnoreMissingFiles { |
Dan Willemsen | edc934c | 2018-12-27 12:41:25 -0800 | [diff] [blame] | 331 | fmt.Fprintln(z.stderr, "warning:", err) |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 332 | } else { |
| 333 | return err |
| 334 | } |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 335 | } |
Colin Cross | 82ea3fb | 2021-04-05 17:48:26 -0700 | [diff] [blame] | 336 | srcs = append(srcs, result.Matches...) |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 337 | } |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 338 | if fa.GlobDir != "" { |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 339 | if exists, isDir, err := z.fs.Exists(fa.GlobDir); err != nil { |
| 340 | return err |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 341 | } else if !exists && !args.IgnoreMissingFiles { |
| 342 | err := &os.PathError{ |
| 343 | Op: "lstat", |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 344 | Path: fa.GlobDir, |
| 345 | Err: os.ErrNotExist, |
| 346 | } |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 347 | if args.IgnoreMissingFiles { |
Dan Willemsen | edc934c | 2018-12-27 12:41:25 -0800 | [diff] [blame] | 348 | fmt.Fprintln(z.stderr, "warning:", err) |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 349 | } else { |
| 350 | return err |
| 351 | } |
| 352 | } else if !isDir && !args.IgnoreMissingFiles { |
| 353 | err := &os.PathError{ |
| 354 | Op: "lstat", |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 355 | Path: fa.GlobDir, |
| 356 | Err: syscall.ENOTDIR, |
| 357 | } |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 358 | if args.IgnoreMissingFiles { |
Dan Willemsen | edc934c | 2018-12-27 12:41:25 -0800 | [diff] [blame] | 359 | fmt.Fprintln(z.stderr, "warning:", err) |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 360 | } else { |
| 361 | return err |
| 362 | } |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 363 | } |
Colin Cross | 82ea3fb | 2021-04-05 17:48:26 -0700 | [diff] [blame] | 364 | result, err := z.fs.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, followSymlinks) |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 365 | if err != nil { |
| 366 | return err |
| 367 | } |
Colin Cross | 82ea3fb | 2021-04-05 17:48:26 -0700 | [diff] [blame] | 368 | srcs = append(srcs, result.Matches...) |
Colin Cross | 7b10cf1 | 2017-08-30 14:12:21 -0700 | [diff] [blame] | 369 | } |
| 370 | for _, src := range srcs { |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 371 | err := fillPathPairs(fa, src, &pathMappings, args.NonDeflatedFiles, noCompression) |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 372 | if err != nil { |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 373 | return err |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 374 | } |
| 375 | } |
| 376 | } |
| 377 | |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 378 | return z.write(w, pathMappings, args.ManifestSourcePath, args.EmulateJar, args.SrcJar, args.NumParallelJobs) |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 379 | } |
| 380 | |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 381 | // Zip creates an output zip archive from given sources. |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 382 | func Zip(args ZipArgs) error { |
| 383 | if args.OutputFilePath == "" { |
| 384 | return fmt.Errorf("output file path must be nonempty") |
| 385 | } |
| 386 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 387 | buf := &bytes.Buffer{} |
| 388 | var out io.Writer = buf |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 389 | |
Colin Cross | 665b678 | 2021-03-15 15:28:40 -0700 | [diff] [blame] | 390 | var zipErr error |
| 391 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 392 | if !args.WriteIfChanged { |
| 393 | f, err := os.Create(args.OutputFilePath) |
| 394 | if err != nil { |
| 395 | return err |
| 396 | } |
| 397 | |
| 398 | defer f.Close() |
| 399 | defer func() { |
Colin Cross | 665b678 | 2021-03-15 15:28:40 -0700 | [diff] [blame] | 400 | if zipErr != nil { |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 401 | os.Remove(args.OutputFilePath) |
| 402 | } |
| 403 | }() |
| 404 | |
| 405 | out = f |
| 406 | } |
| 407 | |
Colin Cross | 665b678 | 2021-03-15 15:28:40 -0700 | [diff] [blame] | 408 | zipErr = zipTo(args, out) |
| 409 | if zipErr != nil { |
| 410 | return zipErr |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 411 | } |
| 412 | |
| 413 | if args.WriteIfChanged { |
| 414 | err := pathtools.WriteFileIfChanged(args.OutputFilePath, buf.Bytes(), 0666) |
| 415 | if err != nil { |
| 416 | return err |
| 417 | } |
| 418 | } |
| 419 | |
| 420 | return nil |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 421 | } |
| 422 | |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 423 | func fillPathPairs(fa FileArg, src string, pathMappings *[]pathMapping, |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 424 | nonDeflatedFiles map[string]bool, noCompression bool) error { |
| 425 | |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 426 | var dest string |
| 427 | |
| 428 | if fa.JunkPaths { |
| 429 | dest = filepath.Base(src) |
| 430 | } else { |
| 431 | var err error |
| 432 | dest, err = filepath.Rel(fa.SourcePrefixToStrip, src) |
| 433 | if err != nil { |
| 434 | return err |
| 435 | } |
Colin Cross | 1d98ee2 | 2018-09-18 17:05:15 -0700 | [diff] [blame] | 436 | if strings.HasPrefix(dest, "../") { |
| 437 | return IncorrectRelativeRootError{ |
| 438 | Path: src, |
| 439 | RelativeRoot: fa.SourcePrefixToStrip, |
| 440 | } |
| 441 | } |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 442 | } |
Colin Cross | b7c6911 | 2018-09-18 16:51:43 -0700 | [diff] [blame] | 443 | dest = filepath.Join(fa.PathPrefixInZip, dest) |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 444 | |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 445 | zipMethod := zip.Deflate |
Colin Cross | d321629 | 2018-09-14 15:06:31 -0700 | [diff] [blame] | 446 | if _, found := nonDeflatedFiles[dest]; found || noCompression { |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 447 | zipMethod = zip.Store |
| 448 | } |
| 449 | *pathMappings = append(*pathMappings, |
| 450 | pathMapping{dest: dest, src: src, zipMethod: zipMethod}) |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 451 | |
| 452 | return nil |
| 453 | } |
| 454 | |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 455 | func jarSort(mappings []pathMapping) { |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 456 | sort.SliceStable(mappings, func(i int, j int) bool { |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 457 | return jar.EntryNamesLess(mappings[i].dest, mappings[j].dest) |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 458 | }) |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 459 | } |
| 460 | |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 461 | func (z *ZipWriter) write(f io.Writer, pathMappings []pathMapping, manifest string, emulateJar, srcJar bool, |
| 462 | parallelJobs int) error { |
| 463 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 464 | z.errors = make(chan error) |
| 465 | defer close(z.errors) |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 466 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 467 | // This channel size can be essentially unlimited -- it's used as a fifo |
| 468 | // queue decouple the CPU and IO loads. Directories don't require any |
| 469 | // compression time, but still cost some IO. Similar with small files that |
| 470 | // can be very fast to compress. Some files that are more difficult to |
| 471 | // compress won't take a corresponding longer time writing out. |
| 472 | // |
| 473 | // The optimum size here depends on your CPU and IO characteristics, and |
| 474 | // the the layout of your zip file. 1000 was chosen mostly at random as |
| 475 | // something that worked reasonably well for a test file. |
| 476 | // |
| 477 | // The RateLimit object will put the upper bounds on the number of |
| 478 | // parallel compressions and outstanding buffers. |
| 479 | z.writeOps = make(chan chan *zipEntry, 1000) |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 480 | z.cpuRateLimiter = NewCPURateLimiter(int64(parallelJobs)) |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 481 | z.memoryRateLimiter = NewMemoryRateLimiter(0) |
| 482 | defer func() { |
| 483 | z.cpuRateLimiter.Stop() |
| 484 | z.memoryRateLimiter.Stop() |
| 485 | }() |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 486 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 487 | if manifest != "" && !emulateJar { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 488 | return errors.New("must specify --jar when specifying a manifest via -m") |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 489 | } |
| 490 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 491 | if emulateJar { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 492 | // manifest may be empty, in which case addManifest will fill in a default |
| 493 | pathMappings = append(pathMappings, pathMapping{jar.ManifestFile, manifest, zip.Deflate}) |
| 494 | |
Jeff Gaston | a297695 | 2017-08-22 17:51:25 -0700 | [diff] [blame] | 495 | jarSort(pathMappings) |
| 496 | } |
| 497 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 498 | go func() { |
| 499 | var err error |
| 500 | defer close(z.writeOps) |
| 501 | |
Nan Zhang | 9067b04 | 2017-03-17 14:04:43 -0700 | [diff] [blame] | 502 | for _, ele := range pathMappings { |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 503 | if emulateJar && ele.dest == jar.ManifestFile { |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 504 | err = z.addManifest(ele.dest, ele.src, ele.zipMethod) |
| 505 | } else { |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 506 | err = z.addFile(ele.dest, ele.src, ele.zipMethod, emulateJar, srcJar) |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 507 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 508 | if err != nil { |
| 509 | z.errors <- err |
| 510 | return |
| 511 | } |
| 512 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 513 | }() |
| 514 | |
| 515 | zipw := zip.NewWriter(f) |
| 516 | |
| 517 | var currentWriteOpChan chan *zipEntry |
| 518 | var currentWriter io.WriteCloser |
| 519 | var currentReaders chan chan io.Reader |
| 520 | var currentReader chan io.Reader |
| 521 | var done bool |
| 522 | |
| 523 | for !done { |
| 524 | var writeOpsChan chan chan *zipEntry |
| 525 | var writeOpChan chan *zipEntry |
| 526 | var readersChan chan chan io.Reader |
| 527 | |
| 528 | if currentReader != nil { |
| 529 | // Only read and process errors |
| 530 | } else if currentReaders != nil { |
| 531 | readersChan = currentReaders |
| 532 | } else if currentWriteOpChan != nil { |
| 533 | writeOpChan = currentWriteOpChan |
| 534 | } else { |
| 535 | writeOpsChan = z.writeOps |
| 536 | } |
| 537 | |
| 538 | select { |
| 539 | case writeOp, ok := <-writeOpsChan: |
| 540 | if !ok { |
| 541 | done = true |
| 542 | } |
| 543 | |
| 544 | currentWriteOpChan = writeOp |
| 545 | |
| 546 | case op := <-writeOpChan: |
| 547 | currentWriteOpChan = nil |
| 548 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 549 | var err error |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 550 | if op.fh.Method == zip.Deflate { |
| 551 | currentWriter, err = zipw.CreateCompressedHeader(op.fh) |
| 552 | } else { |
| 553 | var zw io.Writer |
Jeff Gaston | c5eb66d | 2017-08-24 14:11:27 -0700 | [diff] [blame] | 554 | |
| 555 | op.fh.CompressedSize64 = op.fh.UncompressedSize64 |
| 556 | |
| 557 | zw, err = zipw.CreateHeaderAndroid(op.fh) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 558 | currentWriter = nopCloser{zw} |
| 559 | } |
| 560 | if err != nil { |
| 561 | return err |
| 562 | } |
| 563 | |
| 564 | currentReaders = op.futureReaders |
| 565 | if op.futureReaders == nil { |
| 566 | currentWriter.Close() |
| 567 | currentWriter = nil |
| 568 | } |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 569 | z.memoryRateLimiter.Finish(op.allocatedSize) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 570 | |
| 571 | case futureReader, ok := <-readersChan: |
| 572 | if !ok { |
| 573 | // Done with reading |
| 574 | currentWriter.Close() |
| 575 | currentWriter = nil |
| 576 | currentReaders = nil |
| 577 | } |
| 578 | |
| 579 | currentReader = futureReader |
| 580 | |
| 581 | case reader := <-currentReader: |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 582 | _, err := io.Copy(currentWriter, reader) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 583 | if err != nil { |
| 584 | return err |
| 585 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 586 | |
| 587 | currentReader = nil |
| 588 | |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 589 | case err := <-z.errors: |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 590 | return err |
| 591 | } |
| 592 | } |
| 593 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 594 | // One last chance to catch an error |
| 595 | select { |
Colin Cross | f83c150 | 2017-11-10 13:11:02 -0800 | [diff] [blame] | 596 | case err := <-z.errors: |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 597 | return err |
| 598 | default: |
| 599 | zipw.Close() |
| 600 | return nil |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 601 | } |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 602 | } |
| 603 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 604 | // imports (possibly with compression) <src> into the zip at sub-path <dest> |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 605 | func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar, srcJar bool) error { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 606 | var fileSize int64 |
Dan Willemsen | 10462b3 | 2017-03-15 19:02:51 -0700 | [diff] [blame] | 607 | var executable bool |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 608 | |
Colin Cross | 09f1105 | 2018-09-21 15:12:39 -0700 | [diff] [blame] | 609 | var s os.FileInfo |
| 610 | var err error |
| 611 | if z.followSymlinks { |
| 612 | s, err = z.fs.Stat(src) |
| 613 | } else { |
| 614 | s, err = z.fs.Lstat(src) |
| 615 | } |
| 616 | |
| 617 | if err != nil { |
Colin Cross | 4be8f9e | 2018-09-28 15:16:48 -0700 | [diff] [blame] | 618 | if os.IsNotExist(err) && z.ignoreMissingFiles { |
| 619 | fmt.Fprintln(z.stderr, "warning:", err) |
| 620 | return nil |
| 621 | } |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 622 | return err |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 623 | } |
| 624 | |
| 625 | createParentDirs := func(dest, src string) error { |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 626 | if err := z.writeDirectory(filepath.Dir(dest), src, emulateJar); err != nil { |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 627 | return err |
| 628 | } |
| 629 | |
| 630 | if prev, exists := z.createdDirs[dest]; exists { |
| 631 | return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src) |
| 632 | } |
Colin Cross | 7ddd08a | 2022-08-15 15:47:41 -0700 | [diff] [blame] | 633 | |
| 634 | return nil |
| 635 | } |
| 636 | |
| 637 | checkDuplicateFiles := func(dest, src string) (bool, error) { |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 638 | if prev, exists := z.createdFiles[dest]; exists { |
Colin Cross | 7ddd08a | 2022-08-15 15:47:41 -0700 | [diff] [blame] | 639 | if prev != src { |
| 640 | return true, ConflictingFileError{ |
| 641 | Dest: dest, |
| 642 | Prev: prev, |
| 643 | Src: src, |
| 644 | } |
| 645 | } |
| 646 | return true, nil |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 647 | } |
| 648 | |
| 649 | z.createdFiles[dest] = src |
Colin Cross | 7ddd08a | 2022-08-15 15:47:41 -0700 | [diff] [blame] | 650 | return false, nil |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 651 | } |
| 652 | |
| 653 | if s.IsDir() { |
| 654 | if z.directories { |
| 655 | return z.writeDirectory(dest, src, emulateJar) |
| 656 | } |
| 657 | return nil |
| 658 | } else if s.Mode()&os.ModeSymlink != 0 { |
| 659 | err = createParentDirs(dest, src) |
| 660 | if err != nil { |
| 661 | return err |
| 662 | } |
| 663 | |
Colin Cross | 7ddd08a | 2022-08-15 15:47:41 -0700 | [diff] [blame] | 664 | duplicate, err := checkDuplicateFiles(dest, src) |
| 665 | if err != nil { |
| 666 | return err |
| 667 | } |
| 668 | if duplicate { |
| 669 | return nil |
| 670 | } |
| 671 | |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 672 | return z.writeSymlink(dest, src) |
| 673 | } else if s.Mode().IsRegular() { |
| 674 | r, err := z.fs.Open(src) |
| 675 | if err != nil { |
| 676 | return err |
| 677 | } |
| 678 | |
| 679 | if srcJar && filepath.Ext(src) == ".java" { |
| 680 | // rewrite the destination using the package path if it can be determined |
| 681 | pkg, err := jar.JavaPackage(r, src) |
| 682 | if err != nil { |
| 683 | // ignore errors for now, leaving the file at in its original location in the zip |
| 684 | } else { |
| 685 | dest = filepath.Join(filepath.Join(strings.Split(pkg, ".")...), filepath.Base(src)) |
| 686 | } |
| 687 | |
| 688 | _, err = r.Seek(0, io.SeekStart) |
| 689 | if err != nil { |
| 690 | return err |
| 691 | } |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 692 | } |
| 693 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 694 | fileSize = s.Size() |
Dan Willemsen | 10462b3 | 2017-03-15 19:02:51 -0700 | [diff] [blame] | 695 | executable = s.Mode()&0100 != 0 |
Colin Cross | 957cc4e | 2015-04-24 15:10:32 -0700 | [diff] [blame] | 696 | |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 697 | header := &zip.FileHeader{ |
| 698 | Name: dest, |
| 699 | Method: method, |
| 700 | UncompressedSize64: uint64(fileSize), |
| 701 | } |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 702 | |
Chris Gross | fa5b4e9 | 2021-06-02 12:56:08 -0700 | [diff] [blame] | 703 | mode := os.FileMode(0644) |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 704 | if executable { |
Chris Gross | fa5b4e9 | 2021-06-02 12:56:08 -0700 | [diff] [blame] | 705 | mode = 0755 |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 706 | } |
Colin Cross | e070c3a | 2021-05-11 16:03:57 -0700 | [diff] [blame] | 707 | header.SetMode(mode) |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 708 | |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 709 | err = createParentDirs(dest, src) |
| 710 | if err != nil { |
| 711 | return err |
| 712 | } |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 713 | |
Colin Cross | 7ddd08a | 2022-08-15 15:47:41 -0700 | [diff] [blame] | 714 | duplicate, err := checkDuplicateFiles(dest, src) |
| 715 | if err != nil { |
| 716 | return err |
| 717 | } |
| 718 | if duplicate { |
| 719 | return nil |
| 720 | } |
| 721 | |
Colin Cross | 9cb51db | 2019-06-17 14:12:41 -0700 | [diff] [blame] | 722 | return z.writeFileContents(header, r) |
| 723 | } else { |
| 724 | return fmt.Errorf("%s is not a file, directory, or symlink", src) |
| 725 | } |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 726 | } |
| 727 | |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 728 | func (z *ZipWriter) addManifest(dest string, src string, _ uint16) error { |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 729 | if prev, exists := z.createdDirs[dest]; exists { |
| 730 | return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src) |
| 731 | } |
| 732 | if prev, exists := z.createdFiles[dest]; exists { |
Colin Cross | 7ddd08a | 2022-08-15 15:47:41 -0700 | [diff] [blame] | 733 | if prev != src { |
| 734 | return ConflictingFileError{ |
| 735 | Dest: dest, |
| 736 | Prev: prev, |
| 737 | Src: src, |
| 738 | } |
| 739 | } |
| 740 | return nil |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 741 | } |
| 742 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 743 | if err := z.writeDirectory(filepath.Dir(dest), src, true); err != nil { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 744 | return err |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 745 | } |
| 746 | |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 747 | var contents []byte |
| 748 | if src != "" { |
| 749 | f, err := z.fs.Open(src) |
| 750 | if err != nil { |
| 751 | return err |
| 752 | } |
| 753 | |
| 754 | contents, err = ioutil.ReadAll(f) |
| 755 | f.Close() |
| 756 | if err != nil { |
| 757 | return err |
| 758 | } |
| 759 | } |
| 760 | |
| 761 | fh, buf, err := jar.ManifestFileContents(contents) |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 762 | if err != nil { |
| 763 | return err |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 764 | } |
| 765 | |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 766 | reader := &byteReaderCloser{bytes.NewReader(buf), ioutil.NopCloser(nil)} |
| 767 | |
| 768 | return z.writeFileContents(fh, reader) |
Jeff Gaston | cef50b9 | 2017-08-23 15:41:35 -0700 | [diff] [blame] | 769 | } |
| 770 | |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 771 | func (z *ZipWriter) writeFileContents(header *zip.FileHeader, r pathtools.ReaderAtSeekerCloser) (err error) { |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 772 | |
| 773 | header.SetModTime(z.time) |
| 774 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 775 | compressChan := make(chan *zipEntry, 1) |
| 776 | z.writeOps <- compressChan |
| 777 | |
| 778 | // Pre-fill a zipEntry, it will be sent in the compressChan once |
| 779 | // we're sure about the Method and CRC. |
| 780 | ze := &zipEntry{ |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 781 | fh: header, |
Dan Willemsen | 10462b3 | 2017-03-15 19:02:51 -0700 | [diff] [blame] | 782 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 783 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 784 | ze.allocatedSize = int64(header.UncompressedSize64) |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 785 | z.cpuRateLimiter.Request() |
| 786 | z.memoryRateLimiter.Request(ze.allocatedSize) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 787 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 788 | fileSize := int64(header.UncompressedSize64) |
| 789 | if fileSize == 0 { |
| 790 | fileSize = int64(header.UncompressedSize) |
| 791 | } |
| 792 | |
| 793 | if header.Method == zip.Deflate && fileSize >= minParallelFileSize { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 794 | wg := new(sync.WaitGroup) |
| 795 | |
| 796 | // Allocate enough buffer to hold all readers. We'll limit |
| 797 | // this based on actual buffer sizes in RateLimit. |
| 798 | ze.futureReaders = make(chan chan io.Reader, (fileSize/parallelBlockSize)+1) |
| 799 | |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 800 | // Calculate the CRC and SHA256 in the background, since reading |
| 801 | // the entire file could take a while. |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 802 | // |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 803 | // 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] | 804 | // than the compression. Due to the Go Zip API, we also need to |
| 805 | // know the result before we can begin writing the compressed |
| 806 | // data out to the zipfile. |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 807 | // |
| 808 | // We calculate SHA256 only if `-sha256` is set. |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 809 | wg.Add(1) |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 810 | go z.checksumFileAsync(r, ze, compressChan, wg) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 811 | |
| 812 | for start := int64(0); start < fileSize; start += parallelBlockSize { |
| 813 | sr := io.NewSectionReader(r, start, parallelBlockSize) |
| 814 | resultChan := make(chan io.Reader, 1) |
| 815 | ze.futureReaders <- resultChan |
| 816 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 817 | z.cpuRateLimiter.Request() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 818 | |
| 819 | last := !(start+parallelBlockSize < fileSize) |
| 820 | var dict []byte |
| 821 | if start >= windowSize { |
| 822 | dict, err = ioutil.ReadAll(io.NewSectionReader(r, start-windowSize, windowSize)) |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 823 | if err != nil { |
| 824 | return err |
| 825 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 826 | } |
| 827 | |
| 828 | wg.Add(1) |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 829 | go z.compressPartialFile(sr, dict, last, resultChan, wg) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 830 | } |
| 831 | |
| 832 | close(ze.futureReaders) |
| 833 | |
| 834 | // Close the file handle after all readers are done |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 835 | go func(wg *sync.WaitGroup, closer io.Closer) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 836 | wg.Wait() |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 837 | closer.Close() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 838 | }(wg, r) |
| 839 | } else { |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 840 | go func() { |
| 841 | z.compressWholeFile(ze, r, compressChan) |
| 842 | r.Close() |
| 843 | }() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 844 | } |
| 845 | |
| 846 | return nil |
| 847 | } |
| 848 | |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 849 | func (z *ZipWriter) checksumFileAsync(r io.ReadSeeker, ze *zipEntry, resultChan chan *zipEntry, wg *sync.WaitGroup) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 850 | defer wg.Done() |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 851 | defer z.cpuRateLimiter.Finish() |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 852 | |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 853 | z.checksumFile(r, ze) |
| 854 | |
| 855 | resultChan <- ze |
| 856 | close(resultChan) |
| 857 | } |
| 858 | |
| 859 | func (z *ZipWriter) checksumFile(r io.ReadSeeker, ze *zipEntry) { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 860 | crc := crc32.NewIEEE() |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 861 | writers := []io.Writer{crc} |
| 862 | |
| 863 | var shaHasher hash.Hash |
| 864 | if z.sha256Checksum && !ze.fh.Mode().IsDir() { |
| 865 | shaHasher = sha256.New() |
| 866 | writers = append(writers, shaHasher) |
| 867 | } |
| 868 | |
| 869 | w := io.MultiWriter(writers...) |
| 870 | |
| 871 | _, err := io.Copy(w, r) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 872 | if err != nil { |
| 873 | z.errors <- err |
| 874 | return |
| 875 | } |
| 876 | |
| 877 | ze.fh.CRC32 = crc.Sum32() |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 878 | if shaHasher != nil { |
| 879 | z.appendSHAToExtra(ze, shaHasher.Sum(nil)) |
| 880 | } |
| 881 | } |
| 882 | |
| 883 | func (z *ZipWriter) appendSHAToExtra(ze *zipEntry, checksum []byte) { |
| 884 | // The block of SHA256 checksum consist of: |
| 885 | // - Header ID, equals to Sha256HeaderID (2 bytes) |
| 886 | // - Data size (2 bytes) |
| 887 | // - Data block: |
| 888 | // - Signature, equals to Sha256HeaderSignature (2 bytes) |
| 889 | // - Data, SHA checksum value |
| 890 | var buf []byte |
| 891 | buf = binary.LittleEndian.AppendUint16(buf, Sha256HeaderID) |
| 892 | buf = binary.LittleEndian.AppendUint16(buf, uint16(len(checksum)+2)) |
| 893 | buf = binary.LittleEndian.AppendUint16(buf, Sha256HeaderSignature) |
| 894 | buf = append(buf, checksum...) |
| 895 | ze.fh.Extra = append(ze.fh.Extra, buf...) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 896 | } |
| 897 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 898 | 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] | 899 | defer wg.Done() |
| 900 | |
| 901 | result, err := z.compressBlock(r, dict, last) |
| 902 | if err != nil { |
| 903 | z.errors <- err |
| 904 | return |
| 905 | } |
| 906 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 907 | z.cpuRateLimiter.Finish() |
| 908 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 909 | resultChan <- result |
| 910 | } |
| 911 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 912 | 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] | 913 | buf := new(bytes.Buffer) |
| 914 | var fw *flate.Writer |
| 915 | var err error |
| 916 | if len(dict) > 0 { |
| 917 | // There's no way to Reset a Writer with a new dictionary, so |
| 918 | // don't use the Pool |
| 919 | fw, err = flate.NewWriterDict(buf, z.compLevel, dict) |
| 920 | } else { |
| 921 | var ok bool |
| 922 | if fw, ok = z.compressorPool.Get().(*flate.Writer); ok { |
| 923 | fw.Reset(buf) |
| 924 | } else { |
| 925 | fw, err = flate.NewWriter(buf, z.compLevel) |
| 926 | } |
| 927 | defer z.compressorPool.Put(fw) |
| 928 | } |
| 929 | if err != nil { |
| 930 | return nil, err |
| 931 | } |
| 932 | |
| 933 | _, err = io.Copy(fw, r) |
| 934 | if err != nil { |
| 935 | return nil, err |
| 936 | } |
| 937 | if last { |
| 938 | fw.Close() |
| 939 | } else { |
| 940 | fw.Flush() |
| 941 | } |
| 942 | |
| 943 | return buf, nil |
| 944 | } |
| 945 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 946 | func (z *ZipWriter) compressWholeFile(ze *zipEntry, r io.ReadSeeker, compressChan chan *zipEntry) { |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 947 | z.checksumFile(r, ze) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 948 | |
Zhenhuang Wang | b8451b8 | 2023-01-06 20:58:01 +0800 | [diff] [blame^] | 949 | _, err := r.Seek(0, 0) |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 950 | if err != nil { |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 951 | z.errors <- err |
| 952 | return |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 953 | } |
| 954 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 955 | readFile := func(reader io.ReadSeeker) ([]byte, error) { |
| 956 | _, err := reader.Seek(0, 0) |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 957 | if err != nil { |
| 958 | return nil, err |
| 959 | } |
| 960 | |
Jeff Gaston | 66dd6e5 | 2017-08-23 15:12:48 -0700 | [diff] [blame] | 961 | buf, err := ioutil.ReadAll(reader) |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 962 | if err != nil { |
| 963 | return nil, err |
| 964 | } |
| 965 | |
| 966 | return buf, nil |
| 967 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 968 | |
Dan Willemsen | a8b5502 | 2017-03-15 21:49:26 -0700 | [diff] [blame] | 969 | ze.futureReaders = make(chan chan io.Reader, 1) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 970 | futureReader := make(chan io.Reader, 1) |
| 971 | ze.futureReaders <- futureReader |
| 972 | close(ze.futureReaders) |
| 973 | |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 974 | if ze.fh.Method == zip.Deflate { |
| 975 | compressed, err := z.compressBlock(r, nil, true) |
| 976 | if err != nil { |
| 977 | z.errors <- err |
| 978 | return |
| 979 | } |
| 980 | if uint64(compressed.Len()) < ze.fh.UncompressedSize64 { |
| 981 | futureReader <- compressed |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 982 | } else { |
| 983 | buf, err := readFile(r) |
| 984 | if err != nil { |
| 985 | z.errors <- err |
| 986 | return |
| 987 | } |
| 988 | ze.fh.Method = zip.Store |
| 989 | futureReader <- bytes.NewReader(buf) |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 990 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 991 | } else { |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 992 | buf, err := readFile(r) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 993 | if err != nil { |
| 994 | z.errors <- err |
| 995 | return |
| 996 | } |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 997 | ze.fh.Method = zip.Store |
| 998 | futureReader <- bytes.NewReader(buf) |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 999 | } |
Nan Zhang | f281bd8 | 2017-04-25 16:47:45 -0700 | [diff] [blame] | 1000 | |
Jeff Gaston | 175f34c | 2017-08-17 21:43:21 -0700 | [diff] [blame] | 1001 | z.cpuRateLimiter.Finish() |
| 1002 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 1003 | close(futureReader) |
| 1004 | |
| 1005 | compressChan <- ze |
| 1006 | close(compressChan) |
Colin Cross | 2fe6687 | 2015-03-30 17:20:39 -0700 | [diff] [blame] | 1007 | } |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 1008 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1009 | // writeDirectory annotates that dir is a directory created for the src file or directory, and adds |
| 1010 | // the directory entry to the zip file if directories are enabled. |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 1011 | func (z *ZipWriter) writeDirectory(dir string, src string, emulateJar bool) error { |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 1012 | // clean the input |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1013 | dir = filepath.Clean(dir) |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 1014 | |
| 1015 | // discover any uncreated directories in the path |
Sasha Smundak | 8eedba6 | 2020-11-16 19:00:27 -0800 | [diff] [blame] | 1016 | var zipDirs []string |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1017 | for dir != "" && dir != "." { |
| 1018 | if _, exists := z.createdDirs[dir]; exists { |
| 1019 | break |
| 1020 | } |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 1021 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1022 | if prev, exists := z.createdFiles[dir]; exists { |
| 1023 | return fmt.Errorf("destination %q is both a directory %q and a file %q", dir, src, prev) |
| 1024 | } |
| 1025 | |
| 1026 | z.createdDirs[dir] = src |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 1027 | // parent directories precede their children |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1028 | zipDirs = append([]string{dir}, zipDirs...) |
Jeff Gaston | 2d17413 | 2017-08-15 18:05:56 -0700 | [diff] [blame] | 1029 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1030 | dir = filepath.Dir(dir) |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 1031 | } |
| 1032 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1033 | if z.directories { |
| 1034 | // make a directory entry for each uncreated directory |
| 1035 | for _, cleanDir := range zipDirs { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 1036 | var dirHeader *zip.FileHeader |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 1037 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 1038 | if emulateJar && cleanDir+"/" == jar.MetaDir { |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 1039 | dirHeader = jar.MetaDirFileHeader() |
| 1040 | } else { |
| 1041 | dirHeader = &zip.FileHeader{ |
| 1042 | Name: cleanDir + "/", |
| 1043 | } |
Chris Gross | fa5b4e9 | 2021-06-02 12:56:08 -0700 | [diff] [blame] | 1044 | dirHeader.SetMode(0755 | os.ModeDir) |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1045 | } |
Jeff Gaston | 8edbb3a | 2017-08-22 20:05:28 -0700 | [diff] [blame] | 1046 | |
Colin Cross | 635acc9 | 2017-09-12 22:50:46 -0700 | [diff] [blame] | 1047 | dirHeader.SetModTime(z.time) |
| 1048 | |
Colin Cross | e558097 | 2017-08-30 17:40:21 -0700 | [diff] [blame] | 1049 | ze := make(chan *zipEntry, 1) |
| 1050 | ze <- &zipEntry{ |
| 1051 | fh: dirHeader, |
| 1052 | } |
| 1053 | close(ze) |
| 1054 | z.writeOps <- ze |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 1055 | } |
Colin Cross | e19c793 | 2015-04-24 15:08:38 -0700 | [diff] [blame] | 1056 | } |
| 1057 | |
| 1058 | return nil |
| 1059 | } |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 1060 | |
Jeff Gaston | c3bdc97 | 2017-10-12 12:18:19 -0700 | [diff] [blame] | 1061 | func (z *ZipWriter) writeSymlink(rel, file string) error { |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 1062 | fileHeader := &zip.FileHeader{ |
| 1063 | Name: rel, |
| 1064 | } |
| 1065 | fileHeader.SetModTime(z.time) |
Colin Cross | 297d9bc | 2018-06-22 16:37:47 -0700 | [diff] [blame] | 1066 | fileHeader.SetMode(0777 | os.ModeSymlink) |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 1067 | |
Colin Cross | 05518bc | 2018-09-27 15:06:19 -0700 | [diff] [blame] | 1068 | dest, err := z.fs.Readlink(file) |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 1069 | if err != nil { |
| 1070 | return err |
| 1071 | } |
| 1072 | |
Colin Cross | 297d9bc | 2018-06-22 16:37:47 -0700 | [diff] [blame] | 1073 | fileHeader.UncompressedSize64 = uint64(len(dest)) |
| 1074 | fileHeader.CRC32 = crc32.ChecksumIEEE([]byte(dest)) |
| 1075 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 1076 | ze := make(chan *zipEntry, 1) |
| 1077 | futureReaders := make(chan chan io.Reader, 1) |
| 1078 | futureReader := make(chan io.Reader, 1) |
| 1079 | futureReaders <- futureReader |
| 1080 | close(futureReaders) |
| 1081 | futureReader <- bytes.NewBufferString(dest) |
| 1082 | close(futureReader) |
| 1083 | |
Dan Willemsen | 017d893 | 2016-08-04 15:43:03 -0700 | [diff] [blame] | 1084 | ze <- &zipEntry{ |
| 1085 | fh: fileHeader, |
| 1086 | futureReaders: futureReaders, |
| 1087 | } |
| 1088 | close(ze) |
| 1089 | z.writeOps <- ze |
| 1090 | |
| 1091 | return nil |
Dan Willemsen | a59a3bc | 2016-08-03 17:47:23 -0700 | [diff] [blame] | 1092 | } |