Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

IconProvider: Store icon urls without trailing slash

Browse Source
This commit is contained in:
David Rosca 2016-12-29 12:37:36 +01:00
parent 82e9d0c0ee
commit 485df77880
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/tools/iconprovider.cpp
View File

@ -30,6 +30,11 @@
Q_GLOBAL_STATIC(IconProvider, qz_icon_provider)
static QByteArray encodeUrl(const QUrl &url)
{
return url.toEncoded(QUrl::RemoveFragment | QUrl::StripTrailingSlash);
}
IconProvider::IconProvider()
: QWidget()
{
@ -178,15 +183,17 @@ QImage IconProvider::imageForUrl(const QUrl &url, bool allowEmpty)
return allowEmpty ? QImage() : IconProvider::emptyWebImage();
}
const QByteArray encodedUrl = encodeUrl(url);
foreach (const BufferedIcon &ic, instance()->m_iconBuffer) {
if (ic.first.toString().startsWith(url.toString())) {
if (encodeUrl(ic.first) == encodedUrl) {
return ic.second;
}
}
QSqlQuery query;
query.prepare(QSL("SELECT icon FROM icons WHERE url GLOB ? LIMIT 1"));
query.addBindValue(QString("%1*").arg(QzTools::escapeSqlGlobString(QString::fromUtf8(url.toEncoded(QUrl::RemoveFragment)))));
query.addBindValue(QString("%1*").arg(QzTools::escapeSqlGlobString(QString::fromUtf8(encodedUrl))));
SqlDatabase::instance()->exec(query);
if (query.next()) {
@ -251,7 +258,7 @@ void IconProvider::saveIconsToDatabase()
buffer.open(QIODevice::WriteOnly);
ic.second.save(&buffer, "PNG");
query.bindValue(0, buffer.data());
query.bindValue(1, ic.first.toEncoded(QUrl::RemoveFragment));
query.bindValue(1, encodeUrl(ic.first));
SqlDatabase::instance()->execAsync(query);
}