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

added a button to scan the server for already installed containers

Browse source 
- refactoring of old code, redundant sections of code removed
This commit is contained in:
vladimir.kuznetsov 2023-02-25 17:59:22 +03:00
parent 480b2181f0
commit 2580475f67
12 changed files with 136 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/ui/pages_logic/AdvancedServerSettingsLogic.cpp
View file

@ -35,7 +35,7 @@ void AdvancedServerSettingsLogic::onUpdatePage()
set_labelCurrentVpnProtocolText(tr("Service: ") + selectedContainerName);
}
void AdvancedServerSettingsLogic::onPushButtonClearServer()
void AdvancedServerSettingsLogic::onPushButtonClearServerClicked()
{
set_pageEnabled(false);
set_pushButtonClearText(tr("Uninstalling Amnezia software..."));
@ -47,7 +47,7 @@ void AdvancedServerSettingsLogic::onPushButtonClearServer()
ErrorCode e = m_serverController->removeAllContainers(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
m_serverController->disconnectFromHost(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
if (e) {
emit uiLogic()->showWarningMessage(tr("Error occurred while configuring server.") + "\n" +
emit uiLogic()->showWarningMessage(tr("Error occurred while cleaning the server.") + "\n" +
tr("Error message: ") + errorString(e) + "\n" +
tr("See logs for details."));
} else {
@ -61,3 +61,28 @@ void AdvancedServerSettingsLogic::onPushButtonClearServer()
set_pageEnabled(true);
set_pushButtonClearText(tr("Clear server from Amnezia software"));
}
void AdvancedServerSettingsLogic::onPushButtonScanServerClicked()
{
set_labelWaitInfoVisible(false);
set_pageEnabled(false);
bool isServerCreated;
auto containersCount = m_settings->containers(uiLogic()->m_selectedServerIndex).size();
ErrorCode errorCode = uiLogic()->addAlreadyInstalledContainersGui(false, isServerCreated);
if (errorCode != ErrorCode::NoError) {
emit uiLogic()->showWarningMessage(tr("Error occurred while scanning the server.") + "\n" +
tr("Error message: ") + errorString(errorCode) + "\n" +
tr("See logs for details."));
}
auto newContainersCount = m_settings->containers(uiLogic()->m_selectedServerIndex).size();
if (containersCount != newContainersCount) {
emit uiLogic()->showWarningMessage(tr("All containers installed on the server are added to the GUI"));
} else {
emit uiLogic()->showWarningMessage(tr("No installed containers found on the server"));
}
onUpdatePage();
set_pageEnabled(true);
}

3
client/ui/pages_logic/AdvancedServerSettingsLogic.h
View file

@ -24,7 +24,8 @@ public:
Q_INVOKABLE void onUpdatePage() override;
Q_INVOKABLE void onPushButtonClearServer();
Q_INVOKABLE void onPushButtonClearServerClicked();
Q_INVOKABLE void onPushButtonScanServerClicked();
};
#endif // ADVANCEDSERVERSETTINGSLOGIC_H

5
client/ui/pages_logic/NewServerProtocolsLogic.cpp
View file

@ -17,7 +17,6 @@ void NewServerProtocolsLogic::onUpdatePage()
void NewServerProtocolsLogic::onPushButtonConfigureClicked(DockerContainer c, int port, TransportProto tp)
{
QMap<DockerContainer, QJsonObject> containers;
Proto mainProto = ContainerProps::defaultProtocol(c);
QJsonObject config {
@ -28,8 +27,8 @@ void NewServerProtocolsLogic::onPushButtonConfigureClicked(DockerContainer c, in
}
};
containers.insert(c, config);
QPair<DockerContainer, QJsonObject> container(c, config);
uiLogic()->installServer(containers);
uiLogic()->installServer(container);
}

6
client/ui/pages_logic/ServerContainersLogic.cpp
View file

@ -88,11 +88,11 @@ void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int p
emit uiLogic()->goToPage(Page::ServerConfiguringProgress);
qApp->processEvents();
ServerCredentials credentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
ErrorCode errorCode = uiLogic()->addAlreadyInstalledContainersGui(false, credentials);
bool isServerCreated = false;
ErrorCode errorCode = uiLogic()->addAlreadyInstalledContainersGui(false, isServerCreated);
if (errorCode == ErrorCode::NoError) {
if (!uiLogic()->isContainerAlreadyAddedToGui(c, credentials)) {
if (!uiLogic()->isContainerAlreadyAddedToGui(c)) {
auto installAction = [this, c, &config]() {
return m_serverController->setupContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex), c, config);
};

22
client/ui/pages_logic/WizardLogic.cpp
View file

@ -18,7 +18,7 @@ void WizardLogic::onUpdatePage()
set_radioButtonMediumChecked(true);
}
QMap<DockerContainer, QJsonObject> WizardLogic::getInstallConfigsFromWizardPage() const
QPair<DockerContainer, QJsonObject> WizardLogic::getInstallConfigsFromWizardPage() const
{
QJsonObject cloakConfig {
{ config_key::container, ContainerProps::containerToString(DockerContainer::Cloak) },
@ -33,27 +33,29 @@ QMap<DockerContainer, QJsonObject> WizardLogic::getInstallConfigsFromWizardPage(
{ config_key::container, ContainerProps::containerToString(DockerContainer::OpenVpn) }
};
QMap<DockerContainer, QJsonObject> containers;
QPair<DockerContainer, QJsonObject> container;
DockerContainer dockerContainer;
if (radioButtonHighChecked()) {
containers.insert(DockerContainer::Cloak, cloakConfig);
container = {DockerContainer::Cloak, cloakConfig};
}
if (radioButtonMediumChecked()) {
containers.insert(DockerContainer::ShadowSocks, ssConfig);
container = {DockerContainer::ShadowSocks, ssConfig};
}
if (radioButtonLowChecked()) {
containers.insert(DockerContainer::OpenVpn, openVpnConfig);
container = {DockerContainer::OpenVpn, openVpnConfig};
}
return containers;
return container;
}
void WizardLogic::onPushButtonVpnModeFinishClicked()
{
auto containers = getInstallConfigsFromWizardPage();
uiLogic()->installServer(containers);
auto container = getInstallConfigsFromWizardPage();
uiLogic()->installServer(container);
if (checkBoxVpnModeChecked()) {
m_settings->setRouteMode(Settings::VpnOnlyForwardSites);
} else {
@ -63,6 +65,6 @@ void WizardLogic::onPushButtonVpnModeFinishClicked()
void WizardLogic::onPushButtonLowFinishClicked()
{
auto containers = getInstallConfigsFromWizardPage();
uiLogic()->installServer(containers);
auto container = getInstallConfigsFromWizardPage();
uiLogic()->installServer(container);
}

2
client/ui/pages_logic/WizardLogic.h
View file

@ -25,7 +25,7 @@ public:
explicit WizardLogic(UiLogic *uiLogic, QObject *parent = nullptr);
~WizardLogic() = default;
QMap<DockerContainer, QJsonObject> getInstallConfigsFromWizardPage() const;
QPair<DockerContainer, QJsonObject> getInstallConfigsFromWizardPage() const;
};
#endif // WIZARD_LOGIC_H