Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2024-11-20 11:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make Downloader::getRemoteFileHash use Galaxy API

Browse Source 
There was no reason to use the old downloader API for this because we can get the same data using Galaxy API.
This also means that Downloader::downloadFileWithId is now the only function using the old API.
This commit is contained in:
Sude 2019-10-24 11:20:52 +03:00
parent 367c80293a
commit 30cdd41d90
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/downloader.h
View File

@ -120,7 +120,7 @@ class Downloader
CURLcode beginDownload(); CURLcode beginDownload();
std::string getResponse(const std::string& url); std::string getResponse(const std::string& url);
std::string getLocalFileHash(const std::string& filepath, const std::string& gamename = std::string()); std::string getLocalFileHash(const std::string& filepath, const std::string& gamename = std::string());
std::string getRemoteFileHash(const std::string& gamename, const std::string& id); std::string getRemoteFileHash(const gameFile& gf);
int loadGameDetailsCache(); int loadGameDetailsCache();
int saveGameDetailsCache(); int saveGameDetailsCache();
std::vector<gameDetails> getGameDetailsFromJsonNode(Json::Value root, const int& recursion_level = 0); std::vector<gameDetails> getGameDetailsFromJsonNode(Json::Value root, const int& recursion_level = 0);

44
src/downloader.cpp
View File

@ -341,7 +341,7 @@ int Downloader::login()
{ {
if (!gogAPI->login(email, password)) if (!gogAPI->login(email, password))
{ {
std::cerr << "API: Login failed (some features may not work)" << std::endl; std::cerr << "API: Login failed (--download-file option will not work)" << std::endl;
return 0; return 0;
} }
else else
@ -2020,7 +2020,6 @@ void Downloader::checkStatus()
continue; continue;
std::string gamename = vGameFiles[i].gamename; std::string gamename = vGameFiles[i].gamename;
std::string id = vGameFiles[i].id;
if (boost::filesystem::exists(filepath) && boost::filesystem::is_regular_file(filepath)) if (boost::filesystem::exists(filepath) && boost::filesystem::is_regular_file(filepath))
{ {
@ -2030,7 +2029,7 @@ void Downloader::checkStatus()
// GOG only provides xml data for installers, patches and language packs // GOG only provides xml data for installers, patches and language packs
if (type & (GFTYPE_INSTALLER | GFTYPE_PATCH | GFTYPE_LANGPACK)) if (type & (GFTYPE_INSTALLER | GFTYPE_PATCH | GFTYPE_LANGPACK))
remoteHash = this->getRemoteFileHash(gamename, id); remoteHash = this->getRemoteFileHash(vGameFiles[i]);
std::string localHash = this->getLocalFileHash(filepath.string(), gamename); std::string localHash = this->getLocalFileHash(filepath.string(), gamename);
if (!remoteHash.empty()) if (!remoteHash.empty())
@ -2101,25 +2100,50 @@ std::string Downloader::getLocalFileHash(const std::string& filepath, const std:
return localHash; return localHash;
} }
std::string Downloader::getRemoteFileHash(const std::string& gamename, const std::string& id) std::string Downloader::getRemoteFileHash(const gameFile& gf)
{ {
std::string remoteHash; std::string remoteHash;
std::string xml_data = gogAPI->getXML(gamename, id);
if (gogAPI->getError()) // Refresh Galaxy login if token is expired
if (gogGalaxy->isTokenExpired())
{ {
std::cout << gogAPI->getErrorMessage() << std::endl; if (!gogGalaxy->refreshLogin())
gogAPI->clearError(); {
std::cerr << "Galaxy API failed to refresh login" << std::endl;
return remoteHash;
}
} }
if (!xml_data.empty())
// Get downlink JSON from Galaxy API
Json::Value downlinkJson = gogGalaxy->getResponseJson(gf.galaxy_downlink_json_url);
if (downlinkJson.empty())
{
std::cerr << "Empty JSON response" << std::endl;
return remoteHash;
}
std::string xml_url;
if (downlinkJson.isMember("checksum"))
if (!downlinkJson["checksum"].empty())
xml_url = downlinkJson["checksum"].asString();
// Get XML data
std::string xml;
if (!xml_url.empty())
xml = gogGalaxy->getResponse(xml_url);
if (!xml.empty())
{ {
tinyxml2::XMLDocument remote_xml; tinyxml2::XMLDocument remote_xml;
remote_xml.Parse(xml_data.c_str()); remote_xml.Parse(xml.c_str());
tinyxml2::XMLElement *fileElemRemote = remote_xml.FirstChildElement("file"); tinyxml2::XMLElement *fileElemRemote = remote_xml.FirstChildElement("file");
if (fileElemRemote) if (fileElemRemote)
{ {
remoteHash = fileElemRemote->Attribute("md5"); remoteHash = fileElemRemote->Attribute("md5");
} }
} }
return remoteHash; return remoteHash;
} }