StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused subfolder manifest scanning 

This isn't needed anymore with the current is-mod-folder scanning.
This commit is contained in:
Jesse Plamondon-Willard 2022-04-16 14:34:52 -04:00
parent f93c41f55c
commit 559d763756
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
View File

@ -250,35 +250,24 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
/// <param name="folder">The folder to search.</param> /// <param name="folder">The folder to search.</param>
private FileInfo? FindManifest(DirectoryInfo folder) private FileInfo? FindManifest(DirectoryInfo folder)
{ {
while (true) // check for conventional manifest in current folder
const string defaultName = "manifest.json";
FileInfo file = new(Path.Combine(folder.FullName, defaultName));
if (file.Exists)
return file;
// check for manifest with incorrect capitalization
{ {
// check for conventional manifest in current folder CaseInsensitivePathLookup pathLookup = new(folder.FullName, SearchOption.TopDirectoryOnly); // don't use GetCachedFor, since we only need it temporarily
const string defaultName = "manifest.json"; string realName = pathLookup.GetFilePath(defaultName);
FileInfo file = new(Path.Combine(folder.FullName, defaultName)); if (realName != defaultName)
if (file.Exists) file = new(Path.Combine(folder.FullName, realName));
return file;
// check for manifest with incorrect capitalization
{
CaseInsensitivePathLookup pathLookup = new(folder.FullName, SearchOption.TopDirectoryOnly); // don't use GetCachedFor, since we only need it temporarily
string realName = pathLookup.GetFilePath(defaultName);
if (realName != defaultName)
file = new(Path.Combine(folder.FullName, realName));
}
if (file.Exists)
return file;
// check for single subfolder
FileSystemInfo[] entries = folder.EnumerateFileSystemInfos().Take(2).ToArray();
if (entries.Length == 1 && entries[0] is DirectoryInfo subfolder)
{
folder = subfolder;
continue;
}
// not found
return null;
} }
if (file.Exists)
return file;
// not found
return null;
} }
/// <summary>Get whether a given folder should be treated as a search folder (i.e. look for subfolders containing mods).</summary> /// <summary>Get whether a given folder should be treated as a search folder (i.e. look for subfolders containing mods).</summary>