Merge pull request #12549 from SeproDE/rss-api

Expand RSS related WebAPI
This commit is contained in:
Vladimir Golovnev 2020-04-24 07:46:37 +03:00 committed by GitHub
commit c10318b576
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 2 deletions

View file

@ -165,7 +165,7 @@ void AppController::preferencesAction()
data["ip_filter_enabled"] = session->isIPFilteringEnabled();
data["ip_filter_path"] = Utils::Fs::toNativePath(session->IPFilterFile());
data["ip_filter_trackers"] = session->isTrackerFilteringEnabled();
data["banned_IPs"] = session->bannedIPs().join("\n");
data["banned_IPs"] = session->bannedIPs().join('\n');
// Speed
// Global Rate Limits
@ -231,7 +231,7 @@ void AppController::preferencesAction()
QStringList authSubnetWhitelistStringList;
for (const Utils::Net::Subnet &subnet : asConst(pref->getWebUiAuthSubnetWhitelist()))
authSubnetWhitelistStringList << Utils::Net::subnetToString(subnet);
data["bypass_auth_subnet_whitelist"] = authSubnetWhitelistStringList.join("\n");
data["bypass_auth_subnet_whitelist"] = authSubnetWhitelistStringList.join('\n');
data["web_ui_max_auth_fail_count"] = pref->getWebUIMaxAuthFailCount();
data["web_ui_ban_duration"] = static_cast<int>(pref->getWebUIBanDuration().count());
data["web_ui_session_timeout"] = pref->getWebUISessionTimeout();
@ -258,6 +258,8 @@ void AppController::preferencesAction()
data["rss_max_articles_per_feed"] = RSS::Session::instance()->maxArticlesPerFeed();
data["rss_processing_enabled"] = RSS::Session::instance()->isProcessingEnabled();
data["rss_auto_downloading_enabled"] = RSS::AutoDownloader::instance()->isProcessingEnabled();
data["rss_download_repack_proper_episodes"] = RSS::AutoDownloader::instance()->downloadRepacks();
data["rss_smart_episode_filters"] = RSS::AutoDownloader::instance()->smartEpisodeFilters().join('\n');
// Advanced settings
// qBitorrent preferences
@ -651,6 +653,10 @@ void AppController::setPreferencesAction()
RSS::Session::instance()->setProcessingEnabled(it.value().toBool());
if (hasKey("rss_auto_downloading_enabled"))
RSS::AutoDownloader::instance()->setProcessingEnabled(it.value().toBool());
if (hasKey("rss_download_repack_proper_episodes"))
RSS::AutoDownloader::instance()->setDownloadRepacks(it.value().toBool());
if (hasKey("rss_smart_episode_filters"))
RSS::AutoDownloader::instance()->setSmartEpisodeFilters(it.value().toString().split('\n'));
// Advanced settings
// qBittorrent preferences