Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+12
-12
@@ -63,7 +63,7 @@ WARNING_LOG(x)
|
||||
#endif
|
||||
|
||||
#ifndef ELOG
|
||||
#define ELOG ERROR_LOG()
|
||||
#define ELOG ERROR_LOG(m_logger)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ USB2Dialog::USB2Dialog(LtsSession::LtsSession *session, QWidget *parent)
|
||||
|
||||
m_ui->setupUi(this);
|
||||
|
||||
WARNING_LOG()<<" USB2Dialog::USB2Dialog() START ";
|
||||
WARNING_LOG(m_logger)<<" USB2Dialog::USB2Dialog() START ";
|
||||
connect(m_ui->pbCHange, &QPushButton::clicked,
|
||||
this, &USB2Dialog::slotChangePath);
|
||||
|
||||
@@ -135,13 +135,13 @@ USB2Dialog::USB2Dialog(LtsSession::LtsSession *session, QWidget *parent)
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
WARNING_LOG()<<" data corrupted path: "<< localThpDir();
|
||||
WARNING_LOG(m_logger)<<" data corrupted path: "<< localThpDir();
|
||||
new LtsWidgets::LtsMessageDialogNew(this, tr("Couldn't Load THP(s)"));
|
||||
}
|
||||
|
||||
setOnlineHelpFilename(QStringLiteral("Script_Editor-Export_Script_Administration"));
|
||||
|
||||
WARNING_LOG()<<" USB2Dialog::USB2Dialog() END ";
|
||||
WARNING_LOG(m_logger)<<" USB2Dialog::USB2Dialog() END ";
|
||||
}
|
||||
|
||||
|
||||
@@ -185,15 +185,15 @@ void USB2Dialog::unmountUSB(const QString &device)
|
||||
while (process.canReadLine())
|
||||
{
|
||||
QString outputLine = QString::fromUtf8(process.readLine());
|
||||
DEBUG_LOG() << "OutputLine: " << outputLine;
|
||||
DEBUG_LOG(m_logger) << "OutputLine: " << outputLine;
|
||||
auto outputDevicePath = outputLine.split(QStringLiteral(" ")).last();
|
||||
DEBUG_LOG() << "OutputDevicePath: " << outputDevicePath;
|
||||
DEBUG_LOG(m_logger) << "OutputDevicePath: " << outputDevicePath;
|
||||
|
||||
auto outputPathStripped = outputDevicePath.replace(QLatin1String("\\x20"), QLatin1String(" "));
|
||||
DEBUG_LOG() << "OutputPathStripped: " << outputPathStripped;
|
||||
DEBUG_LOG(m_logger) << "OutputPathStripped: " << outputPathStripped;
|
||||
|
||||
auto outputDeviceName = outputPathStripped.split(QStringLiteral("/")).last();
|
||||
DEBUG_LOG() << "OutputDeviceName: " << outputDeviceName;
|
||||
DEBUG_LOG(m_logger) << "OutputDeviceName: " << outputDeviceName;
|
||||
|
||||
if (outputDeviceName.trimmed().compare(device.trimmed()) == 0)
|
||||
{
|
||||
@@ -201,7 +201,7 @@ void USB2Dialog::unmountUSB(const QString &device)
|
||||
|
||||
auto serialPort = outputLine.split(QStringLiteral(" ")).first();
|
||||
QString absPath = QStringLiteral("/dev/") + serialPort;
|
||||
DEBUG_LOG() << "Serial Port: " << absPath;
|
||||
DEBUG_LOG(m_logger) << "Serial Port: " << absPath;
|
||||
process.start(QStringLiteral("udisksctl"), QStringList() << QStringLiteral("unmount") << QStringLiteral("-b") << absPath);
|
||||
process.waitForFinished();
|
||||
reset();
|
||||
@@ -328,7 +328,7 @@ void USB2Dialog::slotUnmount()
|
||||
|
||||
for(const auto &folder : std::as_const(folderNames))
|
||||
{
|
||||
DEBUG_LOG() << "Folder: " << folder << " USB Root: " << m_usbRoot;
|
||||
DEBUG_LOG(m_logger) << "Folder: " << folder << " USB Root: " << m_usbRoot;
|
||||
|
||||
if(m_usbRoot.contains(folder))
|
||||
{
|
||||
@@ -479,7 +479,7 @@ void USB2Dialog::slotRemove()
|
||||
if (mil.size() < 1)
|
||||
return;
|
||||
|
||||
DEBUG_LOG() << "mil.size()" << mil.size();
|
||||
DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
|
||||
|
||||
QStringList scriptIdList;
|
||||
for (const QModelIndex &idx : mil)
|
||||
@@ -604,7 +604,7 @@ void USB2Dialog::retranslate()
|
||||
|
||||
void USB2Dialog::initLocalModel() noexcept(false)
|
||||
{
|
||||
DEBUG_LOG() << "(re)initModel !!";
|
||||
DEBUG_LOG(m_logger) << "(re)initModel !!";
|
||||
|
||||
|
||||
|
||||
|
||||
+2
@@ -52,6 +52,8 @@ private slots:
|
||||
void slotUnmount();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void removeScript(const QString &scriptId);
|
||||
void reset();
|
||||
void initLocalModel() noexcept(false);
|
||||
|
||||
Reference in new issue
Block a user