maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

allow scheme parsers to opt out of attempting to parse a file

Browse source 
This fixes the issue where the INI file parser can throw errors because it's attempting to parse an `.itermcolors` (xml) file.
This commit is contained in:
Will Fuqua 2019-04-23 22:04:18 +07:00
parent 05f518db5b
commit b61cb830c3
No known key found for this signature in database
GPG key ID: 67B6F489167C16A3
5 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/ColorTool/ColorTool/SchemeManager.cs
View file

@ -91,15 +91,10 @@ namespace ColorTool
public static ColorScheme GetScheme(string schemeName, bool reportErrors = false)
{
foreach (var parser in GetParsers())
{
ColorScheme scheme = parser.ParseScheme(schemeName, reportErrors);
if (scheme != null)
{
return scheme;
}
}
return null;
return GetParsers()
.Where(parser => parser.CanParse(schemeName))
.Select(parser => parser.ParseScheme(schemeName, reportErrors))
.FirstOrDefault();
}
public static IEnumerable<ISchemeParser> GetParsers()

2
tools/ColorTool/ColorTool/SchemeParsers/ISchemeParser.cs
View file

@ -8,7 +8,7 @@ namespace ColorTool.SchemeParsers
interface ISchemeParser
{
string Name { get; }
bool CanParse(string schemeName);
ColorScheme ParseScheme(string schemeName, bool reportErrors = false);
}
}

7
tools/ColorTool/ColorTool/SchemeParsers/IniSchemeParser.cs
View file

@ -18,6 +18,8 @@ namespace ColorTool.SchemeParsers
[DllImport("kernel32")]
private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath);
private const string FileExtension = ".ini";
// These are in Windows Color table order - BRG, not RGB.
internal static readonly IReadOnlyList<string> COLOR_NAMES = new[]
{
@ -41,6 +43,9 @@ namespace ColorTool.SchemeParsers
public string Name { get; } = "INI File Parser";
public bool CanParse(string schemeName) =>
string.Equals(Path.GetExtension(schemeName), FileExtension, StringComparison.OrdinalIgnoreCase);
public ColorScheme ParseScheme(string schemeName, bool reportErrors = false)
{
bool success = true;
@ -182,7 +187,7 @@ namespace ColorTool.SchemeParsers
private static string FindIniScheme(string schemeName)
{
return SchemeManager.GetSearchPaths(schemeName, ".ini").FirstOrDefault(File.Exists);
return SchemeManager.GetSearchPaths(schemeName, FileExtension).FirstOrDefault(File.Exists);
}
}
}

10
tools/ColorTool/ColorTool/SchemeParsers/JsonParser.cs
View file

@ -15,6 +15,7 @@ namespace ColorTool.SchemeParsers
{
class JsonParser : ISchemeParser
{
private const string FileExtension = ".json";
private static IReadOnlyList<string> CONCFG_COLOR_NAMES = new[]
{
"black", // DARK_BLACK
@ -37,9 +38,12 @@ namespace ColorTool.SchemeParsers
public string Name { get; } = "concfg Parser";
public bool CanParse(string schemeName) =>
string.Equals(Path.GetExtension(schemeName), FileExtension, StringComparison.OrdinalIgnoreCase);
public ColorScheme ParseScheme(string schemeName, bool reportErrors = false)
{
XmlDocument xmlDoc = loadJsonFile(schemeName);
XmlDocument xmlDoc = LoadJsonFile(schemeName);
if (xmlDoc == null) return null;
try
@ -113,10 +117,10 @@ namespace ColorTool.SchemeParsers
return RGB(col.R, col.G, col.B);
}
private static XmlDocument loadJsonFile(string schemeName)
private static XmlDocument LoadJsonFile(string schemeName)
{
XmlDocument xmlDoc = new XmlDocument();
foreach (string path in SchemeManager.GetSearchPaths(schemeName, ".json")
foreach (string path in SchemeManager.GetSearchPaths(schemeName, FileExtension)
.Where(File.Exists))
{
try

6
tools/ColorTool/ColorTool/SchemeParsers/XmlSchemeParser.cs
View file

@ -40,9 +40,13 @@ namespace ColorTool.SchemeParsers
private const string RED_KEY = "Red Component";
private const string GREEN_KEY = "Green Component";
private const string BLUE_KEY = "Blue Component";
private const string FileExtension = ".itermcolors";
public string Name { get; } = "iTerm Parser";
public bool CanParse(string schemeName) =>
string.Equals(Path.GetExtension(schemeName), FileExtension, StringComparison.OrdinalIgnoreCase);
public ColorScheme ParseScheme(string schemeName, bool reportErrors = false)
{
XmlDocument xmlDoc = LoadXmlScheme(schemeName); // Create an XML document object
@ -123,7 +127,7 @@ namespace ColorTool.SchemeParsers
private static XmlDocument LoadXmlScheme(string schemeName)
{
XmlDocument xmlDoc = new XmlDocument(); // Create an XML document object
foreach (string path in SchemeManager.GetSearchPaths(schemeName, ".itermcolors")
foreach (string path in SchemeManager.GetSearchPaths(schemeName, FileExtension)
.Where(File.Exists))
{
try