better error texts, report errors correctly for standard and tt-rss, more to come later
This commit is contained in:
parent
22c24fe988
commit
42f164792a
@ -293,8 +293,11 @@ QString Feed::getStatusDescription() const {
|
|||||||
case Status::NetworkError:
|
case Status::NetworkError:
|
||||||
return tr("network error");
|
return tr("network error");
|
||||||
|
|
||||||
|
case Status::ParsingError:
|
||||||
|
return tr("parsing error");
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return tr("unspecified error");
|
return tr("error");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -319,9 +322,15 @@ void Feed::removeMessageFilter(MessageFilter* filter) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
QString Feed::additionalTooltip() const {
|
QString Feed::additionalTooltip() const {
|
||||||
|
QString stat = getStatusDescription();
|
||||||
|
|
||||||
|
if (!m_statusString.simplified().isEmpty()) {
|
||||||
|
stat += QSL(" (%1)").arg(m_statusString);
|
||||||
|
}
|
||||||
|
|
||||||
return tr("Auto-update status: %1\n"
|
return tr("Auto-update status: %1\n"
|
||||||
"Active message filters: %2\n"
|
"Active message filters: %2\n"
|
||||||
"Status: %3").arg(getAutoUpdateStatusDescription(),
|
"Status: %3").arg(getAutoUpdateStatusDescription(),
|
||||||
QString::number(m_messageFilters.size()),
|
QString::number(m_messageFilters.size()),
|
||||||
getStatusDescription());
|
stat);
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,11 @@
|
|||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
FeedParser::FeedParser(QString data) : m_xmlData(std::move(data)), m_mrssNamespace(QSL("http://search.yahoo.com/mrss/")) {
|
FeedParser::FeedParser(QString data) : m_xmlData(std::move(data)), m_mrssNamespace(QSL("http://search.yahoo.com/mrss/")) {
|
||||||
m_xml.setContent(m_xmlData, true);
|
QString error;
|
||||||
|
|
||||||
|
if (!m_xml.setContent(m_xmlData, true, &error)) {
|
||||||
|
throw ApplicationException(QObject::tr("XML problem: %1").arg(error));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FeedParser::~FeedParser() = default;
|
FeedParser::~FeedParser() = default;
|
||||||
|
@ -229,7 +229,7 @@ QList<Message> TtRssServiceRoot::obtainNewMessages(const QList<Feed*>& feeds) {
|
|||||||
networkProxy());
|
networkProxy());
|
||||||
|
|
||||||
if (network()->lastError() != QNetworkReply::NetworkError::NoError) {
|
if (network()->lastError() != QNetworkReply::NetworkError::NoError) {
|
||||||
throw FeedFetchException(Feed::Status::NetworkError);
|
throw FeedFetchException(Feed::Status::NetworkError, headlines.error());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
QList<Message> new_messages = headlines.messages(this);
|
QList<Message> new_messages = headlines.messages(this);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user