AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed the display of the protocol list in the settings when attempting to install a container that is already installed on the server

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-09-11 13:56:49 +05:00
parent f751657903
commit 551f7616f0
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
client/core/servercontroller.cpp
View file

@ -665,7 +665,8 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
QString transportProto = containerConfig.value(config_key::transport_proto).toString(defaultTransportProto); QString transportProto = containerConfig.value(config_key::transport_proto).toString(defaultTransportProto);
// TODO reimplement with netstat // TODO reimplement with netstat
QString script = QString("which lsof &>/dev/null || true && sudo lsof -i -P -n 2>/dev/null | grep -E ':%1 ").arg(port); QString script =
QString("which lsof &>/dev/null || true && sudo lsof -i -P -n 2>/dev/null | grep -E ':%1 ").arg(port);
for (auto &port : fixedPorts) { for (auto &port : fixedPorts) {
script = script.append("|:%1").arg(port); script = script.append("|:%1").arg(port);
} }
@ -739,8 +740,10 @@ ErrorCode ServerController::isServerDpkgBusy(const ServerCredentials &credential
genVarsForScript(credentials)), genVarsForScript(credentials)),
cbReadStdOut, cbReadStdErr); cbReadStdOut, cbReadStdErr);
if (stdOut.contains("Packet manager not found")) return ErrorCode::ServerPacketManagerError; if (stdOut.contains("Packet manager not found"))
if (stdOut.contains("fuser not installed")) return ErrorCode::NoError; return ErrorCode::ServerPacketManagerError;
if (stdOut.contains("fuser not installed"))
return ErrorCode::NoError;
if (stdOut.isEmpty()) { if (stdOut.isEmpty()) {
return ErrorCode::NoError; return ErrorCode::NoError;
@ -798,11 +801,19 @@ ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredential
QString port = containerAndPortMatch.captured(2); QString port = containerAndPortMatch.captured(2);
QString transportProto = containerAndPortMatch.captured(3); QString transportProto = containerAndPortMatch.captured(3);
DockerContainer container = ContainerProps::containerFromString(name); DockerContainer container = ContainerProps::containerFromString(name);
QJsonObject config;
Proto mainProto = ContainerProps::defaultProtocol(container); Proto mainProto = ContainerProps::defaultProtocol(container);
QJsonObject config { { config_key::container, name }, for (auto protocol : ContainerProps::protocolsForContainer(container)) {
{ ProtocolProps::protoToString(mainProto), QJsonObject containerConfig;
QJsonObject { { config_key::port, port }, if (protocol == mainProto) {
{ config_key::transport_proto, transportProto } } } }; containerConfig.insert(config_key::port, port);
containerConfig.insert(config_key::transport_proto, transportProto);
config.insert(config_key::container, ContainerProps::containerToString(container));
}
config.insert(ProtocolProps::protoToString(protocol), containerConfig);
}
installedContainers.insert(container, config); installedContainers.insert(container, config);
} }
} }

2
client/ui/qml/Pages2/PageSettingsAbout.qml
View file

@ -122,7 +122,7 @@ And if you don't like the app, all the more support it - the donation will be us
leftImageSource: "qrc:/images/controls/telegram.svg" leftImageSource: "qrc:/images/controls/telegram.svg"
clickedFunction: function() { clickedFunction: function() {
Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_dev")) Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_en"))
} }
} }