napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a25d61077f
calamares/src/modules/locale/Config.cpp

430 lines
15 KiB
C++
Raw Normal View History

add the localq module and config to locale
2020-03-24 15:47:53 +01:00
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
[locale] Reset Config object The Config object wasn't being used at all in the locale module; reset it to empty and start using it in locale, so that configuration functionality can be added to it as-needed, and with the necessary refactoring built-in.
2020-07-20 12:37:27 +02:00
* SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
* License-Filename: LICENSE
add the localq module and config to locale
2020-03-24 15:47:53 +01:00
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Calamares is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Config.h"
[locale] Move job-creation to Config - since Config knows what settings there are, it should create the jobs to run later -- not the Page. - this doesn't work yet, because the Config does **not** know what the selected timezone is yet.
2020-07-20 22:21:29 +02:00
#include "SetTimezoneJob.h"
[locale] Move the GS updating to the Config object - since all locale changes need to be entered into GS anyway, this is something the Config object can do because it is the source of truth for locale settings. - drop all the GS settings from the Page.
2020-07-21 17:37:09 +02:00
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "Settings.h"
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
#include "locale/Label.h"
add the localq module and config to locale
2020-03-24 15:47:53 +01:00
#include "utils/Logger.h"
[locale] Load supported locales in Config
2020-07-20 12:55:07 +02:00
#include "utils/Variant.h"
#include <QFile>
#include <QProcess>
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
#include <QTimeZone>
[locale] Load supported locales in Config
2020-07-20 12:55:07 +02:00
/** @brief Load supported locale keys
*
* If i18n/SUPPORTED exists, read the lines from that and return those
* as supported locales; otherwise, try the file at @p localeGenPath
* and get lines from that. Failing both, try the output of `locale -a`.
*
* This gives us a list of locale identifiers (e.g. en_US.UTF-8), which
* are not particularly human-readable.
*
* Only UTF-8 locales are returned (even if the system claims to support
* other, non-UTF-8, locales).
*/
static QStringList
loadLocales( const QString& localeGenPath )
{
QStringList localeGenLines;
// Some distros come with a meaningfully commented and easy to parse locale.gen,
// and others ship a separate file /usr/share/i18n/SUPPORTED with a clean list of
// supported locales. We first try that one, and if it doesn't exist, we fall back
// to parsing the lines from locale.gen
localeGenLines.clear();
QFile supported( "/usr/share/i18n/SUPPORTED" );
QByteArray ba;
if ( supported.exists() && supported.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
ba = supported.readAll();
supported.close();
const auto lines = ba.split( '\n' );
for ( const QByteArray& line : lines )
{
localeGenLines.append( QString::fromLatin1( line.simplified() ) );
}
}
else
{
QFile localeGen( localeGenPath );
if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
ba = localeGen.readAll();
localeGen.close();
}
else
{
cWarning() << "Cannot open file" << localeGenPath
<< ". Assuming the supported languages are already built into "
"the locale archive.";
QProcess localeA;
localeA.start( "locale", QStringList() << "-a" );
localeA.waitForFinished();
ba = localeA.readAllStandardOutput();
}
const auto lines = ba.split( '\n' );
for ( const QByteArray& line : lines )
{
if ( line.startsWith( "## " ) || line.startsWith( "# " ) || line.simplified() == "#" )
{
continue;
}
QString lineString = QString::fromLatin1( line.simplified() );
if ( lineString.startsWith( "#" ) )
{
lineString.remove( '#' );
}
lineString = lineString.simplified();
if ( lineString.isEmpty() )
{
continue;
}
localeGenLines.append( lineString );
}
}
if ( localeGenLines.isEmpty() )
{
cWarning() << "cannot acquire a list of available locales."
<< "The locale and localecfg modules will be broken as long as this "
"system does not provide"
<< "\n\t "
<< "* a well-formed" << supported.fileName() << "\n\tOR"
<< "* a well-formed"
<< ( localeGenPath.isEmpty() ? QLatin1String( "/etc/locale.gen" ) : localeGenPath ) << "\n\tOR"
<< "* a complete pre-compiled locale-gen database which allows complete locale -a output.";
return localeGenLines; // something went wrong and there's nothing we can do about it.
}
// Assuming we have a list of supported locales, we usually only want UTF-8 ones
// because it's not 1995.
auto notUtf8 = []( const QString& s ) {
return !s.contains( "UTF-8", Qt::CaseInsensitive ) && !s.contains( "utf8", Qt::CaseInsensitive );
};
auto it = std::remove_if( localeGenLines.begin(), localeGenLines.end(), notUtf8 );
localeGenLines.erase( it, localeGenLines.end() );
// We strip " UTF-8" from "en_US.UTF-8 UTF-8" because it's redundant redundant.
// Also simplify whitespace.
auto unredundant = []( QString& s ) {
if ( s.endsWith( " UTF-8" ) )
{
s.chop( 6 );
}
s = s.simplified();
};
std::for_each( localeGenLines.begin(), localeGenLines.end(), unredundant );
return localeGenLines;
}
[locale] Hook tz widget up to the Config's data
2020-07-20 16:54:44 +02:00
static inline const CalamaresUtils::Locale::CStringPairList&
timezoneData()
{
return CalamaresUtils::Locale::TZRegion::fromZoneTab();
}
[locale] Apply coding style to Config - ci/calamaresstyle - sort includes by kind (local module, Calamares, Qt, STL) - add copyright line
2020-03-24 22:48:14 +01:00
Config::Config( QObject* parent )
: QObject( parent )
[locale] Hook tz widget up to the Config's data
2020-07-20 16:54:44 +02:00
, m_regionModel( std::make_unique< CalamaresUtils::Locale::CStringListModel >( ::timezoneData() ) )
[locale] Add regions & zones models to Config - The models are constant pointers, even if their contents aren't. - Make the top-level (region) model point to the global TZ list.
2020-07-20 16:13:08 +02:00
, m_zonesModel( std::make_unique< CalamaresUtils::Locale::CStringListModel >() )
add the localq module and config to locale
2020-03-24 15:47:53 +01:00
{
[locale] Move the GS updating to the Config object - since all locale changes need to be entered into GS anyway, this is something the Config object can do because it is the source of truth for locale settings. - drop all the GS settings from the Page.
2020-07-21 17:37:09 +02:00
// Slightly unusual: connect to our *own* signals. Wherever the language
// or the location is changed, these signals are emitted, so hook up to
// them to update global storage accordingly. This simplifies code:
// we don't need to call an update-GS method, or introduce an intermediate
// update-thing-and-GS method. And everywhere where we **do** change
// language or location, we already emit the signal.
connect( this, &Config::currentLanguageStatusChanged, [&]() {
auto* gs = Calamares::JobQueue::instance()->globalStorage();
gs->insert( "locale", m_selectedLocaleConfiguration.toBcp47() );
} );
connect( this, &Config::currentLocationChanged, [&]() {
auto* gs = Calamares::JobQueue::instance()->globalStorage();
[locale] Move more business logic to Config - writing *localeConf* settings to GS can be done always when the formats are set, rather than special-cased. The code that handles the "special case" of no widget existing for the ViewStep overlooks the other crashes that happen then. - Since Config knows what jobs to create, just ask it rather than keeping a copy.
2020-07-22 00:23:50 +02:00
// Update the GS region and zone (and possibly the live timezone)
[locale] Move the GS updating to the Config object - since all locale changes need to be entered into GS anyway, this is something the Config object can do because it is the source of truth for locale settings. - drop all the GS settings from the Page.
2020-07-21 17:37:09 +02:00
const auto* location = currentLocation();
bool locationChanged = ( location->region() != gs->value( "locationRegion" ) )
|| ( location->zone() != gs->value( "locationZone" ) );
gs->insert( "locationRegion", location->region() );
gs->insert( "locationZone", location->zone() );
[locale] New setting *adjustLiveTimezone* - allow finer-grained control over whether-or-not to adjust the timezone in the live system. - handle some special cases at the point of loading-configuration. - document the setting in locale.conf - correct some documentation bugs - adjust the YAML schema for locale.conf so it's legal YAML syntax **and** validates the current file.
2020-07-22 00:06:56 +02:00
if ( locationChanged && m_adjustLiveTimezone )
[locale] Move the GS updating to the Config object - since all locale changes need to be entered into GS anyway, this is something the Config object can do because it is the source of truth for locale settings. - drop all the GS settings from the Page.
2020-07-21 17:37:09 +02:00
{
QProcess::execute( "timedatectl", // depends on systemd
{ "set-timezone", location->region() + '/' + location->zone() } );
}
[locale] Move more business logic to Config - writing *localeConf* settings to GS can be done always when the formats are set, rather than special-cased. The code that handles the "special case" of no widget existing for the ViewStep overlooks the other crashes that happen then. - Since Config knows what jobs to create, just ask it rather than keeping a copy.
2020-07-22 00:23:50 +02:00
// Update GS localeConf (the LC_ variables)
auto map = localeConfiguration().toMap();
QVariantMap vm;
for ( auto it = map.constBegin(); it != map.constEnd(); ++it )
{
vm.insert( it.key(), it.value() );
}
gs->insert( "localeConf", vm );
[locale] Move the GS updating to the Config object - since all locale changes need to be entered into GS anyway, this is something the Config object can do because it is the source of truth for locale settings. - drop all the GS settings from the Page.
2020-07-21 17:37:09 +02:00
} );
add the localq module and config to locale
2020-03-24 15:47:53 +01:00
}
[locale] Reset Config object The Config object wasn't being used at all in the locale module; reset it to empty and start using it in locale, so that configuration functionality can be added to it as-needed, and with the necessary refactoring built-in.
2020-07-20 12:37:27 +02:00
Config::~Config() {}
add the localq module and config to locale
2020-03-24 15:47:53 +01:00
[locale] Hook tz widget up to the Config's data
2020-07-20 16:54:44 +02:00
const CalamaresUtils::Locale::CStringPairList&
Config::timezoneData() const
{
return ::timezoneData();
}
[locale] Move current-location to Config
2020-07-20 23:06:12 +02:00
void
Config::setCurrentLocation( const QString& regionName, const QString& zoneName )
{
using namespace CalamaresUtils::Locale;
auto* region = timezoneData().find< TZRegion >( regionName );
auto* zone = region ? region->zones().find< TZZone >( zoneName ) : nullptr;
if ( zone )
{
setCurrentLocation( zone );
}
else
{
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
// Recursive, but America/New_York always exists.
setCurrentLocation( QStringLiteral( "America" ), QStringLiteral( "New_York" ) );
[locale] Move current-location to Config
2020-07-20 23:06:12 +02:00
}
}
void
Config::setCurrentLocation( const CalamaresUtils::Locale::TZZone* location )
{
if ( location != m_currentLocation )
{
m_currentLocation = location;
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
// Overwrite those settings that have not been made explicit.
auto newLocale = automaticLocaleConfiguration();
if ( !m_selectedLocaleConfiguration.explicit_lang )
{
m_selectedLocaleConfiguration.setLanguage( newLocale.language() );
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
emit currentLanguageStatusChanged( currentLanguageStatus() );
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
}
if ( !m_selectedLocaleConfiguration.explicit_lc )
{
m_selectedLocaleConfiguration.lc_numeric = newLocale.lc_numeric;
m_selectedLocaleConfiguration.lc_time = newLocale.lc_time;
m_selectedLocaleConfiguration.lc_monetary = newLocale.lc_monetary;
m_selectedLocaleConfiguration.lc_paper = newLocale.lc_paper;
m_selectedLocaleConfiguration.lc_name = newLocale.lc_name;
m_selectedLocaleConfiguration.lc_address = newLocale.lc_address;
m_selectedLocaleConfiguration.lc_telephone = newLocale.lc_telephone;
m_selectedLocaleConfiguration.lc_measurement = newLocale.lc_measurement;
m_selectedLocaleConfiguration.lc_identification = newLocale.lc_identification;
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
emit currentLCStatusChanged( currentLCStatus() );
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
}
[locale] Move current-location to Config
2020-07-20 23:06:12 +02:00
emit currentLocationChanged( m_currentLocation );
}
}
[locale] Hook tz widget up to the Config's data
2020-07-20 16:54:44 +02:00
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
LocaleConfiguration
Config::automaticLocaleConfiguration() const
{
[locale] Avoid nullptr if there is no location
2020-07-22 00:32:29 +02:00
// Special case: no location has been set at **all**
if ( !currentLocation() )
{
return LocaleConfiguration();
}
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
return LocaleConfiguration::fromLanguageAndLocation(
QLocale().name(), supportedLocales(), currentLocation()->country() );
}
LocaleConfiguration
Config::localeConfiguration() const
{
return m_selectedLocaleConfiguration.isEmpty() ? automaticLocaleConfiguration() : m_selectedLocaleConfiguration;
}
void
Config::setLanguageExplicitly( const QString& language )
{
m_selectedLocaleConfiguration.setLanguage( language );
m_selectedLocaleConfiguration.explicit_lang = true;
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
emit currentLanguageStatusChanged( currentLanguageStatus() );
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
}
void
Config::setLCLocaleExplicitly( const QString& locale )
{
// TODO: improve the granularity of this setting.
m_selectedLocaleConfiguration.lc_numeric = locale;
m_selectedLocaleConfiguration.lc_time = locale;
m_selectedLocaleConfiguration.lc_monetary = locale;
m_selectedLocaleConfiguration.lc_paper = locale;
m_selectedLocaleConfiguration.lc_name = locale;
m_selectedLocaleConfiguration.lc_address = locale;
m_selectedLocaleConfiguration.lc_telephone = locale;
m_selectedLocaleConfiguration.lc_measurement = locale;
m_selectedLocaleConfiguration.lc_identification = locale;
m_selectedLocaleConfiguration.explicit_lc = true;
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
emit currentLCStatusChanged( currentLCStatus() );
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
}
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
QString
Config::currentLocationStatus() const
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
{
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
return tr( "Set timezone to %1/%2." ).arg( m_currentLocation->region(), m_currentLocation->zone() );
}
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
static inline QString
localeLabel( const QString& s )
{
using CalamaresUtils::Locale::Label;
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
Label lang( s, Label::LabelFormat::AlwaysWithCountry );
return lang.label();
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
}
QString
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
Config::currentLanguageStatus() const
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
{
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
return tr( "The system language will be set to %1." )
.arg( localeLabel( m_selectedLocaleConfiguration.language() ) );
}
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
[locale] Sanitize Config signals and slots - remove the weirdly-structured prettyStatus and similar: the Config object has human-readable status strings (three, for location, language, and LC-formats) which can be normal properties with signals. - Implement prettyStatus in the view step by querying the Config.
2020-07-21 16:27:21 +02:00
QString
Config::currentLCStatus() const
{
return tr( "The numbers and dates locale will be set to %1." )
.arg( localeLabel( m_selectedLocaleConfiguration.lc_numeric ) );
[locale] Move status strings from Page to Config - the config knows the status and how to describe it, fetch the strings from there.
2020-07-21 15:51:49 +02:00
}
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
static inline void
getLocaleGenLines( const QVariantMap& configurationMap, QStringList& localeGenLines )
add the localq module and config to locale
2020-03-24 15:47:53 +01:00
{
[locale] Load supported locales in Config
2020-07-20 12:55:07 +02:00
QString localeGenPath = CalamaresUtils::getString( configurationMap, "localeGenPath" );
if ( localeGenPath.isEmpty() )
{
localeGenPath = QStringLiteral( "/etc/locale.gen" );
}
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
localeGenLines = loadLocales( localeGenPath );
}
[locale] New setting *adjustLiveTimezone* - allow finer-grained control over whether-or-not to adjust the timezone in the live system. - handle some special cases at the point of loading-configuration. - document the setting in locale.conf - correct some documentation bugs - adjust the YAML schema for locale.conf so it's legal YAML syntax **and** validates the current file.
2020-07-22 00:06:56 +02:00
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
static inline void
getAdjustLiveTimezone( const QVariantMap& configurationMap, bool& adjustLiveTimezone )
{
adjustLiveTimezone
[locale] New setting *adjustLiveTimezone* - allow finer-grained control over whether-or-not to adjust the timezone in the live system. - handle some special cases at the point of loading-configuration. - document the setting in locale.conf - correct some documentation bugs - adjust the YAML schema for locale.conf so it's legal YAML syntax **and** validates the current file.
2020-07-22 00:06:56 +02:00
= CalamaresUtils::getBool( configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() );
#ifdef DEBUG_TIMEZONES
if ( m_adjustLiveTimezone )
{
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
cWarning() << "Turning off live-timezone adjustments because debugging is on.";
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
adjustLiveTimezone = false;
[locale] New setting *adjustLiveTimezone* - allow finer-grained control over whether-or-not to adjust the timezone in the live system. - handle some special cases at the point of loading-configuration. - document the setting in locale.conf - correct some documentation bugs - adjust the YAML schema for locale.conf so it's legal YAML syntax **and** validates the current file.
2020-07-22 00:06:56 +02:00
}
#endif
#ifdef __FreeBSD__
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
if ( adjustLiveTimezone )
[locale] New setting *adjustLiveTimezone* - allow finer-grained control over whether-or-not to adjust the timezone in the live system. - handle some special cases at the point of loading-configuration. - document the setting in locale.conf - correct some documentation bugs - adjust the YAML schema for locale.conf so it's legal YAML syntax **and** validates the current file.
2020-07-22 00:06:56 +02:00
{
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
cWarning() << "Turning off live-timezone adjustments on FreeBSD.";
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
adjustLiveTimezone = false;
[locale] New setting *adjustLiveTimezone* - allow finer-grained control over whether-or-not to adjust the timezone in the live system. - handle some special cases at the point of loading-configuration. - document the setting in locale.conf - correct some documentation bugs - adjust the YAML schema for locale.conf so it's legal YAML syntax **and** validates the current file.
2020-07-22 00:06:56 +02:00
}
#endif
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
}
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
static inline void
getStartingTimezone( const QVariantMap& configurationMap, CalamaresUtils::GeoIP::RegionZonePair& startingTimezone )
{
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
QString region = CalamaresUtils::getString( configurationMap, "region" );
QString zone = CalamaresUtils::getString( configurationMap, "zone" );
if ( !region.isEmpty() && !zone.isEmpty() )
{
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
startingTimezone = CalamaresUtils::GeoIP::RegionZonePair( region, zone );
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
}
else
{
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
startingTimezone
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
= CalamaresUtils::GeoIP::RegionZonePair( QStringLiteral( "America" ), QStringLiteral( "New_York" ) );
}
if ( CalamaresUtils::getBool( configurationMap, "useSystemTimezone", false ) )
{
auto systemtz = CalamaresUtils::GeoIP::splitTZString( QTimeZone::systemTimeZoneId() );
if ( systemtz.isValid() )
{
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
cDebug() << "Overriding configured timezone" << startingTimezone << "with system timezone" << systemtz;
startingTimezone = systemtz;
[locale] Get starting TZ in Config - read the *region* and *zone* settings; this duplicates what the ViewStep does and is currently unused, but .. - add new support for using the system's TZ (rather than the fixed values from *region* and *zone*). This complements GeoIP lookup. This is the actual feature that started the long rewrite of the Config object (so that all the business logic would be in one place, usable for both widgets and QML). FIXES #1381
2020-07-22 01:26:15 +02:00
}
}
add the localq module and config to locale
2020-03-24 15:47:53 +01:00
}
[locale] Move job-creation to Config - since Config knows what settings there are, it should create the jobs to run later -- not the Page. - this doesn't work yet, because the Config does **not** know what the selected timezone is yet.
2020-07-20 22:21:29 +02:00
[locale] Add GeoIP settings to Config - this doesn't do the lookup **yet** - while here, refactor setConfigurationMap so it reads like a story, with chunks bitten out into a handful of static inline void methods.
2020-07-22 11:53:06 +02:00
static inline void
getGeoIP( const QVariantMap& configurationMap, std::unique_ptr< CalamaresUtils::GeoIP::Handler >& geoip )
{
bool ok = false;
QVariantMap map = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
if ( ok )
{
QString url = CalamaresUtils::getString( map, "url" );
QString style = CalamaresUtils::getString( map, "style" );
QString selector = CalamaresUtils::getString( map, "selector" );
geoip = std::make_unique< CalamaresUtils::GeoIP::Handler >( style, url, selector );
if ( !geoip->isValid() )
{
cWarning() << "GeoIP Style" << style << "is not recognized.";
}
}
}
void
Config::setConfigurationMap( const QVariantMap& configurationMap )
{
getLocaleGenLines( configurationMap, m_localeGenLines );
getAdjustLiveTimezone( configurationMap, m_adjustLiveTimezone );
getStartingTimezone( configurationMap, m_startingTimezone );
getGeoIP( configurationMap, m_geoip );
}
[locale] Move job-creation to Config - since Config knows what settings there are, it should create the jobs to run later -- not the Page. - this doesn't work yet, because the Config does **not** know what the selected timezone is yet.
2020-07-20 22:21:29 +02:00
Calamares::JobList
Config::createJobs()
{
Calamares::JobList list;
[locale] Move localeconfiguration to Config object - the language and LC settings migrate from page to config - add API for explicitly setting language (which is then preserved when clicking new locations)
2020-07-21 13:16:52 +02:00
const CalamaresUtils::Locale::TZZone* location = currentLocation();
[locale] Move job-creation to Config - since Config knows what settings there are, it should create the jobs to run later -- not the Page. - this doesn't work yet, because the Config does **not** know what the selected timezone is yet.
2020-07-20 22:21:29 +02:00
if ( location )
{
Calamares::Job* j = new SetTimezoneJob( location->region(), location->zone() );
list.append( Calamares::job_ptr( j ) );
}
return list;
}
Reference in New Issue Copy Permalink