sfos/ttrss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Api: added error message for server returning unexpected html,

Browse source 
added error message for error during JSON.parse
This commit is contained in:
Hauke Schade 2017-11-11 11:57:36 +01:00
parent 1c492cadf6
commit e1ba95ebef
1 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
qml/ttrss/models/tinytinyrss.js
View file

@ -1399,25 +1399,48 @@ function process_readyState(httpreq) {
var successful = false
var errorMessage = null
var responseObject = null
var responseContentType = httpreq.getResponseHeader('Content-Type')
if(httpreq.status === 200 && httpreq.responseText
&& httpreq.responseText.length > 2) {
if (httpreq.status === 200 &&
responseContentType.match(/json/) &&
httpreq.responseText &&
httpreq.responseText.length > 2) {
console.log(httpreq.responseText);
responseObject = JSON.parse(httpreq.responseText);
try {
responseObject = JSON.parse(httpreq.responseText);
if (responseObject.status === 0) {
successful = true
} else if(responseObject.content.error) {
errorMessage = "Error: " + responseObject.content.error;
} else {
errorMessage = "Error (tt-rss status " + responseObject.status + ")"
if (responseObject.status === 0) {
successful = true
} else if(responseObject.content.error) {
errorMessage = "Error: " + responseObject.content.error
} else {
errorMessage = "Error (tt-rss status " + responseObject.status + ")"
}
}
catch (e) {
console.log(e, httpreq.responseText)
errorMessage = "Error (http status " + httpreq.status + ")"
errorMessage = "\n" + e
}
} else {
errorMessage = "Error (http status " + httpreq.status + ")"
if (responseContentType.match(/html/)) {
var title = httpreq.responseText.match(/<title>(.*)<\/title>/);
var body = httpreq.responseText.match(/<body>[^]*<p>([^]*)<\/p>[^]*<\/body>/);
if (httpreq.responseText) {
errorMessage += ": " + httpreq.responseText
if (title && title.length === 2) {
errorMessage = "Error (" + title[1] + ")"
}
if (body && body.length === 2) {
errorMessage += "\n" + body[1]
}
}
else {
errorMessage = "Error (http status " + httpreq.status + ")"
if (httpreq.responseText) {
errorMessage += "\n" + httpreq.responseText
}
}
}