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

[libcalamaresui] Adjust paste code to desired API

Browse Source 
Still doesn't compile because consumers are not ready.
This commit is contained in:
Adriaan de Groot 2021-03-09 14:56:37 +01:00
parent 3c6683bd98
commit bce6f3f1b7
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libcalamaresui/utils/Paste.cpp
View File

@ -39,17 +39,10 @@ logFileContents()
namespace CalamaresUtils namespace CalamaresUtils
{ {
QStringList UploadServersList = {
"fiche"
// In future more serverTypes can be added as Calamares support them
// "none" serverType is explicitly not mentioned here
};
QString QString
ficheLogUpload( QObject* parent ) ficheLogUpload( QObject* parent )
{ {
const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); auto [ type, serverUrl ] = Calamares::Branding::instance()->uploadServer();
quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt();
QByteArray pasteData = logFileContents(); QByteArray pasteData = logFileContents();
if ( pasteData.isEmpty() ) if ( pasteData.isEmpty() )
@ -59,7 +52,7 @@ ficheLogUpload( QObject* parent )
} }
QTcpSocket* socket = new QTcpSocket( parent ); QTcpSocket* socket = new QTcpSocket( parent );
socket->connectToHost( ficheHost, fichePort ); socket->connectToHost( serverUrl.host(), serverUrl.port() );
if ( !socket->waitForConnected() ) if ( !socket->waitForConnected() )
{ {
@ -68,7 +61,7 @@ ficheLogUpload( QObject* parent )
return QString(); return QString();
} }
cDebug() << "Connected to paste server" << ficheHost; cDebug() << "Connected to paste server" << serverUrl.host();
socket->write( pasteData ); socket->write( pasteData );
@ -98,7 +91,7 @@ ficheLogUpload( QObject* parent )
QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" );
QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr ); QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr );
if ( pasteUrl.isValid() && pasteUrl.host() == ficheHost ) if ( pasteUrl.isValid() && pasteUrl.host() == serverUrl.host() )
{ {
QClipboard* clipboard = QApplication::clipboard(); QClipboard* clipboard = QApplication::clipboard();
clipboard->setText( pasteUrlStr, QClipboard::Clipboard ); clipboard->setText( pasteUrlStr, QClipboard::Clipboard );