xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-06 13:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

7-zip-zstd support zip(zstd)

Browse Source
This commit is contained in:
Force.Charlie
2020-06-23 21:04:35 +08:00
parent 86141253dc
commit 2c34b19505
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CPP/7zip/Archive/Zip/ZipAddCommon.cpp
View File

@@ -18,6 +18,7 @@
#include "../../Compress/LzmaEncoder.h"
#include "../../Compress/PpmdZip.h"
#include "../../Compress/XzEncoder.h"
#include "../../Compress/ZstdEncoder.h"
#include "../Common/InStreamWithCRC.h"
@@ -179,6 +180,7 @@ HRESULT CAddCommon::Set_Pre_CompressionResult(bool inSeqMode, bool outSeqMode, U
case NCompressionMethod::kXz : ver = NCompressionMethod::kExtractVersion_Xz; break;
case NCompressionMethod::kPPMd : ver = NCompressionMethod::kExtractVersion_PPMd; break;
case NCompressionMethod::kBZip2: ver = NCompressionMethod::kExtractVersion_BZip2; break;
case NCompressionMethod::kZstd: ver = NCompressionMethod::kExtractVersion_Zstd; break;
case NCompressionMethod::kLZMA :
{
ver = NCompressionMethod::kExtractVersion_LZMA;
@@ -356,6 +358,12 @@ HRESULT CAddCommon::Compress(
_lzmaEncoder = new CLzmaEncoder();
_compressEncoder = _lzmaEncoder;
}
else if (method == NCompressionMethod::kZstd)
{
_compressExtractVersion = NCompressionMethod::kExtractVersion_Zstd;
NCompress::NZSTD::CEncoder *encoder = new NCompress::NZSTD::CEncoder();
_compressEncoder = encoder;
}
else if (method == NCompressionMethod::kXz)
{
_compressExtractVersion = NCompressionMethod::kExtractVersion_Xz;

29
CPP/7zip/Archive/Zip/ZipHandler.cpp
View File

@@ -23,6 +23,7 @@
#include "../../Compress/PpmdZip.h"
#include "../../Compress/ShrinkDecoder.h"
#include "../../Compress/XzDecoder.h"
#include "../../Compress/ZstdDecoder.h"
#include "../../Crypto/WzAes.h"
#include "../../Crypto/ZipCrypto.h"
@@ -746,6 +747,32 @@ STDMETHODIMP CHandler::Close()
return S_OK;
}
class CZstdDecoder:
public ICompressCoder,
public CMyUnknownImp
{
NCompress::NZSTD::CDecoder *DecoderSpec;
CMyComPtr<ICompressCoder> Decoder;
public:
CZstdDecoder();
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
MY_UNKNOWN_IMP
};
CZstdDecoder::CZstdDecoder()
{
DecoderSpec = new NCompress::NZSTD::CDecoder;
Decoder = DecoderSpec;
}
HRESULT CZstdDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 * /* inSize */, const UInt64 *outSize, ICompressProgressInfo *progress)
{
return Decoder->Code(inStream, outStream, NULL, outSize, progress);
}
class CLzmaDecoder:
public ICompressCoder,
@@ -1059,6 +1086,8 @@ HRESULT CZipDecoder::Decode(
lzmaDecoderSpec = new CLzmaDecoder;
mi.Coder = lzmaDecoderSpec;
}
else if (id ==NFileHeader::NCompressionMethod::kZstd)
mi.Coder = new CZstdDecoder();
else if (id == NFileHeader::NCompressionMethod::kXz)
mi.Coder = new NCompress::NXz::CComDecoder;
else if (id == NFileHeader::NCompressionMethod::kPPMd)

2
CPP/7zip/Archive/Zip/ZipHeader.h
View File

@@ -57,6 +57,7 @@ namespace NFileHeader
kTerse = 18,
kLz77 = 19,
kZstd = 93,
kXz = 95,
kJpeg = 96,
kWavPack = 97,
@@ -77,6 +78,7 @@ namespace NFileHeader
const Byte kExtractVersion_LZMA = 63;
const Byte kExtractVersion_PPMd = 63;
const Byte kExtractVersion_Xz = 20; // test it
const Byte kExtractVersion_Zstd = 20; // WinZip mark it
}
namespace NExtraID