funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 09:48:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed menuSort = no behavior for include.txt files.

Browse Source
This commit is contained in:
Pieter Hulshoff 2016-12-21 11:46:22 +01:00
parent 9d9ed51c58
commit df35355744
3 changed files with 60 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
RetroFE/Source/Collection/CollectionInfoBuilder.cpp
View File

@ -227,11 +227,59 @@ bool CollectionInfoBuilder::ImportBasicList(CollectionInfo *info, std::string fi
return true;
}
bool CollectionInfoBuilder::ImportBasicList(CollectionInfo *info, std::string file, std::vector<Item *> &list)
{
std::ifstream includeStream(file.c_str());
if (!includeStream.good())
{
return false;
}
std::string line;
while(std::getline(includeStream, line))
{
line = Utils::filterComments(line);
if(!line.empty())
{
bool found = false;
for (std::vector<Item *>::iterator it = list.begin(); it != list.end(); ++it)
{
if (line == (*it)->name)
{
found = true;
}
}
if (!found)
{
Item *i = new Item();
line.erase( std::remove(line.begin(), line.end(), '\r'), line.end() );
i->fullTitle = line;
i->name = line;
i->title = line;
i->collectionInfo = info;
list.push_back(i);
}
}
}
return true;
}
bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string mergedCollectionName)
{
DIR *dp;
struct dirent *dirp;
std::string path = info->listpath;
std::vector<Item *> includeFilterUnsorted;
std::map<std::string, Item *> includeFilter;
std::map<std::string, Item *> excludeFilter;
std::string includeFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "include.txt");
@ -256,6 +304,7 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
if(includeFilter.size() == 0)
{
Logger::write(Logger::ZONE_INFO, "CollectionInfoBuilder", "Checking for \"" + includeFile + "\"");
ImportBasicList(info, includeFile, includeFilterUnsorted);
ImportBasicList(info, includeFile, includeFilter);
ImportBasicList(info, excludeFile, excludeFilter);
}
@ -275,16 +324,16 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
if(showMissing)
{
for(std::map<std::string, Item *>::iterator it = includeFilter.begin(); it != includeFilter.end(); it++)
for(std::vector<Item *>::iterator it = includeFilterUnsorted.begin(); it != includeFilterUnsorted.end(); ++it)
{
if(excludeFilter.find(it->first) == excludeFilter.end())
if(excludeFilter.find((*it)->name) == excludeFilter.end())
{
info->items.push_back(it->second);
info->items.push_back(*it);
}
}
}
while(dp != NULL && (dirp = readdir(dp)) != NULL)
while(!showMissing && dp != NULL && (dirp = readdir(dp)) != NULL)
{
std::string file = dirp->d_name;

1
RetroFE/Source/Collection/CollectionInfoBuilder.h
View File

@ -39,5 +39,6 @@ private:
Configuration &conf_;
MetadataDatabase &metaDB_;
bool ImportBasicList(CollectionInfo *info, std::string file, std::map<std::string, Item *> &list);
bool ImportBasicList(CollectionInfo *info, std::string file, std::vector<Item *> &list);
bool ImportDirectory(CollectionInfo *info, std::string mergedCollectionName);
};

8
RetroFE/Source/RetroFE.cpp
View File

@ -859,10 +859,14 @@ CollectionInfo *RetroFE::getCollection(std::string collectionName)
}
}
collection->sortItems();
bool menuSort = true;
config_.getProperty("collections." + collectionName + ".list.menuSort", menuSort);
if (menuSort)
{
collection->sortItems();
}
MenuParser mp;
mp.buildMenuItems(collection, menuSort);