flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T343, support for 7digit ids

Browse Source
This commit is contained in:
Klaus Basan
2018-09-09 02:37:08 +02:00
parent 8c10237dce
commit e4a9a7ce9f
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/blackmisc/network/user.cpp
View File

@@ -134,6 +134,28 @@ namespace BlackMisc
return msgs;
}
QString CUser::get7DigitId() const
{
if (!this->hasNumericId()) { return m_id; }
if (m_id.length() > 6) { return m_id; }
static const QString zeros("0000000");
return zeros.left(7 - m_id.length()) % m_id;
}
int CUser::getIntegerId() const
{
if (m_id.isEmpty()) { return -1; }
if (is09OnlyString(m_id)) { return m_id.toInt(); }
return -1;
}
bool CUser::hasNumericId() const
{
if (m_id.isEmpty()) { return false; }
return is09OnlyString(m_id);
}
void CUser::updateMissingParts(const CUser &otherUser)
{
if (this == &otherUser) { return; }
@@ -153,9 +175,8 @@ namespace BlackMisc
bool CUser::isValidVatsimId(const QString &id)
{
if (id.isEmpty()) { return false; }
bool ok;
const int i = id.toInt(&ok);
if (!ok) { return false; }
if (!is09OnlyString(id)) { return false; }
const int i = id.toInt();
return i >= 100000 && i <= 9999999;
}
@@ -205,10 +226,12 @@ namespace BlackMisc
{
case IndexEmail: return CVariant(m_email);
case IndexId: return CVariant(m_id);
case IndexPassword: return CVariant(m_password);
case IndexRealName: return CVariant(m_realname);
case IndexHomebase: return m_homebase.propertyByIndex(index.copyFrontRemoved());
case IndexCallsign: return m_callsign.propertyByIndex(index.copyFrontRemoved());
case IndexId7Digit: return CVariant(this->get7DigitId());
case IndexIdInteger: return CVariant::fromValue(this->getIntegerId());
case IndexPassword: return CVariant(m_password);
case IndexRealName: return CVariant(m_realname);
case IndexHomebase: return m_homebase.propertyByIndex(index.copyFrontRemoved());
case IndexCallsign: return m_callsign.propertyByIndex(index.copyFrontRemoved());
default: return CValueObject::propertyByIndex(index);
}
}
@@ -220,6 +243,8 @@ namespace BlackMisc
switch (i)
{
case IndexEmail: this->setEmail(variant.value<QString>()); break;
case IndexIdInteger: this->setId(QString::number(variant.toInt())); break;
case IndexId7Digit: // fallthru
case IndexId: this->setId(variant.value<QString>()); break;
case IndexPassword: this->setPassword(variant.value<QString>()); break;
case IndexRealName: this->setRealName(variant.value<QString>()); break;
@@ -237,6 +262,7 @@ namespace BlackMisc
{
case IndexEmail: return m_email.compare(compareValue.getEmail(), Qt::CaseInsensitive);
case IndexId: return m_id.compare(compareValue.getId(), Qt::CaseInsensitive);
case IndexId7Digit: return this->get7DigitId().compare(compareValue.get7DigitId(), Qt::CaseInsensitive);
case IndexRealName: return m_realname.compare(compareValue.getRealName(), Qt::CaseInsensitive);
case IndexHomebase: return m_homebase.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getHomeBase());
case IndexCallsign: return m_callsign.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCallsign());

11
src/blackmisc/network/user.h
View File

@@ -45,6 +45,8 @@ namespace BlackMisc
{
IndexEmail = CPropertyIndex::GlobalIndexCUser,
IndexId,
IndexIdInteger,
IndexId7Digit,
IndexPassword,
IndexRealName,
IndexCallsign,
@@ -120,6 +122,15 @@ namespace BlackMisc
//! Get id.
const QString &getId() const { return m_id; }
//! Numeric ids get a leading zeros if required
QString get7DigitId() const;
//! Id as integer if possible, otherwise -1
int getIntegerId() const;
//! Has a numeric id?
bool hasNumericId() const;
//! Set id
void setId(const QString &id) { m_id = decode(id); }