mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-21 16:55:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve Python installation process

Browse source 
Instead of waiting it to complete, now it will react on installation process finish.
Also add more logging.

PR #21863.
This commit is contained in:
Chocobo1 2024-11-19 18:57:44 +08:00 committed by GitHub
parent 6578fd06fd
commit 7f901a812d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/gui/mainwindow.cpp
View file

@ -112,6 +112,8 @@ namespace
#define EXECUTIONLOG_SETTINGS_KEY(name) (SETTINGS_KEY(u"Log/"_s) name) #define EXECUTIONLOG_SETTINGS_KEY(name) (SETTINGS_KEY(u"Log/"_s) name)
const std::chrono::seconds PREVENT_SUSPEND_INTERVAL {60}; const std::chrono::seconds PREVENT_SUSPEND_INTERVAL {60};
const QString PYTHON_INSTALLER_URL = u"https://www.python.org/ftp/python/3.13.0/python-3.13.0-amd64.exe"_s;
} }
MainWindow::MainWindow(IGUIApplication *app, const WindowState initialState, const QString &titleSuffix) MainWindow::MainWindow(IGUIApplication *app, const WindowState initialState, const QString &titleSuffix)
@ -1887,20 +1889,28 @@ void MainWindow::checkProgramUpdate(const bool invokedByUser)
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
void MainWindow::installPython() void MainWindow::installPython()
{ {
setCursor(QCursor(Qt::WaitCursor)); m_ui->actionSearchWidget->setEnabled(false);
m_ui->actionSearchWidget->setToolTip(tr("Python installation in progress..."));
setCursor(Qt::WaitCursor);
// Download python // Download python
const auto installerURL = u"https://www.python.org/ftp/python/3.13.0/python-3.13.0-amd64.exe"_s;
Net::DownloadManager::instance()->download( Net::DownloadManager::instance()->download(
Net::DownloadRequest(installerURL).saveToFile(true) Net::DownloadRequest(PYTHON_INSTALLER_URL).saveToFile(true)
, Preferences::instance()->useProxyForGeneralPurposes() , Preferences::instance()->useProxyForGeneralPurposes()
, this, &MainWindow::pythonDownloadFinished); , this, &MainWindow::pythonDownloadFinished);
} }
void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result) void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result)
{ {
const auto restoreWidgetsState = [this]
{
m_ui->actionSearchWidget->setEnabled(true);
m_ui->actionSearchWidget->setToolTip({});
setCursor(Qt::ArrowCursor);
};
if (result.status != Net::DownloadStatus::Success) if (result.status != Net::DownloadStatus::Success)
{ {
setCursor(QCursor(Qt::ArrowCursor)); restoreWidgetsState();
QMessageBox::warning( QMessageBox::warning(
this, tr("Download error") this, tr("Download error")
, tr("Python setup could not be downloaded, reason: %1.\nPlease install it manually.") , tr("Python setup could not be downloaded, reason: %1.\nPlease install it manually.")
@ -1908,29 +1918,39 @@ void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result)
return; return;
} }
setCursor(QCursor(Qt::ArrowCursor));
QProcess installer;
qDebug("Launching Python installer in passive mode...");
const Path exePath = result.filePath + u".exe"; const Path exePath = result.filePath + u".exe";
Utils::Fs::renameFile(result.filePath, exePath); Utils::Fs::renameFile(result.filePath, exePath);
installer.start(exePath.toString(), {u"/passive"_s});
// Wait for setup to complete // launch installer
installer.waitForFinished(10 * 60 * 1000); auto *installer = new QProcess(this);
installer->connect(installer, &QProcess::finished, this, [this, exePath, installer, restoreWidgetsState](const int exitCode, const QProcess::ExitStatus exitStatus)
qDebug("Installer stdout: %s", installer.readAllStandardOutput().data());
qDebug("Installer stderr: %s", installer.readAllStandardError().data());
qDebug("Setup should be complete!");
// Delete temp file
Utils::Fs::removeFile(exePath);
// Reload search engine
if (Utils::ForeignApps::pythonInfo().isSupportedVersion())
{ {
m_ui->actionSearchWidget->setChecked(true); restoreWidgetsState();
displaySearchTab(true); installer->deleteLater();
}
if ((exitStatus == QProcess::NormalExit) && (exitCode == 0))
{
LogMsg(tr("Python installation success."), Log::INFO);
// Delete installer
Utils::Fs::removeFile(exePath);
// Reload search engine
if (Utils::ForeignApps::pythonInfo().isSupportedVersion())
{
m_ui->actionSearchWidget->setChecked(true);
displaySearchTab(true);
}
}
else
{
const QString errorInfo = (exitStatus == QProcess::NormalExit)
? tr("Exit code: %1.").arg(QString::number(exitCode))
: tr("Reason: installer crashed.");
LogMsg(u"%1 %2"_s.arg(tr("Python installation failed."), errorInfo), Log::WARNING);
}
});
LogMsg(tr("Launching Python installer. File: \"%1\".").arg(exePath.toString()), Log::INFO);
installer->start(exePath.toString(), {u"/passive"_s});
} }
#endif // Q_OS_WIN #endif // Q_OS_WIN