Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 10:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

karchivemanager: add ZSTD support

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-04-01 16:57:23 +03:00
parent 0cc0f26993
commit d83656f7ad
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
karchivemanager/karchivemanager.cpp
View file

@ -47,6 +47,10 @@ static const QStringList s_readwrite = QStringList()
#endif
#if ARCHIVE_VERSION_NUMBER > 3001002
<< "application/x-lz4"
#endif
#if ARCHIVE_VERSION_NUMBER > 3003002
<< "application/zstd"
<< "application/x-zstd-compressed-tar"
#endif
<< "application/x-tar"
<< "application/x-compressed-tar"
@ -309,7 +313,7 @@ class KArchiveManagerPrivate {
static bool closeWrite(struct archive*);
static bool copyData(struct archive* aread, struct archive* awrite);
static bool copyData(struct archive* aread, QByteArray &awrite);
static bool copyData(struct archive* aread, QByteArray &buffer);
static QByteArray getMime(struct archive* aread);
static KArchiveInfo::KArchiveType getType(const mode_t mode);
@ -422,9 +426,9 @@ bool KArchiveManagerPrivate::copyData(struct archive* aread, struct archive* awr
}
bool KArchiveManagerPrivate::copyData(struct archive* aread, QByteArray &awrite) {
char buffer[KARCHIVEMANAGER_BUFFSIZE];
ssize_t readsize = archive_read_data(aread, buffer, sizeof(buffer));
bool KArchiveManagerPrivate::copyData(struct archive* aread, QByteArray &buffer) {
char readbuffer[KARCHIVEMANAGER_BUFFSIZE];
ssize_t readsize = archive_read_data(aread, readbuffer, sizeof(readbuffer));
while (readsize > 0) {
const int result = archive_errno(aread);
if (result != ARCHIVE_OK) {
@ -432,9 +436,9 @@ bool KArchiveManagerPrivate::copyData(struct archive* aread, QByteArray &awrite)
return false;
}
awrite.append(buffer, readsize);
buffer.append(readbuffer, readsize);
readsize = archive_read_data(aread, buffer, sizeof(buffer));
readsize = archive_read_data(aread, readbuffer, sizeof(readbuffer));
}
return true;