mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 22:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: check for patch updates

Browse Source
This commit is contained in:
Megamouse 2021-11-18 20:47:17 +01:00
parent 08b02efc6c
commit 484a3e6824
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rpcs3/rpcs3qt/patch_manager_dialog.cpp
View File

@ -97,12 +97,13 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_set
} }
else if (button == ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)) else if (button == ui->buttonBox->button(QDialogButtonBox::RestoreDefaults))
{ {
download_update(); download_update(false, true);
} }
}); });
connect(m_downloader, &downloader::signal_download_error, this, [this](const QString& /*error*/) connect(m_downloader, &downloader::signal_download_error, this, [this](const QString& /*error*/)
{ {
QMessageBox::warning(this, tr("Patch downloader"), tr("An error occurred during the download process.\nCheck the log for more information.")); QMessageBox::warning(this, tr("Patch downloader"), tr("An error occurred during the download process.\nCheck the log for more information."));
ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(true);
}); });
connect(m_downloader, &downloader::signal_download_finished, this, [this](const QByteArray& data) connect(m_downloader, &downloader::signal_download_finished, this, [this](const QByteArray& data)
{ {
@ -110,9 +111,15 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_set
if (!result_json) if (!result_json)
{ {
QMessageBox::warning(this, tr("Patch downloader"), tr("An error occurred during the download process.\nCheck the log for more information.")); if (!m_download_automatic)
{
QMessageBox::warning(this, tr("Patch downloader"), tr("An error occurred during the download process.\nCheck the log for more information."));
}
} }
ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(true);
}); });
download_update(true, false);
} }
patch_manager_dialog::~patch_manager_dialog() patch_manager_dialog::~patch_manager_dialog()
@ -861,9 +868,14 @@ void patch_manager_dialog::dragLeaveEvent(QDragLeaveEvent* event)
event->accept(); event->accept();
} }
void patch_manager_dialog::download_update() const void patch_manager_dialog::download_update(bool automatic, bool auto_accept)
{ {
patch_log.notice("Patch download triggered"); patch_log.notice("Patch download triggered (automatic=%d, auto_accept=%d)", automatic, auto_accept);
ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(false);
m_download_automatic = automatic;
m_download_auto_accept = auto_accept;
const std::string path = patch_engine::get_patches_path() + "patch.yml"; const std::string path = patch_engine::get_patches_path() + "patch.yml";
std::string url = "https://rpcs3.net/compatibility?patch&api=v1&v=" + patch_engine_version; std::string url = "https://rpcs3.net/compatibility?patch&api=v1&v=" + patch_engine_version;
@ -882,7 +894,7 @@ void patch_manager_dialog::download_update() const
} }
} }
m_downloader->start(url, true, true, tr("Downloading latest patches")); m_downloader->start(url, true, !m_download_automatic, tr("Downloading latest patches"));
} }
bool patch_manager_dialog::handle_json(const QByteArray& data) bool patch_manager_dialog::handle_json(const QByteArray& data)
@ -913,7 +925,12 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
if (return_code == 1) if (return_code == 1)
{ {
patch_log.notice("Patch download: No newer patches found"); patch_log.notice("Patch download: No newer patches found");
QMessageBox::information(this, tr("Download successful"), tr("Your patch file is already up to date."));
if (!m_download_automatic)
{
QMessageBox::information(this, tr("Download successful"), tr("Your patch file is already up to date."));
}
return true; return true;
} }
@ -923,6 +940,16 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
return false; return false;
} }
// TODO: check for updates first instead of loading the whole file immediately
if (!m_download_auto_accept)
{
const QMessageBox::StandardButton answer = QMessageBox::question(this, tr("Update patches?"), tr("New patches are available.\n\nDo you want to update?"));
if (answer != QMessageBox::StandardButton::Yes)
{
return true;
}
}
const QJsonValue& version_obj = json_data["version"]; const QJsonValue& version_obj = json_data["version"];
if (!version_obj.isString()) if (!version_obj.isString())

4
rpcs3/rpcs3qt/patch_manager_dialog.h
View File

@ -56,7 +56,7 @@ private:
void save_config() const; void save_config() const;
void update_patch_info(const gui_patch_info& info) const; void update_patch_info(const gui_patch_info& info) const;
static bool is_valid_file(const QMimeData& md, QStringList* drop_paths = nullptr); static bool is_valid_file(const QMimeData& md, QStringList* drop_paths = nullptr);
void download_update() const; void download_update(bool automatic, bool auto_accept);
bool handle_json(const QByteArray& data); bool handle_json(const QByteArray& data);
std::shared_ptr<gui_settings> m_gui_settings; std::shared_ptr<gui_settings> m_gui_settings;
@ -70,6 +70,8 @@ private:
patch_engine::patch_map m_map; patch_engine::patch_map m_map;
downloader* m_downloader = nullptr; downloader* m_downloader = nullptr;
bool m_download_automatic = false;
bool m_download_auto_accept = false;
Ui::patch_manager_dialog *ui; Ui::patch_manager_dialog *ui;