From 2ee1cb81dd226ad705faead08e1ca5064cb70ed6 Mon Sep 17 00:00:00 2001
From: "Admiral H. Curtiss" <pikachu025@gmail.com>
Date: Fri, 22 May 2015 19:30:41 +0200
Subject: [PATCH] FolderMemoryCard: Allow multiple save names in the save file
 filtering.

Split multiple save names to be filtered with a "/", ie the filter "A/B" matches both save folders that contain "A" and save folders that contain "B".
---
 pcsx2/gui/MemoryCardFolder.cpp | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/pcsx2/gui/MemoryCardFolder.cpp b/pcsx2/gui/MemoryCardFolder.cpp
index 668ad591cb..ec7cc49eef 100644
--- a/pcsx2/gui/MemoryCardFolder.cpp
+++ b/pcsx2/gui/MemoryCardFolder.cpp
@@ -264,6 +264,26 @@ MemoryCardFileEntry* FolderMemoryCard::AppendFileEntryToDir( MemoryCardFileEntry
 	return newFileEntry;
 }
 
+bool FilterMatches( const wxString& fileName, const wxString& filter ) {
+	size_t start = 0;
+	size_t len = filter.Len();
+	while ( start < len ) {
+		size_t end = filter.find( '/', start );
+		if ( end == wxString::npos ) {
+			end = len;
+		}
+
+		wxString singleFilter = filter.Mid( start, end - start );
+		if ( fileName.Contains( singleFilter ) ) {
+			return true;
+		}
+
+		start = end + 1;
+	}
+
+	return false;
+}
+
 bool FolderMemoryCard::AddFolder( MemoryCardFileEntry* const dirEntry, const wxString& dirPath, const wxString& filter ) {
 	wxDir dir( dirPath );
 	if ( dir.IsOpened() ) {
@@ -274,6 +294,12 @@ bool FolderMemoryCard::AddFolder( MemoryCardFileEntry* const dirEntry, const wxS
 		wxString fileName;
 		bool hasNext;
 
+		wxString localFilter;
+		bool hasFilter = !filter.IsEmpty();
+		if ( hasFilter ) {
+			localFilter = L"DATA-SYSTEM/" + filter;
+		}
+
 		int entryNumber = 2; // include . and ..
 		hasNext = dir.GetFirst( &fileName );
 		while ( hasNext ) {
@@ -293,7 +319,7 @@ bool FolderMemoryCard::AddFolder( MemoryCardFileEntry* const dirEntry, const wxS
 				// if possible filter added directories by game serial
 				// this has the effective result of only files relevant to the current game being loaded into the memory card
 				// which means every game essentially sees the memory card as if no other files exist
-				if ( !filter.IsEmpty() && !fileName.Contains( filter ) ) {
+				if ( hasFilter && !FilterMatches( fileName, localFilter ) ) {
 					hasNext = dir.GetNext( &fileName );
 					continue;
 				}
@@ -1043,6 +1069,7 @@ void FolderMemoryCardAggregator::NextFrame( uint slot ) {
 
 void FolderMemoryCardAggregator::ReIndex( uint slot, const wxString& filter ) {
 	m_cards[slot].Close();
+	Console.WriteLn( Color_Green, L"(FolderMcd) Re-Indexing slot %u with filter \"%s\"", slot, WX_STR( filter ) );
 	m_cards[slot].Open( filter );
 }