FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-02-04 03:08:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix missing icon, more efficient adblock usage

Browse Source
This commit is contained in:
Martin Rotter 2022-03-28 13:12:41 +02:00
parent c2bc532c93
commit d1800a9cf9
5 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" />
<releases>
<release version="4.2.1" date="2022-03-25"/>
<release version="4.2.1" date="2022-03-28"/>
</releases>
<content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute>

4
resources/icons.qrc
View File

@ -29,6 +29,7 @@
<file>./graphics/Breeze/actions/32/edit-reset.svg</file>
<file>./graphics/Breeze/actions/22/edit-select-all.svg</file>
<file>./graphics/Breeze/actions/22/edit-select-none.svg</file>
<file>./graphics/Breeze/emblems/22/emblem-favorite.svg</file>
<file>./graphics/Breeze/emblems/22/emblem-shared.svg</file>
<file>./graphics/Breeze/places/96/folder.svg</file>
<file>./graphics/Breeze/actions/22/format-indent-more.svg</file>
@ -103,6 +104,7 @@
<file>./graphics/Breeze Dark/actions/32/edit-reset.svg</file>
<file>./graphics/Breeze Dark/actions/22/edit-select-all.svg</file>
<file>./graphics/Breeze Dark/actions/22/edit-select-none.svg</file>
<file>./graphics/Breeze Dark/emblems/22/emblem-favorite.svg</file>
<file>./graphics/Breeze Dark/emblems/22/emblem-shared.svg</file>
<file>./graphics/Breeze Dark/places/96/folder.svg</file>
<file>./graphics/Breeze Dark/actions/22/format-indent-more.svg</file>
@ -174,6 +176,7 @@
<file>./graphics/Faenza/actions/64/edit-copy.png</file>
<file>./graphics/Faenza/actions/64/edit-select-all.png</file>
<file>./graphics/Faenza/emblems/64/emblem-downloads.png</file>
<file>./graphics/Faenza/emblems/64/emblem-favorite.png</file>
<file>./graphics/Faenza/emblems/64/emblem-shared.png</file>
<file>./graphics/Faenza/emblems/64/emblem-system.png</file>
<file>./graphics/Faenza/places/64/folder.png</file>
@ -252,6 +255,7 @@
<file>./graphics/Numix/22/actions/edit-copy.svg</file>
<file>./graphics/Numix/22/actions/edit-select-all.svg</file>
<file>./graphics/Numix/22/emblems/emblem-downloads.svg</file>
<file>./graphics/Numix/22/emblems/emblem-favorite.svg</file>
<file>./graphics/Numix/22/emblems/emblem-shared.svg</file>
<file>./graphics/Numix/22/emblems/emblem-system.svg</file>
<file>./graphics/Numix/22/places/folder.svg</file>

66
src/librssguard/gui/litehtml/litehtmlviewer.cpp
View File

@ -60,45 +60,38 @@ void LiteHtmlViewer::findText(const QString& text, bool backwards) {
void LiteHtmlViewer::setUrl(const QUrl& url) {
emit loadStarted();
AdblockRequestInfo block_request(url);
if (url.path().endsWith(QSL("css"))) {
block_request.setResourceType(QSL("stylesheet"));
}
else {
block_request.setResourceType(QSL("image"));
}
if (qApp->web()->adBlock()->block(block_request).m_blocked) {
qWarningNN << LOGSEC_ADBLOCK << "Blocked request:" << QUOTE_W_SPACE_DOT(block_request.requestUrl().toString());
// TODO: Display "site blocked" error.
return;
}
QEventLoop loop;
connect(m_downloader.data(), &Downloader::completed, &loop, &QEventLoop::quit);
m_downloader->manipulateData(url.toString(),
QNetworkAccessManager::Operation::GetOperation,
{},
5000);
loop.exec();
auto net_error = m_downloader->lastOutputError();
QString html_str;
bool is_error = false;
if (net_error != QNetworkReply::NetworkError::NoError) {
html_str = "Error!";
if (blockedWithAdblock(url)) {
is_error = true;
html_str = tr("Site \"%1\" was blocked with AdBlock.").arg(url.toString());
}
else {
html_str = QString::fromUtf8(m_downloader->lastOutputData());
QEventLoop loop;
connect(m_downloader.data(), &Downloader::completed, &loop, &QEventLoop::quit);
m_downloader->manipulateData(url.toString(),
QNetworkAccessManager::Operation::GetOperation,
{},
5000);
loop.exec();
auto net_error = m_downloader->lastOutputError();
if (net_error != QNetworkReply::NetworkError::NoError) {
is_error = true;
html_str = "Error!";
}
else {
html_str = QString::fromUtf8(m_downloader->lastOutputData());
}
}
setHtml(html_str, url);
emit loadFinished(net_error == QNetworkReply::NetworkError::NoError);
emit loadFinished(is_error);
}
void LiteHtmlViewer::setHtml(const QString& html, const QUrl& base_url) {
@ -264,7 +257,7 @@ void LiteHtmlViewer::wheelEvent(QWheelEvent* event) {
QLiteHtmlWidget::wheelEvent(event);
}
QByteArray LiteHtmlViewer::handleResource(const QUrl& url) {
bool LiteHtmlViewer::blockedWithAdblock(const QUrl& url) {
AdblockRequestInfo block_request(url);
if (url.path().endsWith(QSL("css"))) {
@ -276,6 +269,15 @@ QByteArray LiteHtmlViewer::handleResource(const QUrl& url) {
if (qApp->web()->adBlock()->block(block_request).m_blocked) {
qWarningNN << LOGSEC_ADBLOCK << "Blocked request:" << QUOTE_W_SPACE_DOT(block_request.requestUrl().toString());
return true;
}
else {
return false;
}
}
QByteArray LiteHtmlViewer::handleResource(const QUrl& url) {
if (blockedWithAdblock(url)) {
return {};
}
else {

1
src/librssguard/gui/litehtml/litehtmlviewer.h
View File

@ -50,6 +50,7 @@ class LiteHtmlViewer : public QLiteHtmlWidget, public WebViewer {
virtual void wheelEvent(QWheelEvent* event);
private:
bool blockedWithAdblock(const QUrl& url);
QByteArray handleResource(const QUrl& url);
private:

2
src/librssguard/services/abstract/labelsnode.cpp
View File

@ -15,7 +15,7 @@
LabelsNode::LabelsNode(RootItem* parent_item) : RootItem(parent_item), m_actLabelNew(nullptr) {
setKind(RootItem::Kind::Labels);
setId(ID_LABELS);
setIcon(qApp->icons()->fromTheme(QSL("tag-folder")));
setIcon(qApp->icons()->fromTheme(QSL("tag-folder"), QSL("emblem-favorite")));
setTitle(tr("Labels"));
setDescription(tr("You can see all your labels (tags) here."));
}