napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

squashme WIP upload log to paste server - refactor error checking

Browse Source
This commit is contained in:
bill-auger 2019-06-30 06:13:22 -04:00
parent e7960474d4
commit e096631c54
1 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/libcalamaresui/ViewManager.cpp
View File

@ -238,65 +238,73 @@ quint16 fichePort = 9999; // TODO: config var
[msgBox, ficheHost, fichePort, pasteUrlFmt, pasteUrlTitle] ( QAbstractButton* button ) [msgBox, ficheHost, fichePort, pasteUrlFmt, pasteUrlTitle] ( QAbstractButton* button )
{ {
if ( button->text() != tr( "&Yes" ) ) if ( button->text() != tr( "&Yes" ) )
QApplication::quit();
else
{ {
QFile pasteSourceFile( Logger::logFile() ); QApplication::quit();
if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) return;
cError() << "Could not open log file";
else
{
QByteArray pasteData;
while ( !pasteSourceFile.atEnd() )
{
pasteData += pasteSourceFile.readLine();
}
QTcpSocket* socket = new QTcpSocket(msgBox);
socket->connectToHost( ficheHost, fichePort );
if ( !socket->waitForConnected() )
cError() << "Could not connect to paste server";
else
{
cDebug() << "Connected to paste server";
socket->write( pasteData );
if ( !socket->waitForBytesWritten() )
cError() << "Could not write to paste server";
else
{
cDebug() << "Paste data written to paste server";
if ( !socket->waitForReadyRead() )
cError() << "No data from paste server";
else
{
cDebug() << "Reading response from paste server";
char resp[1024];
socket->readLine(resp, 1024);
socket->close();
QString pasteUrl = QString( resp ) ;
QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrl );
cDebug() << pasteUrlMsg;
QMessageBox* pasteUrlMsgBox = new QMessageBox();
pasteUrlMsgBox->setIcon( QMessageBox::Critical );
pasteUrlMsgBox->setWindowTitle( tr( pasteUrlTitle ) );
pasteUrlMsgBox->setStandardButtons( QMessageBox::Close );
pasteUrlMsgBox->setText( pasteUrlMsg );
pasteUrlMsgBox->show();
connect( pasteUrlMsgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit );
}
}
}
}
} }
QFile pasteSourceFile( Logger::logFile() );
if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
cError() << "Could not open log file";
return;
}
QByteArray pasteData;
while ( !pasteSourceFile.atEnd() )
{
pasteData += pasteSourceFile.readLine();
}
QTcpSocket* socket = new QTcpSocket(msgBox);
socket->connectToHost( ficheHost, fichePort );
if ( !socket->waitForConnected() )
{
cError() << "Could not connect to paste server";
socket->close();
return;
}
cDebug() << "Connected to paste server";
socket->write( pasteData );
if ( !socket->waitForBytesWritten() )
{
cError() << "Could not write to paste server";
socket->close();
return;
}
cDebug() << "Paste data written to paste server";
if ( !socket->waitForReadyRead() )
{
cError() << "No data from paste server";
socket->close();
return;
}
cDebug() << "Reading response from paste server";
char resp[1024];
socket->readLine(resp, 1024);
socket->close();
QString pasteUrl = QString( resp ) ;
QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrl );
cDebug() << pasteUrlMsg;
QMessageBox* pasteUrlMsgBox = new QMessageBox();
pasteUrlMsgBox->setIcon( QMessageBox::Critical );
pasteUrlMsgBox->setWindowTitle( pasteUrlTitle );
pasteUrlMsgBox->setStandardButtons( QMessageBox::Close );
pasteUrlMsgBox->setText( pasteUrlMsg );
pasteUrlMsgBox->show();
connect( pasteUrlMsgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit );
}); });
} }