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

Disable sleep mode while scraping.

Browse source 
Fix to actually update metadata.
Write changes to gamelist.xml after each game is done.
This commit is contained in:
Aloshi 2013-10-13 16:40:36 -05:00
parent 69852af751
commit 12dd8b028d
7 changed files with 53 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/SystemData.cpp
View file

@ -326,18 +326,12 @@ std::string SystemData::getGamelistPath()
filePath = getHomePath();
filePath += "/.emulationstation/"+ getName() + "/gamelist.xml";
if(fs::exists(filePath))
return filePath;
return "";
return filePath;
}
bool SystemData::hasGamelist()
{
if(getGamelistPath().empty())
return false;
else
return true;
return (fs::exists(getGamelistPath()));
}
std::vector<MetaDataDecl> SystemData::getGameMDD()

12
src/Window.cpp
View file

@ -8,7 +8,7 @@
#include <iomanip>
Window::Window() : mNormalizeNextUpdate(false), mFrameTimeElapsed(0), mFrameCountElapsed(0), mAverageDeltaTime(10),
mZoomFactor(1.0f), mCenterPoint(0, 0), mMatrix(Eigen::Affine3f::Identity()), mFadePercent(0.0f)
mZoomFactor(1.0f), mCenterPoint(0, 0), mMatrix(Eigen::Affine3f::Identity()), mFadePercent(0.0f), mAllowSleep(true)
{
mInputManager = new InputManager(this);
setCenterPoint(Eigen::Vector2f(Renderer::getScreenWidth() / 2, Renderer::getScreenHeight() / 2));
@ -188,3 +188,13 @@ void Window::postProcess()
Renderer::drawRect(0, 0, Renderer::getScreenWidth(), Renderer::getScreenHeight(), 0x00000000 | ((unsigned char)(mFadePercent * 255)));
}
}
bool Window::getAllowSleep()
{
return mAllowSleep;
}
void Window::setAllowSleep(bool sleep)
{
mAllowSleep = sleep;
}

5
src/Window.h
View file

@ -34,6 +34,9 @@ public:
void setFadePercent(const float& perc);
bool getAllowSleep();
void setAllowSleep(bool sleep);
private:
InputManager* mInputManager;
std::vector<GuiComponent*> mGuiStack;
@ -55,6 +58,8 @@ private:
void postProcess();
float mFadePercent;
bool mAllowSleep;
};
#endif

4
src/XMLReader.cpp
View file

@ -100,7 +100,7 @@ void parseGamelist(SystemData* system)
{
std::string xmlpath = system->getGamelistPath();
if(xmlpath.empty())
if(!boost::filesystem::exists(xmlpath))
return;
LOG(LogInfo) << "Parsing XML file \"" << xmlpath << "\"...";
@ -198,7 +198,7 @@ void updateGamelist(SystemData* system)
return;
std::string xmlpath = system->getGamelistPath();
if(xmlpath.empty())
if(!boost::filesystem::exists(xmlpath))
return;
LOG(LogInfo) << "Parsing XML file \"" << xmlpath << "\" before writing...";

32
src/components/GuiScraperLog.cpp
View file

@ -3,13 +3,15 @@
#include "GuiGameScraper.h"
#include "../Renderer.h"
#include "../Log.h"
#include "../XMLReader.h"
GuiScraperLog::GuiScraperLog(Window* window, const std::queue<ScraperSearchParams>& searches, bool manualMode) : GuiComponent(window),
mManualMode(manualMode),
mBox(window, ":/frame.png"),
mSearches(searches),
mStatus(window),
mTextLines(40)
mTextLines(40),
mSuccessCount(0), mSkippedCount(0)
{
addChild(&mBox);
addChild(&mStatus);
@ -25,6 +27,13 @@ GuiScraperLog::GuiScraperLog(Window* window, const std::queue<ScraperSearchParam
mBox.setEdgeColor(0x111111FF);
mBox.setCenterColor(0xDFDFDFFF);
mBox.fitTo(mSize, Eigen::Vector3f::Zero(), Eigen::Vector2f(8, 0));
mWindow->setAllowSleep(false);
}
GuiScraperLog::~GuiScraperLog()
{
mWindow->setAllowSleep(true);
}
void GuiScraperLog::start()
@ -77,8 +86,16 @@ void GuiScraperLog::resultFetched(ScraperSearchParams params, MetaDataList mdl)
void GuiScraperLog::resultResolved(ScraperSearchParams params, MetaDataList mdl)
{
//apply new metadata
*params.game->metadata() = mdl;
writeLine(" Success!", 0x00FF00FF);
//write changes to gamelist.xml
updateGamelist(params.system);
mSuccessCount++;
next();
}
@ -91,14 +108,21 @@ void GuiScraperLog::resultEmpty(ScraperSearchParams search)
LOG(LogInfo) << "Scraper skipping [" << search.game->getCleanName() << "]";
mSkippedCount++;
next();
}
void GuiScraperLog::done()
{
writeLine("====================", 0x000000FF);
writeLine("DONE!!", 0x00FF00FF);
writeLine("====================", 0x000000FF);
writeLine("===================================", 0x000000FF);
std::stringstream ss;
ss << mSuccessCount << " successful, " << mSkippedCount << " skipped";
writeLine(ss.str(), 0x000000FF);
writeLine("DONE!! Press anything to continue.", 0x00FF00FF);
writeLine("===================================", 0x000000FF);
//done with everything!
}

4
src/components/GuiScraperLog.h
View file

@ -11,6 +11,7 @@ class GuiScraperLog : public GuiComponent
{
public:
GuiScraperLog(Window* window, const std::queue<ScraperSearchParams>& params, bool manualMode);
~GuiScraperLog();
void start();
@ -36,4 +37,7 @@ private:
TextComponent mStatus;
boost::circular_buffer< std::shared_ptr<TextComponent> > mTextLines;
unsigned int mSuccessCount;
unsigned int mSkippedCount;
};

2
src/main.cpp
View file

@ -228,7 +228,7 @@ int main(int argc, char* argv[])
//sleeping entails setting a flag to start skipping frames
//and initially drawing a black semi-transparent rect to dim the screen
timeSinceLastEvent += deltaTime;
if(timeSinceLastEvent >= (unsigned int)Settings::getInstance()->getInt("DIMTIME") && Settings::getInstance()->getInt("DIMTIME") != 0)
if(timeSinceLastEvent >= (unsigned int)Settings::getInstance()->getInt("DIMTIME") && Settings::getInstance()->getInt("DIMTIME") != 0 && window.getAllowSleep())
{
sleeping = true;
timeSinceLastEvent = 0;