d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-09-04 18:12:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix RSS parsing

Browse Source
This commit is contained in:
Christophe Dumez 2012-07-11 20:26:12 +03:00
parent c40801ce99
commit 12280c6a0f
2 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rss/rssarticle.cpp
View File

@ -221,9 +221,13 @@ RssArticlePtr xmlToRssArticle(RssFeed* parent, QXmlStreamReader& xml)
QDateTime date; QDateTime date;
QString author; 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") if (xml.name() == "title")
title = xml.readElementText(); title = xml.readElementText();
else if (xml.name() == "enclosure") { else if (xml.name() == "enclosure") {
@ -240,9 +244,6 @@ RssArticlePtr xmlToRssArticle(RssFeed* parent, QXmlStreamReader& xml)
author = xml.readElementText(); author = xml.readElementText();
else if (xml.name() == "guid") else if (xml.name() == "guid")
guid = xml.readElementText(); guid = xml.readElementText();
else {
qDebug() << "Skipping item tag: " << xml.name();
xml.skipCurrentElement();
} }
} }

9
src/rss/rssfeed.cpp
View File

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