mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-06 18:25:37 +08:00
Use nested namespaces (C++17 feature)
This commit is contained in:
Mat Sutcliffe
@@ -14,137 +14,134 @@ using namespace BlackConfig;
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackMisc::Network;
|
||||
|
||||
namespace BlackMisc
|
||||
namespace BlackMisc::Db
|
||||
{
|
||||
namespace Db
|
||||
CDistribution::CDistribution()
|
||||
{ }
|
||||
|
||||
CDistribution::CDistribution(const QString &channel, int stability, bool restricted) :
|
||||
m_channel(channel.trimmed().toUpper()), m_stability(stability), m_restricted(restricted)
|
||||
{ }
|
||||
|
||||
void CDistribution::setChannel(const QString &channel)
|
||||
{
|
||||
CDistribution::CDistribution()
|
||||
{ }
|
||||
m_channel = channel.trimmed().toUpper();
|
||||
}
|
||||
|
||||
CDistribution::CDistribution(const QString &channel, int stability, bool restricted) :
|
||||
m_channel(channel.trimmed().toUpper()), m_stability(stability), m_restricted(restricted)
|
||||
{ }
|
||||
void CDistribution::addDownloadUrl(const CUrl &url)
|
||||
{
|
||||
if (url.isEmpty()) { return; }
|
||||
m_downloadUrls.push_back(url);
|
||||
}
|
||||
|
||||
void CDistribution::setChannel(const QString &channel)
|
||||
bool CDistribution::hasDownloadUrls() const
|
||||
{
|
||||
return !m_downloadUrls.isEmpty();
|
||||
}
|
||||
|
||||
CIcons::IconIndex CDistribution::getRestrictionIcon() const
|
||||
{
|
||||
// StandardIconLockOpen16 is hard to distinguish from closed
|
||||
return m_restricted ? CIcons::StandardIconLockClosed16 : CIcons::StandardIconGlobe16;
|
||||
}
|
||||
|
||||
bool CDistribution::isStabilitySameOrBetter(const CDistribution &otherDistribution) const
|
||||
{
|
||||
return m_stability >= otherDistribution.m_stability;
|
||||
}
|
||||
|
||||
bool CDistribution::isStabilityBetter(const CDistribution &otherDistribution) const
|
||||
{
|
||||
return m_stability > otherDistribution.m_stability;
|
||||
}
|
||||
|
||||
QString CDistribution::convertToQString(bool i18n) const
|
||||
{
|
||||
return convertToQString(", ", i18n);
|
||||
}
|
||||
|
||||
QString CDistribution::convertToQString(const QString &separator, bool i18n) const
|
||||
{
|
||||
return u"channel: " %
|
||||
this->getChannel() %
|
||||
separator %
|
||||
u"download URLs: " %
|
||||
getDownloadUrls().toQString(i18n) %
|
||||
separator %
|
||||
u"timestamp: " %
|
||||
this->getFormattedUtcTimestampYmdhms();
|
||||
}
|
||||
|
||||
CIcons::IconIndex CDistribution::toIcon() const
|
||||
{
|
||||
return this->getRestrictionIcon();
|
||||
}
|
||||
|
||||
QVariant CDistribution::propertyByIndex(BlackMisc::CPropertyIndexRef index) const
|
||||
{
|
||||
if (index.isMyself()) { return QVariant::fromValue(*this); }
|
||||
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { return IDatastoreObjectWithIntegerKey::propertyByIndex(index); }
|
||||
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
m_channel = channel.trimmed().toUpper();
|
||||
case IndexChannel: return QVariant::fromValue(m_channel);
|
||||
case IndexStability : return QVariant::fromValue(m_stability);
|
||||
case IndexDownloadUrls: return QVariant::fromValue(m_downloadUrls);
|
||||
case IndexRestricted: return QVariant::fromValue(m_restricted);
|
||||
default: return CValueObject::propertyByIndex(index);
|
||||
}
|
||||
}
|
||||
|
||||
void CDistribution::setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant)
|
||||
{
|
||||
if (index.isMyself()) { (*this) = variant.value<CDistribution>(); return; }
|
||||
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index))
|
||||
{
|
||||
IDatastoreObjectWithIntegerKey::setPropertyByIndex(index, variant);
|
||||
return;
|
||||
}
|
||||
|
||||
void CDistribution::addDownloadUrl(const CUrl &url)
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
if (url.isEmpty()) { return; }
|
||||
m_downloadUrls.push_back(url);
|
||||
case IndexChannel: this->setChannel(variant.value<QString>()); break;
|
||||
case IndexStability: m_stability = variant.toInt(); break;
|
||||
case IndexDownloadUrls: m_downloadUrls = variant.value<CUrlList>(); break;
|
||||
case IndexRestricted: m_restricted = variant.toBool(); break;
|
||||
default: CValueObject::setPropertyByIndex(index, variant); break;
|
||||
}
|
||||
}
|
||||
|
||||
bool CDistribution::hasDownloadUrls() const
|
||||
const CDistribution &CDistribution::localDeveloperBuild()
|
||||
{
|
||||
static const CDistribution d = []
|
||||
{
|
||||
return !m_downloadUrls.isEmpty();
|
||||
}
|
||||
CDistribution ld("local developer", 0, true);
|
||||
ld.setCurrentUtcTime();
|
||||
return ld;
|
||||
}();
|
||||
return d;
|
||||
}
|
||||
|
||||
CIcons::IconIndex CDistribution::getRestrictionIcon() const
|
||||
CDistribution CDistribution::fromDatabaseJson(const QJsonObject &json, const QString &prefix)
|
||||
{
|
||||
Q_UNUSED(prefix); // not nested
|
||||
|
||||
const QString channel(json.value("channel").toString());
|
||||
const bool restricted = json.value("restricted").toBool();
|
||||
const int stability = json.value("stability").toInt();
|
||||
CDistribution distribution(channel, stability, restricted);
|
||||
distribution.setKeyVersionTimestampFromDatabaseJson(json);
|
||||
|
||||
// add the URLs
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
// StandardIconLockOpen16 is hard to distinguish from closed
|
||||
return m_restricted ? CIcons::StandardIconLockClosed16 : CIcons::StandardIconGlobe16;
|
||||
const QString key = "url" + QString::number(i);
|
||||
const QString url = json.value(key).toString();
|
||||
if (url.isEmpty()) { continue; }
|
||||
distribution.addDownloadUrl(CUrl(url));
|
||||
}
|
||||
|
||||
bool CDistribution::isStabilitySameOrBetter(const CDistribution &otherDistribution) const
|
||||
{
|
||||
return m_stability >= otherDistribution.m_stability;
|
||||
}
|
||||
|
||||
bool CDistribution::isStabilityBetter(const CDistribution &otherDistribution) const
|
||||
{
|
||||
return m_stability > otherDistribution.m_stability;
|
||||
}
|
||||
|
||||
QString CDistribution::convertToQString(bool i18n) const
|
||||
{
|
||||
return convertToQString(", ", i18n);
|
||||
}
|
||||
|
||||
QString CDistribution::convertToQString(const QString &separator, bool i18n) const
|
||||
{
|
||||
return u"channel: " %
|
||||
this->getChannel() %
|
||||
separator %
|
||||
u"download URLs: " %
|
||||
getDownloadUrls().toQString(i18n) %
|
||||
separator %
|
||||
u"timestamp: " %
|
||||
this->getFormattedUtcTimestampYmdhms();
|
||||
}
|
||||
|
||||
CIcons::IconIndex CDistribution::toIcon() const
|
||||
{
|
||||
return this->getRestrictionIcon();
|
||||
}
|
||||
|
||||
QVariant CDistribution::propertyByIndex(BlackMisc::CPropertyIndexRef index) const
|
||||
{
|
||||
if (index.isMyself()) { return QVariant::fromValue(*this); }
|
||||
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { return IDatastoreObjectWithIntegerKey::propertyByIndex(index); }
|
||||
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
case IndexChannel: return QVariant::fromValue(m_channel);
|
||||
case IndexStability : return QVariant::fromValue(m_stability);
|
||||
case IndexDownloadUrls: return QVariant::fromValue(m_downloadUrls);
|
||||
case IndexRestricted: return QVariant::fromValue(m_restricted);
|
||||
default: return CValueObject::propertyByIndex(index);
|
||||
}
|
||||
}
|
||||
|
||||
void CDistribution::setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant)
|
||||
{
|
||||
if (index.isMyself()) { (*this) = variant.value<CDistribution>(); return; }
|
||||
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index))
|
||||
{
|
||||
IDatastoreObjectWithIntegerKey::setPropertyByIndex(index, variant);
|
||||
return;
|
||||
}
|
||||
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
case IndexChannel: this->setChannel(variant.value<QString>()); break;
|
||||
case IndexStability: m_stability = variant.toInt(); break;
|
||||
case IndexDownloadUrls: m_downloadUrls = variant.value<CUrlList>(); break;
|
||||
case IndexRestricted: m_restricted = variant.toBool(); break;
|
||||
default: CValueObject::setPropertyByIndex(index, variant); break;
|
||||
}
|
||||
}
|
||||
|
||||
const CDistribution &CDistribution::localDeveloperBuild()
|
||||
{
|
||||
static const CDistribution d = []
|
||||
{
|
||||
CDistribution ld("local developer", 0, true);
|
||||
ld.setCurrentUtcTime();
|
||||
return ld;
|
||||
}();
|
||||
return d;
|
||||
}
|
||||
|
||||
CDistribution CDistribution::fromDatabaseJson(const QJsonObject &json, const QString &prefix)
|
||||
{
|
||||
Q_UNUSED(prefix); // not nested
|
||||
|
||||
const QString channel(json.value("channel").toString());
|
||||
const bool restricted = json.value("restricted").toBool();
|
||||
const int stability = json.value("stability").toInt();
|
||||
CDistribution distribution(channel, stability, restricted);
|
||||
distribution.setKeyVersionTimestampFromDatabaseJson(json);
|
||||
|
||||
// add the URLs
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
const QString key = "url" + QString::number(i);
|
||||
const QString url = json.value(key).toString();
|
||||
if (url.isEmpty()) { continue; }
|
||||
distribution.addDownloadUrl(CUrl(url));
|
||||
}
|
||||
return distribution;
|
||||
}
|
||||
} // ns
|
||||
return distribution;
|
||||
}
|
||||
} // ns
|
||||
|
||||
Reference in New Issue
Block a user