@@ -29,21 +29,26 @@ Mediafly* Mediafly::getMediafly() * <err code="14" message="Request must be made over a secure connection." /> * </response> */ -bool Mediafly::checkResponse(QDomDocument& doc, QString& data, QString& errorMsg) +bool Mediafly::checkResponse(QDomDocument& doc, QString& data, QString& errorMsg, bool& expiredToken) { + expiredToken = false; + if (!doc.setContent(data, &errorMsg)) return false; QDomElement docResponse = doc.firstChildElement("response"); if (docResponse.isNull()) { - errorMsg = doc.toString(); + errorMsg = data; return false; } + QString statusAttribute = docResponse.attribute("status"); if (statusAttribute == "fail") { QDomElement docErr = docResponse.firstChildElement("err"); QString errCode = docErr.attribute("code"); QString errMessage = docErr.attribute("message"); + if ((errCode.toInt() == -1) && (errMessage == "Token invalid.")) + expiredToken = true; errorMsg = "[" + errCode + "] " + errMessage; return false; } else if (statusAttribute != "ok") { @@ -69,15 +74,19 @@ void Mediafly::handleRequestFinished(int id, bool error) qDebug() << data; - if (!checkResponse(doc, data, errorMsg)) + bool expiredToken; + if (!checkResponse(doc, data, errorMsg, expiredToken)) { - // We count only with token expired error for now. - // - - // Acquire new session info and restart the operation. - // - Authentication_GetToken(); - m_request << requestInfo; + if (expiredToken) + { + // Acquire new session info and restart + // the operation. + + Authentication_GetToken(); + m_request << requestInfo; + } + else + emit readError(errorMsg); } else requestInfo.m_consumer->read(doc); @@ -108,7 +117,7 @@ Mediafly::Mediafly() // Get token as soon as possible. It will be neccessary // anyway... -// Authentication_GetToken(); + Authentication_GetToken(); } void Mediafly::abort() mediaflyplayer/src/Mediafly.cpp @@ -52,12 +52,11 @@ private: QString makePath(QString& method, QStringList& parameters); void Query(MediaflyConsumer *consumer, QString method, QMap<QString, QString>& firstMap, QMap<QString, QString>& map, bool useHttps = false); - void checkResponse(QDomDocument& doc); QString computeHash(QMap<QString, QString>& map, QString token_id); QStringList makeParams(QMap<QString, QString>& map); void Query(MediaflyConsumer *consumer, QString function, QMap<QString, QString>& map); void Query(MediaflyConsumer *consumer, QString function, QMap<QString, QString>& map, const MediaflySessionInfo& session); - bool checkResponse(QDomDocument& doc, QString& data, QString& errorMsg); + bool checkResponse(QDomDocument& doc, QString& data, QString& errorMsg, bool& expiredToken); void Query (RequestInfo& requestInfo); void Query (RequestInfoBinary& requestInfoBinary); void Query (MediaflyConsumerBinary *modelData, const QString& path); mediaflyplayer/src/Mediafly.h ab79d94bb3efb619ff72cdee8c0aee5e02db6d22 Milan Svoboda milan.svoboda@centrum.cz http://github.com/tex/mediafly/commit/2bf585da6ab65912f5aae28b787c1df8475b5b04 2bf585da6ab65912f5aae28b787c1df8475b5b04 2008-10-10T09:48:00-07:00 2008-10-10T09:48:00-07:00 Better error handling in Mediafly class. Detect token expiration explicitly. Get the token as soon as possible. 103c48310fda8b26710c5479a8e67899d1716055 Milan Svoboda milan.svoboda@centrum.cz