napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7a78f2600e
calamares/src/libcalamares/partition/PartitionSize.cpp

307 lines
7.1 KiB
C++
Raw Normal View History

[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
/* === This file is part of Calamares - <https://github.com/calamares> ===
REUSE: SPDX tagging of application library and main - CC0-1.0 for the uninteresting version-headers - GPL-3.0-or-later for the services - add SPDX identifiers to Calamares C++ libraries and application sources - add SPDX identifiers to Calamares QML (panels and slideshow) - the `qmldir` is a list of names of things in the directory, so CC0-1.0 it as "uninteresting" - QRC files are lists of names of things in the directory, so CC0-1.0 them as well
2020-08-20 22:42:19 +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: 2019 Collabora Ltd <arnaud.ferraris@collabora.com>
* SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
REUSE: SPDX tagging of application library and main - CC0-1.0 for the uninteresting version-headers - GPL-3.0-or-later for the services - add SPDX identifiers to Calamares C++ libraries and application sources - add SPDX identifiers to Calamares QML (panels and slideshow) - the `qmldir` is a list of names of things in the directory, so CC0-1.0 it as "uninteresting" - QRC files are lists of names of things in the directory, so CC0-1.0 them as well
2020-08-20 22:42:19 +02:00
* SPDX-License-Identifier: GPL-3.0-or-later
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02: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/>.
[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
*
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +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
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
#include "partition/PartitionSize.h"
#include "utils/Logger.h"
#include "utils/Units.h"
[libcalamares] Consistent namespace usage in partition service - The sub-directories under libcalamares (e.g. Utils, ..) all live in namespace CalamaresUtils (well, except for Logger). The services (e.g. subdirs other than utils/) live in their own nested namespace, so partitioning should go into CalamaresUtils::Partition for consistency.
2019-05-14 11:52:58 +02:00
namespace CalamaresUtils
{
namespace Partition
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
{
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
static const NamedEnumTable< SizeUnit >&
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
unitSuffixes()
{
[libcalamares] Apply coding style - .. or, rather, avoid re-formatting tables in future.
2019-08-13 20:49:58 +02:00
// *INDENT-OFF*
// clang-format off
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
static const NamedEnumTable< SizeUnit > names {
[libcalamares] Apply coding style - .. or, rather, avoid re-formatting tables in future.
2019-08-13 20:49:58 +02:00
{ QStringLiteral( "%" ), SizeUnit::Percent },
{ QStringLiteral( "K" ), SizeUnit::KiB },
{ QStringLiteral( "KiB" ), SizeUnit::KiB },
{ QStringLiteral( "M" ), SizeUnit::MiB },
{ QStringLiteral( "MiB" ), SizeUnit::MiB },
{ QStringLiteral( "G" ), SizeUnit::GiB },
{ QStringLiteral( "GiB" ), SizeUnit::GiB },
{ QStringLiteral( "KB" ), SizeUnit::KB },
{ QStringLiteral( "MB" ), SizeUnit::MB },
{ QStringLiteral( "GB" ), SizeUnit::GB }
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
};
[libcalamares] Apply coding style - .. or, rather, avoid re-formatting tables in future.
2019-08-13 20:49:58 +02:00
// clang-format on
// *INDENT-ON*
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return names;
}
PartitionSize::PartitionSize( const QString& s )
: NamedSuffix( unitSuffixes(), s )
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
if ( ( unit() == SizeUnit::Percent ) && ( value() > 100 || value() < 0 ) )
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
{
cDebug() << "Percent value" << value() << "is not valid.";
m_value = 0;
}
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
if ( m_unit == SizeUnit::None )
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
{
libcalamares: Prevent integer overflows when parsing configuration Currently, a number of configuration parsing-related functions and classes use only `int` type for dealing with integers. Should the user need a bigger integer value, this would result in an erroneous value being used (`0`), as the correct value would overflow the 32-bits type. In order to prevent these overflow, this patch replaces `int` with `qint64` in the following functions & classes : * CalamaresUtils::yamlScalarToVariant() * CalamaresUtils::getInteger * NamedSuffix * PartitionSize This way, sizes or other integer values greater than 2^31 (for signed types) can be used. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 15:56:20 +02:00
m_value = s.toLongLong();
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
if ( m_value > 0 )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
m_unit = SizeUnit::Byte;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
if ( m_value <= 0 )
{
m_value = 0;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
m_unit = SizeUnit::None;
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
}
qint64
PartitionSize::toSectors( qint64 totalSectors, qint64 sectorSize ) const
{
if ( !isValid() )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
if ( totalSectors < 1 || sectorSize < 1 )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
switch ( m_unit )
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::None:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Percent:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
if ( value() == 100 )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return totalSectors; // Common-case, avoid futzing around
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
else
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return totalSectors * value() / 100;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Byte:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::KB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::KiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::MB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::MiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::GB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::GiB:
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
return CalamaresUtils::bytesToSectors( toBytes(), sectorSize );
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
return -1;
}
qint64
PartitionSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const
{
if ( !isValid() )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
switch ( m_unit )
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::None:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Percent:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
if ( totalSectors < 1 || sectorSize < 1 )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
if ( value() == 100 )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return totalSectors * sectorSize; // Common-case, avoid futzing around
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
else
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return totalSectors * value() / 100;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Byte:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::KB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::KiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::MB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::MiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::GB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::GiB:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return toBytes();
}
// notreached
return -1;
}
qint64
PartitionSize::toBytes( qint64 totalBytes ) const
{
if ( !isValid() )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
switch ( m_unit )
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::None:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Percent:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
if ( totalBytes < 1 )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
if ( value() == 100 )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return totalBytes; // Common-case, avoid futzing around
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
else
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return totalBytes * value() / 100;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Byte:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::KB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::KiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::MB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::MiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::GB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::GiB:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return toBytes();
}
// notreached
return -1;
}
qint64
PartitionSize::toBytes() const
{
if ( !isValid() )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return -1;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
switch ( m_unit )
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::None:
case SizeUnit::Percent:
[partition] Handle all enum values in the switch
2019-05-13 12:23:19 +02:00
return -1;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Byte:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return value();
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::KB:
return CalamaresUtils::KBtoBytes( static_cast< unsigned long long >( value() ) );
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::KiB:
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
return CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( value() ) );
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::MB:
return CalamaresUtils::MBtoBytes( static_cast< unsigned long long >( value() ) );
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::MiB:
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
return CalamaresUtils::MiBtoBytes( static_cast< unsigned long long >( value() ) );
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::GB:
return CalamaresUtils::GBtoBytes( static_cast< unsigned long long >( value() ) );
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::GiB:
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
return CalamaresUtils::GiBtoBytes( static_cast< unsigned long long >( value() ) );
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
[libcalamares] Avoid warnings / errors on both gcc and clang - Clang 8 can detect that there is no need for a return if all previous paths already return. GCC 8 does not. Clang warns if the unreachable return is there, GCC errors out if it isn't. - Introduce a hack NOTREACHED that comments-out on Clang, and marks as unreachable (but still present) on GCC. - This might go away with an [[unreachable]] annotation or similar.
2019-05-13 18:04:31 +02:00
NOTREACHED return -1;
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
bool
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
PartitionSize::operator<( const PartitionSize& other ) const
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
if ( !unitsComparable( m_unit, other.m_unit ) )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return false;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
switch ( m_unit )
{
[libcalamares] Handle all SizeUnit cases inside switch - Although None will be filtered out already by unitsComparable(), include it in the switch to avoid a warning .. then we can drop the post-switch return since the switch covers all possible values of the enum.
2019-05-13 13:54:09 +02:00
case SizeUnit::None:
return false;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Percent:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return ( m_value < other.m_value );
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Byte:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::KB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::KiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::MB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::MiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::GB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::GiB:
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
return ( toBytes() < other.toBytes() );
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
[libcalamares] Avoid warnings / errors on both gcc and clang - Clang 8 can detect that there is no need for a return if all previous paths already return. GCC 8 does not. Clang warns if the unreachable return is there, GCC errors out if it isn't. - Introduce a hack NOTREACHED that comments-out on Clang, and marks as unreachable (but still present) on GCC. - This might go away with an [[unreachable]] annotation or similar.
2019-05-13 18:04:31 +02:00
NOTREACHED return false;
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
bool
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
PartitionSize::operator>( const PartitionSize& other ) const
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
if ( !unitsComparable( m_unit, other.m_unit ) )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return false;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
switch ( m_unit )
{
[libcalamares] Handle all SizeUnit cases inside switch - Although None will be filtered out already by unitsComparable(), include it in the switch to avoid a warning .. then we can drop the post-switch return since the switch covers all possible values of the enum.
2019-05-13 13:54:09 +02:00
case SizeUnit::None:
return false;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Percent:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return ( m_value > other.m_value );
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Byte:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::KB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::KiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::MB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::MiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::GB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::GiB:
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
return ( toBytes() > other.toBytes() );
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
[libcalamares] Avoid warnings / errors on both gcc and clang - Clang 8 can detect that there is no need for a return if all previous paths already return. GCC 8 does not. Clang warns if the unreachable return is there, GCC errors out if it isn't. - Introduce a hack NOTREACHED that comments-out on Clang, and marks as unreachable (but still present) on GCC. - This might go away with an [[unreachable]] annotation or similar.
2019-05-13 18:04:31 +02:00
NOTREACHED return false;
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
bool
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
PartitionSize::operator==( const PartitionSize& other ) const
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
{
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
if ( !unitsComparable( m_unit, other.m_unit ) )
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
{
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return false;
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
}
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
switch ( m_unit )
{
[libcalamares] Handle all SizeUnit cases inside switch - Although None will be filtered out already by unitsComparable(), include it in the switch to avoid a warning .. then we can drop the post-switch return since the switch covers all possible values of the enum.
2019-05-13 13:54:09 +02:00
case SizeUnit::None:
return false;
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Percent:
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
return ( m_value == other.m_value );
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::Byte:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::KB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::KiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::MB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::MiB:
libcalamares: Add support for KB/MB/GB size units Currently, all size units are expressed as KiB, MiB or GiB (resp. 2^10, 2^20 or 2^30). In order to maximize compatibility and consistent results with other partitioning tools, this commit adds support for sizes expressed as KB, MB or GB (resp. 10^3, 10^6 or 10^9). This change won't affect existing users, it simply adds a new option that wasn't previously handled. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-07-22 16:29:39 +02:00
case SizeUnit::GB:
[libcalamares] Tidy PartitionSize - Use unitsComparable where applicable - Use SizeUnit instead of unit_t -- since this is a template specialization, we have the more meaningful type name to use, instead of the generic one.
2019-05-13 13:44:30 +02:00
case SizeUnit::GiB:
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
return ( toBytes() == other.toBytes() );
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
[libcalamares] Avoid warnings / errors on both gcc and clang - Clang 8 can detect that there is no need for a return if all previous paths already return. GCC 8 does not. Clang warns if the unreachable return is there, GCC errors out if it isn't. - Introduce a hack NOTREACHED that comments-out on Clang, and marks as unreachable (but still present) on GCC. - This might go away with an [[unreachable]] annotation or similar.
2019-05-13 18:04:31 +02:00
NOTREACHED return false;
[libcalamares] Add generic PartitionSize class Using PartUtils::PartSize as reference, this commit creates a new PartitionSize class in libcalamares, which will then be used in every module needing such a class. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2019-05-08 19:23:07 +02:00
}
[libcalamares] Apply current coding style to libcalamares/partition/
2019-08-04 22:13:58 +02:00
} // namespace Partition
} // namespace CalamaresUtils
Reference in New Issue Copy Permalink