X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fsituareservice%2Fsituareservice.cpp;h=87847c4adf9fdc434415ed1c886d1ad72f0f7371;hb=58e9620f35a4317bae95cb4e363b1442bdc4c5e2;hp=4565ba008850c02921169df61f213337190d8ef9;hpb=c66d20973b9df653847089199b303f427ff6d8fd;p=situare diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp index 4565ba0..87847c4 100644 --- a/src/situareservice/situareservice.cpp +++ b/src/situareservice/situareservice.cpp @@ -19,18 +19,21 @@ USA. */ -#include +#include + #include -#include -#include -#include #include -#include "situareservice.h" +#include +#include +#include +#include + +#include "error.h" +#include "network/networkaccessmanager.h" #include "situarecommon.h" -#include "common.h" -#include "parser.h" #include "ui/avatarimage.h" -#include "network/networkaccessmanager.h" + +#include "situareservice.h" SituareService::SituareService(QObject *parent) : QObject(parent), @@ -38,11 +41,11 @@ SituareService::SituareService(QObject *parent) { qDebug() << __PRETTY_FUNCTION__; - m_networkManager = NetworkAccessManager::instance(); + m_networkManager = new NetworkAccessManager(this); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*)), Qt::QueuedConnection); - m_imageFetcher = new ImageFetcher(NetworkAccessManager::instance(), this); + m_imageFetcher = new ImageFetcher(new NetworkAccessManager(this), this); connect(this, SIGNAL(fetchImage(QUrl)), m_imageFetcher, SLOT(fetchImage(QUrl))); connect(m_imageFetcher, SIGNAL(imageReceived(QUrl,QPixmap)), @@ -64,54 +67,96 @@ SituareService::~SituareService() m_friendsList.clear(); } -void SituareService::fetchLocations() +void SituareService::addProfileImages(const QList &imageUrlList) { qDebug() << __PRETTY_FUNCTION__; - QString cookie = formCookie(API_KEY, m_credentials.expires(), m_credentials.userID(), - m_credentials.sessionKey(), m_credentials.sessionSecret(), - m_credentials.sig(), EN_LOCALE); + foreach(QUrl url, imageUrlList) { + emit fetchImage(url); + } +} + +void SituareService::appendAccessToken(QString &requestUrl) +{ + qWarning() << __PRETTY_FUNCTION__; - QUrl url = formUrl(SITUARE_URL, GET_LOCATIONS); - sendRequest(url, COOKIE, cookie); +// requestUrl.append("access_token="); + requestUrl.append(m_session); + +// qWarning() << __PRETTY_FUNCTION__ << "request url with parameters and access token:" << requestUrl; } -void SituareService::reverseGeo(const QPointF &coordinates) +void SituareService::buildRequest(const QString &script, const QHash ¶meters) { - qDebug() << __PRETTY_FUNCTION__; + qWarning() << __PRETTY_FUNCTION__; + + const QString PARAMETER_KEY_API = "api"; + const QString PARAMETER_VALUE_API = "2.0"; + + QString url = SITUARE_URL; + url.append(script); + url.append("?"); + + // append default api version parameter if not yet specified + if (!parameters.contains(PARAMETER_KEY_API)) + url.append(PARAMETER_KEY_API + "=" + PARAMETER_VALUE_API + "&"); + + // append parameters + if (!parameters.isEmpty()) { + QHash::const_iterator i = parameters.constBegin(); + while (i != parameters.constEnd()) { + url.append(i.key()); + url.append("="); + url.append(i.value()); + url.append("&"); + i++; + } + } - QString cookie = formCookie(API_KEY, m_credentials.expires(),m_credentials.userID(), - m_credentials.sessionKey(), m_credentials.sessionSecret(), - m_credentials.sig(), EN_LOCALE); +// qWarning() << __PRETTY_FUNCTION__ << "request url with parameters:" << url; - QString urlParameters = formUrlParameters(coordinates); - urlParameters.append(JSON_FORMAT); - QUrl url = formUrl(SITUARE_URL, REVERSE_GEO, urlParameters); + if (!m_session.isEmpty()) { + appendAccessToken(url); + sendRequest(url); + } else { + m_requestsWaitingAccessToken.append(url); + ///< @todo emit login request + } +} + +void SituareService::clearUserData() +{ + qDebug() << __PRETTY_FUNCTION__; - sendRequest(url, COOKIE, cookie); + qDeleteAll(m_friendsList.begin(), m_friendsList.end()); + m_friendsList.clear(); + + if(m_user) { + delete m_user; + m_user = 0; + } + emit userDataChanged(m_user, m_friendsList); } -void SituareService::updateLocation(const QPointF &coordinates, const QString &status, - const bool &publish) +QString SituareService::degreesToString(double degrees) { qDebug() << __PRETTY_FUNCTION__; - QString cookie = formCookie(API_KEY, m_credentials.expires(), m_credentials.userID(), - m_credentials.sessionKey(), m_credentials.sessionSecret(), - m_credentials.sig(), EN_LOCALE); + // one scene pixel is about 5.4e-6 degrees, the integer part is max three digits and one + // additional digit is added for maximum precision + const int PRECISION = 10; + return QString::number(degrees, 'f', PRECISION); +} - QString publishValue; - if(publish) { - publishValue = PUBLISH_TRUE; - } - else { - publishValue = PUBLISH_FALSE; - } - QString urlParameters = formUrlParameters(coordinates, status, publishValue); - QUrl url = formUrl(SITUARE_URL, UPDATE_LOCATION, urlParameters); +void SituareService::fetchLocations() +{ + qDebug() << __PRETTY_FUNCTION__; - sendRequest(url, COOKIE, cookie); + QHash parameters; + parameters.insert("extra_user_data", NORMAL_SIZE_PROFILE_IMAGE); + + buildRequest(GET_LOCATIONS, parameters); } QString SituareService::formCookie(const QString &apiKeyValue, QString expiresValue, @@ -188,31 +233,34 @@ QUrl SituareService::formUrl(const QString &baseUrl, const QString &phpScript, return url; } -QString SituareService::formUrlParameters(const QPointF &coordinates, QString status, - QString publish) +QString SituareService::formUrlParameters(const GeoCoordinate &coordinates, QString status, + bool publish) { + qDebug() << __PRETTY_FUNCTION__; + + // one scene pixel is about 5.4e-6 degrees, the integer part is max three digits and one + // additional digit is added for maximum precision + const int COORDINATE_PRECISION = 10; + QString parameters; parameters.append(QUESTION_MARK); parameters.append(LATITUDE); parameters.append(EQUAL_MARK); - parameters.append(QString::number(coordinates.y())); + parameters.append(QString::number(coordinates.latitude(), 'f', COORDINATE_PRECISION)); parameters.append(AMBERSAND_MARK); parameters.append(LONGTITUDE); parameters.append(EQUAL_MARK); - parameters.append(QString::number(coordinates.x())); + parameters.append(QString::number(coordinates.longitude(), 'f', COORDINATE_PRECISION)); - if(publish.compare(PUBLISH_TRUE) == 0) { - parameters.append(AMBERSAND_MARK); - parameters.append(PUBLISH); - parameters.append(EQUAL_MARK); + parameters.append(AMBERSAND_MARK); + parameters.append(PUBLISH); + parameters.append(EQUAL_MARK); + + if(publish) parameters.append(PUBLISH_TRUE); - } else if(publish.compare(PUBLISH_FALSE) == 0) { - parameters.append(AMBERSAND_MARK); - parameters.append(PUBLISH); - parameters.append(EQUAL_MARK); + else parameters.append(PUBLISH_FALSE); - } if(!status.isEmpty()) { parameters.append(AMBERSAND_MARK); @@ -224,78 +272,44 @@ QString SituareService::formUrlParameters(const QPointF &coordinates, QString st return parameters; } -void SituareService::sendRequest(const QUrl &url, const QString &cookieType, const QString &cookie) -{ - qDebug() << __PRETTY_FUNCTION__; - - QNetworkRequest request; - - request.setUrl(url); - request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false); - request.setRawHeader(cookieType.toAscii(), cookie.toUtf8()); - - QNetworkReply *reply = m_networkManager->get(request, true); - - m_currentRequests.append(reply); -} - -void SituareService::requestFinished(QNetworkReply *reply) +void SituareService::imageReceived(const QUrl &url, const QPixmap &image) { qDebug() << __PRETTY_FUNCTION__; + qDebug() << "Image URL: " << url << " size :" << image.size(); - //Reply from situare - if (m_currentRequests.contains(reply)) { - - qDebug() << "BytesAvailable: " << reply->bytesAvailable(); - - if (reply->error()) { - emit error(ErrorContext::NETWORK, reply->error()); - } else { - QByteArray replyArray = reply->readAll(); - qDebug() << "Reply from: " << reply->url() << "reply " << replyArray; - - if(replyArray == ERROR_LAT.toAscii()) { - qDebug() << "Error: " << ERROR_LAT; - emit error(ErrorContext::SITUARE, SituareError::UPDATE_FAILED); - } else if(replyArray == ERROR_LON.toAscii()) { - qDebug() << "Error: " << ERROR_LON; - emit error(ErrorContext::SITUARE, SituareError::UPDATE_FAILED); - } else if(replyArray.contains(ERROR_SESSION.toAscii())) { - qDebug() << "Error: " << ERROR_SESSION; - emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED); - } else if(replyArray.startsWith(OPENING_BRACE_MARK.toAscii())) { - qDebug() << "JSON string"; - parseUserData(replyArray); - } else if(replyArray.isEmpty()) { - if(reply->url().toString().contains(UPDATE_LOCATION.toAscii())) { - emit updateWasSuccessful(); - } else { - // session credentials are invalid - emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED); - } - } else { - // unknown reply - emit error(ErrorContext::SITUARE, SituareError::ERROR_GENERAL); + // assign facebook silhouette image to all who doesn't have a profile image + if(url == QUrl(SILHOUETTE_URL)) { + if(m_user->profileImageUrl().isEmpty()) { + m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large)); + emit imageReady(m_user); + } + foreach(User *friendItem, m_friendsList) { + if(friendItem->profileImageUrl().isEmpty()) { + friendItem->setProfileImage(AvatarImage::create(image, AvatarImage::Small)); + emit imageReady(friendItem); } } - m_currentRequests.removeAll(reply); - reply->deleteLater(); } -} -void SituareService::credentialsReady(const FacebookCredentials &credentials) -{ - qDebug() << __PRETTY_FUNCTION__; + if (m_user->profileImageUrl() == url) { + m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large)); + emit imageReady(m_user); + } - m_credentials = credentials; + foreach(User *friendItem, m_friendsList) { + if(friendItem->profileImageUrl() == url) { + friendItem->setProfileImage(AvatarImage::create(image, AvatarImage::Small)); + emit imageReady(friendItem); + } + } } void SituareService::parseUserData(const QByteArray &jsonReply) { qDebug() << __PRETTY_FUNCTION__; - m_visited = 0; - m_nbrOfImages = 0; + qWarning() << __PRETTY_FUNCTION__ << "Server reply:" << jsonReply; + m_defaultImage = false; QJson::Parser parser; @@ -313,18 +327,10 @@ void SituareService::parseUserData(const QByteArray &jsonReply) return; } else if(result.contains("user")) { - qDeleteAll(m_friendsList.begin(), m_friendsList.end()); - m_friendsList.clear(); - - if(m_user) { - delete m_user; - m_user = 0; - } - QVariant userVariant = result.value("user"); QMap userMap = userVariant.toMap(); - QPointF coordinates(userMap["longitude"].toReal(), userMap["latitude"].toReal()); + GeoCoordinate coordinates(userMap["latitude"].toReal(), userMap["longitude"].toReal()); QUrl imageUrl = userMap[NORMAL_SIZE_PROFILE_IMAGE].toUrl(); @@ -336,21 +342,23 @@ void SituareService::parseUserData(const QByteArray &jsonReply) QString address = userMap["address"].toString(); if(address.isEmpty()) { QStringList location; - location.append(QString::number(coordinates.y())); - location.append(QString::number(coordinates.x())); + location.append(QString::number(coordinates.latitude())); + location.append(QString::number(coordinates.longitude())); address = location.join(", "); } - m_user = new User(address, coordinates, userMap["name"].toString(), + User user = User(address, coordinates, userMap["name"].toString(), userMap["note"].toString(), imageUrl, userMap["timestamp"].toString(), true, userMap["uid"].toString()); + QList tmpFriendsList; + foreach (QVariant friendsVariant, result["friends"].toList()) { QMap friendMap = friendsVariant.toMap(); QVariant distance = friendMap["distance"]; QMap distanceMap = distance.toMap(); - QPointF coordinates(friendMap["longitude"].toReal(), friendMap["latitude"].toReal()); + GeoCoordinate coordinates(friendMap["latitude"].toReal(),friendMap["longitude"].toReal()); QUrl imageUrl = friendMap["profile_pic"].toUrl(); @@ -362,22 +370,86 @@ void SituareService::parseUserData(const QByteArray &jsonReply) QString address = friendMap["address"].toString(); if(address.isEmpty()) { QStringList location; - location.append(QString::number(coordinates.y())); - location.append(QString::number(coordinates.x())); + location.append(QString::number(coordinates.latitude())); + location.append(QString::number(coordinates.longitude())); address = location.join(", "); } - User *user = new User(address, coordinates, - friendMap["name"].toString(), - friendMap["note"].toString(), imageUrl, - friendMap["timestamp"].toString(), - false, friendMap["uid"].toString(), - distanceMap["units"].toString(), - distanceMap["value"].toDouble()); + User buddy = User(address, coordinates, friendMap["name"].toString(), + friendMap["note"].toString(), imageUrl, + friendMap["timestamp"].toString(), + false, friendMap["uid"].toString(), distanceMap["units"].toString(), + distanceMap["value"].toDouble()); - m_friendsList.append(user); + tmpFriendsList.append(buddy); } - addProfileImages(); + + QList imageUrlList; // url list for images + + // set unchanged profile images or add new images to imageUrlList for downloading + if(m_user) { + if(m_user->profileImageUrl() != user.profileImageUrl()) { + if(!user.profileImageUrl().isEmpty()) + imageUrlList.append(user.profileImageUrl()); + } else { + user.setProfileImage(m_user->profileImage()); + } + } else { + if(!user.profileImageUrl().isEmpty()) + imageUrlList.append(user.profileImageUrl()); + } + + // clear old user object + if(m_user) { + delete m_user; + m_user = 0; + } + + // create new user object from temporary user object + m_user = new User(user); + + // set unchanged profile images or add new images to imageUrlList for downloading + if(!m_friendsList.isEmpty()) { + foreach(User tmpBuddy, tmpFriendsList) { + if(!tmpBuddy.profileImageUrl().isEmpty()) { + bool found = false; + foreach(User *buddy, m_friendsList) { + if(tmpBuddy.profileImageUrl() == buddy->profileImageUrl()) { + tmpBuddy.setProfileImage(buddy->profileImage()); + found = true; + break; + } + } + if(!found && !tmpBuddy.profileImageUrl().isEmpty()) + imageUrlList.append(tmpBuddy.profileImageUrl()); + } + } + } else { + foreach(User buddy, tmpFriendsList) { + if(!buddy.profileImageUrl().isEmpty()) + imageUrlList.append(buddy.profileImageUrl()); + } + } + + // clear old friendlist + qDeleteAll(m_friendsList.begin(), m_friendsList.end()); + m_friendsList.clear(); + + // populate new friendlist with temporary friendlist's data + foreach(User tmpFriendItem, tmpFriendsList) { + User *friendItem = new User(tmpFriendItem); + m_friendsList.append(friendItem); + } + tmpFriendsList.clear(); + + emit userDataChanged(m_user, m_friendsList); + + // set silhouette image to imageUrlList for downloading + if(m_defaultImage) + imageUrlList.append(QUrl(SILHOUETTE_URL)); + + addProfileImages(imageUrlList); + imageUrlList.clear(); } else { QVariant address = result.value("address"); if(!address.toString().isEmpty()) { @@ -394,73 +466,113 @@ void SituareService::parseUserData(const QByteArray &jsonReply) } } -void SituareService::imageReceived(const QUrl &url, const QPixmap &image) +void SituareService::requestFinished(QNetworkReply *reply) { qDebug() << __PRETTY_FUNCTION__; - qDebug() << "Image URL: " << url << " size :" << image.size(); - // assign facebook silhouette image to all who doesn't have a profile image - if(url == QUrl(SILHOUETTE_URL)) { - if(m_user->profileImageUrl().isEmpty()) { - m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large)); - } - for(int i=0;i < m_friendsList.count();i++) { - if(m_friendsList.at(i)->profileImageUrl().isEmpty()) { - m_friendsList.at(i)->setProfileImage(AvatarImage::create(image, - AvatarImage::Small)); + //Reply from situare + if (m_currentRequests.contains(reply)) { + + qDebug() << "BytesAvailable: " << reply->bytesAvailable(); + + if (reply->error()) { + emit error(ErrorContext::NETWORK, reply->error()); + } else { + QByteArray replyArray = reply->readAll(); + qDebug() << "Reply from: " << reply->url() << "reply " << replyArray; + + if(replyArray == ERROR_LAT.toAscii()) { + qDebug() << "Error: " << ERROR_LAT; + emit error(ErrorContext::SITUARE, SituareError::UPDATE_FAILED); + } else if(replyArray == ERROR_LON.toAscii()) { + qDebug() << "Error: " << ERROR_LON; + emit error(ErrorContext::SITUARE, SituareError::UPDATE_FAILED); + } else if(replyArray.contains(ERROR_SESSION.toAscii())) { + qDebug() << "Error: " << ERROR_SESSION; + emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED); + } else if(replyArray.startsWith(OPENING_BRACE_MARK.toAscii())) { + qDebug() << "JSON string"; + parseUserData(replyArray); + } else if(replyArray.isEmpty()) { + if(reply->url().toString().contains(UPDATE_LOCATION.toAscii())) { + emit updateWasSuccessful(); + } else { + // session credentials are invalid + emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED); + } + } else { + // unknown reply + emit error(ErrorContext::SITUARE, SituareError::ERROR_GENERAL); } } + m_currentRequests.removeAll(reply); + reply->deleteLater(); } +} - if (m_user->profileImageUrl() == url) { - m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large)); - } +void SituareService::reverseGeo(const GeoCoordinate &coordinates) +{ + qDebug() << __PRETTY_FUNCTION__; - for(int i=0;iprofileImageUrl() == url) { - m_friendsList.at(i)->setProfileImage(AvatarImage::create(image, AvatarImage::Small)); - m_nbrOfImages++; // indicates how many friend profile images has been downloaded - } - } + QHash parameters; + parameters.insert("lat", degreesToString(coordinates.latitude())); + parameters.insert("lon", degreesToString(coordinates.longitude())); + parameters.insert("format", "json"); - if(m_nbrOfImages == m_visited) { - qDebug() << "m_nbrOfImages: " << m_nbrOfImages << " m_visited: " << m_visited; - qDebug() << "emit userDataChanged"; - emit userDataChanged(m_user, m_friendsList); - } + buildRequest(REVERSE_GEO, parameters); } -void SituareService::addProfileImages() +void SituareService::sendRequest(const QUrl &url, const QString &cookieType, const QString &cookie) { qDebug() << __PRETTY_FUNCTION__; - // reduce net traffic by sending only one download request for facebook silhouette image - if(m_defaultImage) { - emit fetchImage(QUrl(SILHOUETTE_URL)); - } + QNetworkRequest request; - if(!m_user->profileImageUrl().isEmpty() && m_user->profileImageUrl().isValid()) - emit fetchImage(m_user->profileImageUrl()); + request.setUrl(url); + request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false); + request.setRawHeader(cookieType.toAscii(), cookie.toUtf8()); - for(int i=0;iprofileImageUrl().isEmpty() && - m_friendsList.at(i)->profileImageUrl().isValid()) { - m_visited++; // indicates how many friends that have profile image - emit fetchImage(m_friendsList.at(i)->profileImageUrl()); - } + QNetworkReply *reply = m_networkManager->get(request, true); + + m_currentRequests.append(reply); +} + +void SituareService::sendRequest(const QString &requestUrl) +{ + qWarning() << __PRETTY_FUNCTION__ << "requestUrl" << requestUrl; + + // make and send the request + QNetworkRequest request; + request.setUrl(QUrl(requestUrl)); + request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false); + QNetworkReply *reply = m_networkManager->get(request, true); + m_currentRequests.append(reply); +} + +void SituareService::updateSession(const QString &session) +{ + qWarning() << __PRETTY_FUNCTION__; + + m_session = session; + + foreach (QString request, m_requestsWaitingAccessToken) { + appendAccessToken(request); + sendRequest(request); } + + m_requestsWaitingAccessToken.clear(); } -void SituareService::clearUserData() +void SituareService::updateLocation(const GeoCoordinate &coordinates, const QString &status, + const bool &publish) { qDebug() << __PRETTY_FUNCTION__; - qDeleteAll(m_friendsList.begin(), m_friendsList.end()); - m_friendsList.clear(); + QHash parameters; + parameters.insert("lat", degreesToString(coordinates.latitude())); + parameters.insert("lon", degreesToString(coordinates.longitude())); + parameters.insert("publish", publish ? "true" : "false"); + parameters.insert("data", status); ///< @todo if !empty ??? - if(m_user) { - delete m_user; - m_user = 0; - } - emit userDataChanged(m_user, m_friendsList); + buildRequest(UPDATE_LOCATION, parameters); }