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

94 lines
2.0 KiB
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] 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
*
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
* SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
[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-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] Add alternate GeoIP data format
2018-04-12 18:18:43 +02:00
*/
#include "GeoIPXML.h"
#include "utils/Logger.h"
#include <QtXml/QDomDocument>
[libcalamares] One more nested namespace
2019-05-13 13:06:28 +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
{
[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
GeoIPXML::GeoIPXML( const QString& element )
[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
: Interface( element.isEmpty() ? QStringLiteral( "TimeZone" ) : element )
[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
{
}
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
static QStringList
getElementTexts( const QByteArray& data, const QString& tag )
[locale] Add alternate GeoIP data format
2018-04-12 18:18:43 +02:00
{
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
QStringList elements;
[locale] Add alternate GeoIP data format
2018-04-12 18:18:43 +02:00
QString domError;
int errorLine, errorColumn;
QDomDocument doc;
[locale] Refactor GeoIP handlers - Read the data in the caller of the handler, instead of in the callers
2018-04-12 18:22:43 +02:00
if ( doc.setContent( data, false, &domError, &errorLine, &errorColumn ) )
[locale] Add alternate GeoIP data format
2018-04-12 18:18:43 +02:00
{
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
const auto tzElements = doc.elementsByTagName( tag );
[locale] Add alternate GeoIP data format
2018-04-12 18:18:43 +02:00
cDebug() << "GeoIP found" << tzElements.length() << "elements";
for ( int it = 0; it < tzElements.length(); ++it )
{
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
auto e = tzElements.at( it ).toElement();
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
auto e_text = e.text();
if ( !e_text.isEmpty() )
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
{
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
elements.append( e_text );
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
}
[locale] Add alternate GeoIP data format
2018-04-12 18:18:43 +02:00
}
}
else
{
[locale] Adjust to Calamares 3.2 idiom
2018-04-13 15:24:59 +02:00
cWarning() << "GeoIP XML data error:" << domError << "(line" << errorLine << errorColumn << ')';
[locale] Add alternate GeoIP data format
2018-04-12 18:18:43 +02:00
}
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
if ( elements.count() < 1 )
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
{
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
cWarning() << "GeopIP XML had no non-empty elements" << tag;
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
}
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
return elements;
}
QString
GeoIPXML::rawReply( const QByteArray& data )
{
for ( const auto& e : getElementTexts( data, m_element ) )
[libcalamares] Apply coding style to geoip/
2019-09-04 15:19:00 +02:00
{
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
if ( !e.isEmpty() )
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
{
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
return e;
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
}
[libcalamares] Apply coding style to geoip/
2019-09-04 15:19:00 +02:00
}
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
return QString();
}
GeoIP::RegionZonePair
GeoIPXML::processReply( const QByteArray& data )
{
for ( const auto& e : getElementTexts( data, m_element ) )
{
auto tz = splitTZString( e );
if ( !tz.first.isEmpty() )
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
{
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
return tz;
[libcalamares] Apply coding style to geoip/
2019-08-08 12:32:21 +02:00
}
[libcalamares] Add "raw" support for extracting data from GeoIP - This is prep-work for getting something other than the timezone (e.g. most extended formats also support Country).
2019-05-09 16:15:53 +02:00
}
return RegionZonePair();
[locale] Add alternate GeoIP data format
2018-04-12 18:18:43 +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