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

40
src/libcalamaresui/ViewManager.cpp
View File

@ -238,14 +238,18 @@ 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
{ {
QApplication::quit();
return;
}
QFile pasteSourceFile( Logger::logFile() ); QFile pasteSourceFile( Logger::logFile() );
if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
cError() << "Could not open log file";
else
{ {
cError() << "Could not open log file";
return;
}
QByteArray pasteData; QByteArray pasteData;
while ( !pasteSourceFile.atEnd() ) while ( !pasteSourceFile.atEnd() )
{ {
@ -256,23 +260,32 @@ quint16 fichePort = 9999; // TODO: config var
socket->connectToHost( ficheHost, fichePort ); socket->connectToHost( ficheHost, fichePort );
if ( !socket->waitForConnected() ) if ( !socket->waitForConnected() )
cError() << "Could not connect to paste server";
else
{ {
cError() << "Could not connect to paste server";
socket->close();
return;
}
cDebug() << "Connected to paste server"; cDebug() << "Connected to paste server";
socket->write( pasteData ); socket->write( pasteData );
if ( !socket->waitForBytesWritten() ) if ( !socket->waitForBytesWritten() )
cError() << "Could not write to paste server";
else
{ {
cError() << "Could not write to paste server";
socket->close();
return;
}
cDebug() << "Paste data written to paste server"; cDebug() << "Paste data written to paste server";
if ( !socket->waitForReadyRead() ) if ( !socket->waitForReadyRead() )
cError() << "No data from paste server";
else
{ {
cError() << "No data from paste server";
socket->close();
return;
}
cDebug() << "Reading response from paste server"; cDebug() << "Reading response from paste server";
char resp[1024]; char resp[1024];
@ -286,17 +299,12 @@ quint16 fichePort = 9999; // TODO: config var
QMessageBox* pasteUrlMsgBox = new QMessageBox(); QMessageBox* pasteUrlMsgBox = new QMessageBox();
pasteUrlMsgBox->setIcon( QMessageBox::Critical ); pasteUrlMsgBox->setIcon( QMessageBox::Critical );
pasteUrlMsgBox->setWindowTitle( tr( pasteUrlTitle ) ); pasteUrlMsgBox->setWindowTitle( pasteUrlTitle );
pasteUrlMsgBox->setStandardButtons( QMessageBox::Close ); pasteUrlMsgBox->setStandardButtons( QMessageBox::Close );
pasteUrlMsgBox->setText( pasteUrlMsg ); pasteUrlMsgBox->setText( pasteUrlMsg );
pasteUrlMsgBox->show(); pasteUrlMsgBox->show();
connect( pasteUrlMsgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit ); connect( pasteUrlMsgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit );
}
}
}
}
}
}); });
} }