andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-20 02:00:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fixed increment name server N

Browse Source
This commit is contained in:
dranik
2026-06-11 17:30:55 +03:00
parent 0e6d0b444f
commit 7064e8465b
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/core/repositories/secureServersRepository.cpp
+10 -7
View File
@@ -3,6 +3,7 @@
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonValue> #include <QJsonValue>
#include <QRegularExpression>
#include <QSet> #include <QSet>
#include <QUuid> #include <QUuid>
@@ -205,14 +206,16 @@ QString SecureServersRepository::nextAvailableServerName() const
} }
} }
int i = 0; static const QRegularExpression serverNameRe(QStringLiteral("^Server (\\d+)$"));
QString candidate; int maxN = 0;
do { for (const QString &name : std::as_const(usedNames)) {
i++; const QRegularExpressionMatch match = serverNameRe.match(name);
candidate = QStringLiteral("Server %1").arg(i); if (match.hasMatch()) {
} while (usedNames.contains(candidate)); maxN = std::max(maxN, match.captured(1).toInt());
}
}
return candidate; return QStringLiteral("Server %1").arg(maxN + 1);
} }
QString SecureServersRepository::addServer(const QString &serverId, const QJsonObject &serverJson, serverConfigUtils::ConfigType kind) QString SecureServersRepository::addServer(const QString &serverId, const QJsonObject &serverJson, serverConfigUtils::ConfigType kind)