From a9b0b1ef952238fa4bb5bf91a4607f33943fa8aa Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 6 Dec 2023 12:03:46 +0100 Subject: [PATCH] disable debug code --- .../scripts/github-actions/build-windows.ps1 | 4 ++-- src/librssguard/network-web/webfactory.cpp | 4 ++-- .../standard/gui/formdiscoverfeeds.cpp | 2 +- .../services/standard/parsers/atomparser.cpp | 6 +++++- .../services/standard/parsers/feedparser.cpp | 20 ++++++++++++++++++- .../services/standard/parsers/jsonparser.cpp | 6 +++++- .../services/standard/parsers/rdfparser.cpp | 6 +++++- .../services/standard/parsers/rssparser.cpp | 6 +++++- .../standard/parsers/sitemapparser.cpp | 13 ++++++++++++ 9 files changed, 57 insertions(+), 10 deletions(-) diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 9d7e102d4..b26b5704f 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -36,11 +36,11 @@ else { $is_qt_6 = $qt_version.StartsWith("6") -$maria_version = "11.1.2" +$maria_version = "11.2.2" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_output = "maria.zip" -$cmake_version = "3.27.7" +$cmake_version = "3.27.9" $cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip" $cmake_output = "cmake.zip" diff --git a/src/librssguard/network-web/webfactory.cpp b/src/librssguard/network-web/webfactory.cpp index 80367a69e..91a734277 100644 --- a/src/librssguard/network-web/webfactory.cpp +++ b/src/librssguard/network-web/webfactory.cpp @@ -275,7 +275,7 @@ QString WebFactory::limitSizeOfHtmlImages(const QString& html, int desired_width QString my_html = html; QElapsedTimer tmr; - IOFactory::writeFile("a.html", html.toUtf8()); + // IOFactory::writeFile("a.html", html.toUtf8()); tmr.start(); @@ -359,7 +359,7 @@ QString WebFactory::limitSizeOfHtmlImages(const QString& html, int desired_width match_offset = exp_match.capturedStart() + img_reconstructed.size(); } - IOFactory::writeFile("b.html", my_html.toUtf8()); + // IOFactory::writeFile("b.html", my_html.toUtf8()); qDebugNN << LOGSEC_GUI << "HTML image resizing took" << NONQUOTE_W_SPACE(tmr.elapsed()) << "miliseconds."; return my_html; diff --git a/src/librssguard/services/standard/gui/formdiscoverfeeds.cpp b/src/librssguard/services/standard/gui/formdiscoverfeeds.cpp index 0945975f1..3b8119557 100644 --- a/src/librssguard/services/standard/gui/formdiscoverfeeds.cpp +++ b/src/librssguard/services/standard/gui/formdiscoverfeeds.cpp @@ -144,7 +144,7 @@ FormDiscoverFeeds::~FormDiscoverFeeds() { QList FormDiscoverFeeds::discoverFeedsWithParser(const FeedParser* parser, const QString& url, bool greedy) { - auto feeds = parser->discoverFeeds(m_serviceRoot, url, greedy); + auto feeds = parser->discoverFeeds(m_serviceRoot, QUrl::fromUserInput(url), greedy); QPixmap icon; int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); diff --git a/src/librssguard/services/standard/parsers/atomparser.cpp b/src/librssguard/services/standard/parsers/atomparser.cpp index 4fd984c55..17ab8885a 100644 --- a/src/librssguard/services/standard/parsers/atomparser.cpp +++ b/src/librssguard/services/standard/parsers/atomparser.cpp @@ -26,7 +26,11 @@ AtomParser::AtomParser(const QString& data) : FeedParser(data) { AtomParser::~AtomParser() {} QList AtomParser::discoverFeeds(ServiceRoot* root, const QUrl& url, bool greedy) const { - Q_UNUSED(greedy) + auto base_result = FeedParser::discoverFeeds(root, url, greedy); + + if (!base_result.isEmpty()) { + return base_result; + } QString my_url = url.toString(); QList feeds; diff --git a/src/librssguard/services/standard/parsers/feedparser.cpp b/src/librssguard/services/standard/parsers/feedparser.cpp index 829d3178e..809d79eec 100644 --- a/src/librssguard/services/standard/parsers/feedparser.cpp +++ b/src/librssguard/services/standard/parsers/feedparser.cpp @@ -43,9 +43,27 @@ FeedParser::~FeedParser() {} QList FeedParser::discoverFeeds(ServiceRoot* root, const QUrl& url, bool greedy) const { Q_UNUSED(root) - Q_UNUSED(url) Q_UNUSED(greedy) + if (url.isLocalFile()) { + QString file_path = url.toLocalFile(); + + if (QFile::exists(file_path)) { + try { + // 1. + auto guessed_feed = guessFeed(IOFactory::readFile(file_path), {}); + + guessed_feed.first->setSourceType(StandardFeed::SourceType::LocalFile); + guessed_feed.first->setSource(file_path); + + return {guessed_feed.first}; + } + catch (...) { + qDebugNN << LOGSEC_CORE << QUOTE_W_SPACE(file_path) << "is not a local feed file."; + } + } + } + return {}; } diff --git a/src/librssguard/services/standard/parsers/jsonparser.cpp b/src/librssguard/services/standard/parsers/jsonparser.cpp index 955c68b19..027b58a16 100644 --- a/src/librssguard/services/standard/parsers/jsonparser.cpp +++ b/src/librssguard/services/standard/parsers/jsonparser.cpp @@ -20,7 +20,11 @@ JsonParser::JsonParser(const QString& data) : FeedParser(data, false) {} JsonParser::~JsonParser() {} QList JsonParser::discoverFeeds(ServiceRoot* root, const QUrl& url, bool greedy) const { - Q_UNUSED(greedy) + auto base_result = FeedParser::discoverFeeds(root, url, greedy); + + if (!base_result.isEmpty()) { + return base_result; + } QString my_url = url.toString(); QList feeds; diff --git a/src/librssguard/services/standard/parsers/rdfparser.cpp b/src/librssguard/services/standard/parsers/rdfparser.cpp index 71c9b2e29..d7040d280 100644 --- a/src/librssguard/services/standard/parsers/rdfparser.cpp +++ b/src/librssguard/services/standard/parsers/rdfparser.cpp @@ -19,7 +19,11 @@ RdfParser::RdfParser(const QString& data) RdfParser::~RdfParser() {} QList RdfParser::discoverFeeds(ServiceRoot* root, const QUrl& url, bool greedy) const { - Q_UNUSED(greedy) + auto base_result = FeedParser::discoverFeeds(root, url, greedy); + + if (!base_result.isEmpty()) { + return base_result; + } QString my_url = url.toString(); QList feeds; diff --git a/src/librssguard/services/standard/parsers/rssparser.cpp b/src/librssguard/services/standard/parsers/rssparser.cpp index f31dd8c61..4a2c6bb51 100644 --- a/src/librssguard/services/standard/parsers/rssparser.cpp +++ b/src/librssguard/services/standard/parsers/rssparser.cpp @@ -19,7 +19,11 @@ RssParser::RssParser(const QString& data) : FeedParser(data) {} RssParser::~RssParser() {} QList RssParser::discoverFeeds(ServiceRoot* root, const QUrl& url, bool greedy) const { - Q_UNUSED(greedy) + auto base_result = FeedParser::discoverFeeds(root, url, greedy); + + if (!base_result.isEmpty()) { + return base_result; + } QString my_url = url.toString(); QList feeds; diff --git a/src/librssguard/services/standard/parsers/sitemapparser.cpp b/src/librssguard/services/standard/parsers/sitemapparser.cpp index 25db01f00..210ef8959 100644 --- a/src/librssguard/services/standard/parsers/sitemapparser.cpp +++ b/src/librssguard/services/standard/parsers/sitemapparser.cpp @@ -22,7 +22,20 @@ SitemapParser::SitemapParser(const QString& data) : FeedParser(data) {} SitemapParser::~SitemapParser() {} QList SitemapParser::discoverFeeds(ServiceRoot* root, const QUrl& url, bool greedy) const { + auto base_result = FeedParser::discoverFeeds(root, url, greedy); QHash feeds; + + if (!base_result.isEmpty()) { + if (greedy) { + for (StandardFeed* base_fd : base_result) { + feeds.insert(base_fd->source(), base_fd); + } + } + else { + return base_result; + } + } + QStringList to_process_sitemaps; int sitemap_index_limit = 2; int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();