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

Added experimental support for folder flattening.

Browse source
This commit is contained in:
Leon Styhre 2022-05-18 19:47:51 +02:00
parent 43191e4005
commit 9ee56da021
4 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-app/src/FileData.cpp
View file

@ -446,7 +446,8 @@ const bool FileData::isArcadeGame() const
void FileData::addChild(FileData* file)
{
assert(mType == FOLDER);
assert(file->getParent() == nullptr);
if (!mSystem->getFlattenFolders())
assert(file->getParent() == nullptr);
const std::string key = file->getKey();
if (mChildrenByFilename.find(key) == mChildrenByFilename.cend()) {

14
es-app/src/GamelistFileParser.cpp
View file

@ -85,12 +85,14 @@ namespace GamelistFileParser
return nullptr;
}
// Create missing folder.
FileData* folder = new FileData(
FOLDER, Utils::FileSystem::getStem(treeNode->getPath()) + "/" + *path_it,
system->getSystemEnvData(), system);
treeNode->addChild(folder);
treeNode = folder;
if (!system->getFlattenFolders()) {
// Create missing folder.
FileData* folder {new FileData(
FOLDER, Utils::FileSystem::getStem(treeNode->getPath()) + "/" + *path_it,
system->getSystemEnvData(), system)};
treeNode->addChild(folder);
treeNode = folder;
}
}
++path_it;

46
es-app/src/SystemData.cpp
View file

@ -185,17 +185,18 @@ SystemData::SystemData(const std::string& name,
const std::string& themeFolder,
bool CollectionSystem,
bool CustomCollectionSystem)
: mName(name)
, mFullName(fullName)
, mSortName(sortName)
, mEnvData(envData)
, mThemeFolder(themeFolder)
, mIsCollectionSystem(CollectionSystem)
, mIsCustomCollectionSystem(CustomCollectionSystem)
, mIsGroupedCustomCollectionSystem(false)
, mIsGameSystem(true)
, mScrapeFlag(false)
, mPlaceholder(nullptr)
: mName {name}
, mFullName {fullName}
, mSortName {sortName}
, mEnvData {envData}
, mThemeFolder {themeFolder}
, mIsCollectionSystem {CollectionSystem}
, mIsCustomCollectionSystem {CustomCollectionSystem}
, mIsGroupedCustomCollectionSystem {false}
, mIsGameSystem {true}
, mScrapeFlag {false}
, mFlattenFolders {false}
, mPlaceholder {nullptr}
{
mFilterIndex = new FileFilterIndex();
@ -271,6 +272,13 @@ bool SystemData::populateFolder(FileData* folder)
if (dirContent.size() == 0)
return false;
if (std::find(dirContent.cbegin(), dirContent.cend(), mEnvData->mStartPath + "/flatten.txt") !=
dirContent.cend()) {
LOG(LogInfo) << "A flatten.txt file is present for the \"" << mName
<< "\" system, folder flattening will be applied";
mFlattenFolders = true;
}
for (Utils::FileSystem::StringList::const_iterator it = dirContent.cbegin();
it != dirContent.cend(); ++it) {
filePath = *it;
@ -344,11 +352,17 @@ bool SystemData::populateFolder(FileData* folder)
FileData* newFolder = new FileData(FOLDER, filePath, mEnvData, this);
populateFolder(newFolder);
// Ignore folders that do not contain games.
if (newFolder->getChildrenByFilename().size() == 0)
delete newFolder;
else
folder->addChild(newFolder);
if (mFlattenFolders) {
for (auto& entry : newFolder->getChildrenByFilename())
folder->addChild(entry.second);
}
else {
// Ignore folders that do not contain games.
if (newFolder->getChildrenByFilename().size() == 0)
delete newFolder;
else
folder->addChild(newFolder);
}
}
}
return true;

2
es-app/src/SystemData.h
View file

@ -97,6 +97,7 @@ public:
std::string getThemePath() const;
std::pair<unsigned int, unsigned int> getDisplayedGameCount() const;
const bool getFlattenFolders() const { return mFlattenFolders; }
const bool getScrapeFlag() const { return mScrapeFlag; }
void setScrapeFlag(bool scrapeflag) { mScrapeFlag = scrapeflag; }
@ -156,6 +157,7 @@ private:
bool mIsGroupedCustomCollectionSystem;
bool mIsGameSystem;
bool mScrapeFlag; // Only used by scraper GUI to remember which systems to scrape.
bool mFlattenFolders;
bool populateFolder(FileData* folder);
void indexAllGameFilters(const FileData* folder);