Commit eccc1570 authored by Bkg2k's avatar Bkg2k
Browse files

chore: fix all scrape/scraper/scrapping terms everywhere

parent ba783cff
......@@ -14,7 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- No game launch if core doesn't match
- Game not listed in lobby if password protected
- Restore scrapped folder display
- Restore scraped folder display
- Changed popups handling for better stability
- Wifi options securely saved automatically
......@@ -92,7 +92,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add a UDP sock server on port 1337
- Added new version support
- Added an option to scrape recalbox-mix-images from screenscraper
- Added new mamedb scrapper mirror
- Added new mamedb scraper mirror
- Only save changed metadata when saving gamelist.xml (improve shutdown time)
- Ignore all known bios and devices for arcade/neogeo platform
- Added Czech support
......
......@@ -49,7 +49,7 @@ private:
// Running state
enum class State
{
Running, //!< Running (scrapping)
Running, //!< Running (scraping)
StopPending, //!< Stop pending
Stopped, //!< Stopped, display statistics
OverQuota, //!< Stopped, over quota
......@@ -69,7 +69,7 @@ private:
void GameResult(int index, int total, FileData* result) override;
/*!
* @brief Scraper site quota reached. Scrapping is being aborted immediately.
* @brief Scraper site quota reached. Scraping is being aborted immediately.
*/
void ScrapingComplete(ScrapeResult reason) override;
};
......@@ -61,7 +61,7 @@ class GuiScraperSingleGameRun : public Gui, public INotifyScrapeResult
void GameResult(int index, int total, FileData* result) override;
/*!
* @brief Scraper site quota reached. Scrapping is being aborted immediately.
* @brief Scraper site quota reached. Scraping is being aborted immediately.
*/
void ScrapingComplete(ScrapeResult reason) override;
};
......@@ -93,12 +93,12 @@ class MenuMessages
#define MENUMESSAGE_SCRAPER_HELP_MSG "Get informations and visual for your games. The scraper downloads metadata and visuals for your games from different servers and enhances the user experience in EmulationStation completely."
#define MENUMESSAGE_SCRAPER_FROM_HELP_MSG "Select a server to scrape from. The SCREENSCRAPER server is recommended and is based on www.screenscraper.fr and scrapes game data in your language, if available."
#define MENUMESSAGE_SCRAPER_GET_NAME_FROM_HELP_MSG "Select the source of your game name. Trust the scrapping database or get them from filename, raw or undecorated (without decoration in () or [] )."
#define MENUMESSAGE_SCRAPER_GET_NAME_FROM_HELP_MSG "Select the source of your game name. Trust the scraping database or get them from filename, raw or undecorated (without decoration in () or [] )."
#define MENUMESSAGE_SCRAPER_EXTRACT_REGION_FROM_FILENAME_HELP_MSG "Try to extract game region from its filename when possible. Support long and short region game (JP or Japan, EU or Europe, ...)"
#define MENUMESSAGE_SCRAPER_NOW_HELP_MSG "Begin the scrape process with the configuration shown below."
#define MENUMESSAGE_SCRAPER_RATINGS_HELP_MSG "Scrape and display game ratings."
#define MENUMESSAGE_SCRAPER_FINAL_POPUP "Scrapping complete! {PROCESSED} games processed.\n\n{SUCCESS} game(s) scraped or updated\n{NOTFOUND} game(s) not found...\n{ERRORS} request/download errors\n\n{TEXTINFO} Text information updated\n{IMAGES} images and {VIDEOS} videos downloaded\n{MEDIASIZE} of media saved\nNow, EmulationStation is going to relaunch to update all gamelists."
#define MENUMESSAGE_SCRAPER_FINAL_QUOTA "You reached your daily quota of scrapping request.\nAll your today's scrapes have been saved anyway.\n\nStart scrapping again tomorrow.\nDont forget to select 'update' and not 'scrape all'"
#define MENUMESSAGE_SCRAPER_FINAL_POPUP "Scraping complete! {PROCESSED} games processed.\n\n{SUCCESS} game(s) scraped or updated\n{NOTFOUND} game(s) not found...\n{ERRORS} request/download errors\n\n{TEXTINFO} Text information updated\n{IMAGES} images and {VIDEOS} videos downloaded\n{MEDIASIZE} of media saved\nNow, EmulationStation is going to relaunch to update all gamelists."
#define MENUMESSAGE_SCRAPER_FINAL_QUOTA "You reached your daily quota of scraping request.\nAll your today's scrapes have been saved anyway.\n\nStart scraping again tomorrow.\nDont forget to select 'update' and not 'scrape all'"
#define MENUMESSAGE_SCRAPER_FINAL_DISKFULL "Your share partition is almost full.\nThe scraper stopped automatically.\n\nRemove unused games, media, files to make room before running the scraper again!"
#define MENUMESSAGE_ADVANCED_HELP_MSG "Advanced settings. Please make sure you really know what you're doing, before changing any values in this menu."
......
......@@ -55,9 +55,9 @@ GuiMenu::GuiMenu(WindowManager& window, SystemManager& systemManager)
if (!bartop)
AddSubMenu(_("NETWORK SETTINGS"), mTheme.menuIconSet.network, (int)Components::Network, _(MENUMESSAGE_NETWORK_HELP_MSG));
// Scrapper
// Scraper
if (!bartop)
AddSubMenu(_("SCRAPER"), mTheme.menuIconSet.scraper, (int)Components::Scrapper, _(MENUMESSAGE_SCRAPER_HELP_MSG));
AddSubMenu(_("SCRAPER"), mTheme.menuIconSet.scraper, (int)Components::Scraper, _(MENUMESSAGE_SCRAPER_HELP_MSG));
// Advanced
if (!bartop)
......@@ -97,7 +97,7 @@ void GuiMenu::SubMenuSelected(int id)
case Components::UISettings: mWindow.pushGui(new GuiMenuUserInterface(mWindow, mSystemManager)); break;
case Components::Sound: mWindow.pushGui(new GuiMenuSound(mWindow)); break;
case Components::Network: mWindow.pushGui(new GuiMenuNetwork(mWindow)); break;
case Components::Scrapper: mWindow.pushGui(new GuiMenuScraper(mWindow, mSystemManager)); break;
case Components::Scraper: mWindow.pushGui(new GuiMenuScraper(mWindow, mSystemManager)); break;
case Components::Advanced: mWindow.pushGui(new GuiMenuAdvancedSettings(mWindow, mSystemManager)); break;
case Components::Bios: mWindow.pushGui(new GuiBiosScan(mWindow, mSystemManager)); break;
case Components::License:
......
......@@ -24,7 +24,7 @@ class GuiMenu : public GuiMenuBase
UISettings,
Sound,
Network,
Scrapper,
Scraper,
Advanced,
Bios,
License,
......
......@@ -66,9 +66,9 @@ GuiMenuGamelistGameOptions::GuiMenuGamelistGameOptions(WindowManager& window, IG
if (mGame.isGame())
mAdult = AddSwitch(_("Adult"), mGame.Metadata().Adult(), (int)Components::Adult, this);
// Scrappe
// Scrape
if (mGame.isGame())
AddSubMenu(_("SCRAPE"), (int)Components::Scrappe);
AddSubMenu(_("SCRAPE"), (int)Components::Scrape);
}
std::vector<GuiMenuBase::ListEntry<std::string>> GuiMenuGamelistGameOptions::GetRatioEntries()
......@@ -172,7 +172,7 @@ void GuiMenuGamelistGameOptions::SwitchComponentChanged(int id, bool status)
case Components::Description:
case Components::Rating:
case Components::Genre:
case Components::Scrappe:
case Components::Scrape:
case Components::Ratio:
case Components::Emulator: break;
}
......@@ -186,7 +186,7 @@ void GuiMenuGamelistGameOptions::RatingChanged(int id, float value)
void GuiMenuGamelistGameOptions::SubMenuSelected(int id)
{
if ((Components)id == Components::Scrappe)
if ((Components)id == Components::Scrape)
mWindow.pushGui(new GuiScraperSingleGameRun(mWindow, mGame, this));
}
......
......@@ -39,7 +39,7 @@ class GuiMenuGamelistGameOptions : public GuiMenuBase
Description,
Rating,
Genre,
Scrappe,
Scrape,
};
//! View reference
......
......@@ -42,7 +42,7 @@ std::vector<GuiMenuBase::ListEntry<ScraperNameOptions>> GuiMenuScraper::GetNameO
ScraperNameOptions nameOption = RecalboxConf::Instance().GetScraperNameOptions();
std::vector<ListEntry<ScraperNameOptions>> list;
list.push_back({ _("Scrapper results"), ScraperNameOptions::GetFromScraper, nameOption == ScraperNameOptions::GetFromScraper });
list.push_back({ _("Scraper results"), ScraperNameOptions::GetFromScraper, nameOption == ScraperNameOptions::GetFromScraper });
list.push_back({ _("Raw filename"), ScraperNameOptions::GetFromFilename, nameOption == ScraperNameOptions::GetFromFilename });
list.push_back({ _("Undecorated filename"), ScraperNameOptions::GetFromFilenameUndecorated, nameOption == ScraperNameOptions::GetFromFilenameUndecorated });
......@@ -63,7 +63,7 @@ std::vector<GuiMenuBase::ListEntry<SystemData*>> GuiMenuScraper::GetSystemsEntri
for(SystemData* system : mSystemManager.GetVisibleSystemList())
{
if(!system->hasPlatformId(PlatformIds::PlatformId::PLATFORM_IGNORE))
if (!system->IsVirtual() || system->IsFavorite() || system->IsPorts()) // Allow scrapping favorites, but not virtual systems
if (!system->IsVirtual() || system->IsFavorite() || system->IsPorts()) // Allow scraping favorites, but not virtual systems
if (system->HasGame())
list.push_back({ system->getFullName(), system, system->PlatformCount() != 0 });
}
......
......@@ -17,7 +17,7 @@ class INotifyScrapeResult
virtual void GameResult(int index, int total, FileData* result) = 0;
/*!
* @brief Notify the caller of scrapping is being aborted immediately
* @brief Notify the caller of scraping is being aborted immediately
*/
virtual void ScrapingComplete(ScrapeResult reason) = 0;
};
......@@ -7,9 +7,9 @@
enum class ScrapeResult
{
Ok, //!< Game found
NotScraped, //!< Game does not need to be scrapped
NotScraped, //!< Game does not need to be scraped
NotFound, //!< Game not found
QuotaReached, //!< Quota reached - Stop scrapping!
DiskFull, //!< Disk limit reached - Stop scrapping!
FatalError, //!< Fatal error - Stop scrapping!
QuotaReached, //!< Quota reached - Stop scraping!
DiskFull, //!< Disk limit reached - Stop scraping!
FatalError, //!< Fatal error - Stop scraping!
};
\ No newline at end of file
......@@ -5,7 +5,7 @@
#include <string>
//! Scrapped name options
//! Scraped name options
enum class ScraperNameOptions
{
GetFromScraper, //!< Get name from scraper (default)
......
......@@ -25,9 +25,9 @@ class IScraperEngine : private INoCopy
/*!
* @brief Run the scraper using the given methods, on the given system list and report progress using notifyTarget
* @param method Scrapping method
* @param method Scraping method
* @param systemList System list
* @param notifyTarget Interface for reporting scrapping progression
* @param notifyTarget Interface for reporting scraping progression
* @return True if everything has been successful. False if cancelled, quota reached or fatal error occurred
*/
virtual bool RunOn(ScrappingMethod method, const SystemManager::SystemList& systemList,
......@@ -35,9 +35,9 @@ class IScraperEngine : private INoCopy
/*!
* @brief Run the scraper using the given methods, on the given single game and report progress using notifyTarget
* @param method Scrapping method
* @param method Scraping method
* @param singleGame Single game to scrape
* @param notifyTarget Interface for reporting scrapping progression
* @param notifyTarget Interface for reporting scraping progression
* @return True if everything has been successful. False if cancelled, quota reached or fatal error occurred
*/
virtual bool RunOn(ScrappingMethod method, FileData& singleGame,
......
......@@ -215,7 +215,7 @@ void ScreenScraperEngine::Initialize()
bool ScreenScraperEngine::RunOn(ScrappingMethod method, FileData& singleGame, INotifyScrapeResult* notifyTarget,
long long diskMinimumFree)
{
{ LOG(LogInfo) << "[ScreenScraper] Starting new single game scrapping session..."; }
{ LOG(LogInfo) << "[ScreenScraper] Starting new single game scraping session..."; }
mNotifier = notifyTarget;
mMethod = method;
......@@ -236,7 +236,7 @@ bool ScreenScraperEngine::RunOn(ScrappingMethod method, FileData& singleGame, IN
bool ScreenScraperEngine::RunOn(ScrappingMethod method, const SystemManager::SystemList& systemList,
INotifyScrapeResult* notifyTarget, long long diskMinimumFree)
{
{ LOG(LogInfo) << "[ScreenScraper] Starting new multi-system scrapping session..."; }
{ LOG(LogInfo) << "[ScreenScraper] Starting new multi-system scraping session..."; }
mNotifier = notifyTarget;
mMethod = method;
......@@ -310,7 +310,7 @@ void ScreenScraperEngine::ReceiveSyncCallback(const SDL_Event& event)
// Call completed game notification
if (mNotifier != nullptr)
mNotifier->GameResult(mCount, mTotal, game);
// End of scrapping?
// End of scraping?
if (mCount == mTotal)
if (mNotifier != nullptr)
mNotifier->ScrapingComplete(ScrapeResult::Ok);
......@@ -400,7 +400,7 @@ ScrapeResult ScreenScraperEngine::Engine::Scrape(ScrappingMethod method, FileDat
ScreenScraperApis::Game gameResult;
gameResult.mResult = ScrapeResult::NotFound;
{ LOG(LogDebug) << "[ScreenScraper] Start scrapping data for " << game.getPath().ToString(); }
{ LOG(LogDebug) << "[ScreenScraper] Start scraping data for " << game.getPath().ToString(); }
if (mAbortRequest) break;
// Get file size
......@@ -623,7 +623,7 @@ bool ScreenScraperEngine::Engine::NeedScrapping(ScrappingMethod method, FileData
}
// Unknown method
{ LOG(LogError) << "[ScreenScraper] Unknown scrapping method"; }
{ LOG(LogError) << "[ScreenScraper] Unknown scraping method"; }
return false;
}
......@@ -636,7 +636,7 @@ ScreenScraperEngine::Engine::StoreTextData(ScrappingMethod method, const ScreenS
game.Metadata().SetName(sourceData.mName);
mTextInfo++;
}
// Store data only if they are not empty and not scrapped if method is IncompleteKeep
// Store data only if they are not empty and not scraped if method is IncompleteKeep
if (!sourceData.mSynopsis.empty())
if (game.Metadata().Description().empty() || method != ScrappingMethod::IncompleteKeep)
{
......
......@@ -67,16 +67,16 @@ class ScreenScraperEngine
ScrapeResult RequestZipGameInfo(ScreenScraperApis::Game& result, const FileData& game, long long size);
/*!
* @brief Check if the current game needs to be scrapped regarding the given method
* @param method Scrapping method
* @brief Check if the current game needs to be scraped regarding the given method
* @param method Scraping method
* @param game Game to scrape
* @return True of the game need to be scraped
*/
bool NeedScrapping(ScrappingMethod method, FileData& game);
/*!
* @brief Store scraped data into destination game's metadata, regarding the scrapping method
* @param method Scrapping method
* @brief Store scraped data into destination game's metadata, regarding the scraping method
* @param method Scraping method
* @param sourceData Source data
* @param game DFestination game
*/
......@@ -84,18 +84,18 @@ class ScreenScraperEngine
/*!
* @brief Download an store media one after once
* @param method Scrapping method
* @param method Scraping method
* @param sourceData Source data
* @param game DFestination game
* @return True if the quota is reached and the scrapping must stop ASAP. False in any other case
* @return True if the quota is reached and the scraping must stop ASAP. False in any other case
*/
ScrapeResult DownloadAndStoreMedia(ScrappingMethod method, const ScreenScraperApis::Game& sourceData, FileData& game);
/*!
* @brief Download and store one media
* @param gameName Relatiove game path to the system rom folder
* @param method Scrapping method
* @param game Game being scrapped
* @param method Scraping method
* @param game Game being scraped
* @param mediaFolder Base media folder (roms/<system>/media/<mediatype>)
* @param media Media being downloaded
* @param format MEdia format (file extension)
......@@ -134,7 +134,7 @@ class ScreenScraperEngine
ScrapeResult Scrape(ScrappingMethod method, FileData& game);
/*!
* @brief Abort the current engine. The engine is required to quit its current scrapping ASAP
* @brief Abort the current engine. The engine is required to quit its current scraping ASAP
*/
void Abort() { mAbortRequest = true; }
......@@ -239,10 +239,10 @@ class ScreenScraperEngine
* Getters
*/
//! Get current scrapping session completion
//! Get current scraping session completion
int Completed() const { return mCount; }
//! Get current scrapping session's total item to process
//! Get current scraping session's total item to process
int Total() const { return mTotal; }
/*
......@@ -273,9 +273,9 @@ class ScreenScraperEngine
/*!
* @brief Run the scraper using the given methods, on the given system list and report progress using notifyTarget
* @param method Scrapping method
* @param method Scraping method
* @param systemList System list
* @param notifyTarget Interface for reporting scrapping progression
* @param notifyTarget Interface for reporting scraping progression
* @return True if everything has been successful. False if cancelled, quota reached or fatal error occurred
*/
bool RunOn(ScrappingMethod method, const SystemManager::SystemList& systemList, INotifyScrapeResult* notifyTarget,
......@@ -283,9 +283,9 @@ class ScreenScraperEngine
/*!
* @brief Run the scraper using the given methods, on the given single game and report progress using notifyTarget
* @param method Scrapping method
* @param method Scraping method
* @param singleGame Single game to scrape
* @param notifyTarget Interface for reporting scrapping progression
* @param notifyTarget Interface for reporting scraping progression
* @return True if everything has been successful. False if cancelled, quota reached or fatal error occurred
*/
bool RunOn(ScrappingMethod method, FileData& singleGame,
......
......@@ -20,9 +20,9 @@ class TheGameDBEngine : public IScraperEngine
/*!
* @brief Run the scraper using the given methods, on the given system list and report progress using notifyTarget
* @param method Scrapping method
* @param method Scraping method
* @param systemList System list
* @param notifyTarget Interface for reporting scrapping progression
* @param notifyTarget Interface for reporting scraping progression
* @return True if everything has been successful. False if cancelled, quota reached or fatal error occurred
*/
bool RunOn(ScrappingMethod method, const SystemManager::SystemList& systemList, INotifyScrapeResult* notifyTarget,
......@@ -30,9 +30,9 @@ class TheGameDBEngine : public IScraperEngine
/*!
* @brief Run the scraper using the given methods, on the given single game and report progress using notifyTarget
* @param method Scrapping method
* @param method Scraping method
* @param singleGame Single game to scrape
* @param notifyTarget Interface for reporting scrapping progression
* @param notifyTarget Interface for reporting scraping progression
* @return True if everything has been successful. False if cancelled, quota reached or fatal error occurred
*/
bool RunOn(ScrappingMethod method, FileData& singleGame,
......
......@@ -477,7 +477,7 @@ FileData* SystemData::LookupOrCreateGame(RootFolderData& topAncestor, const Path
}
return game;
}
else // Final folder (scrapped obviously)
else // Final folder (scraped obviously)
{
FolderData* folder = (FolderData*) item;
if (folder == nullptr)
......
......@@ -24,9 +24,9 @@ enum class Notification
EndDemo = 0x00800, //!< Game demo session end. Parameter: game path
Sleep = 0x01000, //!< EmulationStation is entering sleep state.
WakeUp = 0x02000, //!< EmulationStation is waking up
ScrapStart = 0x04000, //!< A multiple game scrapping session starts
ScrapStop = 0x08000, //!< Scrapping session end. Parameter: scrapped game count
ScrapGame = 0x10000, //!< A game has been scrapped. Parameter: game path
ScrapStart = 0x04000, //!< A multiple game scraping session starts
ScrapStop = 0x08000, //!< Scraping session end. Parameter: scraped game count
ScrapGame = 0x10000, //!< A game has been scraped. Parameter: game path
ConfigurationChanged = 0x20000, //!< The user changed something in the configuration.
RunKodi = 0x40000, //!< Run kodi!
StartGameClip = 0x60000, //!< Start a game clip
......
......@@ -109,7 +109,7 @@ void ImageComponent::setImage(const Path& path, bool tile) {
}
/**
* Set image from data scrapped
* Set image from data scraped
*/
void ImageComponent::setImage(const char* image, size_t length, bool tile) {
mPath = "!";
......
......@@ -149,7 +149,7 @@ msgstr ""
#:
msgid ""
"Scrapping complete! {PROCESSED} games processed.\n\n"
"Scraping complete! {PROCESSED} games processed.\n\n"
"{SUCCESS} game(s) scraped or updated\n"
"{NOTFOUND} game(s) not found...\n"
"{ERRORS} request/download errors\n\n"
......@@ -161,9 +161,9 @@ msgstr ""
#:
msgid ""
"You reached your daily quota of scrapping request.\n"
"You reached your daily quota of scraping request.\n"
"All your today's scrapes have been saved anyway.\n\n"
"Start scrapping again tomorrow.\n"
"Start scraping again tomorrow.\n"
"Dont forget to select 'update' and not 'scrape all'"
msgstr ""
......@@ -2149,7 +2149,7 @@ msgid "Highlight all games of a particular region and fade out all others."
msgstr ""
#:
msgid "Select the source of your game name. Trust the scrapping database or get them from filename, raw or undecorated (without decoration in () or [] )."
msgid "Select the source of your game name. Trust the scraping database or get them from filename, raw or undecorated (without decoration in () or [] )."
msgstr ""
#:
......@@ -2165,7 +2165,7 @@ msgid "GET REGION FROM FILENAME WHEN POSSIBLE"
msgstr ""
#:
msgid "Scrapper results"
msgid "Scraper results"
msgstr ""
#:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment