TerribleDev/TimberWinR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidated code

Browse Source
This commit is contained in:
Eric Fontana
2014-07-22 12:18:24 -04:00
parent ec8c41eb83
commit 343b409afe
3 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TimberWinR.sln
View File

@@ -16,6 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimberWinR.UnitTests", "Tim
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1B2F600B-2400-45B9-A28E-CFC391D9EFA9}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1B2F600B-2400-45B9-A28E-CFC391D9EFA9}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
LICENSE.txt = LICENSE.txt
Package.nuspec = Package.nuspec Package.nuspec = Package.nuspec
README.md = README.md README.md = README.md
EndProjectSection EndProjectSection

34
TimberWinR/Filters/DateFilter.cs
View File

@@ -32,32 +32,26 @@ namespace TimberWinR.Filters
if (Patterns == null || Patterns.Count == 0) if (Patterns == null || Patterns.Count == 0)
{ {
if (DateTime.TryParse(text, out ts)) if (DateTime.TryParse(text, out ts))
{ AddOrModify(json, ts);
if (ConvertToUTC)
ts = ts.ToUniversalTime();
if (json[Target] == null)
json.Add(Target, ts);
else
json[Target] = ts;
}
} }
else else
{ {
if (DateTime.TryParseExact(text, Patterns.ToArray(), CultureInfo.InvariantCulture, if (DateTime.TryParseExact(text, Patterns.ToArray(), CultureInfo.InvariantCulture, DateTimeStyles.None, out ts))
DateTimeStyles.None, out ts)) AddOrModify(json, ts);
{
if (ConvertToUTC)
ts = ts.ToUniversalTime();
if (json[Target] == null)
json.Add(Target, ts);
else
json[Target] = ts;
}
} }
} }
} }
} }
private void AddOrModify(JObject json, DateTime ts)
{
if (ConvertToUTC)
ts = ts.ToUniversalTime();
if (json[Target] == null)
json.Add(Target, ts);
else
json[Target] = ts;
}
} }
} }

30
TimberWinR/Filters/GrokFilter.cs
View File

@@ -36,7 +36,6 @@ namespace TimberWinR.Filters
{ {
sb.Append(String.Format("\t{0}: {1}\n", prop.Name, prop.GetValue(this, null))); sb.Append(String.Format("\t{0}: {1}\n", prop.Name, prop.GetValue(this, null)));
} }
} }
return sb.ToString(); return sb.ToString();
} }
@@ -59,30 +58,19 @@ namespace TimberWinR.Filters
var namedCaptures = regex.MatchNamedCaptures(text); var namedCaptures = regex.MatchNamedCaptures(text);
foreach (string fieldName in namedCaptures.Keys) foreach (string fieldName in namedCaptures.Keys)
{ {
AddOrModify(json, fieldName, namedCaptures[fieldName]);
//if (fieldName == "timestamp")
//{
// string value = namedCaptures[fieldName];
// DateTime ts;
// if (DateTime.TryParse(value, out ts))
// json.Add(fieldName, ts.ToUniversalTime());
// else if (DateTime.TryParseExact(value, new string[]
// {
// "MMM dd hh:mm:ss",
// "MMM dd HH:mm:ss",
// "MMM dd h:mm",
// "MMM dd hh:mm",
// }, CultureInfo.InvariantCulture, DateTimeStyles.None, out ts))
// json.Add(fieldName, ts.ToUniversalTime());
// else
// json.Add(fieldName, (JToken) namedCaptures[fieldName]);
//}
//else
json.Add(fieldName, (JToken) namedCaptures[fieldName]);
} }
} }
} }
} }
} }
private void AddOrModify(JObject json, string fieldName, string fieldValue)
{
if (json[fieldName] == null)
json.Add(fieldName, fieldValue);
else
json[fieldName] = fieldValue;
}
} }
} }