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

"added display of busy server package manager on the PageSetupWizardInstalling"

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-16 23:48:25 +05:00
parent 3964bffce4
commit a40f365a54
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/ui/controllers/installController.cpp
View file

@ -85,6 +85,7 @@ void InstallController::install(DockerContainer container, int port, TransportPr
void InstallController::installServer(DockerContainer container, QJsonObject &config) void InstallController::installServer(DockerContainer container, QJsonObject &config)
{ {
ServerController serverController(m_settings); ServerController serverController(m_settings);
connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
QMap<DockerContainer, QJsonObject> installedContainers; QMap<DockerContainer, QJsonObject> installedContainers;
ErrorCode errorCode = ErrorCode errorCode =
@ -138,6 +139,7 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole)); qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
ServerController serverController(m_settings); ServerController serverController(m_settings);
connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
QMap<DockerContainer, QJsonObject> installedContainers; QMap<DockerContainer, QJsonObject> installedContainers;
ErrorCode errorCode = serverController.getAlreadyInstalledContainers(serverCredentials, installedContainers); ErrorCode errorCode = serverController.getAlreadyInstalledContainers(serverCredentials, installedContainers);
@ -239,6 +241,7 @@ void InstallController::updateContainer(QJsonObject config)
qvariant_cast<QJsonObject>(m_containersModel->data(modelIndex, ContainersModel::Roles::ConfigRole)); qvariant_cast<QJsonObject>(m_containersModel->data(modelIndex, ContainersModel::Roles::ConfigRole));
ServerController serverController(m_settings); ServerController serverController(m_settings);
connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config); auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
if (errorCode == ErrorCode::NoError) { if (errorCode == ErrorCode::NoError) {

2
client/ui/controllers/installController.h
View file

@ -60,6 +60,8 @@ signals:
void passphraseRequestStarted(); void passphraseRequestStarted();
void passphraseRequestFinished(); void passphraseRequestFinished();
void serverIsBusy(const bool isBusy);
private: private:
void installServer(DockerContainer container, QJsonObject &config); void installServer(DockerContainer container, QJsonObject &config);
void installContainer(DockerContainer container, QJsonObject &config); void installContainer(DockerContainer container, QJsonObject &config);

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

@ -75,7 +75,7 @@ PageType {
repeat: true repeat: true
running: true running: true
onTriggered: { onTriggered: {
progressBar.value += 0.001 progressBar.value += 0.003
} }
} }
} }

23
client/ui/qml/Pages2/PageSetupWizardInstalling.qml
View file

@ -17,6 +17,9 @@ PageType {
Component.onCompleted: PageController.enableTabBar(false) Component.onCompleted: PageController.enableTabBar(false)
Component.onDestruction: PageController.enableTabBar(true) Component.onDestruction: PageController.enableTabBar(true)
property bool isTimerRunning: true
property string progressBarText: qsTr("Usually it takes no more than 5 minutes")
Connections { Connections {
target: InstallController target: InstallController
@ -57,6 +60,18 @@ PageType {
PageController.showErrorMessage(qsTr("The server has already been added to the application")) PageController.showErrorMessage(qsTr("The server has already been added to the application"))
} }
function onServerIsBusy(isBusy) {
if (isBusy) {
root.progressBarText = qsTr("Amnesia has detected that your server is currently ") +
qsTr("busy installing other software. Amnesia installation ") +
qsTr("will pause until the server finishes installing other software")
root.isTimerRunning = false
} else {
root.progressBarText = qsTr("Usually it takes no more than 5 minutes")
root.isTimerRunning = true
}
}
} }
SortFilterProxyModel { SortFilterProxyModel {
@ -122,18 +137,20 @@ PageType {
interval: 300 interval: 300
repeat: true repeat: true
running: true running: root.isTimerRunning
onTriggered: { onTriggered: {
progressBar.value += 0.001 progressBar.value += 0.003
} }
} }
} }
ParagraphTextType { ParagraphTextType {
id: progressText
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 8 Layout.topMargin: 8
text: qsTr("Usually it takes no more than 5 minutes") text: root.progressBarText
} }
} }
} }