Mercurial > hg > orthanc
annotate Core/Compression/ZipWriter.cpp @ 1422:52b2070fc8f1
improvements to the logs
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 24 Jun 2015 16:17:43 +0200 |
| parents | 6e7e5ed91c2d |
| children | bd1889029cbb |
| rev | line source |
|---|---|
| 136 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1278
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1278
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 136 | 5 * |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 10 * | |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 22 * | |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
32 |
|
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
33 #include "../PrecompiledHeaders.h" |
|
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
34 |
|
658
e8e59e80868c
note about glog-0.3.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
644
diff
changeset
|
35 #ifndef NOMINMAX |
| 568 | 36 #define NOMINMAX |
| 37 #endif | |
| 136 | 38 |
| 81 | 39 #include "ZipWriter.h" |
| 40 | |
| 1278 | 41 #include <limits> |
| 42 #include <boost/filesystem.hpp> | |
| 81 | 43 #include <boost/date_time/posix_time/posix_time.hpp> |
| 44 | |
| 1278 | 45 #include "../../Resources/ThirdParty/minizip/zip.h" |
| 81 | 46 #include "../OrthancException.h" |
| 47 | |
| 48 | |
| 49 static void PrepareFileInfo(zip_fileinfo& zfi) | |
| 50 { | |
| 51 memset(&zfi, 0, sizeof(zfi)); | |
| 52 | |
| 53 using namespace boost::posix_time; | |
| 54 ptime now = second_clock::local_time(); | |
| 55 | |
| 56 boost::gregorian::date today = now.date(); | |
| 57 ptime midnight(today); | |
| 58 | |
| 59 time_duration sinceMidnight = now - midnight; | |
| 60 zfi.tmz_date.tm_sec = sinceMidnight.seconds(); // seconds after the minute - [0,59] | |
| 61 zfi.tmz_date.tm_min = sinceMidnight.minutes(); // minutes after the hour - [0,59] | |
| 62 zfi.tmz_date.tm_hour = sinceMidnight.hours(); // hours since midnight - [0,23] | |
| 63 | |
| 64 // http://www.boost.org/doc/libs/1_35_0/doc/html/boost/gregorian/greg_day.html | |
| 65 zfi.tmz_date.tm_mday = today.day(); // day of the month - [1,31] | |
| 66 | |
| 67 // http://www.boost.org/doc/libs/1_35_0/doc/html/boost/gregorian/greg_month.html | |
| 68 zfi.tmz_date.tm_mon = today.month() - 1; // months since January - [0,11] | |
| 69 | |
| 70 // http://www.boost.org/doc/libs/1_35_0/doc/html/boost/gregorian/greg_year.html | |
| 71 zfi.tmz_date.tm_year = today.year(); // years - [1980..2044] | |
| 72 } | |
| 73 | |
| 74 | |
| 75 | |
| 76 namespace Orthanc | |
| 77 { | |
| 78 struct ZipWriter::PImpl | |
| 79 { | |
| 80 zipFile file_; | |
|
1277
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
81 |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
82 PImpl() : file_(NULL) |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
83 { |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
84 } |
| 81 | 85 }; |
| 86 | |
|
1277
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
87 ZipWriter::ZipWriter() : |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
88 pimpl_(new PImpl), |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
89 isZip64_(false), |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
90 hasFileInZip_(false), |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
91 append_(false), |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
92 compressionLevel_(6) |
| 81 | 93 { |
| 94 } | |
| 95 | |
| 96 ZipWriter::~ZipWriter() | |
| 97 { | |
| 98 Close(); | |
| 99 } | |
| 100 | |
| 101 void ZipWriter::Close() | |
| 102 { | |
| 103 if (IsOpen()) | |
| 104 { | |
| 105 zipClose(pimpl_->file_, "Created by Orthanc"); | |
| 106 pimpl_->file_ = NULL; | |
| 107 hasFileInZip_ = false; | |
| 108 } | |
| 109 } | |
| 110 | |
| 111 bool ZipWriter::IsOpen() const | |
| 112 { | |
| 113 return pimpl_->file_ != NULL; | |
| 114 } | |
| 115 | |
| 116 void ZipWriter::Open() | |
| 117 { | |
| 118 if (IsOpen()) | |
| 119 { | |
| 120 return; | |
| 121 } | |
| 122 | |
| 123 if (path_.size() == 0) | |
| 124 { | |
| 125 throw OrthancException("Please call SetOutputPath() before creating the file"); | |
| 126 } | |
| 127 | |
| 128 hasFileInZip_ = false; | |
|
644
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
129 |
| 1278 | 130 int mode = APPEND_STATUS_CREATE; |
| 131 if (append_ && | |
| 132 boost::filesystem::exists(path_)) | |
| 133 { | |
| 134 mode = APPEND_STATUS_ADDINZIP; | |
| 135 } | |
|
1277
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
136 |
|
644
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
137 if (isZip64_) |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
138 { |
|
1277
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
139 pimpl_->file_ = zipOpen64(path_.c_str(), mode); |
|
644
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
140 } |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
141 else |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
142 { |
|
1277
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
143 pimpl_->file_ = zipOpen(path_.c_str(), mode); |
|
644
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
144 } |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
145 |
| 81 | 146 if (!pimpl_->file_) |
| 147 { | |
| 148 throw OrthancException(ErrorCode_CannotWriteFile); | |
| 149 } | |
| 150 } | |
| 151 | |
| 152 void ZipWriter::SetOutputPath(const char* path) | |
| 153 { | |
| 154 Close(); | |
| 155 path_ = path; | |
| 156 } | |
| 157 | |
|
644
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
158 void ZipWriter::SetZip64(bool isZip64) |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
159 { |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
160 Close(); |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
161 isZip64_ = isZip64; |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
162 } |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
163 |
| 81 | 164 void ZipWriter::SetCompressionLevel(uint8_t level) |
| 165 { | |
| 166 if (level >= 10) | |
| 167 { | |
| 168 throw OrthancException("ZIP compression level must be between 0 (no compression) and 9 (highest compression"); | |
| 169 } | |
| 170 | |
|
644
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
171 Close(); |
| 81 | 172 compressionLevel_ = level; |
| 173 } | |
| 174 | |
| 249 | 175 void ZipWriter::OpenFile(const char* path) |
| 81 | 176 { |
| 177 Open(); | |
| 178 | |
| 179 zip_fileinfo zfi; | |
| 180 PrepareFileInfo(zfi); | |
| 181 | |
|
644
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
182 int result; |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
183 |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
184 if (isZip64_) |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
185 { |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
186 result = zipOpenNewFileInZip64(pimpl_->file_, path, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
187 &zfi, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
188 NULL, 0, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
189 NULL, 0, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
190 "", // Comment |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
191 Z_DEFLATED, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
192 compressionLevel_, 1); |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
193 } |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
194 else |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
195 { |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
196 result = zipOpenNewFileInZip(pimpl_->file_, path, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
197 &zfi, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
198 NULL, 0, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
199 NULL, 0, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
200 "", // Comment |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
201 Z_DEFLATED, |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
202 compressionLevel_); |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
203 } |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
204 |
|
eb5a0b21d05e
do not use ZIP64 as the default format anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
568
diff
changeset
|
205 if (result != 0) |
| 81 | 206 { |
| 207 throw OrthancException(ErrorCode_CannotWriteFile); | |
| 208 } | |
| 209 | |
| 210 hasFileInZip_ = true; | |
| 211 } | |
| 212 | |
| 213 | |
| 214 void ZipWriter::Write(const std::string& data) | |
| 215 { | |
| 216 if (data.size()) | |
| 217 { | |
| 218 Write(&data[0], data.size()); | |
| 219 } | |
| 220 } | |
| 221 | |
| 222 | |
| 223 void ZipWriter::Write(const char* data, size_t length) | |
| 224 { | |
| 225 if (!hasFileInZip_) | |
| 226 { | |
| 249 | 227 throw OrthancException("Call first OpenFile()"); |
| 81 | 228 } |
| 229 | |
| 230 const size_t maxBytesInAStep = std::numeric_limits<int32_t>::max(); | |
| 231 | |
| 232 while (length > 0) | |
| 233 { | |
| 234 int bytes = static_cast<int32_t>(length <= maxBytesInAStep ? length : maxBytesInAStep); | |
| 235 | |
| 236 if (zipWriteInFileInZip(pimpl_->file_, data, bytes)) | |
| 237 { | |
| 238 throw OrthancException(ErrorCode_CannotWriteFile); | |
| 239 } | |
| 240 | |
| 241 data += bytes; | |
| 242 length -= bytes; | |
| 243 } | |
| 244 } | |
|
1277
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
245 |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
246 |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
247 void ZipWriter::SetAppendToExisting(bool append) |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
248 { |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
249 Close(); |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
250 append_ = append; |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
251 } |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
252 |
|
46bca019587e
primitives to add new content to existing ZIP files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
950
diff
changeset
|
253 |
| 81 | 254 } |