7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-04 09:11:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix resource download freezing the game

Browse source
This commit is contained in:
HJfod 2022-12-17 19:08:01 +02:00
parent 6a8fec3a9f
commit 2d7ce01b1f
3 changed files with 39 additions and 11 deletions
loader
include/Geode/loader
Event.hpp
src
hooks
LoadingLayer.cpp
utils
web.cpp

16
loader/include/Geode/loader/Event.hpp
View file

@ -89,6 +89,22 @@ namespace geode {
this->enable();
}
EventListener(EventListener&& other)
: m_callback(std::move(other.m_callback)),
m_filter(std::move(other.m_filter))
{
other.disable();
this->enable();
}
EventListener(EventListener const& other)
: m_callback(other.m_callback),
m_filter(other.m_filter)
{
other.disable();
this->enable();
}
void bind(std::function<Callback> fn) {
m_callback = fn;
}

15
loader/src/hooks/LoadingLayer.cpp
View file

@ -21,15 +21,16 @@ struct CustomLoadingLayer : Modify<CustomLoadingLayer, LoadingLayer> {
auto count = Loader::get()->getAllMods().size();
auto label =
CCLabelBMFont::create(fmt::format("Geode: Loaded {} mods", count).c_str(), "goldFont.fnt");
auto label = CCLabelBMFont::create(
fmt::format("Geode: Loaded {} mods", count).c_str(),
"goldFont.fnt"
);
label->setPosition(winSize.width / 2, 30.f);
label->setScale(.45f);
label->setID("geode-loaded-info");
this->addChild(label);
// for some reason storing the listener as a field caused the
// destructor for the field not to be run
// fields have unpredictable destructors
this->addChild(EventListenerNode<ResourceDownloadFilter>::create(
this, &CustomLoadingLayer::updateResourcesProgress
));
@ -62,10 +63,12 @@ struct CustomLoadingLayer : Modify<CustomLoadingLayer, LoadingLayer> {
[&](UpdateFailed const& error) {
InternalLoader::get()->platformMessageBox(
"Error updating resources",
"Unable to update Geode resources: " +
error + ".\n"
"You will have to install resources manually by downloading resources.zip "
"from the latest release on GitHub: "
"https://github.com/geode-sdk/geode/releases/latest.\n"
"The game will be loaded as normal, but please be aware "
"that it may very likely crash."
"that it is very likely to crash. "
);
this->setUpdateText("Resource Download Failed");
m_fields->m_updatingResources = false;

19
loader/src/utils/web.cpp
View file

@ -228,11 +228,17 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, utils::fetch::writeBytes);
}
curl_easy_setopt(curl, CURLOPT_URL, m_url.c_str());
// No need to verify SSL, we trust our domains :-)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
// Github User Agent
curl_easy_setopt(curl, CURLOPT_USERAGENT, "github_api/1.0");
// Track progress
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
// Follow redirects
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
// Fail if response code is 4XX or 5XX
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
curl_slist* headers = nullptr;
for (auto& header : m_httpHeaders) {
@ -272,6 +278,7 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const
curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &data);
auto res = curl_easy_perform(curl);
if (res != CURLE_OK) {
curl_easy_cleanup(curl);
return this->error("Fetch failed: " + std::string(curl_easy_strerror(res)));
}
curl_easy_cleanup(curl);
@ -344,14 +351,16 @@ bool SentAsyncWebRequest::Impl::finished() const {
void SentAsyncWebRequest::Impl::error(std::string const& error) {
auto lock = std::unique_lock(m_statusMutex);
m_statusCV.wait(lock, [this]() {
return bool(m_paused);
return !m_paused;
});
Loader::get()->queueInGDThread([this, error]() {
std::lock_guard _(m_mutex);
for (auto& expect : m_expects) {
expect(error);
{
std::lock_guard _(m_mutex);
for (auto& expect : m_expects) {
expect(error);
}
}
std::lock_guard __(RUNNING_REQUESTS_MUTEX);
std::lock_guard _(RUNNING_REQUESTS_MUTEX);
RUNNING_REQUESTS.erase(m_id);
});
}