napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47cbcbd348
calamares/src/libcalamares/geoip/Interface.cpp

47 lines
1006 B
C++
Raw Normal View History

REUSE: Giant boilerplate cleanup - point to main Calamares site in the 'part of' headers instead of to github (this is the "this file is part of Calamares" opening line for most files). - remove boilerplate from all source files, CMake modules and completions, this is the 3-paragraph summary of the GPL-3.0-or-later, which has a meaning entirely covered by the SPDX tag.
2020-08-25 16:05:56 +02:00
/* === This file is part of Calamares - <https://calamares.io> ===
[libcalamares][modules] Use compatibility for QString::split() - Use the compatibility value, which has an enum value suitable for the Qt version in use.
2020-06-23 11:13:55 +02:00
*
[libcalamares] Update SPDX identifiers. Update CppJob.h Update CalamaresConfig.h.in Update DllMacro.h Update GlobalStorage.cpp Update GlobalStorage.h Update Job.cpp Update Job.h Update JobExample.cpp Update JobExample.h Update JobQueue.cpp Update CalamaresConfig.h.in Update CppJob.cpp Update CppJob.h Update DllMacro.h Update GlobalStorage.cpp Update GlobalStorage.h Update Job.cpp Update Job.h Update JobExample.cpp Update JobExample.h Update JobQueue.h Update ProcessJob.cpp Update ProcessJob.h Update PythonHelper.cpp Update PythonJob.cpp Update PythonJob.h Update PythonHelper.h Update PythonJobApi.cpp Update PythonJobApi.h Update Settings.cpp Update Settings.h Update GeoIPJSON.cpp Update GeoIPJSON.h Update GeoIPTests.cpp Update GeoIPTests.h Update GeoIPXML.cpp Update GeoIPXML.h Update Handler.cpp Update Handler.h Update Interface.cpp Update Interface.h Update test_geoip.cpp Update CountryData_p.cpp Update Label.cpp Update Label.h Update LabelModel.cpp Update LabelModel.h Update CountryData_p.cpp Update CountryData_p.cpp Update Lookup.cpp Update Lookup.h Update Tests.cpp Update Tests.h Update TimeZone.cpp Update TimeZone.h Update TranslatableConfiguration.cpp Update TranslatableConfiguration.h Update ZoneData_p.cxxtr Update cldr-extractor.py Update zone-extractor.py Update Actions.h Update Actions.h Update Descriptor.h Update InstanceKey.cpp Update Module.cpp Update Module.h Update Requirement.cpp Update RequirementsChecker.h Update RequirementsModel.cpp Update RequirementsModel.h Update Tests.cpp Update Manager.cpp Update Manager.h Update Tests.cpp Update FileSystem.cpp Update FileSystem.h Update KPMManager.cpp Update KPMManager.h Update KPMTests.cpp Update FileSystem.cpp Update FileSystem.cpp Update FileSystem.h Update KPMManager.cpp Update KPMManager.h Update Mount.cpp Update Mount.h Update PartitionIterator.cpp Update PartitionIterator.h Update PartitionIterator.h Update PartitionQuery.cpp Update PartitionQuery.h Update PartitionSize.cpp Update PartitionSize.h Update Sync.cpp Update Sync.h Update Tests.cpp Update Tests.h Update BoostPython.h Update CalamaresUtilsSystem.cpp Update CalamaresUtilsSystem.h Update CommandList.cpp Update CommandList.h Update Dirs.cpp Update Dirs.h Update Entropy.cpp Update Entropy.h Update Entropy.cpp Update Logger.cpp Update Logger.h Update NamedEnum.h Update NamedSuffix.h Update PluginFactory.cpp Update PluginFactory.h Update RAII.h Update RAII.h Update Retranslator.cpp Update Retranslator.h Update String.cpp Update String.h Update TestPaths.cpp Update Tests.cpp Update Tests.h Update UMask.cpp Update UMask.h Update Units.h Update Variant.cpp Update Variant.h Update Yaml.cpp Update Yaml.h Update moc-warnings.h
2020-05-30 16:15:03 +02:00
* SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
REUSE: Giant boilerplate cleanup - point to main Calamares site in the 'part of' headers instead of to github (this is the "this file is part of Calamares" opening line for most files). - remove boilerplate from all source files, CMake modules and completions, this is the 3-paragraph summary of the GPL-3.0-or-later, which has a meaning entirely covered by the SPDX tag.
2020-08-25 16:05:56 +02:00
*
* Calamares is Free Software: see the License-Identifier above.
[libcalamares] Update SPDX identifiers. Update CppJob.h Update CalamaresConfig.h.in Update DllMacro.h Update GlobalStorage.cpp Update GlobalStorage.h Update Job.cpp Update Job.h Update JobExample.cpp Update JobExample.h Update JobQueue.cpp Update CalamaresConfig.h.in Update CppJob.cpp Update CppJob.h Update DllMacro.h Update GlobalStorage.cpp Update GlobalStorage.h Update Job.cpp Update Job.h Update JobExample.cpp Update JobExample.h Update JobQueue.h Update ProcessJob.cpp Update ProcessJob.h Update PythonHelper.cpp Update PythonJob.cpp Update PythonJob.h Update PythonHelper.h Update PythonJobApi.cpp Update PythonJobApi.h Update Settings.cpp Update Settings.h Update GeoIPJSON.cpp Update GeoIPJSON.h Update GeoIPTests.cpp Update GeoIPTests.h Update GeoIPXML.cpp Update GeoIPXML.h Update Handler.cpp Update Handler.h Update Interface.cpp Update Interface.h Update test_geoip.cpp Update CountryData_p.cpp Update Label.cpp Update Label.h Update LabelModel.cpp Update LabelModel.h Update CountryData_p.cpp Update CountryData_p.cpp Update Lookup.cpp Update Lookup.h Update Tests.cpp Update Tests.h Update TimeZone.cpp Update TimeZone.h Update TranslatableConfiguration.cpp Update TranslatableConfiguration.h Update ZoneData_p.cxxtr Update cldr-extractor.py Update zone-extractor.py Update Actions.h Update Actions.h Update Descriptor.h Update InstanceKey.cpp Update Module.cpp Update Module.h Update Requirement.cpp Update RequirementsChecker.h Update RequirementsModel.cpp Update RequirementsModel.h Update Tests.cpp Update Manager.cpp Update Manager.h Update Tests.cpp Update FileSystem.cpp Update FileSystem.h Update KPMManager.cpp Update KPMManager.h Update KPMTests.cpp Update FileSystem.cpp Update FileSystem.cpp Update FileSystem.h Update KPMManager.cpp Update KPMManager.h Update Mount.cpp Update Mount.h Update PartitionIterator.cpp Update PartitionIterator.h Update PartitionIterator.h Update PartitionQuery.cpp Update PartitionQuery.h Update PartitionSize.cpp Update PartitionSize.h Update Sync.cpp Update Sync.h Update Tests.cpp Update Tests.h Update BoostPython.h Update CalamaresUtilsSystem.cpp Update CalamaresUtilsSystem.h Update CommandList.cpp Update CommandList.h Update Dirs.cpp Update Dirs.h Update Entropy.cpp Update Entropy.h Update Entropy.cpp Update Logger.cpp Update Logger.h Update NamedEnum.h Update NamedSuffix.h Update PluginFactory.cpp Update PluginFactory.h Update RAII.h Update RAII.h Update Retranslator.cpp Update Retranslator.h Update String.cpp Update String.h Update TestPaths.cpp Update Tests.cpp Update Tests.h Update UMask.cpp Update UMask.h Update Units.h Update Variant.cpp Update Variant.h Update Yaml.cpp Update Yaml.h Update moc-warnings.h
2020-05-30 16:15:03 +02:00
*
[locale] Refactor GeoIP handler - Move GeoIP to its own cpp file - Provide a default implementation of the URL mangler
2018-04-12 15:54:22 +02:00
*/
[libcalamares] Shuffle GeoIP into a namespace - Use CalamaresUtils::GeoIP for GeoIP code - Name the public interface parts generically, while the implementation details retain GeoIP<foo> names.
2019-05-02 13:25:48 +02:00
#include "Interface.h"
[locale] Refactor GeoIP handler - Move GeoIP to its own cpp file - Provide a default implementation of the URL mangler
2018-04-12 15:54:22 +02:00
[locale] Convenience function for TZ splitting
2018-04-12 17:51:50 +02:00
#include "utils/Logger.h"
[libcalamares][modules] Use compatibility for QString::split() - Use the compatibility value, which has an enum value suitable for the Qt version in use.
2020-06-23 11:13:55 +02:00
#include "utils/String.h"
[locale] Convenience function for TZ splitting
2018-04-12 17:51:50 +02:00
[libcalamares] namespace A::B is a C++17 extension
2019-05-13 12:25:14 +02:00
namespace CalamaresUtils
{
namespace GeoIP
[libcalamares] Put GeoIP in namespace - Use consistent include-guard style - Put things in namespace CalamaresUtils
2019-05-02 11:58:52 +02:00
{
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
Interface::Interface( const QString& e )
[locale] Make the selector configurable - GeoIP gets a string selector; the interpretation is up to derived classes. - GeoIPXML and GeoIPJSON use the selector to select an element by tag or an attribute, respectively.
2018-04-16 10:55:37 +02:00
: m_element( e )
{
}
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
Interface::~Interface() {}
[locale] Convenience function for TZ splitting
2018-04-12 17:51:50 +02:00
[libcalamares] Shuffle GeoIP into a namespace - Use CalamaresUtils::GeoIP for GeoIP code - Name the public interface parts generically, while the implementation details retain GeoIP<foo> names.
2019-05-02 13:25:48 +02:00
RegionZonePair
splitTZString( const QString& tz )
[locale] Convenience function for TZ splitting
2018-04-12 17:51:50 +02:00
{
[locale] Auto-clean up time zone data - Some providers return weirdly escaped data; strip out useless escaping before splitting (there are no characters in correct time zone names that need escaping) - Add some tests for TZ splitting
2018-04-16 11:45:48 +02:00
QString timezoneString( tz );
timezoneString.remove( '\\' );
[locale] Accomodate more dodgy GeoIP providers - Force spaces to _ - Document the bits FIXES #933
2018-04-17 13:32:27 +02:00
timezoneString.replace( ' ', '_' );
[locale] Auto-clean up time zone data - Some providers return weirdly escaped data; strip out useless escaping before splitting (there are no characters in correct time zone names that need escaping) - Add some tests for TZ splitting
2018-04-16 11:45:48 +02:00
[libcalamares][modules] Use compatibility for QString::split() - Use the compatibility value, which has an enum value suitable for the Qt version in use.
2020-06-23 11:13:55 +02:00
QStringList tzParts = timezoneString.split( '/', SplitSkipEmptyParts );
[locale] Convenience function for TZ splitting
2018-04-12 17:51:50 +02:00
if ( tzParts.size() >= 2 )
{
QString region = tzParts.takeFirst();
QString zone = tzParts.join( '/' );
[libcalamares] Make RegionZonePair type stronger - Derive from QPair instead of being QPair - Add isValid() for checking - Convenience constructors
2019-05-02 12:16:08 +02:00
return RegionZonePair( region, zone );
[locale] Convenience function for TZ splitting
2018-04-12 17:51:50 +02:00
}
[libcalamares] Make RegionZonePair type stronger - Derive from QPair instead of being QPair - Add isValid() for checking - Convenience constructors
2019-05-02 12:16:08 +02:00
return RegionZonePair( QString(), QString() );
[locale] Convenience function for TZ splitting
2018-04-12 17:51:50 +02:00
}
[libcalamares] Put GeoIP in namespace - Use consistent include-guard style - Put things in namespace CalamaresUtils
2019-05-02 11:58:52 +02:00
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
} // namespace GeoIP
} // namespace CalamaresUtils
Reference in New Issue Copy Permalink