Browse Source

Fix RSS parsing

adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
12280c6a0f
  1. 11
      src/rss/rssarticle.cpp
  2. 9
      src/rss/rssfeed.cpp

11
src/rss/rssarticle.cpp

@ -221,9 +221,13 @@ RssArticlePtr xmlToRssArticle(RssFeed* parent, QXmlStreamReader& xml) @@ -221,9 +221,13 @@ RssArticlePtr xmlToRssArticle(RssFeed* parent, QXmlStreamReader& xml)
QDateTime date;
QString author;
Q_ASSERT(xml.isStartElement() && xml.name() == "item");
while(!xml.atEnd()) {
xml.readNext();
while (xml.readNextStartElement()) {
if(xml.isEndElement() && xml.name() == "item")
break;
if (xml.isStartElement()) {
if (xml.name() == "title")
title = xml.readElementText();
else if (xml.name() == "enclosure") {
@ -240,9 +244,6 @@ RssArticlePtr xmlToRssArticle(RssFeed* parent, QXmlStreamReader& xml) @@ -240,9 +244,6 @@ RssArticlePtr xmlToRssArticle(RssFeed* parent, QXmlStreamReader& xml)
author = xml.readElementText();
else if (xml.name() == "guid")
guid = xml.readElementText();
else {
qDebug() << "Skipping item tag: " << xml.name();
xml.skipCurrentElement();
}
}

9
src/rss/rssfeed.cpp

@ -214,7 +214,10 @@ void RssFeed::parseRSSChannel(QXmlStreamReader& xml) @@ -214,7 +214,10 @@ void RssFeed::parseRSSChannel(QXmlStreamReader& xml)
qDebug() << Q_FUNC_INFO;
Q_ASSERT(xml.isStartElement() && xml.name() == "channel");
while (xml.readNextStartElement()) {
while(!xml.atEnd()) {
xml.readNext();
if (xml.isStartElement()) {
if (xml.name() == "title") {
m_title = xml.readElementText();
if (m_alias == url())
@ -236,9 +239,7 @@ void RssFeed::parseRSSChannel(QXmlStreamReader& xml) @@ -236,9 +239,7 @@ void RssFeed::parseRSSChannel(QXmlStreamReader& xml)
article->markAsRead();
m_articles[guid] = article;
}
} else {
qDebug() << "Skipping RSS tag: " << xml.name();
xml.skipCurrentElement();
}
}
}
}

Loading…
Cancel
Save