Skip to content

Commit

Permalink
Update game file loading and improve search functionality
Browse files Browse the repository at this point in the history 
The game file loading system has been updated and properly structured with an attempt to improve and optimize the search functionality. Additionally, leverages the previous search results for better performance and user experience. Lastly, assembly version updated to 2.14.3.
  • Loading branch information
@drpetersonfernandes
drpetersonfernandes committed Jun 4, 2024
1 parent 5ffc77a commit 6eb4f9c
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 109 deletions.
232 changes: 125 additions & 107 deletions SimpleLauncher/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,133 +393,151 @@ private bool IsValidPath2(string parameters)
}

private async Task LoadGameFiles(string startLetter = null, string searchQuery = null)
{
// Move scroller to top
Scroller.ScrollToTop();

try
{
GameFileGrid.Children.Clear();

if (SystemComboBox.SelectedItem == null)
{
AddNoSystemMessage();
return;
}
string selectedSystem = SystemComboBox.SelectedItem.ToString();
var selectedConfig = _systemConfigs.FirstOrDefault(c => c.SystemName == selectedSystem);
if (selectedConfig == null)
{
string errorMessage = "Error while loading selected system configuration.";
Exception exception = new Exception(errorMessage);
await LogErrors.LogErrorAsync(exception, errorMessage);
MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}

// Get the SystemFolder from the selected configuration
string systemFolderPath = selectedConfig.SystemFolder;

// Extract the file extensions from the selected system configuration
var fileExtensions = selectedConfig.FileFormatsToSearch.Select(ext => $"*.{ext}").ToList();

// List of files with that match the system extensions
// then sort the list alphabetically
List<string> allFiles = await LoadFiles.GetFilesAsync(systemFolderPath, fileExtensions);

if (!string.IsNullOrWhiteSpace(startLetter))
{
allFiles = LoadFiles.FilterFiles(allFiles, startLetter);
}
// Move scroller to top
Scroller.ScrollToTop();

// Search engine
if (!string.IsNullOrWhiteSpace(searchQuery))
{
bool systemIsMame = selectedConfig.SystemIsMame;
allFiles = allFiles.Where(file =>
try
{
var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file);
// Search in filename
bool filenameMatch = fileNameWithoutExtension.IndexOf(searchQuery, StringComparison.OrdinalIgnoreCase) >= 0;
GameFileGrid.Children.Clear();

if (!systemIsMame) // If not a MAME system, return match based on filename only
if (SystemComboBox.SelectedItem == null)
{
return filenameMatch;
AddNoSystemMessage();
return;
}
string selectedSystem = SystemComboBox.SelectedItem.ToString();
var selectedConfig = _systemConfigs.FirstOrDefault(c => c.SystemName == selectedSystem);
if (selectedConfig == null)
{
string errorMessage = "Error while loading selected system configuration.";
Exception exception = new Exception(errorMessage);
await LogErrors.LogErrorAsync(exception, errorMessage);
MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}

// For MAME systems, additionally check the description for a match
var machine = _machines.FirstOrDefault(m => m.MachineName.Equals(fileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
bool descriptionMatch = machine != null && machine.Description.IndexOf(searchQuery, StringComparison.OrdinalIgnoreCase) >= 0;
return filenameMatch || descriptionMatch;
// Get the SystemFolder from the selected configuration
string systemFolderPath = selectedConfig.SystemFolder;

}).ToList();
// Extract the file extensions from the selected system configuration
var fileExtensions = selectedConfig.FileFormatsToSearch.Select(ext => $"*.{ext}").ToList();

// Store the search results
_currentSearchResults = allFiles;
}
else
{
// Reset search results if no search query is provided
_currentSearchResults.Clear();
}
List<string> allFiles;

if (!string.IsNullOrWhiteSpace(searchQuery))
{
// Use stored search results if available
if (_currentSearchResults.Any())
{
allFiles = _currentSearchResults;
}
else
{
// List of files with that match the system extensions
// then sort the list alphabetically
allFiles = await LoadFiles.GetFilesAsync(systemFolderPath, fileExtensions);

if (!string.IsNullOrWhiteSpace(startLetter))
{
allFiles = LoadFiles.FilterFiles(allFiles, startLetter);
}

bool systemIsMame = selectedConfig.SystemIsMame;
allFiles = allFiles.Where(file =>
{
var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file);
// Search in filename
bool filenameMatch = fileNameWithoutExtension.IndexOf(searchQuery, StringComparison.OrdinalIgnoreCase) >= 0;

if (!systemIsMame) // If not a MAME system, return match based on filename only
{
return filenameMatch;
}

// For MAME systems, additionally check the description for a match
var machine = _machines.FirstOrDefault(m => m.MachineName.Equals(fileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
bool descriptionMatch = machine != null && machine.Description.IndexOf(searchQuery, StringComparison.OrdinalIgnoreCase) >= 0;
return filenameMatch || descriptionMatch;

}).ToList();

// Store the search results
_currentSearchResults = allFiles;
}
}
else
{
// Reset search results if no search query is provided
_currentSearchResults.Clear();

// List of files with that match the system extensions
// then sort the list alphabetically
allFiles = await LoadFiles.GetFilesAsync(systemFolderPath, fileExtensions);

//Sort the collection of files
allFiles.Sort();
if (!string.IsNullOrWhiteSpace(startLetter))
{
allFiles = LoadFiles.FilterFiles(allFiles, startLetter);
}
}

// Count the collection of files
_totalFiles = allFiles.Count;
// Sort the collection of files
allFiles.Sort();

// Calculate the indices of files displayed on the current page
int startIndex = (_currentPage - 1) * _filesPerPage + 1; // +1 because we are dealing with a 1-based index for displaying
int endIndex = startIndex + _filesPerPage; // Actual number of files loaded on this page
if (endIndex > _totalFiles)
{
endIndex = _totalFiles;
}
// Count the collection of files
_totalFiles = allFiles.Count;

// Pagination related
if (_totalFiles > _paginationThreshold)
{
// Enable pagination and adjust file list based on the current page
allFiles = allFiles.Skip((_currentPage - 1) * _filesPerPage).Take(_filesPerPage).ToList();
// Update or create pagination controls
InitializePaginationButtons();
}
// Calculate the indices of files displayed on the current page
int startIndex = (_currentPage - 1) * _filesPerPage + 1; // +1 because we are dealing with a 1-based index for displaying
int endIndex = startIndex + _filesPerPage; // Actual number of files loaded on this page
if (endIndex > _totalFiles)
{
endIndex = _totalFiles;
}

// Display message if the number of files == 0
if (allFiles.Count == 0)
{
NoFilesMessage();
}
// Pagination related
if (_totalFiles > _paginationThreshold)
{
// Enable pagination and adjust file list based on the current page
allFiles = allFiles.Skip((_currentPage - 1) * _filesPerPage).Take(_filesPerPage).ToList();
// Update or create pagination controls
InitializePaginationButtons();
}

// Update the UI to reflect the current pagination status and the indices of files being displayed
TotalFilesLabel.Content = allFiles.Count == 0 ? $"Displaying files 0 to {endIndex} out of {_totalFiles} total" : $"Displaying files {startIndex} to {endIndex} out of {_totalFiles} total";
// Display message if the number of files == 0
if (allFiles.Count == 0)
{
NoFilesMessage();
}

// Create a new instance of GameButtonFactory
var factory = new GameButtonFactory(EmulatorComboBox, SystemComboBox, _systemConfigs, _machines, _settings);
// Update the UI to reflect the current pagination status and the indices of files being displayed
TotalFilesLabel.Content = allFiles.Count == 0 ? $"Displaying files 0 to {endIndex} out of {_totalFiles} total" : $"Displaying files {startIndex} to {endIndex} out of {_totalFiles} total";

// Create Button action for each cell
foreach (var filePath in allFiles)
{
// Adjust the CreateGameButton call.
Button gameButton = await factory.CreateGameButtonAsync(filePath, SystemComboBox.SelectedItem.ToString(), selectedConfig);
GameFileGrid.Children.Add(gameButton);
}
// Create a new instance of GameButtonFactory
var factory = new GameButtonFactory(EmulatorComboBox, SystemComboBox, _systemConfigs, _machines, _settings);

// Apply visibility settings to each button based on _settings.ShowGames
ApplyShowGamesSetting();
// Create Button action for each cell
foreach (var filePath in allFiles)
{
// Adjust the CreateGameButton call.
Button gameButton = await factory.CreateGameButtonAsync(filePath, SystemComboBox.SelectedItem.ToString(), selectedConfig);
GameFileGrid.Children.Add(gameButton);
}

// Update the UI to reflect the current pagination status
UpdatePaginationButtons();
// Apply visibility settings to each button based on _settings.ShowGames
ApplyShowGamesSetting();

}
catch (Exception exception)
{
string errorMessage = $"Error while loading ROM files.\n\nException detail: {exception}";
await LogErrors.LogErrorAsync(exception, errorMessage);
MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
// Update the UI to reflect the current pagination status
UpdatePaginationButtons();

}
catch (Exception exception)
{
string errorMessage = $"Error while loading ROM files.\n\nException detail: {exception}";
await LogErrors.LogErrorAsync(exception, errorMessage);
MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
}

private void ApplyShowGamesSetting()
{
Expand Down
4 changes: 2 additions & 2 deletions SimpleLauncher/SimpleLauncher.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<PackageIcon>icon2.png</PackageIcon>
<RepositoryUrl>https://github.com/drpetersonfernandes/SimpleLauncher</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<AssemblyVersion>2.13</AssemblyVersion>
<FileVersion>2.13</FileVersion>
<AssemblyVersion>2.14.3</AssemblyVersion>
<FileVersion>2.14.3</FileVersion>
<PlatformTarget>x64</PlatformTarget>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
<Version>$(VersionPrefix)</Version>
Expand Down

0 comments on commit 6eb4f9c

Please sign in to comment.