Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Custom collection entries are now re-enabled when changing a game to be counted as a game.

Browse source
This commit is contained in:
Leon Styhre 2020-12-31 21:54:32 +01:00
parent 4dded3306c
commit 128056667d
3 changed files with 72 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
es-app/src/CollectionSystemsManager.cpp
View file

@ -95,7 +95,7 @@ CollectionSystemsManager::~CollectionSystemsManager()
// Delete all custom collections.
for (std::map<std::string, CollectionSystemData, stringComparator>::const_iterator
it = mCustomCollectionSystemsData.cbegin();
it != mCustomCollectionSystemsData.cend() ; it++)
it != mCustomCollectionSystemsData.cend(); it++)
delete it->second.system;
// Delete the custom collections bundle.
@ -231,7 +231,7 @@ void CollectionSystemsManager::loadEnabledListFromSettings()
// Iterate the map.
for (std::map<std::string, CollectionSystemData, stringComparator>::iterator
it = mAutoCollectionSystemsData.begin();
it != mAutoCollectionSystemsData.end() ; it++ ) {
it != mAutoCollectionSystemsData.end(); it++) {
it->second.isEnabled = (std::find(autoSelected.cbegin(),
autoSelected.cend(), it->first) != autoSelected.cend());
@ -246,7 +246,7 @@ void CollectionSystemsManager::loadEnabledListFromSettings()
// Iterate the map.
for (std::map<std::string, CollectionSystemData, stringComparator>::iterator
it = mCustomCollectionSystemsData.begin();
it != mCustomCollectionSystemsData.end() ; it++ ) {
it != mCustomCollectionSystemsData.end(); it++) {
it->second.isEnabled = (std::find(customSelected.cbegin(),
customSelected.cend(), it->first) != customSelected.cend());
@ -380,7 +380,7 @@ void CollectionSystemsManager::updateCollectionSystem(FileData* file, Collection
}
else {
bool addGame = false;
// We didn't find it here - we need to check if we should add it.
// We didn't find the entry in the collection, so we need to check if we should add it.
if ((name == "recent" && file->metadata.get("playcount") > "0" &&
file->getCountAsGame() && includeFileInAutoCollections(file)) ||
(name == "favorites" && file->metadata.get("favorite") == "true" &&
@ -573,7 +573,7 @@ std::string CollectionSystemsManager::getValidNewCollectionName(std::string inNa
return name;
}
void CollectionSystemsManager::setEditMode(std::string collectionName)
void CollectionSystemsManager::setEditMode(std::string collectionName, bool showPopup)
{
if (mCustomCollectionSystemsData.find(collectionName) == mCustomCollectionSystemsData.cend()) {
LOG(LogError) << "Tried to edit a non-existing collection: " << collectionName;
@ -589,19 +589,24 @@ void CollectionSystemsManager::setEditMode(std::string collectionName)
// If it's bundled, this needs to be the bundle system.
mEditingCollectionSystemData = sysData;
GuiInfoPopup* s = new GuiInfoPopup(mWindow, "EDITING THE '" +
Utils::String::toUpper(collectionName) +
"' COLLECTION, ADD/REMOVE GAMES WITH 'Y'", 10000);
if (showPopup) {
GuiInfoPopup* s = new GuiInfoPopup(mWindow, "EDITING THE '" +
Utils::String::toUpper(collectionName) +
"' COLLECTION, ADD/REMOVE GAMES WITH 'Y'", 10000);
mWindow->setInfoPopup(s);
mWindow->setInfoPopup(s);
}
}
void CollectionSystemsManager::exitEditMode()
void CollectionSystemsManager::exitEditMode(bool showPopup)
{
GuiInfoPopup* s = new GuiInfoPopup(mWindow, "FINISHED EDITING THE '" +
Utils::String::toUpper(mEditingCollection) + "' COLLECTION", 4000);
if (showPopup) {
GuiInfoPopup* s = new GuiInfoPopup(mWindow, "FINISHED EDITING THE '" +
Utils::String::toUpper(mEditingCollection) + "' COLLECTION", 4000);
mWindow->setInfoPopup(s);
}
mWindow->setInfoPopup(s);
mIsEditingCustom = false;
mEditingCollection = "Favorites";
@ -883,11 +888,39 @@ void CollectionSystemsManager::deleteCustomCollection(std::string collectionName
}
}
void CollectionSystemsManager::reactivateCustomCollectionEntry(FileData* game)
{
std::string gamePath = Utils::FileSystem::getFileName(game->getFullPath());
gamePath = "%ROMPATH%/" + game->getSystemName() + "/" + gamePath;
// Try to read from all custom collection configuration files to see if there are any
// matching entries for the game passed as the parameter. If so, then enable it in each
// of those collections. This is done also for disabled collections, as otherwise the
// game would be missing if the collection was enabled during the program session.
for (std::map<std::string, CollectionSystemData, stringComparator>::const_iterator
it = mCustomCollectionSystemsData.cbegin();
it != mCustomCollectionSystemsData.cend(); it++) {
std::string path = getCustomCollectionConfigPath(it->first);
if (Utils::FileSystem::exists(path)) {
std::ifstream input(path);
for (std::string gameKey; getline(input, gameKey);) {
if (gameKey == gamePath) {
setEditMode(it->first, false);
toggleGameInCollection(game);
exitEditMode(false);
}
}
if (input.is_open())
input.close();
}
}
}
void CollectionSystemsManager::initAutoCollectionSystems()
{
for (std::map<std::string, CollectionSystemDecl, stringComparator>::const_iterator
it = mCollectionSystemDeclsIndex.cbegin();
it != mCollectionSystemDeclsIndex.cend() ; it++ ) {
it != mCollectionSystemDeclsIndex.cend(); it++) {
CollectionSystemDecl sysDecl = it->second;
if (!sysDecl.isCustom)
@ -1025,7 +1058,7 @@ void CollectionSystemsManager::populateCustomCollection(CollectionSystemData* sy
const std::string rompath = FileData::getROMDirectory();
// Iterate list of files in the config file.
for (std::string gameKey; getline(input, gameKey); ) {
for (std::string gameKey; getline(input, gameKey);) {
// If there is a %ROMPATH% variable set for the game, expand it. By doing this
// it's possible to use either absolute ROM paths in the collection files or using
// the path variable. The absolute ROM paths are only used for backward compatibility
@ -1045,6 +1078,9 @@ void CollectionSystemsManager::populateCustomCollection(CollectionSystemData* sy
"\" does not exist, is hidden, or is not counted as a game, ignoring entry";
}
}
if (input.is_open())
input.close();
}
void CollectionSystemsManager::removeCollectionsFromDisplayedSystems()
@ -1076,7 +1112,7 @@ void CollectionSystemsManager::addEnabledCollectionsToDisplayedSystems(
{
// Add auto enabled collections.
for (std::map<std::string, CollectionSystemData, stringComparator>::iterator
it = colSystemData->begin() ; it != colSystemData->end() ; it++ ) {
it = colSystemData->begin(); it != colSystemData->end(); it++) {
if (it->second.isEnabled) {
// Check if populated, otherwise populate.
if (!it->second.isPopulated) {
@ -1223,7 +1259,7 @@ std::vector<std::string> CollectionSystemsManager::getCollectionThemeFolders(boo
std::vector<std::string> systems;
for (std::map<std::string, CollectionSystemDecl, stringComparator>::const_iterator
it = mCollectionSystemDeclsIndex.cbegin();
it != mCollectionSystemDeclsIndex.cend() ; it++ ) {
it != mCollectionSystemDeclsIndex.cend(); it++) {
CollectionSystemDecl sysDecl = it->second;
if (sysDecl.isCustom == custom)
systems.push_back(sysDecl.themeFolder);
@ -1236,7 +1272,7 @@ std::vector<std::string> CollectionSystemsManager::getUserCollectionThemeFolders
std::vector<std::string> systems;
for (std::map<std::string, CollectionSystemData, stringComparator>::const_iterator
it = mCustomCollectionSystemsData.cbegin();
it != mCustomCollectionSystemsData.cend() ; it++ )
it != mCustomCollectionSystemsData.cend(); it++)
systems.push_back(it->second.decl.themeFolder);
return systems;
}

7
es-app/src/CollectionSystemsManager.h
View file

@ -94,8 +94,8 @@ public:
bool isThemeCustomCollectionCompatible(std::vector<std::string> stringVector);
std::string getValidNewCollectionName(std::string name, int index = 0);
void setEditMode(std::string collectionName);
void exitEditMode();
void setEditMode(std::string collectionName, bool showPopup = true);
void exitEditMode(bool showPopup = true);
bool inCustomCollection(const std::string& collectionName, FileData* gameFile);
// Add or remove a game from a specific collection.
bool toggleGameInCollection(FileData* file);
@ -109,6 +109,9 @@ public:
SystemData* addNewCustomCollection(std::string name);
void deleteCustomCollection(std::string collectionName);
// Reactivate a game in all custom collections where it has an entry in the configuration file.
void reactivateCustomCollectionEntry(FileData* game);
inline std::map<std::string, CollectionSystemData, stringComparator>
getAutoCollectionSystems() { return mAutoCollectionSystemsData; };
inline std::map<std::string, CollectionSystemData, stringComparator>

13
es-app/src/guis/GuiMetaDataEd.cpp
View file

@ -354,6 +354,7 @@ void GuiMetaDataEd::save()
// ShowHiddenGames is set to false, meaning it will immediately disappear from the gamelist.
bool showHiddenGames = Settings::getInstance()->getBool("ShowHiddenGames");
bool hideGameWhileHidden = false;
bool setGameAsCounted = false;
for (unsigned int i = 0; i < mEditors.size(); i++) {
if (mMetaDataDecl.at(i).isStatistic)
@ -363,6 +364,13 @@ void GuiMetaDataEd::save()
mEditors.at(i)->getValue() != mMetaData->get("hidden"))
hideGameWhileHidden = true;
// Check whether the flag to count the entry as a game was set to enabled.
if (mMetaDataDecl.at(i).key == "nogamecount" &&
mEditors.at(i)->getValue() != mMetaData->get("nogamecount") &&
mMetaData->get("nogamecount") == "true") {
setGameAsCounted = true;
}
mMetaData->set(mMetaDataDecl.at(i).key, mEditors.at(i)->getValue());
}
@ -389,6 +397,11 @@ void GuiMetaDataEd::save()
if (mScraperParams.game->getType() == GAME)
CollectionSystemsManager::get()->refreshCollectionSystems(mScraperParams.game);
// If game counting was re-enabled for the game, then reactivate it in any custom collections
// where it may exist.
if (setGameAsCounted)
CollectionSystemsManager::get()->reactivateCustomCollectionEntry(mScraperParams.game);
mScraperParams.system->onMetaDataSavePoint();
// If hidden games are not shown and the hide flag was set for the entry, we also need