Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kutils: new getter and setter for the temporary KArchive prefix

Browse source 
to be used by ark

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-19 18:01:51 +02:00
parent 275b7be299
commit 3298200d40
2 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
kutils/karchive/karchive.cpp
View file

@ -190,6 +190,7 @@ public:
QString m_error;
QByteArray m_readpass;
QByteArray m_writepass;
QString m_tempprefix;
#if defined(HAVE_LIBARCHIVE)
struct archive* openRead(const QByteArray &path);
@ -200,6 +201,8 @@ public:
bool copyData(struct archive* readarchive, struct archive* writearchive);
bool copyData(struct archive* readarchive, QByteArray *buffer);
QString tempFilePath() const;
#endif
};
@ -403,6 +406,15 @@ bool KArchivePrivate::copyData(struct archive* readarchive, QByteArray *buffer)
return true;
}
QString KArchivePrivate::tempFilePath() const
{
QFileInfo fileinfo(m_path);
QString tmptemplate = m_tempprefix;
tmptemplate.append(QLatin1String("XXXXXXXXXX."));
tmptemplate.append(fileinfo.completeSuffix());
return KTemporaryFile::filePath(tmptemplate);
}
#endif // HAVE_LIBARCHIVE
KArchive::KArchive(const QString &path, QObject *parent)
@ -467,9 +479,7 @@ bool KArchive::add(const QStringList &paths, const QByteArray &strip, const QByt
return result;
}
QFileInfo fileinfo(d->m_path);
const QString tmptemplate = QString::fromLatin1("XXXXXXXXXX.%1").arg(fileinfo.completeSuffix());
const QString tmpfile = KTemporaryFile::filePath(tmptemplate);
const QString tmpfile = d->tempFilePath();
struct archive* writearchive = d->openWrite(QFile::encodeName(tmpfile));
if (!writearchive) {
@ -718,9 +728,7 @@ bool KArchive::remove(const QStringList &paths) const
return result;
}
QFileInfo fileinfo(d->m_path);
const QString tmptemplate = QString::fromLatin1("XXXXXXXXXX.%1").arg(fileinfo.completeSuffix());
const QString tmpfile = KTemporaryFile::filePath(tmptemplate);
const QString tmpfile = d->tempFilePath();
struct archive* writearchive = d->openWrite(QFile::encodeName(tmpfile));
if (!writearchive) {
@ -1137,14 +1145,12 @@ bool KArchive::requiresPassphrase() const
{
bool result = false;
#if defined(HAVE_LIBARCHIVE)
foreach (const KArchiveEntry &karchiveentry, KArchive::list()) {
if (karchiveentry.encrypted == true) {
result = true;
break;
}
}
#endif
return result;
}
@ -1159,6 +1165,16 @@ void KArchive::setWritePassphrase(const QString &passphrase)
d->m_writepass = passphrase.toUtf8();
}
QString KArchive::tempPrefix() const
{
return d->m_tempprefix;
}
void KArchive::setTempPrefix(const QString &prefix)
{
d->m_tempprefix = prefix;
}
QString KArchive::errorString() const
{
return d->m_error;

10
kutils/karchive/karchive.h
View file

@ -152,6 +152,16 @@ public:
//! @brief Sets the passphrase to be used when writing archive
void setWritePassphrase(const QString &passphrase);
/*!
@brief Returns if temporary file path prefix, may be empty
@note The default (which is empty) means the temporary file will be placed in /tmp
(usually), if large files are compressed and there is not enough space write error may
occurr
*/
QString tempPrefix() const;
//! @brief Sets the temporary file path prefix to @p prefix
void setTempPrefix(const QString &prefix);
//! @brief Returns human-readable description of the error that occured
QString errorString() const;