applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 02:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[locale] Move GeoIP lookup to config

Browse source 
- replace the weird synchronous-lookup-during-requirements-checking
  with a proper async lookup when the system is ready.
This commit is contained in:
Adriaan de Groot 2020-07-22 14:47:43 +02:00
parent a25d61077f
commit 42331f6e13
4 changed files with 68 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/modules/locale/Config.cpp
View file

@ -26,6 +26,8 @@
#include "JobQueue.h"
#include "Settings.h"
#include "locale/Label.h"
#include "modulesystem/ModuleManager.h"
#include "network/Manager.h"
#include "utils/Logger.h"
#include "utils/Variant.h"
@ -204,6 +206,15 @@ Config::timezoneData() const
return ::timezoneData();
}
void
Config::setCurrentLocation()
{
if ( !m_currentLocation && m_startingTimezone.isValid() )
{
setCurrentLocation( m_startingTimezone.first, m_startingTimezone.second );
}
}
void
Config::setCurrentLocation( const QString& regionName, const QString& zoneName )
{
@ -252,7 +263,6 @@ Config::setCurrentLocation( const CalamaresUtils::Locale::TZZone* location )
}
}
LocaleConfiguration
Config::automaticLocaleConfiguration() const
{
@ -341,8 +351,8 @@ getLocaleGenLines( const QVariantMap& configurationMap, QStringList& localeGenLi
static inline void
getAdjustLiveTimezone( const QVariantMap& configurationMap, bool& adjustLiveTimezone )
{
adjustLiveTimezone
= CalamaresUtils::getBool( configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() );
adjustLiveTimezone = CalamaresUtils::getBool(
configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() );
#ifdef DEBUG_TIMEZONES
if ( m_adjustLiveTimezone )
{
@ -411,6 +421,12 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
getAdjustLiveTimezone( configurationMap, m_adjustLiveTimezone );
getStartingTimezone( configurationMap, m_startingTimezone );
getGeoIP( configurationMap, m_geoip );
if ( m_geoip && m_geoip->isValid() )
{
connect(
Calamares::ModuleManager::instance(), &Calamares::ModuleManager::modulesLoaded, this, &Config::startGeoIP );
}
}
Calamares::JobList
@ -427,3 +443,42 @@ Config::createJobs()
return list;
}
void
Config::startGeoIP()
{
if ( m_geoip && m_geoip->isValid() )
{
auto& network = CalamaresUtils::Network::Manager::instance();
if ( network.hasInternet() || network.synchronousPing( m_geoip->url() ) )
{
using Watcher = QFutureWatcher< CalamaresUtils::GeoIP::RegionZonePair >;
m_geoipWatcher = std::make_unique< Watcher >();
m_geoipWatcher->setFuture( m_geoip->query() );
connect( m_geoipWatcher.get(), &Watcher::finished, this, &Config::completeGeoIP );
}
}
}
void
Config::completeGeoIP()
{
if ( !currentLocation() )
{
auto r = m_geoipWatcher->result();
if ( r.isValid() )
{
m_startingTimezone = r;
}
else
{
cWarning() << "GeoIP returned invalid result.";
}
}
else
{
cWarning() << "GeoIP result ignored because a location is already set.";
}
m_geoipWatcher.reset();
m_geoip.reset();
}