AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qnetworkrequest: extract method

Browse Source 
for If-Match and If-None-Match parsing

Change-Id: I523f5c639a01bafe6f25f13c0d25b3c62fa75282
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Anton Kudryavtsev 2023-08-23 19:09:23 +03:00
parent 881260f9e4
commit e3bb75340e
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/network/access/qnetworkrequest.cpp
View File

@ -1219,7 +1219,8 @@ static QVariant parseETag(QByteArrayView raw)
return QString::fromLatin1(trimmed);
}
static QVariant parseIfMatch(const QByteArray &raw)
template<typename T>
static QVariant parseMatchImpl(const QByteArray &raw, T op)
{
const QByteArray trimmedRaw = raw.trimmed();
if (trimmedRaw == "*")
@ -1229,36 +1230,25 @@ static QVariant parseIfMatch(const QByteArray &raw)
const QList<QByteArray> split = trimmedRaw.split(',');
for (const QByteArray &element : split) {
const QByteArray trimmed = element.trimmed();
if (!trimmed.startsWith('"'))
if (!op(trimmed))
continue;
if (!trimmed.endsWith('"'))
continue;
tags += QString::fromLatin1(trimmed);
}
return tags;
}
static QVariant parseIfMatch(const QByteArray &raw)
{
return parseMatchImpl(raw, [](QByteArrayView element) {
return element.startsWith('"') && element.endsWith('"');
});
}
static QVariant parseIfNoneMatch(const QByteArray &raw)
{
const QByteArray trimmedRaw = raw.trimmed();
if (trimmedRaw == "*")
return QStringList(QStringLiteral("*"));
QStringList tags;
const QList<QByteArray> split = trimmedRaw.split(',');
for (const QByteArray &element : split) {
const QByteArray trimmed = element.trimmed();
if (!trimmed.startsWith('"') && !trimmed.startsWith(R"(W/")"))
continue;
if (!trimmed.endsWith('"'))
continue;
tags += QString::fromLatin1(trimmed);
}
return tags;
return parseMatchImpl(raw, [](QByteArrayView element) {
return (element.startsWith('"') || element.startsWith(R"(W/")")) && element.endsWith('"');
});
}