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

Removed the ScraperHaltOnInvalidMedia option and corresponding menu entry

Browse source
This commit is contained in:
Leon Styhre 2024-01-11 01:02:35 +01:00
parent 3fca7b2567
commit 0535f0d333
3 changed files with 0 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
es-app/src/guis/GuiScraperMenu.cpp
View file

@ -950,20 +950,6 @@ void GuiScraperMenu::openOtherOptions()
} }
}); });
// Halt scraping on invalid media files.
auto scraperHaltOnInvalidMedia = std::make_shared<SwitchComponent>();
scraperHaltOnInvalidMedia->setState(
Settings::getInstance()->getBool("ScraperHaltOnInvalidMedia"));
s->addWithLabel("HALT ON INVALID MEDIA FILES", scraperHaltOnInvalidMedia);
s->addSaveFunc([scraperHaltOnInvalidMedia, s] {
if (scraperHaltOnInvalidMedia->getState() !=
Settings::getInstance()->getBool("ScraperHaltOnInvalidMedia")) {
Settings::getInstance()->setBool("ScraperHaltOnInvalidMedia",
scraperHaltOnInvalidMedia->getState());
s->setNeedsSaving();
}
});
// Search using file hashes for non-interactive mode. // Search using file hashes for non-interactive mode.
auto scraperSearchFileHash = std::make_shared<SwitchComponent>(); auto scraperSearchFileHash = std::make_shared<SwitchComponent>();
scraperSearchFileHash->setState(Settings::getInstance()->getBool("ScraperSearchFileHash")); scraperSearchFileHash->setState(Settings::getInstance()->getBool("ScraperSearchFileHash"));

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

@ -315,34 +315,6 @@ MDResolveHandle::MDResolveHandle(const ScraperSearchResult& result,
// If the image is cached already as the thumbnail, then we don't need // If the image is cached already as the thumbnail, then we don't need
// to download it again, in this case just save it to disk and resize it. // to download it again, in this case just save it to disk and resize it.
if (mResult.thumbnailImageUrl == it->fileURL && mResult.thumbnailImageData.size() > 0) { if (mResult.thumbnailImageUrl == it->fileURL && mResult.thumbnailImageData.size() > 0) {
// This is just a temporary workaround to avoid saving media files to disk that
// are actually just containing error messages from the scraper service. The
// proper solution is to implement file checksum checks to determine if the
// server response contains valid media. As for the current approach, if the
// file is less than 350 bytes, we check if FreeImage can actually detect a
// valid format, and if not, we present an error message. Black/empty images
// are sometimes returned from the scraper service and these can actually be
// less than 350 bytes in size.
if (Settings::getInstance()->getBool("ScraperHaltOnInvalidMedia") &&
mResult.thumbnailImageData.size() < 350) {
FIMEMORY* memoryStream {
FreeImage_OpenMemory(reinterpret_cast<BYTE*>(&mResult.thumbnailImageData.at(0)),
static_cast<DWORD>(mResult.thumbnailImageData.size()))};
FREE_IMAGE_FORMAT imageFormat {FreeImage_GetFileTypeFromMemory(memoryStream, 0)};
FreeImage_CloseMemory(memoryStream);
if (imageFormat == FIF_UNKNOWN) {
setError(
"The file \"" + Utils::FileSystem::getFileName(filePath) +
"\" returned by the scraper seems to be invalid as it's less than " +
"350 bytes in size",
true);
return;
}
}
// Remove any existing media file before attempting to write a new one. // Remove any existing media file before attempting to write a new one.
// This avoids the problem where there's already a file for this media type // This avoids the problem where there's already a file for this media type
// with a different format/extension (e.g. game.jpg and we're going to write // with a different format/extension (e.g. game.jpg and we're going to write
@ -542,35 +514,6 @@ void MediaDownloadHandle::update()
} }
} }
// This is just a temporary workaround to avoid saving media files to disk that are
// actually just containing error messages from the scraper service. The proper solution
// is to implement file checksum checks to determine if the server response contains valid
// media. As for the current approach, if the file is less than 350 bytes, we check if
// FreeImage can actually detect a valid format, and if not, we present an error message.
// Black/empty images are sometimes returned from the scraper service and these can actually
// be less than 350 bytes in size.
if (Settings::getInstance()->getBool("ScraperHaltOnInvalidMedia") &&
mReq->getContent().size() < 350) {
FREE_IMAGE_FORMAT imageFormat {FIF_UNKNOWN};
if (mMediaType != "videos") {
std::string imageData {mReq->getContent()};
FIMEMORY* memoryStream {FreeImage_OpenMemory(reinterpret_cast<BYTE*>(&imageData.at(0)),
static_cast<DWORD>(imageData.size()))};
imageFormat = FreeImage_GetFileTypeFromMemory(memoryStream, 0);
FreeImage_CloseMemory(memoryStream);
}
if (imageFormat == FIF_UNKNOWN) {
setError("The " + mMediaType + " file \"" + Utils::FileSystem::getFileName(mSavePath) +
"\" returned by the scraper seems to be invalid as it's less than " +
"350 bytes in size",
true);
return;
}
}
// Remove any existing media file before attempting to write a new one. // Remove any existing media file before attempting to write a new one.
// This avoids the problem where there's already a file for this media type // This avoids the problem where there's already a file for this media type
// with a different format/extension (e.g. game.jpg and we're going to write // with a different format/extension (e.g. game.jpg and we're going to write

1
es-core/src/Settings.cpp
View file

@ -149,7 +149,6 @@ void Settings::setDefaults()
mIntMap["ScraperRetryOnErrorTimer"] = {3, 3}; mIntMap["ScraperRetryOnErrorTimer"] = {3, 3};
mIntMap["ScraperSearchFileHashMaxSize"] = {384, 384}; mIntMap["ScraperSearchFileHashMaxSize"] = {384, 384};
mBoolMap["ScraperOverwriteData"] = {true, true}; mBoolMap["ScraperOverwriteData"] = {true, true};
mBoolMap["ScraperHaltOnInvalidMedia"] = {true, true};
mBoolMap["ScraperIgnoreHTTP404Errors"] = {true, true}; mBoolMap["ScraperIgnoreHTTP404Errors"] = {true, true};
mBoolMap["ScraperSearchFileHash"] = {true, true}; mBoolMap["ScraperSearchFileHash"] = {true, true};
mBoolMap["ScraperSearchMetadataName"] = {true, true}; mBoolMap["ScraperSearchMetadataName"] = {true, true};