drewcassidy/ReStocked
1
0
Fork 0
mirror of https://github.com/PorktoberRevolution/ReStocked synced 2024-09-01 17:34:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #478 from PorktoberRevolution/ImproveBlacklistCode

Browse Source 
Improve blacklist a bit
This commit is contained in:
Joseph Wong
2019-03-01 01:04:31 -08:00
committed by GitHub
parent 8d2f5395b8 2a8287491b
commit 28968d28d4
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
View File

Binary file not shown.

49
Source/Restock/ResourceBlacklist.cs
View File

@ -9,7 +9,7 @@ namespace Restock
[KSPAddon(KSPAddon.Startup.Instantly, true)] [KSPAddon(KSPAddon.Startup.Instantly, true)]
public class ResourceBlacklist : MonoBehaviour public class ResourceBlacklist : MonoBehaviour
{ {
private readonly string[] commentSep = { "//" }; private readonly string[] COMMENT_SEPARATOR = { "//" };
private void Start() private void Start()
{ {
HashSet<UrlDir.UrlFile> blacklist = new HashSet<UrlDir.UrlFile>(); HashSet<UrlDir.UrlFile> blacklist = new HashSet<UrlDir.UrlFile>();
@ -22,29 +22,17 @@ namespace Restock
if (file.fileExtension == "restockblacklist") if (file.fileExtension == "restockblacklist")
{ {
Debug.Log($"[Restock] Reading blacklist {file.url}.{file.fileExtension}"); Debug.Log($"[Restock] Reading blacklist {file.url}.{file.fileExtension}");
foreach (string line in File.ReadAllLines(file.fullPath)) foreach (UrlDir.UrlFile blacklistFile in FindFilesInAssetListFile(file.fullPath, gameData))
{ {
string lineBeforeComment = line.Split(commentSep, 2, StringSplitOptions.None)[0].Trim(); blacklist.Add(blacklistFile);
if (lineBeforeComment == string.Empty) continue;
foreach (UrlDir.UrlFile blacklistFile in FindFiles(lineBeforeComment, gameData))
{
blacklist.Add(blacklistFile);
}
} }
} }
else if (file.fileExtension == "restockwhitelist") else if (file.fileExtension == "restockwhitelist")
{ {
Debug.Log($"[Restock] Reading whitelist {file.url}.{file.fileExtension}"); Debug.Log($"[Restock] Reading whitelist {file.url}.{file.fileExtension}");
foreach (string line in File.ReadAllLines(file.fullPath)) foreach (UrlDir.UrlFile whitelistFile in FindFilesInAssetListFile(file.fullPath, gameData))
{ {
string lineBeforeComment = line.Split(commentSep, 2, StringSplitOptions.None)[0].Trim(); whitelist.Add(whitelistFile);
if (lineBeforeComment == string.Empty) continue;
foreach (UrlDir.UrlFile whitelistFile in FindFiles(lineBeforeComment, gameData))
{
whitelist.Add(whitelistFile);
}
} }
} }
} }
@ -62,10 +50,29 @@ namespace Restock
Destroy(gameObject); Destroy(gameObject);
} }
private readonly char[] sep = new[] { '/' }; private IEnumerable<UrlDir.UrlFile> FindFilesInAssetListFile(string filePath, UrlDir dir)
private IEnumerable<UrlDir.UrlFile> FindFiles(string url, UrlDir dir)
{ {
string[] splits = url.Split(sep, 2); foreach (string line in File.ReadAllLines(filePath))
{
string lineBeforeComment = line.Split(COMMENT_SEPARATOR, 2, StringSplitOptions.None)[0].Trim();
if (lineBeforeComment == string.Empty) continue;
bool matchedFile = false;
foreach (UrlDir.UrlFile urlFile in FindFilesForUrl(lineBeforeComment, dir))
{
yield return urlFile;
matchedFile = true;
}
if (!matchedFile)
Debug.LogError($"[Restock] No files found matching url {lineBeforeComment}");
}
}
private readonly char[] PATH_SEPARATOR = new[] { '/' };
private IEnumerable<UrlDir.UrlFile> FindFilesForUrl(string url, UrlDir dir)
{
string[] splits = url.Split(PATH_SEPARATOR, 2);
if (splits.Length == 1) if (splits.Length == 1)
{ {
@ -121,7 +128,7 @@ namespace Restock
{ {
if (regex.IsMatch(subDir.name)) if (regex.IsMatch(subDir.name))
{ {
foreach (UrlDir.UrlFile file in FindFiles(splits[1], subDir)) foreach (UrlDir.UrlFile file in FindFilesForUrl(splits[1], subDir))
{ {
yield return file; yield return file;
} }