GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r703:ba0e6f7d7791

Correction for MR

perrinel -

r703:ba0e6f7d7791

parent child

Context file:

r703:ba0e6f7d7791

core/src/Network/NetworkController.cpp +12 -5

                                                       << QThread::currentThread() << request.get() << reply;
                      impl->lockRead();
                      auto it = impl->m_NetworkReplyToId.find(reply);
-                     impl->unlock();
                      if (it != impl->m_NetworkReplyToId.cend()) {
+                         qCDebug(LOG_NetworkController()) << tr("Remove for reply: ") << it->second;
+                         impl->unlock();
                          impl->lockWrite();
-                         qCDebug(LOG_NetworkController()) << tr("Remove for reply: ")
-                                                          << impl->m_NetworkReplyToId[reply];
                          impl->m_NetworkReplyToId.erase(reply);
                          impl->unlock();
                          // Deletes reply
                          callback(reply, identifier);
                          reply->deleteLater();
                      }
+                     else {
+                         impl->unlock();
+                     }
                      qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished END")
                                                       << QThread::currentThread() << reply;
                                                           << bytesRead << totalBytes;
                          impl->lockRead();
                          auto it = impl->m_NetworkReplyToId.find(reply);
-                         impl->unlock();
                          if (it != impl->m_NetworkReplyToId.cend()) {
-                             emit this->replyDownloadProgress(it->second, request, progress);
+                             auto id = it->second;
+                             impl->unlock();
+                             emit this->replyDownloadProgress(id, request, progress);
+                         }
+                         else {
+                             impl->unlock();
                          }
                          qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress END")
                                                           << QThread::currentThread() << reply;
                      }

plugins/amda/src/AmdaProvider.cpp +16 -13

                  const auto times = parameters.m_Times;
                  const auto data = parameters.m_Data;
                  for (const auto &dateTime : qAsConst(times)) {
+                     qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::requestDataLoading ") << acqIdentifier
+                                                << dateTime;
                      this->retrieveData(acqIdentifier, dateTime, data);
                                                         std::shared_ptr<QNetworkRequest> networkRequest,
                                                         double progress)
              {
-                 qCInfo(LOG_AmdaProvider()) << tr("onReplyDownloadProgress") << acqIdentifier
-                                            << networkRequest.get() << progress;
+                 qCDebug(LOG_AmdaProvider()) << tr("onReplyDownloadProgress") << acqIdentifier
+                                             << networkRequest.get() << progress;
                  auto acqIdToRequestProgressMapIt = m_AcqIdToRequestProgressMap.find(acqIdentifier);
                  if (acqIdToRequestProgressMapIt != m_AcqIdToRequestProgressMap.end()) {
+                     // Update the progression for the current request
                      auto requestPtr = networkRequest;
                      auto findRequest = [requestPtr](const auto &entry) { return requestPtr == entry.first; };
                          qCWarning(LOG_AmdaProvider()) << tr("Can't retrieve Request in progress")
                                                        << acqIdentifier << networkRequest.get() << progress;
                      }
+                 }
-                 acqIdToRequestProgressMapIt = m_AcqIdToRequestProgressMap.find(acqIdentifier);
-                 if (acqIdToRequestProgressMapIt != m_AcqIdToRequestProgressMap.end()) {
+                     // Compute the current final progress and notify it
                      double finalProgress = 0.0;
-                     auto &requestProgressMap = acqIdToRequestProgressMapIt->second;
                      auto fraq = requestProgressMap.size();
                      for (auto requestProgress : requestProgressMap) {
                          finalProgress += requestProgress.second;
-                         qCDebug(LOG_AmdaProvider()) << tr("current final progress without freq:")
+                         qCDebug(LOG_AmdaProvider()) << tr("Current final progress without fraq:")
                                                      << finalProgress << requestProgress.second;
                      }
                          finalProgress = finalProgress / fraq;
                      }
-                     qCDebug(LOG_AmdaProvider()) << tr("2 onReplyDownloadProgress final progress") << fraq
-                                                 << finalProgress;
+                     qCDebug(LOG_AmdaProvider()) << tr("Current final progress: ") << fraq << finalProgress;
                      emit dataProvidedProgress(acqIdentifier, finalProgress);
                  }
                  else {
                  auto endDate = dateFormat(dateTime.m_TEnd);
                  auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};
-                 qCDebug(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;
+                 qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;
                  auto tempFile = std::make_shared<QTemporaryFile>();
                  // LAMBDA
                                               productValueType](QNetworkReply *reply, QUuid dataId) noexcept {
                      // Don't do anything if the reply was abort
-                     if (reply->error() != QNetworkReply::OperationCanceledError) {
+                     if (reply->error() == QNetworkReply::NoError) {
                          if (tempFile) {
                              auto replyReadAll = reply->readAll();
                                                      << dataId;
                          m_AcqIdToRequestProgressMap.erase(dataId);
                      }
+                     else {
+                         qCCritical(LOG_AmdaProvider()) << tr("httpDownloadFinished ERROR");
+                     }
                  };
                  auto httpFinishedLambda
                      = [this, httpDownloadFinished, tempFile](QNetworkReply *reply, QUuid dataId) noexcept {
                            // Don't do anything if the reply was abort
-                           if (reply->error() != QNetworkReply::OperationCanceledError) {
+                           if (reply->error() == QNetworkReply::NoError) {
                                auto downloadFileUrl = QUrl{QString{reply->readAll()}};
-                               qCDebug(LOG_AmdaProvider())
+                               qCInfo(LOG_AmdaProvider())
                                    << tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;
                                // Executes request for downloading file //
                            else {
                                qCDebug(LOG_AmdaProvider())
                                    << tr("acquisition requests erase because of aborting") << dataId;
+                               qCCritical(LOG_AmdaProvider()) << tr("httpFinishedLambda ERROR");
                                m_AcqIdToRequestProgressMap.erase(dataId);
                            }
                        };

General Comments 2

perrinel

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 2 added
  * 0 removed

Changed files:
  * A core/include/Variable/VariableAcquisitionWorker.h
  * M core/include/Data/IDataProvider.h
  * M core/include/Variable/VariableController.h
  * M core/src/Network/NetworkController.cpp
  * M core/src/Variable/VariableAcquisitionWorker.cpp
  * M core/src/Variable/VariableController.cpp
  * M plugins/amda/src/AmdaProvider.cpp

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages