kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-24 04:32:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add logic for allowing user to choose Ip and port.

Browse Source
This commit is contained in:
Nikhil Tanwar 2021-12-01 12:23:08 +05:30
parent a9c65222c7
commit 93edcbd41b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/localkiwixserver.cpp
View File

@ -27,13 +27,15 @@ LocalKiwixServer::LocalKiwixServer(QWidget *parent) :
connect(KiwixApp::instance()->getSettingsManager(), &SettingsManager::portChanged, connect(KiwixApp::instance()->getSettingsManager(), &SettingsManager::portChanged,
this, [=](int port) { m_port = port; }); this, [=](int port) { m_port = port; });
connect(ui->closeButton, &QPushButton::clicked, this, &LocalKiwixServer::close); connect(ui->closeButton, &QPushButton::clicked, this, &LocalKiwixServer::close);
const QHostAddress &localhost = QHostAddress(QHostAddress::LocalHost);
for (const QHostAddress &address: QNetworkInterface::allAddresses()) { const auto interfacesMap = mp_server->getNetworkInterfaces();
if (address.protocol() == QAbstractSocket::IPv4Protocol && address != localhost) { for(auto interfacePair : interfacesMap) {
m_ipAddress = address.toString(); QString ip = QString::fromStdString(interfacePair.second);
break; ui->IpChooser->addItem(ip);
}
} }
ui->IpChooser->addItem("0.0.0.0");
ui->IpChooser->setCurrentText(QString::fromStdString(mp_server->getBestPublicIp())); // put best Public Ip as default
ui->PortChooser->setText(QString::number(m_port));
ui->KiwixServerButton->setStyleSheet("QPushButton {background-color: RoyalBlue;" ui->KiwixServerButton->setStyleSheet("QPushButton {background-color: RoyalBlue;"
"color: white;" "color: white;"
"padding: 5px;" "padding: 5px;"
@ -63,7 +65,10 @@ void LocalKiwixServer::openInBrowser()
void LocalKiwixServer::runOrStopServer() void LocalKiwixServer::runOrStopServer()
{ {
if (!m_active) { if (!m_active) {
m_port = ui->PortChooser->text().toInt();
m_ipAddress = (ui->IpChooser->currentText() != "0.0.0.0") ? ui->IpChooser->currentText() : QString::fromStdString(mp_server->getBestPublicIp());
mp_server->setPort(m_port); mp_server->setPort(m_port);
mp_server->setAddress(ui->IpChooser->currentText().toStdString());
ui->IpAddress->setText("http://" + m_ipAddress + ":" + QString::number(m_port)); ui->IpAddress->setText("http://" + m_ipAddress + ":" + QString::number(m_port));
if (!mp_server->start()) { if (!mp_server->start()) {
QMessageBox messageBox; QMessageBox messageBox;