funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-04-28 08:59:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed removal of all .sub files from the all playlist when exclude_all.txt is not empty.

Browse Source
This commit is contained in:
Pieter Hulshoff
2018-11-27 22:18:02 +01:00
parent d66aa26868
commit 68902745e0
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,10 +280,8 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
std::vector<Item *> includeFilterUnsorted; std::vector<Item *> includeFilterUnsorted;
std::map<std::string, Item *> includeFilter; std::map<std::string, Item *> includeFilter;
std::map<std::string, Item *> excludeFilter; std::map<std::string, Item *> excludeFilter;
std::map<std::string, Item *> excludeAllFilter;
std::string includeFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "include.txt"); std::string includeFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "include.txt");
std::string excludeFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "exclude.txt"); std::string excludeFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "exclude.txt");
std::string excludeAllFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "exclude_all.txt");
std::string launcher; std::string launcher;
bool showMissing = false; bool showMissing = false;
@@ -315,7 +313,6 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
ImportBasicList(info, includeFile, includeFilter); ImportBasicList(info, includeFile, includeFilter);
ImportBasicList(info, excludeFile, excludeFilter); ImportBasicList(info, excludeFile, excludeFilter);
} }
ImportBasicList(info, excludeAllFile, excludeAllFilter);
if (showMissing) if (showMissing)
{ {
@@ -366,6 +363,17 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
excludeFilter.erase(it); excludeFilter.erase(it);
} }
return true;
}
void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
{
std::map<std::string, Item *> excludeAllFilter;
std::string excludeAllFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "exclude_all.txt");
ImportBasicList(info, excludeAllFile, excludeAllFilter);
if ( excludeAllFilter.size() > 0) if ( excludeAllFilter.size() > 0)
{ {
info->playlists["all"] = new std::vector<Item *>(); info->playlists["all"] = new std::vector<Item *>();
@@ -406,12 +414,7 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
{ {
info->playlists["all"] = &info->items; info->playlists["all"] = &info->items;
} }
return true;
}
void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
{
DIR *dp; DIR *dp;
struct dirent *dirp; struct dirent *dirp;
std::string path = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "playlists"); std::string path = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "playlists");

2
RetroFE/Source/Version.cpp
View File

@@ -21,7 +21,7 @@
std::string retrofe_version_major = "0"; std::string retrofe_version_major = "0";
std::string retrofe_version_minor = "8"; std::string retrofe_version_minor = "8";
std::string retrofe_version_build = "21"; std::string retrofe_version_build = "22";
std::string Version::getString( ) std::string Version::getString( )