mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-12 05:44:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10191 from sledgehammer999/drop_google

Browse source 
Don't query Google for tracker favicons
This commit is contained in:
sledgehammer999 2019-01-27 22:19:56 +02:00 committed by GitHub
commit bb3ad8acd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/transferlistfilterswidget.cpp
View file

@ -67,8 +67,6 @@ namespace
scheme = "http"; scheme = "http";
return scheme; return scheme;
} }
const QLatin1String GOOGLE_FAVICON_URL("https://www.google.com/s2/favicons?domain=");
} }
BaseFilterWidget::BaseFilterWidget(QWidget *parent, TransferListWidget *transferList) BaseFilterWidget::BaseFilterWidget(QWidget *parent, TransferListWidget *transferList)
@ -419,9 +417,7 @@ void TrackerFiltersList::downloadFavicon(const QString &url)
void TrackerFiltersList::handleFavicoDownload(const QString &url, const QString &filePath) void TrackerFiltersList::handleFavicoDownload(const QString &url, const QString &filePath)
{ {
QString host = url.startsWith(GOOGLE_FAVICON_URL) const QString host = getHost(url);
? url.mid(GOOGLE_FAVICON_URL.size())
: getHost(url);
if (!m_trackers.contains(host)) { if (!m_trackers.contains(host)) {
Utils::Fs::forceRemove(filePath); Utils::Fs::forceRemove(filePath);
@ -449,12 +445,8 @@ void TrackerFiltersList::handleFavicoDownload(const QString &url, const QString
void TrackerFiltersList::handleFavicoFailure(const QString &url, const QString &error) void TrackerFiltersList::handleFavicoFailure(const QString &url, const QString &error)
{ {
Q_UNUSED(error) Q_UNUSED(error)
if (url.endsWith(".ico", Qt::CaseInsensitive)) { if (url.endsWith(".ico", Qt::CaseInsensitive))
downloadFavicon(url.left(url.size() - 4) + ".png"); downloadFavicon(url.left(url.size() - 4) + ".png");
}
else if (!url.startsWith(GOOGLE_FAVICON_URL)) {
downloadFavicon(GOOGLE_FAVICON_URL + getHost(url));
}
} }
void TrackerFiltersList::showMenu(QPoint) void TrackerFiltersList::showMenu(QPoint)