Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 23:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved the handling of invalid scraper configuration file entries.

Browse source
This commit is contained in:
Leon Styhre 2021-11-06 21:21:41 +01:00
parent af337124d6
commit c673f06eb0
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
es-app/src/scrapers/Scraper.cpp
View file

@ -32,7 +32,14 @@ const std::map<std::string, generate_scraper_requests_func> scraper_request_func
std::unique_ptr<ScraperSearchHandle> startScraperSearch(const ScraperSearchParams& params) std::unique_ptr<ScraperSearchHandle> startScraperSearch(const ScraperSearchParams& params)
{ {
const std::string& name = Settings::getInstance()->getString("Scraper"); std::string name = Settings::getInstance()->getString("Scraper");
// Handle a potentially invalid entry in the configuration file.
if (name != "screenscraper" && name != "thegamesdb") {
name = "screenscraper";
Settings::getInstance()->setString("Scraper", name);
Settings::getInstance()->saveFile();
}
std::unique_ptr<ScraperSearchHandle> handle(new ScraperSearchHandle()); std::unique_ptr<ScraperSearchHandle> handle(new ScraperSearchHandle());
// Check if the scraper in the settings still exists as a registered scraping source. // Check if the scraper in the settings still exists as a registered scraping source.
@ -80,15 +87,8 @@ std::vector<std::string> getScraperList()
bool isValidConfiguredScraper() bool isValidConfiguredScraper()
{ {
std::string scraper = Settings::getInstance()->getString("Scraper"); const std::string& name = Settings::getInstance()->getString("Scraper");
// Handle a potentially invalid entry in the configuration file. return scraper_request_funcs.find(name) != scraper_request_funcs.end();
if (scraper != "screenscraper" && scraper != "thegamesdb") {
scraper = "screenscraper";
Settings::getInstance()->setString("Scraper", scraper);
Settings::getInstance()->saveFile();
}
return scraper_request_funcs.find(scraper) != scraper_request_funcs.end();
} }
void ScraperSearchHandle::update() void ScraperSearchHandle::update()