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

save

Browse Source
This commit is contained in:
Martin Rotter 2021-05-07 13:58:44 +02:00
parent 764ab8d083
commit 9029a63323
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librssguard/definitions/definitions.h
View File

@ -14,7 +14,7 @@
#define SERVICE_CODE_INOREADER "inoreader" #define SERVICE_CODE_INOREADER "inoreader"
#define SERVICE_CODE_GMAIL "gmail" #define SERVICE_CODE_GMAIL "gmail"
#define ADBLOCK_SERVER_PORT "48484" #define ADBLOCK_SERVER_PORT 48484
#define ADBLOCK_HOWTO "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#adblock" #define ADBLOCK_HOWTO "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#adblock"
#define ADBLOCK_ICON_ACTIVE "adblock" #define ADBLOCK_ICON_ACTIVE "adblock"
#define ADBLOCK_ICON_DISABLED "adblock-disabled" #define ADBLOCK_ICON_DISABLED "adblock-disabled"

12
src/librssguard/network-web/adblock/adblockmanager.cpp
View File

@ -176,7 +176,7 @@ BlockingResult AdBlockManager::askServerIfBlocked(const QString& url) const {
tmr.start(); tmr.start();
auto network_res = NetworkFactory::performNetworkOperation(QSL("http://%1:%2").arg(QHostAddress(QHostAddress::SpecialAddress::LocalHost).toString(), auto network_res = NetworkFactory::performNetworkOperation(QSL("http://%1:%2").arg(QHostAddress(QHostAddress::SpecialAddress::LocalHost).toString(),
ADBLOCK_SERVER_PORT), QString::number(ADBLOCK_SERVER_PORT)),
500, 500,
QJsonDocument(req_obj).toJson(), QJsonDocument(req_obj).toJson(),
out, out,
@ -217,7 +217,7 @@ QString AdBlockManager::askServerForCosmeticRules(const QString& url) const {
tmr.start(); tmr.start();
auto network_res = NetworkFactory::performNetworkOperation(QSL("http://%1:%2").arg(QHostAddress(QHostAddress::SpecialAddress::LocalHost).toString(), auto network_res = NetworkFactory::performNetworkOperation(QSL("http://%1:%2").arg(QHostAddress(QHostAddress::SpecialAddress::LocalHost).toString(),
ADBLOCK_SERVER_PORT), QString::number(ADBLOCK_SERVER_PORT)),
500, 500,
QJsonDocument(req_obj).toJson(), QJsonDocument(req_obj).toJson(),
out, out,
@ -241,7 +241,7 @@ QString AdBlockManager::askServerForCosmeticRules(const QString& url) const {
} }
} }
void AdBlockManager::restartServer() { void AdBlockManager::restartServer(int port) {
if (m_serverProcess->state() == QProcess::ProcessState::Running) { if (m_serverProcess->state() == QProcess::ProcessState::Running) {
m_serverProcess->kill(); m_serverProcess->kill();
@ -256,7 +256,7 @@ void AdBlockManager::restartServer() {
QSL("adblock-server.js"); QSL("adblock-server.js");
if (!IOFactory::copyFile(QSL(":/scripts/adblock/adblock-server.js"), temp_server)) { if (!IOFactory::copyFile(QSL(":/scripts/adblock/adblock-server.js"), temp_server)) {
qCriticalNN << LOGSEC_ADBLOCK << "Failed to copy server file to TEMP."; qWarningNN << LOGSEC_ADBLOCK << "Failed to copy server file to TEMP.";
} }
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
@ -267,7 +267,7 @@ void AdBlockManager::restartServer() {
m_serverProcess->setArguments({ m_serverProcess->setArguments({
QDir::toNativeSeparators(temp_server), QDir::toNativeSeparators(temp_server),
ADBLOCK_SERVER_PORT, QString::number(port),
QDir::toNativeSeparators(m_unifiedFiltersFile) QDir::toNativeSeparators(m_unifiedFiltersFile)
}); });
@ -347,7 +347,7 @@ void AdBlockManager::updateUnifiedFiltersFile() {
IOFactory::writeFile(m_unifiedFiltersFile, unified_contents.toUtf8()); IOFactory::writeFile(m_unifiedFiltersFile, unified_contents.toUtf8());
if (m_enabled) { if (m_enabled) {
restartServer(); restartServer(ADBLOCK_SERVER_PORT);
} }
} }
catch (const ApplicationException& ex) { catch (const ApplicationException& ex) {

2
src/librssguard/network-web/adblock/adblockmanager.h
View File

@ -63,7 +63,7 @@ class AdBlockManager : public QObject {
BlockingResult askServerIfBlocked(const QString& url) const; BlockingResult askServerIfBlocked(const QString& url) const;
QString askServerForCosmeticRules(const QString& url) const; QString askServerForCosmeticRules(const QString& url) const;
void restartServer(); void restartServer(int port);
private: private:
bool m_loaded; bool m_loaded;