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

[logUpload] suggestionsAndFixes-part2

Browse Source
This commit is contained in:
Anubhav Choudhary 2021-03-30 08:28:30 -06:00
parent d109fc5856
commit b42f86f20f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* par
QString QString
CalamaresUtils::Paste::doLogUpload( QObject* parent ) CalamaresUtils::Paste::doLogUpload( QObject* parent )
{ {
auto [ type, serverUrl, sizeLimit ] = Calamares::Branding::instance()->uploadServer(); auto [ type, serverUrl, sizeLimitKiB ] = Calamares::Branding::instance()->uploadServer();
if ( !serverUrl.isValid() ) if ( !serverUrl.isValid() )
{ {
cWarning() << "Upload configure with invalid URL"; cWarning() << "Upload configure with invalid URL";
@ -120,7 +120,7 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent )
return QString(); return QString();
} }
QByteArray pasteData = logFileContents( sizeLimit ); QByteArray pasteData = logFileContents( sizeLimitKiB );
if ( pasteData.isEmpty() ) if ( pasteData.isEmpty() )
{ {
// An error has already been logged // An error has already been logged
@ -172,6 +172,6 @@ CalamaresUtils::Paste::doLogUploadUI( QWidget* parent )
bool bool
CalamaresUtils::Paste::isEnabled() CalamaresUtils::Paste::isEnabled()
{ {
auto [ type, serverUrl, sizeLimit ] = Calamares::Branding::instance()->uploadServer(); auto [ type, serverUrl, sizeLimitKiB ] = Calamares::Branding::instance()->uploadServer();
return type != Calamares::Branding::UploadServerType::None; return type != Calamares::Branding::UploadServerType::None;
} }

2
src/libcalamaresui/utils/TestPaste.cpp
View File

@ -16,7 +16,7 @@
#include <QDateTime> #include <QDateTime>
#include <QtTest/QtTest> #include <QtTest/QtTest>
extern QByteArray logFileContents( qint64 sizeLimit ); extern QByteArray logFileContents( qint64 sizeLimitKiB );
extern QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ); extern QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent );
class TestPaste : public QObject class TestPaste : public QObject