From 1b9882b3a31fa51b43554935e36fc6708c260857 Mon Sep 17 00:00:00 2001 From: KingLucius Date: Tue, 30 May 2017 15:45:33 +0200 Subject: [PATCH] Fetch Favicons via google --- src/gui/transferlistfilterswidget.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index d99185dd0..7a2288868 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -57,6 +57,8 @@ #include "transferlistdelegate.h" #include "transferlistwidget.h" +const QLatin1String GOOGLE_FAVICON_URL("https://www.google.com/s2/favicons?domain="); + FiltersBase::FiltersBase(QWidget *parent, TransferListWidget *transferList) : QListWidget(parent) , transferList(transferList) @@ -393,7 +395,10 @@ void TrackerFiltersList::downloadFavicon(const QString& url) void TrackerFiltersList::handleFavicoDownload(const QString& url, const QString& filePath) { - QString host = getHost(url); + QString host = url.startsWith(GOOGLE_FAVICON_URL) + ? url.mid(GOOGLE_FAVICON_URL.size()) + : getHost(url); + if (!m_trackers.contains(host)) { Utils::Fs::forceRemove(filePath); return; @@ -420,8 +425,12 @@ void TrackerFiltersList::handleFavicoDownload(const QString& url, const QString& void TrackerFiltersList::handleFavicoFailure(const QString& url, const QString& error) { Q_UNUSED(error) - if (url.endsWith(".ico", Qt::CaseInsensitive)) + if (url.endsWith(".ico", Qt::CaseInsensitive)) { downloadFavicon(url.left(url.size() - 4) + ".png"); + } + else if (!url.startsWith(GOOGLE_FAVICON_URL)) { + downloadFavicon(GOOGLE_FAVICON_URL + getHost(url)); + } } void TrackerFiltersList::showMenu(QPoint)