deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter hidden game files from the Game List (#4051)

Browse source 
* Filter “._” files from the game list

* Filter all hidden files from the game list

* Fix style

Co-authored-by: gdkchan <gab.dark.100@gmail.com>

* merge OR expression into a pattern

* migrate from GetFiles/Directories to Enumerate

* Remove GetFilesInDirectory()

* Update Ryujinx.Ui.Common/App/ApplicationLibrary.cs

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* add error handeling

* code cleanup

Co-authored-by: gdkchan <gab.dark.100@gmail.com>
Co-authored-by: Ac_K <Acoustik666@gmail.com>
This commit is contained in:
Andrew Glaze 2022-12-29 10:52:30 -05:00 committed by GitHub
parent 9dfe81770a
commit 2b23463daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
Ryujinx.Ui.Common/App/ApplicationLibrary.cs
View file

@ -68,53 +68,6 @@ namespace Ryujinx.Ui.App.Common
_cancellationToken?.Cancel(); _cancellationToken?.Cancel();
} }
public IEnumerable<string> GetFilesInDirectory(string directory)
{
Stack<string> stack = new Stack<string>();
stack.Push(directory);
while (stack.Count > 0)
{
string dir = stack.Pop();
string[] content = Array.Empty<string>();
try
{
content = Directory.GetFiles(dir, "*");
}
catch (UnauthorizedAccessException)
{
Logger.Warning?.Print(LogClass.Application, $"Failed to get access to directory: \"{dir}\"");
}
if (content.Length > 0)
{
foreach (string file in content)
{
yield return file;
}
}
try
{
content = Directory.GetDirectories(dir);
}
catch (UnauthorizedAccessException)
{
Logger.Warning?.Print(LogClass.Application, $"Failed to get access to directory: \"{dir}\"");
}
if (content.Length > 0)
{
foreach (string subdir in content)
{
stack.Push(subdir);
}
}
}
}
public void ReadControlData(IFileSystem controlFs, Span<byte> outProperty) public void ReadControlData(IFileSystem controlFs, Span<byte> outProperty)
{ {
using var controlFile = new UniqueRef<IFile>(); using var controlFile = new UniqueRef<IFile>();
@ -151,26 +104,28 @@ namespace Ryujinx.Ui.App.Common
continue; continue;
} }
foreach (string app in GetFilesInDirectory(appDir)) try
{ {
if (_cancellationToken.Token.IsCancellationRequested) foreach (string app in Directory.EnumerateFiles(appDir, "*", SearchOption.AllDirectories))
{ {
return; if (_cancellationToken.Token.IsCancellationRequested)
} {
return;
string extension = Path.GetExtension(app).ToLower(); }
if ((extension == ".nsp") || string extension = Path.GetExtension(app).ToLower();
(extension == ".pfs0") ||
(extension == ".xci") || if (!File.GetAttributes(app).HasFlag(FileAttributes.Hidden) && extension is ".nsp" or ".pfs0" or ".xci" or ".nca" or ".nro" or ".nso")
(extension == ".nca") || {
(extension == ".nro") || applications.Add(app);
(extension == ".nso")) numApplicationsFound++;
{ }
applications.Add(app);
numApplicationsFound++;
} }
} }
catch (UnauthorizedAccessException)
{
Logger.Warning?.Print(LogClass.Application, $"Failed to get access to directory: \"{appDir}\"");
}
} }
// Loops through applications list, creating a struct and then firing an event containing the struct for each application // Loops through applications list, creating a struct and then firing an event containing the struct for each application