-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refs #99. Refactored DanceComManager to use base class
- Loading branch information
Showing
5 changed files
with
30 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,24 @@ | ||
| #include "DanceComManager.h" | ||
| #include "DanceWebAPI.h" | ||
|
|
||
| DanceComManager::DanceComManager(ComManager *comManager, QObject *parent) | ||
| : BaseComManager(comManager->getServerUrl()), | ||
| m_comManager(comManager) | ||
| : BaseServiceComManager(comManager, "DanceService") | ||
| { | ||
|
|
||
| // Set initial user token | ||
| setCredentials(m_comManager->getCurrentToken()); | ||
|
|
||
| // Connect signals | ||
| connectSignals(); | ||
|
|
||
| } | ||
|
|
||
| DanceComManager::~DanceComManager() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| bool DanceComManager::processNetworkReply(QNetworkReply *reply) | ||
| { | ||
| QString reply_path = reply->url().path(); | ||
| QString reply_data = reply->readAll(); | ||
| QUrlQuery reply_query = QUrlQuery(reply->url().query()); | ||
| //qDebug() << reply_path << " ---> " << reply_data << ": " << reply->url().query(); | ||
|
|
||
| bool handled = false; | ||
|
|
||
| if (reply->operation()==QNetworkAccessManager::GetOperation){ | ||
| if (!handled){ | ||
| // General case | ||
| handled = handleDataReply(reply_path, reply_data, reply_query); | ||
| if (handled) emit queryResultsOK(reply_path, reply_query); | ||
| } | ||
| } | ||
|
|
||
| if (reply->operation()==QNetworkAccessManager::PostOperation){ | ||
| if (!handled){ | ||
| handled=handleDataReply(reply_path, reply_data, reply_query); | ||
| if (handled) emit postResultsOK(reply_path, reply_data); | ||
| } | ||
| } | ||
|
|
||
| if (reply->operation()==QNetworkAccessManager::DeleteOperation){ | ||
| // Extract id from url | ||
| int id = 0; | ||
| if (reply_query.hasQueryItem("id")){ | ||
| id = reply_query.queryItemValue("id").toInt(); | ||
| } | ||
| emit deleteResultsOK(reply_path, id); | ||
| handled=true; | ||
| } | ||
|
|
||
| return handled; | ||
| } | ||
|
|
||
| void DanceComManager::connectSignals() | ||
| void DanceComManager::postHandleData(const QList<QJsonObject> &items, const QString &reply_path, const QUrlQuery &reply_query) | ||
| { | ||
| connect(m_comManager, &ComManager::userTokenUpdated, this, &DanceComManager::handleUserTokenUpdated); | ||
| } | ||
|
|
||
| bool DanceComManager::handleDataReply(const QString &reply_path, const QString &reply_data, const QUrlQuery &reply_query) | ||
| { | ||
| QJsonParseError json_error; | ||
|
|
||
| // Process reply | ||
| QString data_str = filterReplyString(reply_data); | ||
|
|
||
| QJsonDocument data_list = QJsonDocument::fromJson(data_str.toUtf8(), &json_error); | ||
| if (json_error.error!= QJsonParseError::NoError){ | ||
| LOG_ERROR("Received a JSON string for " + reply_path + " with " + reply_query.toString() + " with error: " + json_error.errorString(), "DanceComManager::handleDataReply"); | ||
| return false; | ||
| } | ||
|
|
||
| // Browse each items received | ||
| QList<QJsonObject> items; | ||
| if (data_list.isArray()){ | ||
| QJsonArray data_list_array = data_list.array(); | ||
| for (const QJsonValue &data:std::as_const(data_list_array)){ | ||
| items.append(data.toObject()); | ||
| } | ||
| }else{ | ||
| items.append(data_list.object()); | ||
| } | ||
|
|
||
| // Check to emit correct signals for specific data types | ||
| if (reply_path.endsWith(DANCE_LIBRARY_PATH) || reply_path.endsWith(DANCE_LIBRARY_VIDEOS_PATH)){ | ||
| emit videosReceived(items, reply_query); | ||
| } | ||
|
|
||
| if (reply_path.endsWith(DANCE_PLAYLIST_PATH)){ | ||
| emit playlistReceived(items, reply_query); | ||
| } | ||
|
|
||
| // Always emit generic signal | ||
| emit dataReceived(items, reply_query); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| void DanceComManager::handleUserTokenUpdated() | ||
| { | ||
| // Update token | ||
| setCredentials(m_comManager->getCurrentToken()); | ||
| } | ||
|
|
||
| void DanceComManager::doGet(const QString &path, const QUrlQuery &query_args, const bool &use_token) | ||
| { | ||
| Q_UNUSED(use_token) | ||
| BaseComManager::doGet(path, query_args, true); // Always use token! | ||
| } | ||
|
|
||
| void DanceComManager::doPost(const QString &path, const QString &post_data, const bool &use_token) | ||
| { | ||
| Q_UNUSED(use_token) | ||
| BaseComManager::doPost(path, post_data, true); // Always use token! | ||
| } | ||
|
|
||
| void DanceComManager::doDelete(const QString &path, const int &id, const bool &use_token) | ||
| { | ||
| Q_UNUSED(use_token) | ||
| BaseComManager::doDelete(path, id, true); // Always use token! | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| #ifndef DANCEWEBAPI_H | ||
| #define DANCEWEBAPI_H | ||
|
|
||
| #define DANCE_LIBRARY_PATH "/dance/api/library" | ||
| #define DANCE_LIBRARY_VIDEOS_PATH "/dance/api/library/videos" | ||
| #define DANCE_PLAYLIST_PATH "/dance/api/playlist" | ||
| #define DANCE_LIBRARY_PATH "api/library" | ||
| #define DANCE_LIBRARY_VIDEOS_PATH "api/library/videos" | ||
| #define DANCE_PLAYLIST_PATH "api/playlist" | ||
|
|
||
| #endif // DANCEWEBAPI_H |