diff options
Diffstat (limited to 'Source/Core/DiscIO/VolumeVerifier.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeVerifier.cpp | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 29bd38c665..3031f14a0f 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -96,18 +96,14 @@ void RedumpVerifier::Start(const Volume& volume) switch (download_state->status) { case DownloadStatus::FailButOldCacheAvailable: - ERROR_LOG_FMT(DISCIO, "Failed to fetch data from Redump.org, using old cached data instead"); + ERROR_LOG_FMT(DISCIO, "Failed to fetch data from Redump.info, using old cached data instead"); [[fallthrough]]; case DownloadStatus::Success: return ScanDatfile(ReadDatfile(system), system); - case DownloadStatus::SystemNotAvailable: - m_result = {Status::Error, Common::GetStringT("Wii data is not public yet")}; - return {}; - case DownloadStatus::Fail: default: - m_result = {Status::Error, Common::GetStringT("Failed to connect to Redump.org")}; + m_result = {Status::Error, Common::GetStringT("Failed to connect to Redump.info")}; return {}; } }); @@ -121,14 +117,14 @@ static std::string GetPathForSystem(const std::string& system) RedumpVerifier::DownloadStatus RedumpVerifier::DownloadDatfile(const std::string& system, DownloadStatus old_status) { - if (old_status == DownloadStatus::Success || old_status == DownloadStatus::SystemNotAvailable) + if (old_status == DownloadStatus::Success) return old_status; Common::HttpRequest request; const std::optional<std::vector<u8>> result = - request.Get("http://redump.org/datfile/" + system + "/serial,version", - {{"User-Agent", Common::GetScmRevStr()}}); + request.Get("https://redump.info/datfile/" + system + "/serial,version", + {{"User-Agent", Common::GetEmulatorName()}}); const std::string output_path = GetPathForSystem(system); @@ -141,13 +137,8 @@ RedumpVerifier::DownloadStatus RedumpVerifier::DownloadDatfile(const std::string if (result->size() > 1 && (*result)[0] == '<' && (*result)[1] == '!') { // This is an HTML page, not a zip file like we want - - if (File::Exists(output_path)) - return DownloadStatus::FailButOldCacheAvailable; - - const bool system_not_available_match = - Common::ContainsSubrange(*result, "System \"" + system + "\" doesn't exist."); - return system_not_available_match ? DownloadStatus::SystemNotAvailable : DownloadStatus::Fail; + return File::Exists(output_path) ? DownloadStatus::FailButOldCacheAvailable : + DownloadStatus::Fail; } File::CreateFullPath(output_path); @@ -219,7 +210,7 @@ std::vector<RedumpVerifier::PotentialMatch> RedumpVerifier::ScanDatfile(std::spa pugi::xml_document doc; if (!doc.load_buffer(data.data(), data.size())) { - m_result = {Status::Error, Common::GetStringT("Failed to parse Redump.org data")}; + m_result = {Status::Error, Common::GetStringT("Failed to parse Redump.info data")}; return {}; } @@ -317,8 +308,8 @@ std::vector<RedumpVerifier::PotentialMatch> RedumpVerifier::ScanDatfile(std::spa "Serial and/or version data is missing from {0}\n" "Please append \"{1}\" (without the quotes) to the datfile URL when downloading\n" "Example: {2}", - GetPathForSystem(system), "serial,version", "http://redump.org/datfile/gc/serial,version"); - m_result = {Status::Error, Common::GetStringT("Failed to parse Redump.org data")}; + GetPathForSystem(system), "serial,version", "http://redump.info/datfile/gc/serial,version"); + m_result = {Status::Error, Common::GetStringT("Failed to parse Redump.info data")}; return {}; } @@ -1389,7 +1380,7 @@ void VolumeVerifier::Finish() else { m_result.summary_text = - Common::GetStringT("This is a good dump according to Redump.org, but Dolphin has found " + Common::GetStringT("This is a good dump according to Redump.info, but Dolphin has found " "problems. This might be a bug in Dolphin."); } return; |
