claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify some Folder logic

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-06 10:33:13 -05:00
parent 3d3d22b5d3
commit 770536fbd7
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
SabreTools.FileTypes/Folder.cs
View File

@@ -225,29 +225,23 @@ namespace SabreTools.FileTypes
if (Filename == null) if (Filename == null)
return null; return null;
if (_children == null || _children.Count == 0) // If we already have children
{ if (_children != null && _children.Count > 0)
_children = []; return _children;
#if NET20 || NET35
foreach (string file in Directory.GetFiles(Filename, "*"))
#else
foreach (string file in Directory.EnumerateFiles(Filename, "*", SearchOption.TopDirectoryOnly))
#endif
{
BaseFile? nf = FileTypeTool.GetInfo(file, _hashTypes);
if (nf != null)
_children.Add(nf);
}
#if NET20 || NET35 // Build the child item list
foreach (string dir in Directory.GetDirectories(Filename, "*")) _children = [];
#else foreach (string file in IOExtensions.SafeEnumerateFiles(Filename, "*", SearchOption.TopDirectoryOnly))
foreach (string dir in Directory.EnumerateDirectories(Filename, "*", SearchOption.TopDirectoryOnly)) {
#endif BaseFile? nf = FileTypeTool.GetInfo(file, _hashTypes);
{ if (nf != null)
var fl = new Folder(dir); _children.Add(nf);
_children.Add(fl); }
}
foreach (string dir in IOExtensions.SafeEnumerateDirectories(Filename, "*", SearchOption.TopDirectoryOnly))
{
var fl = new Folder(dir);
_children.Add(fl);
} }
return _children; return _children;