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

libcalamares: use namespace Calamares::Network consistently

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-10 22:32:49 +02:00
parent d199288034
commit a9ef587705
12 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamares/geoip/GeoIPTests.cpp
View File

@ -187,7 +187,7 @@ GeoIPTests::testSplitTZ()
#define CHECK_GET( t, selector, url ) \ #define CHECK_GET( t, selector, url ) \
{ \ { \
auto tz = GeoIP##t( selector ) \ auto tz = GeoIP##t( selector ) \
.processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \ .processReply( Calamares::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \
qDebug() << tz; \ qDebug() << tz; \
QCOMPARE( default_tz, tz ); \ QCOMPARE( default_tz, tz ); \
auto tz2 = Calamares::GeoIP::Handler( "" #t, url, selector ).get(); \ auto tz2 = Calamares::GeoIP::Handler( "" #t, url, selector ).get(); \
@ -207,7 +207,7 @@ GeoIPTests::testGet()
GeoIPJSON default_handler; GeoIPJSON default_handler;
// Call the KDE service the definitive source. // Call the KDE service the definitive source.
auto default_tz = default_handler.processReply( auto default_tz = default_handler.processReply(
CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( "https://geoip.kde.org/v1/calamares" ) ) ); Calamares::Network::Manager::instance().synchronousGet( QUrl( "https://geoip.kde.org/v1/calamares" ) ) );
// This is bogus, because the test isn't always run by me // This is bogus, because the test isn't always run by me
// QCOMPARE( default_tz.first, QStringLiteral("Europe") ); // QCOMPARE( default_tz.first, QStringLiteral("Europe") );

8
src/libcalamares/geoip/Handler.cpp
View File

@ -113,9 +113,9 @@ do_query( Handler::Type type, const QString& url, const QString& selector )
return RegionZonePair(); return RegionZonePair();
} }
using namespace CalamaresUtils::Network; using namespace Calamares::Network;
return interface->processReply( return interface->processReply(
CalamaresUtils::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); Calamares::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) );
} }
static QString static QString
@ -127,9 +127,9 @@ do_raw_query( Handler::Type type, const QString& url, const QString& selector )
return QString(); return QString();
} }
using namespace CalamaresUtils::Network; using namespace Calamares::Network;
return interface->rawReply( return interface->rawReply(
CalamaresUtils::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); Calamares::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) );
} }
RegionZonePair RegionZonePair

11
src/libcalamares/network/Manager.cpp
View File

@ -22,7 +22,7 @@
#include <algorithm> #include <algorithm>
namespace CalamaresUtils namespace Calamares
{ {
namespace Network namespace Network
{ {
@ -127,7 +127,6 @@ Manager::Private::cleanupNam()
} }
} }
Manager::Manager() Manager::Manager()
: d( std::make_unique< Private >() ) : d( std::make_unique< Private >() )
{ {
@ -187,7 +186,6 @@ Manager::checkHasInternet()
attempts++; attempts++;
} while ( !d->m_hasInternet && ( attempts < d->m_hasInternetUrls.size() ) ); } while ( !d->m_hasInternet && ( attempts < d->m_hasInternetUrls.size() ) );
// For earlier Qt versions (< 5.15.0), set the accessibility flag to // For earlier Qt versions (< 5.15.0), set the accessibility flag to
// NotAccessible if synchronous ping has failed, so that any module // NotAccessible if synchronous ping has failed, so that any module
// using Qt's networkAccessible method to determine whether or not // using Qt's networkAccessible method to determine whether or not
@ -348,13 +346,13 @@ Manager::synchronousGet( const QUrl& url, const RequestOptions& options )
} }
QNetworkReply* QNetworkReply*
Manager::asynchronousGet( const QUrl& url, const CalamaresUtils::Network::RequestOptions& options ) Manager::asynchronousGet( const QUrl& url, const Calamares::Network::RequestOptions& options )
{ {
return asynchronousRun( d->nam(), url, options ); return asynchronousRun( d->nam(), url, options );
} }
QDebug& QDebug&
operator<<( QDebug& s, const CalamaresUtils::Network::RequestStatus& e ) operator<<( QDebug& s, const Calamares::Network::RequestStatus& e )
{ {
s << int( e.status ) << bool( e ); s << int( e.status ) << bool( e );
switch ( e.status ) switch ( e.status )
@ -377,9 +375,8 @@ operator<<( QDebug& s, const CalamaresUtils::Network::RequestStatus& e )
return s; return s;
} }
} // namespace Network } // namespace Network
} // namespace CalamaresUtils } // namespace Calamares
#include "utils/moc-warnings.h" #include "utils/moc-warnings.h"

4
src/libcalamares/network/Manager.h
View File

@ -24,7 +24,7 @@
class QNetworkReply; class QNetworkReply;
class QNetworkRequest; class QNetworkRequest;
namespace CalamaresUtils namespace Calamares
{ {
namespace Network namespace Network
{ {
@ -170,5 +170,5 @@ private:
std::unique_ptr< Private > d; std::unique_ptr< Private > d;
}; };
} // namespace Network } // namespace Network
} // namespace CalamaresUtils } // namespace Calamares
#endif // LIBCALAMARES_NETWORK_MANAGER_H #endif // LIBCALAMARES_NETWORK_MANAGER_H

8
src/libcalamares/network/Tests.cpp
View File

@ -28,7 +28,7 @@ NetworkTests::initTestCase()
void void
NetworkTests::testInstance() NetworkTests::testInstance()
{ {
auto& nam = CalamaresUtils::Network::Manager::instance(); auto& nam = Calamares::Network::Manager::instance();
QVERIFY( !nam.hasInternet() ); QVERIFY( !nam.hasInternet() );
QCOMPARE( nam.getCheckInternetUrls().count(), 0 ); QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
} }
@ -36,7 +36,7 @@ NetworkTests::testInstance()
void void
NetworkTests::testPing() NetworkTests::testPing()
{ {
using namespace CalamaresUtils::Network; using namespace Calamares::Network;
Logger::setupLogLevel( Logger::LOGVERBOSE ); Logger::setupLogLevel( Logger::LOGVERBOSE );
auto& nam = Manager::instance(); auto& nam = Manager::instance();
@ -65,7 +65,7 @@ NetworkTests::testPing()
void void
NetworkTests::testCheckUrl() NetworkTests::testCheckUrl()
{ {
using namespace CalamaresUtils::Network; using namespace Calamares::Network;
Logger::setupLogLevel( Logger::LOGVERBOSE ); Logger::setupLogLevel( Logger::LOGVERBOSE );
auto& nam = Manager::instance(); auto& nam = Manager::instance();
@ -95,7 +95,7 @@ NetworkTests::testCheckUrl()
void void
NetworkTests::testCheckMultiUrl() NetworkTests::testCheckMultiUrl()
{ {
using namespace CalamaresUtils::Network; using namespace Calamares::Network;
Logger::setupLogLevel( Logger::LOGVERBOSE ); Logger::setupLogLevel( Logger::LOGVERBOSE );
auto& nam = Manager::instance(); auto& nam = Manager::instance();

4
src/libcalamaresui/utils/Qml.cpp
View File

@ -240,12 +240,12 @@ registerQmlModels()
0, 0,
"Global", "Global",
[]( QQmlEngine*, QJSEngine* ) -> QObject* { return Calamares::JobQueue::instance()->globalStorage(); } ); []( QQmlEngine*, QJSEngine* ) -> QObject* { return Calamares::JobQueue::instance()->globalStorage(); } );
qmlRegisterSingletonType< CalamaresUtils::Network::Manager >( qmlRegisterSingletonType< Calamares::Network::Manager >(
"io.calamares.core", "io.calamares.core",
1, 1,
0, 0,
"Network", "Network",
[]( QQmlEngine*, QJSEngine* ) -> QObject* { return &CalamaresUtils::Network::Manager::instance(); } ); []( QQmlEngine*, QJSEngine* ) -> QObject* { return &Calamares::Network::Manager::instance(); } );
} }
} }

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

@ -75,7 +75,7 @@ TestPaste::testUploadSize()
QVERIFY( !s.isEmpty() ); QVERIFY( !s.isEmpty() );
QUrl url( s ); QUrl url( s );
QByteArray returnedData = CalamaresUtils::Network::Manager::instance().synchronousGet( url ); QByteArray returnedData = Calamares::Network::Manager::instance().synchronousGet( url );
QCOMPARE( returnedData.size(), 100 ); QCOMPARE( returnedData.size(), 100 );
} }

2
src/modules/locale/Config.cpp
View File

@ -549,7 +549,7 @@ Config::startGeoIP()
{ {
if ( m_geoip && m_geoip->isValid() ) if ( m_geoip && m_geoip->isValid() )
{ {
auto& network = CalamaresUtils::Network::Manager::instance(); auto& network = Calamares::Network::Manager::instance();
if ( network.hasInternet() || network.synchronousPing( m_geoip->url() ) ) if ( network.hasInternet() || network.synchronousPing( m_geoip->url() ) )
{ {
using Watcher = QFutureWatcher< Calamares::GeoIP::RegionZonePair >; using Watcher = QFutureWatcher< Calamares::GeoIP::RegionZonePair >;

2
src/modules/netinstall/LoaderQueue.cpp
View File

@ -126,7 +126,7 @@ LoaderQueue::fetch( const QUrl& url )
return; return;
} }
using namespace CalamaresUtils::Network; using namespace Calamares::Network;
cDebug() << "NetInstall loading groups from" << url; cDebug() << "NetInstall loading groups from" << url;
QNetworkReply* reply = Manager::instance().asynchronousGet( QNetworkReply* reply = Manager::instance().asynchronousGet(

6
src/modules/tracking/TrackingJobs.cpp
View File

@ -110,9 +110,9 @@ TrackingInstallJob::prettyStatusMessage() const
Calamares::JobResult Calamares::JobResult
TrackingInstallJob::exec() TrackingInstallJob::exec()
{ {
using CalamaresUtils::Network::Manager; using Calamares::Network::Manager;
using CalamaresUtils::Network::RequestOptions; using Calamares::Network::RequestOptions;
using CalamaresUtils::Network::RequestStatus; using Calamares::Network::RequestStatus;
auto result = Manager::instance().synchronousPing( auto result = Manager::instance().synchronousPing(
QUrl( m_url ), QUrl( m_url ),

12
src/modules/welcome/Tests.cpp
View File

@ -72,7 +72,7 @@ WelcomeTests::testOneUrl()
QVERIFY( map.contains( "requirements" ) ); QVERIFY( map.contains( "requirements" ) );
c.setConfigurationMap( map ); c.setConfigurationMap( map );
QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 1 ); QCOMPARE( Calamares::Network::Manager::instance().getCheckInternetUrls().count(), 1 );
} }
void void
@ -107,17 +107,17 @@ WelcomeTests::testUrls()
const auto map = CalamaresUtils::loadYaml( fi, &ok ); const auto map = CalamaresUtils::loadYaml( fi, &ok );
QVERIFY( ok ); QVERIFY( ok );
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} ); Calamares::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} );
QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 0 ); QCOMPARE( Calamares::Network::Manager::instance().getCheckInternetUrls().count(), 0 );
c.setConfigurationMap( map ); c.setConfigurationMap( map );
QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), result ); QCOMPARE( Calamares::Network::Manager::instance().getCheckInternetUrls().count(), result );
} }
void void
WelcomeTests::testBadConfigDoesNotResetUrls() WelcomeTests::testBadConfigDoesNotResetUrls()
{ {
auto& nam = CalamaresUtils::Network::Manager::instance(); auto& nam = Calamares::Network::Manager::instance();
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} ); Calamares::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} );
QCOMPARE( nam.getCheckInternetUrls().count(), 0 ); QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
nam.setCheckHasInternetUrl( QVector< QUrl > { QUrl( "http://example.com" ), QUrl( "https://www.kde.org" ) } ); nam.setCheckHasInternetUrl( QVector< QUrl > { QUrl( "http://example.com" ), QUrl( "https://www.kde.org" ) } );
QCOMPARE( nam.getCheckInternetUrls().count(), 2 ); QCOMPARE( nam.getCheckInternetUrls().count(), 2 );

8
src/modules/welcome/checker/GeneralRequirements.cpp
View File

@ -306,12 +306,12 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
{ {
cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs, " cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs, "
<< "reverting to default (" << exampleUrl << ")."; << "reverting to default (" << exampleUrl << ").";
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) ); Calamares::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
incomplete = true; incomplete = true;
} }
else else
{ {
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( urls ); Calamares::Network::Manager::instance().setCheckHasInternetUrl( urls );
} }
} }
else else
@ -319,7 +319,7 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf, " cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf, "
"reverting to default (" "reverting to default ("
<< exampleUrl << ")."; << exampleUrl << ").";
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) ); Calamares::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
incomplete = true; incomplete = true;
} }
return incomplete; return incomplete;
@ -508,7 +508,7 @@ GeneralRequirements::checkHasPower()
bool bool
GeneralRequirements::checkHasInternet() GeneralRequirements::checkHasInternet()
{ {
auto& nam = CalamaresUtils::Network::Manager::instance(); auto& nam = Calamares::Network::Manager::instance();
bool hasInternet = nam.checkHasInternet(); bool hasInternet = nam.checkHasInternet();
Calamares::JobQueue::instance()->globalStorage()->insert( "hasInternet", hasInternet ); Calamares::JobQueue::instance()->globalStorage()->insert( "hasInternet", hasInternet );
return hasInternet; return hasInternet;