pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bit looser opml parsing

Browse source
This commit is contained in:
Martin Rotter 2025-04-08 12:18:12 +02:00
parent 9b477c0e8e
commit f0b8e3cc89
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librssguard-standard/src/standardfeedsimportexportmodel.cpp
View file

@ -362,7 +362,8 @@ void FeedsImportExportModel::importAsOPML20(const QByteArray& data,
// Now analyze if this element is category or feed.
// NOTE: All feeds must include xmlUrl attribute and text attribute.
if (child_element.attributes().contains(QSL("xmlUrl")) && child.attributes().contains(QSL("text"))) {
if (child_element.hasAttribute(QSL("xmlUrl")) &&
(child_element.hasAttribute(QSL("text")) || child_element.hasAttribute(QSL("title")))) {
// This is FEED.
// Add feed and end this iteration.
QString feed_url = child_element.attribute(QSL("xmlUrl"));
@ -372,6 +373,11 @@ void FeedsImportExportModel::importAsOPML20(const QByteArray& data,
QVariantMap feed_data;
feed_data[QSL("title")] = child_element.attribute(QSL("text"));
if (feed_data[QSL("title")].toString().isEmpty()) {
feed_data[QSL("title")] = child_element.attribute(QSL("title"));
}
feed_data[QSL("encoding")] = child_element.attribute(QSL("encoding"), QSL(DEFAULT_FEED_ENCODING));
feed_data[QSL("type")] = child_element.attribute(QSL("version"), QSL(DEFAULT_FEED_TYPE)).toUpper();
feed_data[QSL("description")] = child_element.attribute(QSL("description"));

2
src/librssguard/network-web/downloader.cpp
View file

@ -222,7 +222,7 @@ void Downloader::finished() {
}
// In this phase, some part of downloading process is completed.
QUrl redirection_url = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
QUrl redirection_url = reply->attribute(QNetworkRequest::Attribute::RedirectionTargetAttribute).toUrl();
if (redirection_url.isValid()) {
auto redir_number = numberOfRedirections(reply);