Merge branch 'tor_site_container' into teplitsa_tz
Containers page refactoring
This commit is contained in:
pokamest
commit
6ee203a21d
22 changed files with 10641 additions and 748 deletions
|
|
@ -1,5 +1,9 @@
|
|||
#include "ServerContainersLogic.h"
|
||||
#include "ShareConnectionLogic.h"
|
||||
#include "ServerConfiguringProgressLogic.h"
|
||||
|
||||
#include <QApplication>
|
||||
|
||||
#include "protocols/CloakLogic.h"
|
||||
#include "protocols/OpenVpnLogic.h"
|
||||
#include "protocols/ShadowSocksLogic.h"
|
||||
|
|
@ -10,105 +14,17 @@
|
|||
#include "../uilogic.h"
|
||||
|
||||
ServerContainersLogic::ServerContainersLogic(UiLogic *logic, QObject *parent):
|
||||
PageLogicBase(logic, parent),
|
||||
m_progressBarProtocolsContainerReinstallValue{0},
|
||||
m_progressBarProtocolsContainerReinstallMaximium{100},
|
||||
m_pushButtonOpenVpnContInstallEnabled{false},
|
||||
m_pushButtonSsOpenVpnContInstallEnabled{false},
|
||||
m_pushButtonCloakOpenVpnContInstallEnabled{false},
|
||||
m_pushButtonWireguardContInstallEnabled{false},
|
||||
m_pushButtonOpenVpnContDefaultChecked{false},
|
||||
m_pushButtonSsOpenVpnContDefaultChecked{false},
|
||||
m_pushButtonCloakOpenVpnContDefaultChecked{false},
|
||||
m_pushButtonWireguardContDefaultChecked{false},
|
||||
m_pushButtonOpenVpnContDefaultVisible{true},
|
||||
m_pushButtonSsOpenVpnContDefaultVisible{false},
|
||||
m_pushButtonCloakOpenVpnContDefaultVisible{false},
|
||||
m_pushButtonWireguardContDefaultVisible{false},
|
||||
m_pushButtonOpenVpnContShareVisible{false},
|
||||
m_pushButtonSsOpenVpnContShareVisible{false},
|
||||
m_pushButtonCloakOpenVpnContShareVisible{false},
|
||||
m_pushButtonWireguardContShareVisible{false},
|
||||
m_frameOpenvpnSettingsVisible{true},
|
||||
m_frameOpenvpnSsSettingsVisible{true},
|
||||
m_frameOpenvpnSsCloakSettingsVisible{true},
|
||||
m_progressBarProtocolsContainerReinstallVisible{false},
|
||||
m_frameWireguardSettingsVisible{false},
|
||||
m_frameWireguardVisible{false}
|
||||
PageLogicBase(logic, parent)
|
||||
{
|
||||
setupProtocolsPageConnections();
|
||||
|
||||
set_frameWireguardSettingsVisible(false);
|
||||
set_frameWireguardVisible(false);
|
||||
}
|
||||
|
||||
void ServerContainersLogic::updateServerContainersPage()
|
||||
{
|
||||
set_progressBarProtocolsContainerReinstallVisible(false);
|
||||
|
||||
ContainersModel *c_model = qobject_cast<ContainersModel *>(uiLogic()->containersModel());
|
||||
c_model->setSelectedServerIndex(uiLogic()->selectedServerIndex);
|
||||
|
||||
ProtocolsModel *p_model = qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel());
|
||||
p_model->setSelectedServerIndex(uiLogic()->selectedServerIndex);
|
||||
|
||||
auto containers = m_settings.containers(uiLogic()->selectedServerIndex);
|
||||
DockerContainer defaultContainer = m_settings.defaultContainer(uiLogic()->selectedServerIndex);
|
||||
bool haveAuthData = m_settings.haveAuthData(uiLogic()->selectedServerIndex);
|
||||
|
||||
// all containers
|
||||
QList<DockerContainer> allContainers {
|
||||
DockerContainer::OpenVpn,
|
||||
DockerContainer::ShadowSocks,
|
||||
DockerContainer::Cloak,
|
||||
DockerContainer::WireGuard
|
||||
};
|
||||
|
||||
using SetVisibleFunc = std::function<void(bool)>;
|
||||
using SetCheckedFunc = std::function<void(bool)>;
|
||||
using SetEnabledFunc = std::function<void(bool)>;
|
||||
|
||||
QList<SetEnabledFunc> installButtonsEnabledFunc {
|
||||
[this](bool enabled) ->void {set_pushButtonOpenVpnContInstallEnabled(enabled);},
|
||||
[this](bool enabled) ->void {set_pushButtonSsOpenVpnContInstallEnabled(enabled);},
|
||||
[this](bool enabled) ->void {set_pushButtonCloakOpenVpnContInstallEnabled(enabled);},
|
||||
[this](bool enabled) ->void {set_pushButtonWireguardContInstallEnabled(enabled);},
|
||||
};
|
||||
|
||||
QList<SetCheckedFunc> defaultButtonsCheckedFunc {
|
||||
[this](bool checked) ->void {set_pushButtonOpenVpnContDefaultChecked(checked);},
|
||||
[this](bool checked) ->void {set_pushButtonSsOpenVpnContDefaultChecked(checked);},
|
||||
[this](bool checked) ->void {set_pushButtonCloakOpenVpnContDefaultChecked(checked);},
|
||||
[this](bool checked) ->void {set_pushButtonWireguardContDefaultChecked(checked);},
|
||||
};
|
||||
QList<SetVisibleFunc> defaultButtonsVisibleFunc {
|
||||
[this](bool visible) ->void {set_pushButtonOpenVpnContDefaultVisible(visible);},
|
||||
[this](bool visible) ->void {set_pushButtonSsOpenVpnContDefaultVisible(visible);},
|
||||
[this](bool visible) ->void {set_pushButtonCloakOpenVpnContDefaultVisible(visible);},
|
||||
[this](bool visible) ->void {set_pushButtonWireguardContDefaultVisible(visible);},
|
||||
};
|
||||
|
||||
QList<SetVisibleFunc> shareButtonsVisibleFunc {
|
||||
[this](bool visible) ->void {set_pushButtonOpenVpnContShareVisible(visible);},
|
||||
[this](bool visible) ->void {set_pushButtonSsOpenVpnContShareVisible(visible);},
|
||||
[this](bool visible) ->void {set_pushButtonCloakOpenVpnContShareVisible(visible);},
|
||||
[this](bool visible) ->void {set_pushButtonWireguardContShareVisible(visible);},
|
||||
};
|
||||
|
||||
QList<SetVisibleFunc> framesVisibleFunc {
|
||||
[this](bool visible) ->void {set_frameOpenvpnSettingsVisible(visible);},
|
||||
[this](bool visible) ->void {set_frameOpenvpnSsSettingsVisible(visible);},
|
||||
[this](bool visible) ->void {set_frameOpenvpnSsCloakSettingsVisible(visible);},
|
||||
[this](bool visible) ->void {set_frameWireguardSettingsVisible(visible);},
|
||||
};
|
||||
|
||||
for (int i = 0; i < allContainers.size(); ++i) {
|
||||
defaultButtonsCheckedFunc.at(i)(defaultContainer == allContainers.at(i));
|
||||
defaultButtonsVisibleFunc.at(i)(haveAuthData && containers.contains(allContainers.at(i)));
|
||||
shareButtonsVisibleFunc.at(i)(haveAuthData && containers.contains(allContainers.at(i)));
|
||||
installButtonsEnabledFunc.at(i)(haveAuthData);
|
||||
framesVisibleFunc.at(i)(containers.contains(allContainers.at(i)));
|
||||
}
|
||||
}
|
||||
|
||||
void ServerContainersLogic::onPushButtonProtoSettingsClicked(DockerContainer c, Protocol p)
|
||||
|
|
@ -134,114 +50,48 @@ void ServerContainersLogic::onPushButtonShareClicked(DockerContainer c)
|
|||
emit uiLogic()->goToPage(Page::ShareConnection);
|
||||
}
|
||||
|
||||
void ServerContainersLogic::setupProtocolsPageConnections()
|
||||
void ServerContainersLogic::onPushButtonRemoveClicked(DockerContainer container)
|
||||
{
|
||||
QJsonObject openvpnConfig;
|
||||
//buttonSetEnabledFunc(false);
|
||||
ErrorCode e = ServerController::removeContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), container);
|
||||
m_settings.removeContainerConfig(uiLogic()->selectedServerIndex, container);
|
||||
//buttonSetEnabledFunc(true);
|
||||
|
||||
// all containers
|
||||
QList<DockerContainer> containers {
|
||||
DockerContainer::OpenVpn,
|
||||
DockerContainer::ShadowSocks,
|
||||
DockerContainer::Cloak,
|
||||
DockerContainer::WireGuard
|
||||
};
|
||||
using ButtonClickedFunc = void (ServerContainersLogic::*)(bool);
|
||||
using ButtonSetEnabledFunc = std::function<void(bool)>;
|
||||
|
||||
|
||||
// install buttons
|
||||
QList<ButtonClickedFunc> installButtonsClickedSig {
|
||||
&ServerContainersLogic::pushButtonOpenVpnContInstallClicked,
|
||||
&ServerContainersLogic::pushButtonSsOpenVpnContInstallClicked,
|
||||
&ServerContainersLogic::pushButtonCloakOpenVpnContInstallClicked,
|
||||
&ServerContainersLogic::pushButtonWireguardContInstallClicked,
|
||||
};
|
||||
QList<ButtonSetEnabledFunc> installButtonsSetEnabledFunc {
|
||||
[this] (bool enabled) -> void {
|
||||
set_pushButtonOpenVpnContInstallEnabled(enabled);
|
||||
},
|
||||
[this] (bool enabled) -> void {
|
||||
set_pushButtonSsOpenVpnContInstallEnabled(enabled);
|
||||
},
|
||||
[this] (bool enabled) -> void {
|
||||
set_pushButtonCloakOpenVpnContInstallEnabled(enabled);
|
||||
},
|
||||
[this] (bool enabled) -> void {
|
||||
set_pushButtonWireguardContInstallEnabled(enabled);
|
||||
},
|
||||
};
|
||||
|
||||
for (int i = 0; i < containers.size(); ++i) {
|
||||
ButtonClickedFunc buttonClickedFunc = installButtonsClickedSig.at(i);
|
||||
ButtonSetEnabledFunc buttonSetEnabledFunc = installButtonsSetEnabledFunc.at(i);
|
||||
DockerContainer container = containers.at(i);
|
||||
|
||||
connect(this, buttonClickedFunc, [this, container, buttonSetEnabledFunc](bool checked){
|
||||
if (checked) {
|
||||
UiLogic::PageFunc page_server_containers;
|
||||
page_server_containers.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
set_pageEnabled(enabled);
|
||||
};
|
||||
UiLogic::ButtonFunc no_button;
|
||||
UiLogic::LabelFunc no_label;
|
||||
UiLogic::ProgressFunc progressBar_protocols_container_reinstall;
|
||||
progressBar_protocols_container_reinstall.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_progressBarProtocolsContainerReinstallVisible(visible);
|
||||
};
|
||||
progressBar_protocols_container_reinstall.setValueFunc = [this] (int value) ->void {
|
||||
set_progressBarProtocolsContainerReinstallValue(value);
|
||||
};
|
||||
progressBar_protocols_container_reinstall.getValueFunc = [this] (void) -> int {
|
||||
return progressBarProtocolsContainerReinstallValue();
|
||||
};
|
||||
progressBar_protocols_container_reinstall.getMaximiumFunc = [this] (void) -> int {
|
||||
return progressBarProtocolsContainerReinstallMaximium();
|
||||
};
|
||||
|
||||
ErrorCode e = uiLogic()->doInstallAction([this, container](){
|
||||
return ServerController::setupContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), container);
|
||||
},
|
||||
page_server_containers, progressBar_protocols_container_reinstall,
|
||||
no_button, no_label);
|
||||
|
||||
if (!e) {
|
||||
m_settings.setContainerConfig(uiLogic()->selectedServerIndex, container, QJsonObject());
|
||||
m_settings.setDefaultContainer(uiLogic()->selectedServerIndex, container);
|
||||
}
|
||||
}
|
||||
else {
|
||||
buttonSetEnabledFunc(false);
|
||||
ErrorCode e = ServerController::removeContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), container);
|
||||
m_settings.removeContainerConfig(uiLogic()->selectedServerIndex, container);
|
||||
buttonSetEnabledFunc(true);
|
||||
|
||||
if (m_settings.defaultContainer(uiLogic()->selectedServerIndex) == container) {
|
||||
const auto &c = m_settings.containers(uiLogic()->selectedServerIndex);
|
||||
if (c.isEmpty()) m_settings.setDefaultContainer(uiLogic()->selectedServerIndex, DockerContainer::None);
|
||||
else m_settings.setDefaultContainer(uiLogic()->selectedServerIndex, c.keys().first());
|
||||
}
|
||||
}
|
||||
|
||||
updateServerContainersPage();
|
||||
});
|
||||
}
|
||||
|
||||
// share buttons
|
||||
QList<ButtonClickedFunc> shareButtonsClickedSig {
|
||||
&ServerContainersLogic::pushButtonOpenVpnContShareClicked,
|
||||
&ServerContainersLogic::pushButtonSsOpenVpnContShareClicked,
|
||||
&ServerContainersLogic::pushButtonCloakOpenVpnContShareClicked,
|
||||
&ServerContainersLogic::pushButtonWireguardContShareClicked,
|
||||
};
|
||||
|
||||
for (int i = 0; i < containers.size(); ++i) {
|
||||
ButtonClickedFunc buttonClickedFunc = shareButtonsClickedSig.at(i);
|
||||
DockerContainer container = containers.at(i);
|
||||
|
||||
connect(this, buttonClickedFunc, [this, container](bool){
|
||||
uiLogic()->shareConnectionLogic()->updateSharingPage(uiLogic()->selectedServerIndex, m_settings.serverCredentials(uiLogic()->selectedServerIndex), container);
|
||||
emit uiLogic()->goToPage(Page::ShareConnection);
|
||||
});
|
||||
if (m_settings.defaultContainer(uiLogic()->selectedServerIndex) == container) {
|
||||
const auto &c = m_settings.containers(uiLogic()->selectedServerIndex);
|
||||
if (c.isEmpty()) m_settings.setDefaultContainer(uiLogic()->selectedServerIndex, DockerContainer::None);
|
||||
else m_settings.setDefaultContainer(uiLogic()->selectedServerIndex, c.keys().first());
|
||||
}
|
||||
updateServerContainersPage();
|
||||
}
|
||||
|
||||
void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int port, TransportProto tp)
|
||||
{
|
||||
QMap<DockerContainer, QJsonObject> containers;
|
||||
Protocol mainProto = ContainerProps::defaultProtocol(c);
|
||||
|
||||
QJsonObject config {
|
||||
{ config_key::container, ContainerProps::containerToString(c) },
|
||||
{ ProtocolProps::protoToString(mainProto), QJsonObject {
|
||||
{ config_key::port, QString::number(port) },
|
||||
{ config_key::transport_proto, ProtocolProps::transportProtoToString(tp, mainProto) }}
|
||||
}
|
||||
};
|
||||
|
||||
containers.insert(c, config);
|
||||
|
||||
emit uiLogic()->goToPage(Page::ServerConfiguringProgress);
|
||||
qApp->processEvents();
|
||||
|
||||
ErrorCode e = uiLogic()->serverConfiguringProgressLogic()->doInstallAction([this, c](){
|
||||
return ServerController::setupContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), c);
|
||||
});
|
||||
|
||||
if (!e) {
|
||||
m_settings.setContainerConfig(uiLogic()->selectedServerIndex, c, QJsonObject());
|
||||
m_settings.setDefaultContainer(uiLogic()->selectedServerIndex, c);
|
||||
}
|
||||
|
||||
updateServerContainersPage();
|
||||
emit uiLogic()->closePage();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue