|
|
@ -82,16 +82,9 @@ bool compressSubDir(QuaZip *zip, |
|
|
if (dir != origDir) { |
|
|
if (dir != origDir) { |
|
|
QuaZipFile dirZipFile(zip); |
|
|
QuaZipFile dirZipFile(zip); |
|
|
std::unique_ptr<QuaZipNewInfo> qzni; |
|
|
std::unique_ptr<QuaZipNewInfo> qzni; |
|
|
if (options.getDateTime().isNull()) { |
|
|
|
|
|
qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir) |
|
|
qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir) |
|
|
+ QLatin1String("/"), |
|
|
+ QLatin1String("/"), |
|
|
dir); |
|
|
dir); |
|
|
} else { |
|
|
|
|
|
qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir) |
|
|
|
|
|
+ QLatin1String("/"), |
|
|
|
|
|
dir, |
|
|
|
|
|
options.getDateTime()); |
|
|
|
|
|
} |
|
|
|
|
|
if (!dirZipFile.open(QIODevice::WriteOnly, *qzni, nullptr, 0, 0)) { |
|
|
if (!dirZipFile.open(QIODevice::WriteOnly, *qzni, nullptr, 0, 0)) { |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
@ -156,7 +149,7 @@ bool compressFile(QuaZip *zip, |
|
|
return false; |
|
|
return false; |
|
|
} else { |
|
|
} else { |
|
|
if (!outFile.open(QIODevice::WriteOnly, |
|
|
if (!outFile.open(QIODevice::WriteOnly, |
|
|
QuaZipNewInfo(fileDest, fileName, options.getDateTime()), |
|
|
|
|
|
|
|
|
QuaZipNewInfo(fileDest, fileName), |
|
|
nullptr, |
|
|
nullptr, |
|
|
0, |
|
|
0, |
|
|
options.getCompressionMethod(), |
|
|
options.getCompressionMethod(), |
|
|
|