ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WiiUtils: Move ShouldInstallTitle to the online updater 

The disc updater uses different conditions.
This commit is contained in:
Léo Lam 2017-07-04 14:15:22 +02:00
parent f2a9ad0089
commit bc588948c9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/WiiUtils.cpp
View File

@ -118,7 +118,6 @@ protected:
std::string GetDeviceRegion(); std::string GetDeviceRegion();
std::string GetDeviceId(); std::string GetDeviceId();
bool ShouldInstallTitle(const TitleInfo& title);
IOS::HLE::Kernel m_ios; IOS::HLE::Kernel m_ios;
}; };
@ -149,14 +148,6 @@ std::string SystemUpdater::GetDeviceId()
return StringFromFormat("%" PRIu64, (u64(1) << 32) | ios_device_id); return StringFromFormat("%" PRIu64, (u64(1) << 32) | ios_device_id);
} }
bool SystemUpdater::ShouldInstallTitle(const TitleInfo& title)
{
const auto es = m_ios.GetES();
const auto installed_tmd = es->FindInstalledTMD(title.id);
return !(installed_tmd.IsValid() && installed_tmd.GetTitleVersion() >= title.version &&
es->GetStoredContentsFromTMD(installed_tmd).size() == installed_tmd.GetNumContents());
}
class OnlineSystemUpdater final : public SystemUpdater class OnlineSystemUpdater final : public SystemUpdater
{ {
public: public:
@ -172,6 +163,7 @@ private:
Response GetSystemTitles(); Response GetSystemTitles();
Response ParseTitlesResponse(const std::vector<u8>& response) const; Response ParseTitlesResponse(const std::vector<u8>& response) const;
bool ShouldInstallTitle(const TitleInfo& title);
UpdateResult InstallTitleFromNUS(const std::string& prefix_url, const TitleInfo& title, UpdateResult InstallTitleFromNUS(const std::string& prefix_url, const TitleInfo& title,
std::unordered_set<u64>* updated_titles); std::unordered_set<u64>* updated_titles);
@ -241,6 +233,14 @@ OnlineSystemUpdater::ParseTitlesResponse(const std::vector<u8>& response) const
return info; return info;
} }
bool OnlineSystemUpdater::ShouldInstallTitle(const TitleInfo& title)
{
const auto es = m_ios.GetES();
const auto installed_tmd = es->FindInstalledTMD(title.id);
return !(installed_tmd.IsValid() && installed_tmd.GetTitleVersion() >= title.version &&
es->GetStoredContentsFromTMD(installed_tmd).size() == installed_tmd.GetNumContents());
}
constexpr const char* GET_SYSTEM_TITLES_REQUEST_PAYLOAD = R"(<?xml version="1.0" encoding="UTF-8"?> constexpr const char* GET_SYSTEM_TITLES_REQUEST_PAYLOAD = R"(<?xml version="1.0" encoding="UTF-8"?>
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"