Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp

@@ -21,16 +21,15 @@
 
 namespace OcBaseDownload
 {
-PdfDownloader::PdfDownloader(const QVector<WebSocketInterface::Messages::PdfListMessage::PdfInformation> &pdfInfoVec, MainHandler *mainHandler, const QString &hostName, int exerciseId, QObject *parent)
-  : QObject(parent)
+PdfDownloader::PdfDownloader(const QVector<WebSocketInterface::Messages::PdfListMessage::PdfInformation> &pdfInfoVec, MainHandler *mainHandler, const QString &hostName, int exerciseId, QObject *parent) : QObject(parent)
   , m_pdfInfoVec(pdfInfoVec)
   , m_socket(new PdfDownloadSocket(hostName, this))
   , m_mainHandler(mainHandler)
   , m_exerciseId(exerciseId)
   , m_exTblGen(new DBAdministration::ExerciseTableGenerator(getLogger("ExerciseTableGenerator"), NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml")), this))
   , m_downloadCount(0)
-  , m_totalDownloads(pdfInfoVec.size())
-{
+  , m_totalDownloads(pdfInfoVec.size()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_socket, &PdfDownloadSocket::downloadFinished,
           this, &PdfDownloader::onSingleDownloadFinished);
 }
@@ -42,17 +41,17 @@ PdfDownloader::~PdfDownloader()
 
 bool PdfDownloader::startDownload()
 {
-  DEBUG_LOG() << "Downloading startet";
+  DEBUG_LOG(m_logger) << "Downloading startet";
 
   if (!m_socket->isConnected())
   {
-    ERROR_LOG() << "Download could not be startet. Socket not connected.";
+    ERROR_LOG(m_logger) << "Download could not be startet. Socket not connected.";
     return false;
   }
 
   if (!openDbConnection())
   {
-    ERROR_LOG() << "Could not open database connection";
+    ERROR_LOG(m_logger) << "Could not open database connection";
     return false;
   }
 
@@ -61,24 +60,24 @@ bool PdfDownloader::startDownload()
 
 void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
 {
-  DEBUG_LOG() << "Downloading file " << m_currentDownload.name << " finished.";
+  DEBUG_LOG(m_logger) << "Downloading file " << m_currentDownload.name << " finished.";
 
   ++m_downloadCount;
 
   if (!data.size())
-    WARNING_LOG() << "Got finished download without data";
+    WARNING_LOG(m_logger) << "Got finished download without data";
 
   QString msg = QString::fromUtf8(data);
   if (msg.startsWith(QStringLiteral("ERROR")))
   {
-    ERROR_LOG() << msg;
+    ERROR_LOG(m_logger) << msg;
     startNextDownload();
     return;
   }
 
   if (!m_dbConnection.isValid())
   {
-    ERROR_LOG() << "Database not open";
+    ERROR_LOG(m_logger) << "Database not open";
     return;
   }
 
@@ -86,7 +85,7 @@ void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
 
   if (!flmDbHandler->init(0, m_dbConnection))
   {
-    ERROR_LOG() << "Couldn't initialise flmDbHandler";
+    ERROR_LOG(m_logger) << "Couldn't initialise flmDbHandler";
     return;
   }
 
@@ -110,7 +109,7 @@ void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
   flmDbHandler->db()->insert(dbData);
 
   if (!trans.commit())
-    ERROR_LOG() << "Error while inserting FLM data into database.";
+    ERROR_LOG(m_logger) << "Error while inserting FLM data into database.";
 
   startNextDownload();
 }
@@ -119,7 +118,7 @@ bool PdfDownloader::startNextDownload()
 {
   if (m_pdfInfoVec.isEmpty())
   {
-    DEBUG_LOG() << "No more pending downloads.";
+    DEBUG_LOG(m_logger) << "No more pending downloads.";
 
     closeDb(m_dbConnection);
     emit allDownloadsFinished();
@@ -131,7 +130,7 @@ bool PdfDownloader::startNextDownload()
 
   emit newState(100 / m_totalDownloads * m_downloadCount, tr("Downloading file \"%1\"").arg(m_currentDownload.name));
 
-  DEBUG_LOG() << "Downloading file " << m_currentDownload.name;
+  DEBUG_LOG(m_logger) << "Downloading file " << m_currentDownload.name;
 
   m_socket->downloadFromHost(m_currentDownload.id, m_currentDownload.fileSize);
 
@@ -168,10 +167,10 @@ QSqlDatabase PdfDownloader::openDb(bool *bOk)
                                                  s->databaseDriver(),
                                                  s->databaseHostname(),
                                                  s->databaseName());
-  DEBUG_LOG() << "Trying to open database " << s->databaseHostname() << ":" << s->databaseName();
+  DEBUG_LOG(m_logger) << "Trying to open database " << s->databaseHostname() << ":" << s->databaseName();
   if (!dbConnection.isOpen())
   {
-    ERROR_LOG() << "Error opening database " << s->databaseHostname() << ":" << s->databaseName();
+    ERROR_LOG(m_logger) << "Error opening database " << s->databaseHostname() << ":" << s->databaseName();
     if (bOk)
       *bOk = false;
   }
@@ -182,7 +181,7 @@ void PdfDownloader::closeDb(QSqlDatabase &dbConn)
 {
   const QString connName = dbConn.connectionName();
 
-  DEBUG_LOG() << "Closing database: " << connName;
+  DEBUG_LOG(m_logger) << "Closing database: " << connName;
 
   dbConn.close();
   dbConn = QSqlDatabase();