Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 1 commit into from
Feb 11, 2018
Merged

Serilog console themes + quick CSV tokenizer -> nicer query results #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/SeqCli/Cli/Commands/QueryCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
readonly SignalExpressionFeature _signal;
string _query;
int? _timeoutMS;
bool _noColor;

public QueryCommand(SeqConnectionFactory connectionFactory)
public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
{
_connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
Options.Add("q=|query=", "The query to execute", v => _query = v);
_range = Enable<DateRangeFeature>();
_signal = Enable<SignalExpressionFeature>();
Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
_noColor = config.Output.DisableColor;
_connection = Enable<ConnectionFeature>();
}

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
// remove the `.Value` when _Seq.Api_ is updated to reflect this.
// ReSharper disable once PossibleInvalidOperationException
var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
Console.WriteLine(result);
if (_noColor)
{
Console.Write(result);
return 0;
}

var tokens = new CsvTokenizer().Tokenize(result);
CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

return 0;
}
Expand Down
4 changes: 3 additions & 1 deletion src/SeqCli/Cli/Features/OutputFormatFeature.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
_noColor = outputConfig.DisableColor;
}

public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

public override void Enable(OptionSet options)
{
options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
else
outputConfiguration.WriteTo.Console(
outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

return outputConfiguration.CreateLogger();
}
Expand Down
15 changes: 15 additions & 0 deletions src/SeqCli/Csv/CsvToken.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
enum CsvToken
{
None,
Newline,
DoubleQuote,
Comma,
Number,
Boolean,
Null,
Text,
EscapedDoubleQuote
}
}
143 changes: 143 additions & 0 deletions src/SeqCli/Csv/CsvTokenizer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
class CsvTokenizer : Tokenizer<CsvToken>
{
static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
{
var next = SkipInsignificant(span);
if (!next.HasValue)
yield break;

do
{
// Here we're always either at the beginning of a line, or behind a comma.
if (next.Value == '"')
{
yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
next = next.Remainder.ConsumeChar();
if (!next.HasValue) yield break;

var text = Content(next.Location);
while (text.HasValue)
{
if (text.Value.Length > 0)
{
if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
!IsEscapedDoubleQuote(text.Remainder))
yield return Result.Value(specialTokenType, text.Location, text.Remainder);
else
yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
}

next = text.Remainder.ConsumeChar();
if (!next.HasValue) yield break;

if (next.Value != '"')
{
yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
yield break;
}

var lookahead = next.Remainder.ConsumeChar();
if (lookahead.HasValue && lookahead.Value == '"')
{
yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
next = lookahead.Remainder.ConsumeChar();
if (!next.HasValue) yield break;
}
else
{
yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
next = next.Remainder.ConsumeChar();
if (!next.HasValue) yield break;
break; // Done with the content
}

text = Content(next.Location);
}

next = SkipInsignificant(next.Location);
if (next.Value == ',')
{
yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
next = next.Remainder.ConsumeChar();
if (!next.HasValue) yield break;
}
else if (next.Value == '\n')
{
yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
next = next.Remainder.ConsumeChar();
if (!next.HasValue) yield break;
}
else
{
yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
yield break;
}
}
else
{
yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
yield break;
}

next = SkipInsignificant(next.Location);
} while (next.HasValue);
}

static bool IsEscapedDoubleQuote(TextSpan span)
{
return span.Length >= 2 &&
span.Source[span.Position.Absolute] == '"' &&
span.Source[span.Position.Absolute + 1] == '"';
}

static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
{
// Planning a switch from "True" to "true" for CSV Booleans
if (text.EqualsValueIgnoreCase("true") ||
text.EqualsValueIgnoreCase("false"))
{
specialTokenType = CsvToken.Boolean;
return true;
}

if (text.EqualsValue("null"))
{
specialTokenType = CsvToken.Null;
return true;
}

// Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
// an `IsMatch(TextSpan)` on `TextParser`.
var s = text.ToStringValue();
if (text.Length > 0
&& text.Length < 16
&& (decimal.TryParse(text.ToStringValue(), out _) ||
s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
{
specialTokenType = CsvToken.Number;
return true;
}

specialTokenType = CsvToken.None;
return false;
}

static Result<char> SkipInsignificant(TextSpan span)
{
var result = span.ConsumeChar();
while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
result = result.Remainder.ConsumeChar();
return result;
}
}
}
64 changes: 64 additions & 0 deletions src/SeqCli/Csv/CsvWriter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
static class CsvWriter
{
public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
{
var isHeaderRow = hasHeaderRow;

foreach (var token in csv)
{
switch (token.Kind)
{
case CsvToken.Newline:
output.WriteLine();
isHeaderRow = false;
break;
case CsvToken.Comma:
theme.Set(output, ConsoleThemeStyle.TertiaryText);
output.Write(',');
theme.Reset(output);
break;
case CsvToken.DoubleQuote:
theme.Set(output, ConsoleThemeStyle.TertiaryText);
output.Write('"');
theme.Reset(output);
break;
case CsvToken.Boolean:
theme.Set(output, ConsoleThemeStyle.Boolean);
output.Write(token.ToStringValue());
theme.Reset(output);
break;
case CsvToken.Null:
theme.Set(output, ConsoleThemeStyle.Null);
output.Write(token.ToStringValue());
theme.Reset(output);
break;
case CsvToken.Number:
theme.Set(output, ConsoleThemeStyle.Number);
output.Write(token.ToStringValue());
theme.Reset(output);
break;
case CsvToken.EscapedDoubleQuote:
theme.Set(output, ConsoleThemeStyle.Scalar);
output.Write(token.ToStringValue());
theme.Reset(output);
break;
case CsvToken.Text:
theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
output.Write(token.ToStringValue());
theme.Reset(output);
break;
default:
throw new ArgumentException($"Unrecognized token `{token}`.");
}
}
}
}
}
1 change: 1 addition & 0 deletions src/SeqCli/SeqCli.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
<PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
<PackageReference Include="Autofac" Version="4.0.0" />
<PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
<PackageReference Include="Superpower" Version="1.1.0" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
<PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down
54 changes: 54 additions & 0 deletions test/SeqCli.Tests/Csv/CsvTokenizerTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
public class CsvTokenizerTests
{
[Fact]
public void AnEmptyStringYieldsNoTokens()
{
Assert.Empty(Tokenize(""));
}

[Fact]
public void TokenizesATextCell()
{
var tokens = Tokenize("\"abc\"");
Assert.Equal(tokens.Count(), 3);
Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
}

[Fact]
public void TokenizesARow()
{
var tokens = Tokenize("\"abc\",\"def\"\r\n");
Assert.Equal(tokens.Count(), 8);
}

[Theory]
[InlineData(CsvToken.Text, "abc")]
[InlineData(CsvToken.Text, "1a")]
[InlineData(CsvToken.Text, "1\"\"")]
[InlineData(CsvToken.Number, "1")]
[InlineData(CsvToken.Number, "-123.45")]
[InlineData(CsvToken.Number, "0xa123")]
[InlineData(CsvToken.Boolean, "true")]
[InlineData(CsvToken.Boolean, "false")]
[InlineData(CsvToken.Null, "null")]
public void DetectsSpecialTokenTypes(object o, string cell)
{
var tokenKind = (CsvToken) o;
var content = Tokenize($"\"{cell}\"").ElementAt(1);
Assert.Equal(tokenKind, content.Kind);
}

static TokenList<CsvToken> Tokenize(string csv)
{
return new CsvTokenizer().Tokenize(csv);
}
}
}
11 changes: 3 additions & 8 deletions test/SeqCli.Tests/SeqCli.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Platforms>x64</Platforms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

</Project>
</Project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nblumhardt
merged 1 commit into

from

Feb 11, 2018
 Merged


Serilog console themes + quick CSV tokenizer -> nicer query results
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory)
 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 Options.Add("q=|query=", "The query to execute", v => _query = v);
 _range = Enable<DateRangeFeature>();
 _signal = Enable<SignalExpressionFeature>();
 Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
 Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
 _noColor = config.Output.DisableColor;
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
 // remove the `.Value` when _Seq.Api_ is updated to reflect this.
 // ReSharper disable once PossibleInvalidOperationException
 var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 if (_noColor)
 {
 Console.Write(result);
 return 0;
 }

 var tokens = new CsvTokenizer().Tokenize(result);
 CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

 return 0;
 }
Expand Down

4 changes: 3 additions & 1 deletion
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

 public override void Enable(OptionSet options)
 {
 options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
 else
 outputConfiguration.WriteTo.Console(
 outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
 theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
 theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

 return outputConfiguration.CreateLogger();
 }
Expand Down

15 changes: 15 additions & 0 deletions
src/SeqCli/Csv/CsvToken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
 enum CsvToken
 {
 None,
 Newline,
 DoubleQuote,
 Comma,
 Number,
 Boolean,
 Null,
 Text,
 EscapedDoubleQuote
 }
}

143 changes: 143 additions & 0 deletions
src/SeqCli/Csv/CsvTokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
 class CsvTokenizer : Tokenizer<CsvToken>
 {
 static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

 protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
 {
 var next = SkipInsignificant(span);
 if (!next.HasValue)
 yield break;

 do
 {
 // Here we're always either at the beginning of a line, or behind a comma.
 if (next.Value == '"')
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 var text = Content(next.Location);
 while (text.HasValue)
 {
 if (text.Value.Length > 0)
 {
 if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
 !IsEscapedDoubleQuote(text.Remainder))
 yield return Result.Value(specialTokenType, text.Location, text.Remainder);
 else
 yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
 }

 next = text.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 if (next.Value != '"')
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 var lookahead = next.Remainder.ConsumeChar();
 if (lookahead.HasValue && lookahead.Value == '"')
 {
 yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
 next = lookahead.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 break; // Done with the content
 }

 text = Content(next.Location);
 }

 next = SkipInsignificant(next.Location);
 if (next.Value == ',')
 { 
 yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else if (next.Value == '\n')
 {
 yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
 yield break;
 }
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 next = SkipInsignificant(next.Location);
 } while (next.HasValue);
 }

 static bool IsEscapedDoubleQuote(TextSpan span)
 {
 return span.Length >= 2 &&
 span.Source[span.Position.Absolute] == '"' &&
 span.Source[span.Position.Absolute + 1] == '"';
 }

 static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
 { 
 // Planning a switch from "True" to "true" for CSV Booleans
 if (text.EqualsValueIgnoreCase("true") ||
 text.EqualsValueIgnoreCase("false"))
 {
 specialTokenType = CsvToken.Boolean;
 return true;
 }

 if (text.EqualsValue("null"))
 {
 specialTokenType = CsvToken.Null;
 return true;
 }

 // Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
 // an `IsMatch(TextSpan)` on `TextParser`.
 var s = text.ToStringValue();
 if (text.Length > 0 
 && text.Length < 16
 && (decimal.TryParse(text.ToStringValue(), out _) ||
 s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
 {
 specialTokenType = CsvToken.Number;
 return true;
 }

 specialTokenType = CsvToken.None;
 return false;
 }

 static Result<char> SkipInsignificant(TextSpan span)
 {
 var result = span.ConsumeChar();
 while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
 result = result.Remainder.ConsumeChar();
 return result;
 }
 }
}

64 changes: 64 additions & 0 deletions
src/SeqCli/Csv/CsvWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
 static class CsvWriter
 {
 public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
 {
 var isHeaderRow = hasHeaderRow;

 foreach (var token in csv)
 {
 switch (token.Kind)
 {
 case CsvToken.Newline:
 output.WriteLine();
 isHeaderRow = false;
 break;
 case CsvToken.Comma:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write(',');
 theme.Reset(output);
 break;
 case CsvToken.DoubleQuote:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write('"');
 theme.Reset(output);
 break;
 case CsvToken.Boolean:
 theme.Set(output, ConsoleThemeStyle.Boolean);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Null:
 theme.Set(output, ConsoleThemeStyle.Null);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Number:
 theme.Set(output, ConsoleThemeStyle.Number);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.EscapedDoubleQuote:
 theme.Set(output, ConsoleThemeStyle.Scalar);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Text:
 theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 default:
 throw new ArgumentException($"Unrecognized token `{token}`.");
 }
 }
 }
 }
}

1 change: 1 addition & 0 deletions
src/SeqCli/SeqCli.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
 <PackageReference Include="Autofac" Version="4.0.0" />
 <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
 <PackageReference Include="Superpower" Version="1.1.0" />
 <PackageReference Include="System.Reactive" Version="3.1.1" />
 <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
 <PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down

54 changes: 54 additions & 0 deletions
test/SeqCli.Tests/Csv/CsvTokenizerTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
 public class CsvTokenizerTests
 {
 [Fact]
 public void AnEmptyStringYieldsNoTokens()
 {
 Assert.Empty(Tokenize(""));
 }

 [Fact]
 public void TokenizesATextCell()
 {
 var tokens = Tokenize("\"abc\"");
 Assert.Equal(tokens.Count(), 3);
 Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
 }

 [Fact]
 public void TokenizesARow()
 {
 var tokens = Tokenize("\"abc\",\"def\"\r\n");
 Assert.Equal(tokens.Count(), 8);
 }

 [Theory]
 [InlineData(CsvToken.Text, "abc")]
 [InlineData(CsvToken.Text, "1a")]
 [InlineData(CsvToken.Text, "1\"\"")]
 [InlineData(CsvToken.Number, "1")]
 [InlineData(CsvToken.Number, "-123.45")]
 [InlineData(CsvToken.Number, "0xa123")]
 [InlineData(CsvToken.Boolean, "true")]
 [InlineData(CsvToken.Boolean, "false")]
 [InlineData(CsvToken.Null, "null")]
 public void DetectsSpecialTokenTypes(object o, string cell)
 {
 var tokenKind = (CsvToken) o;
 var content = Tokenize($"\"{cell}\"").ElementAt(1);
 Assert.Equal(tokenKind, content.Kind);
 }

 static TokenList<CsvToken> Tokenize(string csv)
 {
 return new CsvTokenizer().Tokenize(csv);
 }
 }
}

11 changes: 3 additions & 8 deletions
test/SeqCli.Tests/SeqCli.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup> 
 <TargetFramework>netcoreapp2.0</TargetFramework> 
 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>
 <Platforms>x64</Platforms>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
 <PackageReference Include="xunit" Version="2.2.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
 </ItemGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
 </ItemGroup>

 <ItemGroup>
 <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 </ItemGroup>

</Project>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nblumhardt
merged 1 commit into

from

Feb 11, 2018
 Merged


Serilog console themes + quick CSV tokenizer -> nicer query results
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory)
 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 Options.Add("q=|query=", "The query to execute", v => _query = v);
 _range = Enable<DateRangeFeature>();
 _signal = Enable<SignalExpressionFeature>();
 Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
 Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
 _noColor = config.Output.DisableColor;
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
 // remove the `.Value` when _Seq.Api_ is updated to reflect this.
 // ReSharper disable once PossibleInvalidOperationException
 var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 if (_noColor)
 {
 Console.Write(result);
 return 0;
 }

 var tokens = new CsvTokenizer().Tokenize(result);
 CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

 return 0;
 }
Expand Down

4 changes: 3 additions & 1 deletion
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

 public override void Enable(OptionSet options)
 {
 options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
 else
 outputConfiguration.WriteTo.Console(
 outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
 theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
 theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

 return outputConfiguration.CreateLogger();
 }
Expand Down

15 changes: 15 additions & 0 deletions
src/SeqCli/Csv/CsvToken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
 enum CsvToken
 {
 None,
 Newline,
 DoubleQuote,
 Comma,
 Number,
 Boolean,
 Null,
 Text,
 EscapedDoubleQuote
 }
}

143 changes: 143 additions & 0 deletions
src/SeqCli/Csv/CsvTokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
 class CsvTokenizer : Tokenizer<CsvToken>
 {
 static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

 protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
 {
 var next = SkipInsignificant(span);
 if (!next.HasValue)
 yield break;

 do
 {
 // Here we're always either at the beginning of a line, or behind a comma.
 if (next.Value == '"')
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 var text = Content(next.Location);
 while (text.HasValue)
 {
 if (text.Value.Length > 0)
 {
 if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
 !IsEscapedDoubleQuote(text.Remainder))
 yield return Result.Value(specialTokenType, text.Location, text.Remainder);
 else
 yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
 }

 next = text.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 if (next.Value != '"')
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 var lookahead = next.Remainder.ConsumeChar();
 if (lookahead.HasValue && lookahead.Value == '"')
 {
 yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
 next = lookahead.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 break; // Done with the content
 }

 text = Content(next.Location);
 }

 next = SkipInsignificant(next.Location);
 if (next.Value == ',')
 { 
 yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else if (next.Value == '\n')
 {
 yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
 yield break;
 }
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 next = SkipInsignificant(next.Location);
 } while (next.HasValue);
 }

 static bool IsEscapedDoubleQuote(TextSpan span)
 {
 return span.Length >= 2 &&
 span.Source[span.Position.Absolute] == '"' &&
 span.Source[span.Position.Absolute + 1] == '"';
 }

 static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
 { 
 // Planning a switch from "True" to "true" for CSV Booleans
 if (text.EqualsValueIgnoreCase("true") ||
 text.EqualsValueIgnoreCase("false"))
 {
 specialTokenType = CsvToken.Boolean;
 return true;
 }

 if (text.EqualsValue("null"))
 {
 specialTokenType = CsvToken.Null;
 return true;
 }

 // Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
 // an `IsMatch(TextSpan)` on `TextParser`.
 var s = text.ToStringValue();
 if (text.Length > 0 
 && text.Length < 16
 && (decimal.TryParse(text.ToStringValue(), out _) ||
 s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
 {
 specialTokenType = CsvToken.Number;
 return true;
 }

 specialTokenType = CsvToken.None;
 return false;
 }

 static Result<char> SkipInsignificant(TextSpan span)
 {
 var result = span.ConsumeChar();
 while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
 result = result.Remainder.ConsumeChar();
 return result;
 }
 }
}

64 changes: 64 additions & 0 deletions
src/SeqCli/Csv/CsvWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
 static class CsvWriter
 {
 public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
 {
 var isHeaderRow = hasHeaderRow;

 foreach (var token in csv)
 {
 switch (token.Kind)
 {
 case CsvToken.Newline:
 output.WriteLine();
 isHeaderRow = false;
 break;
 case CsvToken.Comma:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write(',');
 theme.Reset(output);
 break;
 case CsvToken.DoubleQuote:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write('"');
 theme.Reset(output);
 break;
 case CsvToken.Boolean:
 theme.Set(output, ConsoleThemeStyle.Boolean);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Null:
 theme.Set(output, ConsoleThemeStyle.Null);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Number:
 theme.Set(output, ConsoleThemeStyle.Number);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.EscapedDoubleQuote:
 theme.Set(output, ConsoleThemeStyle.Scalar);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Text:
 theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 default:
 throw new ArgumentException($"Unrecognized token `{token}`.");
 }
 }
 }
 }
}

1 change: 1 addition & 0 deletions
src/SeqCli/SeqCli.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
 <PackageReference Include="Autofac" Version="4.0.0" />
 <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
 <PackageReference Include="Superpower" Version="1.1.0" />
 <PackageReference Include="System.Reactive" Version="3.1.1" />
 <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
 <PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down

54 changes: 54 additions & 0 deletions
test/SeqCli.Tests/Csv/CsvTokenizerTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
 public class CsvTokenizerTests
 {
 [Fact]
 public void AnEmptyStringYieldsNoTokens()
 {
 Assert.Empty(Tokenize(""));
 }

 [Fact]
 public void TokenizesATextCell()
 {
 var tokens = Tokenize("\"abc\"");
 Assert.Equal(tokens.Count(), 3);
 Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
 }

 [Fact]
 public void TokenizesARow()
 {
 var tokens = Tokenize("\"abc\",\"def\"\r\n");
 Assert.Equal(tokens.Count(), 8);
 }

 [Theory]
 [InlineData(CsvToken.Text, "abc")]
 [InlineData(CsvToken.Text, "1a")]
 [InlineData(CsvToken.Text, "1\"\"")]
 [InlineData(CsvToken.Number, "1")]
 [InlineData(CsvToken.Number, "-123.45")]
 [InlineData(CsvToken.Number, "0xa123")]
 [InlineData(CsvToken.Boolean, "true")]
 [InlineData(CsvToken.Boolean, "false")]
 [InlineData(CsvToken.Null, "null")]
 public void DetectsSpecialTokenTypes(object o, string cell)
 {
 var tokenKind = (CsvToken) o;
 var content = Tokenize($"\"{cell}\"").ElementAt(1);
 Assert.Equal(tokenKind, content.Kind);
 }

 static TokenList<CsvToken> Tokenize(string csv)
 {
 return new CsvTokenizer().Tokenize(csv);
 }
 }
}

11 changes: 3 additions & 8 deletions
test/SeqCli.Tests/SeqCli.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup> 
 <TargetFramework>netcoreapp2.0</TargetFramework> 
 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>
 <Platforms>x64</Platforms>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
 <PackageReference Include="xunit" Version="2.2.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
 </ItemGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
 </ItemGroup>

 <ItemGroup>
 <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 </ItemGroup>

</Project>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nblumhardt
merged 1 commit into

from

Feb 11, 2018
 Merged


Serilog console themes + quick CSV tokenizer -> nicer query results
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory)
 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 Options.Add("q=|query=", "The query to execute", v => _query = v);
 _range = Enable<DateRangeFeature>();
 _signal = Enable<SignalExpressionFeature>();
 Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
 Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
 _noColor = config.Output.DisableColor;
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
 // remove the `.Value` when _Seq.Api_ is updated to reflect this.
 // ReSharper disable once PossibleInvalidOperationException
 var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 if (_noColor)
 {
 Console.Write(result);
 return 0;
 }

 var tokens = new CsvTokenizer().Tokenize(result);
 CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

 return 0;
 }
Expand Down

4 changes: 3 additions & 1 deletion
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

 public override void Enable(OptionSet options)
 {
 options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
 else
 outputConfiguration.WriteTo.Console(
 outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
 theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
 theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

 return outputConfiguration.CreateLogger();
 }
Expand Down

15 changes: 15 additions & 0 deletions
src/SeqCli/Csv/CsvToken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
 enum CsvToken
 {
 None,
 Newline,
 DoubleQuote,
 Comma,
 Number,
 Boolean,
 Null,
 Text,
 EscapedDoubleQuote
 }
}

143 changes: 143 additions & 0 deletions
src/SeqCli/Csv/CsvTokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
 class CsvTokenizer : Tokenizer<CsvToken>
 {
 static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

 protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
 {
 var next = SkipInsignificant(span);
 if (!next.HasValue)
 yield break;

 do
 {
 // Here we're always either at the beginning of a line, or behind a comma.
 if (next.Value == '"')
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 var text = Content(next.Location);
 while (text.HasValue)
 {
 if (text.Value.Length > 0)
 {
 if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
 !IsEscapedDoubleQuote(text.Remainder))
 yield return Result.Value(specialTokenType, text.Location, text.Remainder);
 else
 yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
 }

 next = text.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 if (next.Value != '"')
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 var lookahead = next.Remainder.ConsumeChar();
 if (lookahead.HasValue && lookahead.Value == '"')
 {
 yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
 next = lookahead.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 break; // Done with the content
 }

 text = Content(next.Location);
 }

 next = SkipInsignificant(next.Location);
 if (next.Value == ',')
 { 
 yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else if (next.Value == '\n')
 {
 yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
 yield break;
 }
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 next = SkipInsignificant(next.Location);
 } while (next.HasValue);
 }

 static bool IsEscapedDoubleQuote(TextSpan span)
 {
 return span.Length >= 2 &&
 span.Source[span.Position.Absolute] == '"' &&
 span.Source[span.Position.Absolute + 1] == '"';
 }

 static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
 { 
 // Planning a switch from "True" to "true" for CSV Booleans
 if (text.EqualsValueIgnoreCase("true") ||
 text.EqualsValueIgnoreCase("false"))
 {
 specialTokenType = CsvToken.Boolean;
 return true;
 }

 if (text.EqualsValue("null"))
 {
 specialTokenType = CsvToken.Null;
 return true;
 }

 // Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
 // an `IsMatch(TextSpan)` on `TextParser`.
 var s = text.ToStringValue();
 if (text.Length > 0 
 && text.Length < 16
 && (decimal.TryParse(text.ToStringValue(), out _) ||
 s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
 {
 specialTokenType = CsvToken.Number;
 return true;
 }

 specialTokenType = CsvToken.None;
 return false;
 }

 static Result<char> SkipInsignificant(TextSpan span)
 {
 var result = span.ConsumeChar();
 while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
 result = result.Remainder.ConsumeChar();
 return result;
 }
 }
}

64 changes: 64 additions & 0 deletions
src/SeqCli/Csv/CsvWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
 static class CsvWriter
 {
 public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
 {
 var isHeaderRow = hasHeaderRow;

 foreach (var token in csv)
 {
 switch (token.Kind)
 {
 case CsvToken.Newline:
 output.WriteLine();
 isHeaderRow = false;
 break;
 case CsvToken.Comma:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write(',');
 theme.Reset(output);
 break;
 case CsvToken.DoubleQuote:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write('"');
 theme.Reset(output);
 break;
 case CsvToken.Boolean:
 theme.Set(output, ConsoleThemeStyle.Boolean);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Null:
 theme.Set(output, ConsoleThemeStyle.Null);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Number:
 theme.Set(output, ConsoleThemeStyle.Number);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.EscapedDoubleQuote:
 theme.Set(output, ConsoleThemeStyle.Scalar);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Text:
 theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 default:
 throw new ArgumentException($"Unrecognized token `{token}`.");
 }
 }
 }
 }
}

1 change: 1 addition & 0 deletions
src/SeqCli/SeqCli.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
 <PackageReference Include="Autofac" Version="4.0.0" />
 <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
 <PackageReference Include="Superpower" Version="1.1.0" />
 <PackageReference Include="System.Reactive" Version="3.1.1" />
 <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
 <PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down

54 changes: 54 additions & 0 deletions
test/SeqCli.Tests/Csv/CsvTokenizerTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
 public class CsvTokenizerTests
 {
 [Fact]
 public void AnEmptyStringYieldsNoTokens()
 {
 Assert.Empty(Tokenize(""));
 }

 [Fact]
 public void TokenizesATextCell()
 {
 var tokens = Tokenize("\"abc\"");
 Assert.Equal(tokens.Count(), 3);
 Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
 }

 [Fact]
 public void TokenizesARow()
 {
 var tokens = Tokenize("\"abc\",\"def\"\r\n");
 Assert.Equal(tokens.Count(), 8);
 }

 [Theory]
 [InlineData(CsvToken.Text, "abc")]
 [InlineData(CsvToken.Text, "1a")]
 [InlineData(CsvToken.Text, "1\"\"")]
 [InlineData(CsvToken.Number, "1")]
 [InlineData(CsvToken.Number, "-123.45")]
 [InlineData(CsvToken.Number, "0xa123")]
 [InlineData(CsvToken.Boolean, "true")]
 [InlineData(CsvToken.Boolean, "false")]
 [InlineData(CsvToken.Null, "null")]
 public void DetectsSpecialTokenTypes(object o, string cell)
 {
 var tokenKind = (CsvToken) o;
 var content = Tokenize($"\"{cell}\"").ElementAt(1);
 Assert.Equal(tokenKind, content.Kind);
 }

 static TokenList<CsvToken> Tokenize(string csv)
 {
 return new CsvTokenizer().Tokenize(csv);
 }
 }
}

11 changes: 3 additions & 8 deletions
test/SeqCli.Tests/SeqCli.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup> 
 <TargetFramework>netcoreapp2.0</TargetFramework> 
 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>
 <Platforms>x64</Platforms>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
 <PackageReference Include="xunit" Version="2.2.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
 </ItemGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
 </ItemGroup>

 <ItemGroup>
 <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 </ItemGroup>

</Project>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nblumhardt
merged 1 commit into

from

Feb 11, 2018
 Merged


Serilog console themes + quick CSV tokenizer -> nicer query results
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory)
 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 Options.Add("q=|query=", "The query to execute", v => _query = v);
 _range = Enable<DateRangeFeature>();
 _signal = Enable<SignalExpressionFeature>();
 Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
 Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
 _noColor = config.Output.DisableColor;
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
 // remove the `.Value` when _Seq.Api_ is updated to reflect this.
 // ReSharper disable once PossibleInvalidOperationException
 var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 if (_noColor)
 {
 Console.Write(result);
 return 0;
 }

 var tokens = new CsvTokenizer().Tokenize(result);
 CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

 return 0;
 }
Expand Down

4 changes: 3 additions & 1 deletion
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

 public override void Enable(OptionSet options)
 {
 options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
 else
 outputConfiguration.WriteTo.Console(
 outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
 theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
 theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

 return outputConfiguration.CreateLogger();
 }
Expand Down

15 changes: 15 additions & 0 deletions
src/SeqCli/Csv/CsvToken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
 enum CsvToken
 {
 None,
 Newline,
 DoubleQuote,
 Comma,
 Number,
 Boolean,
 Null,
 Text,
 EscapedDoubleQuote
 }
}

143 changes: 143 additions & 0 deletions
src/SeqCli/Csv/CsvTokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
 class CsvTokenizer : Tokenizer<CsvToken>
 {
 static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

 protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
 {
 var next = SkipInsignificant(span);
 if (!next.HasValue)
 yield break;

 do
 {
 // Here we're always either at the beginning of a line, or behind a comma.
 if (next.Value == '"')
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 var text = Content(next.Location);
 while (text.HasValue)
 {
 if (text.Value.Length > 0)
 {
 if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
 !IsEscapedDoubleQuote(text.Remainder))
 yield return Result.Value(specialTokenType, text.Location, text.Remainder);
 else
 yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
 }

 next = text.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 if (next.Value != '"')
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 var lookahead = next.Remainder.ConsumeChar();
 if (lookahead.HasValue && lookahead.Value == '"')
 {
 yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
 next = lookahead.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 break; // Done with the content
 }

 text = Content(next.Location);
 }

 next = SkipInsignificant(next.Location);
 if (next.Value == ',')
 { 
 yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else if (next.Value == '\n')
 {
 yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
 yield break;
 }
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 next = SkipInsignificant(next.Location);
 } while (next.HasValue);
 }

 static bool IsEscapedDoubleQuote(TextSpan span)
 {
 return span.Length >= 2 &&
 span.Source[span.Position.Absolute] == '"' &&
 span.Source[span.Position.Absolute + 1] == '"';
 }

 static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
 { 
 // Planning a switch from "True" to "true" for CSV Booleans
 if (text.EqualsValueIgnoreCase("true") ||
 text.EqualsValueIgnoreCase("false"))
 {
 specialTokenType = CsvToken.Boolean;
 return true;
 }

 if (text.EqualsValue("null"))
 {
 specialTokenType = CsvToken.Null;
 return true;
 }

 // Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
 // an `IsMatch(TextSpan)` on `TextParser`.
 var s = text.ToStringValue();
 if (text.Length > 0 
 && text.Length < 16
 && (decimal.TryParse(text.ToStringValue(), out _) ||
 s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
 {
 specialTokenType = CsvToken.Number;
 return true;
 }

 specialTokenType = CsvToken.None;
 return false;
 }

 static Result<char> SkipInsignificant(TextSpan span)
 {
 var result = span.ConsumeChar();
 while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
 result = result.Remainder.ConsumeChar();
 return result;
 }
 }
}

64 changes: 64 additions & 0 deletions
src/SeqCli/Csv/CsvWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
 static class CsvWriter
 {
 public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
 {
 var isHeaderRow = hasHeaderRow;

 foreach (var token in csv)
 {
 switch (token.Kind)
 {
 case CsvToken.Newline:
 output.WriteLine();
 isHeaderRow = false;
 break;
 case CsvToken.Comma:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write(',');
 theme.Reset(output);
 break;
 case CsvToken.DoubleQuote:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write('"');
 theme.Reset(output);
 break;
 case CsvToken.Boolean:
 theme.Set(output, ConsoleThemeStyle.Boolean);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Null:
 theme.Set(output, ConsoleThemeStyle.Null);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Number:
 theme.Set(output, ConsoleThemeStyle.Number);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.EscapedDoubleQuote:
 theme.Set(output, ConsoleThemeStyle.Scalar);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Text:
 theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 default:
 throw new ArgumentException($"Unrecognized token `{token}`.");
 }
 }
 }
 }
}

1 change: 1 addition & 0 deletions
src/SeqCli/SeqCli.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
 <PackageReference Include="Autofac" Version="4.0.0" />
 <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
 <PackageReference Include="Superpower" Version="1.1.0" />
 <PackageReference Include="System.Reactive" Version="3.1.1" />
 <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
 <PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down

54 changes: 54 additions & 0 deletions
test/SeqCli.Tests/Csv/CsvTokenizerTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
 public class CsvTokenizerTests
 {
 [Fact]
 public void AnEmptyStringYieldsNoTokens()
 {
 Assert.Empty(Tokenize(""));
 }

 [Fact]
 public void TokenizesATextCell()
 {
 var tokens = Tokenize("\"abc\"");
 Assert.Equal(tokens.Count(), 3);
 Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
 }

 [Fact]
 public void TokenizesARow()
 {
 var tokens = Tokenize("\"abc\",\"def\"\r\n");
 Assert.Equal(tokens.Count(), 8);
 }

 [Theory]
 [InlineData(CsvToken.Text, "abc")]
 [InlineData(CsvToken.Text, "1a")]
 [InlineData(CsvToken.Text, "1\"\"")]
 [InlineData(CsvToken.Number, "1")]
 [InlineData(CsvToken.Number, "-123.45")]
 [InlineData(CsvToken.Number, "0xa123")]
 [InlineData(CsvToken.Boolean, "true")]
 [InlineData(CsvToken.Boolean, "false")]
 [InlineData(CsvToken.Null, "null")]
 public void DetectsSpecialTokenTypes(object o, string cell)
 {
 var tokenKind = (CsvToken) o;
 var content = Tokenize($"\"{cell}\"").ElementAt(1);
 Assert.Equal(tokenKind, content.Kind);
 }

 static TokenList<CsvToken> Tokenize(string csv)
 {
 return new CsvTokenizer().Tokenize(csv);
 }
 }
}

11 changes: 3 additions & 8 deletions
test/SeqCli.Tests/SeqCli.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup> 
 <TargetFramework>netcoreapp2.0</TargetFramework> 
 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>
 <Platforms>x64</Platforms>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
 <PackageReference Include="xunit" Version="2.2.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
 </ItemGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
 </ItemGroup>

 <ItemGroup>
 <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 </ItemGroup>

</Project>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nblumhardt
merged 1 commit into

from

Feb 11, 2018
 Merged


Serilog console themes + quick CSV tokenizer -> nicer query results
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory)
 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 Options.Add("q=|query=", "The query to execute", v => _query = v);
 _range = Enable<DateRangeFeature>();
 _signal = Enable<SignalExpressionFeature>();
 Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
 Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
 _noColor = config.Output.DisableColor;
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
 // remove the `.Value` when _Seq.Api_ is updated to reflect this.
 // ReSharper disable once PossibleInvalidOperationException
 var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 if (_noColor)
 {
 Console.Write(result);
 return 0;
 }

 var tokens = new CsvTokenizer().Tokenize(result);
 CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

 return 0;
 }
Expand Down

4 changes: 3 additions & 1 deletion
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

 public override void Enable(OptionSet options)
 {
 options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
 else
 outputConfiguration.WriteTo.Console(
 outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
 theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
 theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

 return outputConfiguration.CreateLogger();
 }
Expand Down

15 changes: 15 additions & 0 deletions
src/SeqCli/Csv/CsvToken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
 enum CsvToken
 {
 None,
 Newline,
 DoubleQuote,
 Comma,
 Number,
 Boolean,
 Null,
 Text,
 EscapedDoubleQuote
 }
}

143 changes: 143 additions & 0 deletions
src/SeqCli/Csv/CsvTokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
 class CsvTokenizer : Tokenizer<CsvToken>
 {
 static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

 protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
 {
 var next = SkipInsignificant(span);
 if (!next.HasValue)
 yield break;

 do
 {
 // Here we're always either at the beginning of a line, or behind a comma.
 if (next.Value == '"')
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 var text = Content(next.Location);
 while (text.HasValue)
 {
 if (text.Value.Length > 0)
 {
 if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
 !IsEscapedDoubleQuote(text.Remainder))
 yield return Result.Value(specialTokenType, text.Location, text.Remainder);
 else
 yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
 }

 next = text.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 if (next.Value != '"')
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 var lookahead = next.Remainder.ConsumeChar();
 if (lookahead.HasValue && lookahead.Value == '"')
 {
 yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
 next = lookahead.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 break; // Done with the content
 }

 text = Content(next.Location);
 }

 next = SkipInsignificant(next.Location);
 if (next.Value == ',')
 { 
 yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else if (next.Value == '\n')
 {
 yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
 yield break;
 }
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 next = SkipInsignificant(next.Location);
 } while (next.HasValue);
 }

 static bool IsEscapedDoubleQuote(TextSpan span)
 {
 return span.Length >= 2 &&
 span.Source[span.Position.Absolute] == '"' &&
 span.Source[span.Position.Absolute + 1] == '"';
 }

 static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
 { 
 // Planning a switch from "True" to "true" for CSV Booleans
 if (text.EqualsValueIgnoreCase("true") ||
 text.EqualsValueIgnoreCase("false"))
 {
 specialTokenType = CsvToken.Boolean;
 return true;
 }

 if (text.EqualsValue("null"))
 {
 specialTokenType = CsvToken.Null;
 return true;
 }

 // Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
 // an `IsMatch(TextSpan)` on `TextParser`.
 var s = text.ToStringValue();
 if (text.Length > 0 
 && text.Length < 16
 && (decimal.TryParse(text.ToStringValue(), out _) ||
 s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
 {
 specialTokenType = CsvToken.Number;
 return true;
 }

 specialTokenType = CsvToken.None;
 return false;
 }

 static Result<char> SkipInsignificant(TextSpan span)
 {
 var result = span.ConsumeChar();
 while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
 result = result.Remainder.ConsumeChar();
 return result;
 }
 }
}

64 changes: 64 additions & 0 deletions
src/SeqCli/Csv/CsvWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
 static class CsvWriter
 {
 public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
 {
 var isHeaderRow = hasHeaderRow;

 foreach (var token in csv)
 {
 switch (token.Kind)
 {
 case CsvToken.Newline:
 output.WriteLine();
 isHeaderRow = false;
 break;
 case CsvToken.Comma:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write(',');
 theme.Reset(output);
 break;
 case CsvToken.DoubleQuote:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write('"');
 theme.Reset(output);
 break;
 case CsvToken.Boolean:
 theme.Set(output, ConsoleThemeStyle.Boolean);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Null:
 theme.Set(output, ConsoleThemeStyle.Null);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Number:
 theme.Set(output, ConsoleThemeStyle.Number);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.EscapedDoubleQuote:
 theme.Set(output, ConsoleThemeStyle.Scalar);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Text:
 theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 default:
 throw new ArgumentException($"Unrecognized token `{token}`.");
 }
 }
 }
 }
}

1 change: 1 addition & 0 deletions
src/SeqCli/SeqCli.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
 <PackageReference Include="Autofac" Version="4.0.0" />
 <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
 <PackageReference Include="Superpower" Version="1.1.0" />
 <PackageReference Include="System.Reactive" Version="3.1.1" />
 <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
 <PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down

54 changes: 54 additions & 0 deletions
test/SeqCli.Tests/Csv/CsvTokenizerTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
 public class CsvTokenizerTests
 {
 [Fact]
 public void AnEmptyStringYieldsNoTokens()
 {
 Assert.Empty(Tokenize(""));
 }

 [Fact]
 public void TokenizesATextCell()
 {
 var tokens = Tokenize("\"abc\"");
 Assert.Equal(tokens.Count(), 3);
 Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
 }

 [Fact]
 public void TokenizesARow()
 {
 var tokens = Tokenize("\"abc\",\"def\"\r\n");
 Assert.Equal(tokens.Count(), 8);
 }

 [Theory]
 [InlineData(CsvToken.Text, "abc")]
 [InlineData(CsvToken.Text, "1a")]
 [InlineData(CsvToken.Text, "1\"\"")]
 [InlineData(CsvToken.Number, "1")]
 [InlineData(CsvToken.Number, "-123.45")]
 [InlineData(CsvToken.Number, "0xa123")]
 [InlineData(CsvToken.Boolean, "true")]
 [InlineData(CsvToken.Boolean, "false")]
 [InlineData(CsvToken.Null, "null")]
 public void DetectsSpecialTokenTypes(object o, string cell)
 {
 var tokenKind = (CsvToken) o;
 var content = Tokenize($"\"{cell}\"").ElementAt(1);
 Assert.Equal(tokenKind, content.Kind);
 }

 static TokenList<CsvToken> Tokenize(string csv)
 {
 return new CsvTokenizer().Tokenize(csv);
 }
 }
}

11 changes: 3 additions & 8 deletions
test/SeqCli.Tests/SeqCli.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup> 
 <TargetFramework>netcoreapp2.0</TargetFramework> 
 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>
 <Platforms>x64</Platforms>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
 <PackageReference Include="xunit" Version="2.2.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
 </ItemGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
 </ItemGroup>

 <ItemGroup>
 <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 </ItemGroup>

</Project>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nblumhardt
merged 1 commit into

from

Feb 11, 2018
 Merged


Serilog console themes + quick CSV tokenizer -> nicer query results
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory)
 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 Options.Add("q=|query=", "The query to execute", v => _query = v);
 _range = Enable<DateRangeFeature>();
 _signal = Enable<SignalExpressionFeature>();
 Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
 Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
 _noColor = config.Output.DisableColor;
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
 // remove the `.Value` when _Seq.Api_ is updated to reflect this.
 // ReSharper disable once PossibleInvalidOperationException
 var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 if (_noColor)
 {
 Console.Write(result);
 return 0;
 }

 var tokens = new CsvTokenizer().Tokenize(result);
 CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

 return 0;
 }
Expand Down

4 changes: 3 additions & 1 deletion
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

 public override void Enable(OptionSet options)
 {
 options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
 else
 outputConfiguration.WriteTo.Console(
 outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
 theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
 theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

 return outputConfiguration.CreateLogger();
 }
Expand Down

15 changes: 15 additions & 0 deletions
src/SeqCli/Csv/CsvToken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
 enum CsvToken
 {
 None,
 Newline,
 DoubleQuote,
 Comma,
 Number,
 Boolean,
 Null,
 Text,
 EscapedDoubleQuote
 }
}

143 changes: 143 additions & 0 deletions
src/SeqCli/Csv/CsvTokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
 class CsvTokenizer : Tokenizer<CsvToken>
 {
 static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

 protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
 {
 var next = SkipInsignificant(span);
 if (!next.HasValue)
 yield break;

 do
 {
 // Here we're always either at the beginning of a line, or behind a comma.
 if (next.Value == '"')
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 var text = Content(next.Location);
 while (text.HasValue)
 {
 if (text.Value.Length > 0)
 {
 if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
 !IsEscapedDoubleQuote(text.Remainder))
 yield return Result.Value(specialTokenType, text.Location, text.Remainder);
 else
 yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
 }

 next = text.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 if (next.Value != '"')
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 var lookahead = next.Remainder.ConsumeChar();
 if (lookahead.HasValue && lookahead.Value == '"')
 {
 yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
 next = lookahead.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 break; // Done with the content
 }

 text = Content(next.Location);
 }

 next = SkipInsignificant(next.Location);
 if (next.Value == ',')
 { 
 yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else if (next.Value == '\n')
 {
 yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
 yield break;
 }
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 next = SkipInsignificant(next.Location);
 } while (next.HasValue);
 }

 static bool IsEscapedDoubleQuote(TextSpan span)
 {
 return span.Length >= 2 &&
 span.Source[span.Position.Absolute] == '"' &&
 span.Source[span.Position.Absolute + 1] == '"';
 }

 static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
 { 
 // Planning a switch from "True" to "true" for CSV Booleans
 if (text.EqualsValueIgnoreCase("true") ||
 text.EqualsValueIgnoreCase("false"))
 {
 specialTokenType = CsvToken.Boolean;
 return true;
 }

 if (text.EqualsValue("null"))
 {
 specialTokenType = CsvToken.Null;
 return true;
 }

 // Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
 // an `IsMatch(TextSpan)` on `TextParser`.
 var s = text.ToStringValue();
 if (text.Length > 0 
 && text.Length < 16
 && (decimal.TryParse(text.ToStringValue(), out _) ||
 s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
 {
 specialTokenType = CsvToken.Number;
 return true;
 }

 specialTokenType = CsvToken.None;
 return false;
 }

 static Result<char> SkipInsignificant(TextSpan span)
 {
 var result = span.ConsumeChar();
 while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
 result = result.Remainder.ConsumeChar();
 return result;
 }
 }
}

64 changes: 64 additions & 0 deletions
src/SeqCli/Csv/CsvWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
 static class CsvWriter
 {
 public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
 {
 var isHeaderRow = hasHeaderRow;

 foreach (var token in csv)
 {
 switch (token.Kind)
 {
 case CsvToken.Newline:
 output.WriteLine();
 isHeaderRow = false;
 break;
 case CsvToken.Comma:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write(',');
 theme.Reset(output);
 break;
 case CsvToken.DoubleQuote:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write('"');
 theme.Reset(output);
 break;
 case CsvToken.Boolean:
 theme.Set(output, ConsoleThemeStyle.Boolean);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Null:
 theme.Set(output, ConsoleThemeStyle.Null);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Number:
 theme.Set(output, ConsoleThemeStyle.Number);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.EscapedDoubleQuote:
 theme.Set(output, ConsoleThemeStyle.Scalar);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Text:
 theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 default:
 throw new ArgumentException($"Unrecognized token `{token}`.");
 }
 }
 }
 }
}

1 change: 1 addition & 0 deletions
src/SeqCli/SeqCli.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
 <PackageReference Include="Autofac" Version="4.0.0" />
 <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
 <PackageReference Include="Superpower" Version="1.1.0" />
 <PackageReference Include="System.Reactive" Version="3.1.1" />
 <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
 <PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down

54 changes: 54 additions & 0 deletions
test/SeqCli.Tests/Csv/CsvTokenizerTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
 public class CsvTokenizerTests
 {
 [Fact]
 public void AnEmptyStringYieldsNoTokens()
 {
 Assert.Empty(Tokenize(""));
 }

 [Fact]
 public void TokenizesATextCell()
 {
 var tokens = Tokenize("\"abc\"");
 Assert.Equal(tokens.Count(), 3);
 Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
 }

 [Fact]
 public void TokenizesARow()
 {
 var tokens = Tokenize("\"abc\",\"def\"\r\n");
 Assert.Equal(tokens.Count(), 8);
 }

 [Theory]
 [InlineData(CsvToken.Text, "abc")]
 [InlineData(CsvToken.Text, "1a")]
 [InlineData(CsvToken.Text, "1\"\"")]
 [InlineData(CsvToken.Number, "1")]
 [InlineData(CsvToken.Number, "-123.45")]
 [InlineData(CsvToken.Number, "0xa123")]
 [InlineData(CsvToken.Boolean, "true")]
 [InlineData(CsvToken.Boolean, "false")]
 [InlineData(CsvToken.Null, "null")]
 public void DetectsSpecialTokenTypes(object o, string cell)
 {
 var tokenKind = (CsvToken) o;
 var content = Tokenize($"\"{cell}\"").ElementAt(1);
 Assert.Equal(tokenKind, content.Kind);
 }

 static TokenList<CsvToken> Tokenize(string csv)
 {
 return new CsvTokenizer().Tokenize(csv);
 }
 }
}

11 changes: 3 additions & 8 deletions
test/SeqCli.Tests/SeqCli.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup> 
 <TargetFramework>netcoreapp2.0</TargetFramework> 
 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>
 <Platforms>x64</Platforms>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
 <PackageReference Include="xunit" Version="2.2.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
 </ItemGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
 </ItemGroup>

 <ItemGroup>
 <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 </ItemGroup>

</Project>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Serilog console themes + quick CSV tokenizer -> nicer query results#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nblumhardt
merged 1 commit into

from

Feb 11, 2018
 Merged


Serilog console themes + quick CSV tokenizer -> nicer query results
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,9 @@
using Seq.Api;
using Seq.Api.Model.Signals;
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -33,14 +35,17 @@ class QueryCommand : Command
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory)
 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 Options.Add("q=|query=", "The query to execute", v => _query = v);
 _range = Enable<DateRangeFeature>();
 _signal = Enable<SignalExpressionFeature>();
 Options.Add("timeout=", "The query execution timeout in milliseconds", v => _timeoutMS = int.Parse(v));
 Options.Add("no-color", "Don't colorize text output", v => _noColor = true);
 _noColor = config.Output.DisableColor;
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -58,7 +63,14 @@ protected override async Task<int> Run()
 // remove the `.Value` when _Seq.Api_ is updated to reflect this.
 // ReSharper disable once PossibleInvalidOperationException
 var result = await QueryCsvAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 if (_noColor)
 {
 Console.Write(result);
 return 0;
 }

 var tokens = new CsvTokenizer().Tokenize(result);
 CsvWriter.WriteCsv(tokens, OutputFormatFeature.ConsoleTheme, Console.Out, true);

 return 0;
 }
Expand Down

4 changes: 3 additions & 1 deletion
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;

 public override void Enable(OptionSet options)
 {
 options.Add(
Expand All@@ -50,7 +52,7 @@ public Logger CreateOutputLogger()
 else
 outputConfiguration.WriteTo.Console(
 outputTemplate: "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}",
 theme: _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate);
 theme: _noColor ? ConsoleTheme.None : ConsoleTheme);

 return outputConfiguration.CreateLogger();
 }
Expand Down

15 changes: 15 additions & 0 deletions
src/SeqCli/Csv/CsvToken.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
namespace SeqCli.Csv
{
 enum CsvToken
 {
 None,
 Newline,
 DoubleQuote,
 Comma,
 Number,
 Boolean,
 Null,
 Text,
 EscapedDoubleQuote
 }
}

143 changes: 143 additions & 0 deletions
src/SeqCli/Csv/CsvTokenizer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
using System.Collections.Generic;
using System.Globalization;
using Superpower;
using Superpower.Model;
using Superpower.Parsers;

namespace SeqCli.Csv
{
 class CsvTokenizer : Tokenizer<CsvToken>
 {
 static readonly TextParser<TextSpan> Content = Span.While(ch => ch != '"');

 protected override IEnumerable<Result<CsvToken>> Tokenize(TextSpan span)
 {
 var next = SkipInsignificant(span);
 if (!next.HasValue)
 yield break;

 do
 {
 // Here we're always either at the beginning of a line, or behind a comma.
 if (next.Value == '"')
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 var text = Content(next.Location);
 while (text.HasValue)
 {
 if (text.Value.Length > 0)
 {
 if (TryMatchSpecialContent(text.Value, out var specialTokenType) &&
 !IsEscapedDoubleQuote(text.Remainder))
 yield return Result.Value(specialTokenType, text.Location, text.Remainder);
 else
 yield return Result.Value(CsvToken.Text, text.Location, text.Remainder);
 }

 next = text.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;

 if (next.Value != '"')
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 var lookahead = next.Remainder.ConsumeChar();
 if (lookahead.HasValue && lookahead.Value == '"')
 {
 yield return Result.Value(CsvToken.EscapedDoubleQuote, next.Location, lookahead.Remainder);
 next = lookahead.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Value(CsvToken.DoubleQuote, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 break; // Done with the content
 }

 text = Content(next.Location);
 }

 next = SkipInsignificant(next.Location);
 if (next.Value == ',')
 { 
 yield return Result.Value(CsvToken.Comma, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else if (next.Value == '\n')
 {
 yield return Result.Value(CsvToken.Newline, next.Location, next.Remainder);
 next = next.Remainder.ConsumeChar();
 if (!next.HasValue) yield break;
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"comma", "newline"});
 yield break;
 }
 }
 else
 {
 yield return Result.Empty<CsvToken>(next.Location, new[] {"double-quote"});
 yield break;
 }

 next = SkipInsignificant(next.Location);
 } while (next.HasValue);
 }

 static bool IsEscapedDoubleQuote(TextSpan span)
 {
 return span.Length >= 2 &&
 span.Source[span.Position.Absolute] == '"' &&
 span.Source[span.Position.Absolute + 1] == '"';
 }

 static bool TryMatchSpecialContent(TextSpan text, out CsvToken specialTokenType)
 { 
 // Planning a switch from "True" to "true" for CSV Booleans
 if (text.EqualsValueIgnoreCase("true") ||
 text.EqualsValueIgnoreCase("false"))
 {
 specialTokenType = CsvToken.Boolean;
 return true;
 }

 if (text.EqualsValue("null"))
 {
 specialTokenType = CsvToken.Null;
 return true;
 }

 // Just a quick temp job here until Superpower `Numerics` gets `Decimal` and `HexNumber`, plus
 // an `IsMatch(TextSpan)` on `TextParser`.
 var s = text.ToStringValue();
 if (text.Length > 0 
 && text.Length < 16
 && (decimal.TryParse(text.ToStringValue(), out _) ||
 s.StartsWith("0x") && ulong.TryParse(s.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _)))
 {
 specialTokenType = CsvToken.Number;
 return true;
 }

 specialTokenType = CsvToken.None;
 return false;
 }

 static Result<char> SkipInsignificant(TextSpan span)
 {
 var result = span.ConsumeChar();
 while (result.HasValue && result.Value != '\n' && char.IsWhiteSpace(result.Value))
 result = result.Remainder.ConsumeChar();
 return result;
 }
 }
}

64 changes: 64 additions & 0 deletions
src/SeqCli/Csv/CsvWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using Serilog.Sinks.SystemConsole.Themes;
using Superpower.Model;

namespace SeqCli.Csv
{
 static class CsvWriter
 {
 public static void WriteCsv(IEnumerable<Token<CsvToken>> csv, ConsoleTheme theme, TextWriter output, bool hasHeaderRow)
 {
 var isHeaderRow = hasHeaderRow;

 foreach (var token in csv)
 {
 switch (token.Kind)
 {
 case CsvToken.Newline:
 output.WriteLine();
 isHeaderRow = false;
 break;
 case CsvToken.Comma:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write(',');
 theme.Reset(output);
 break;
 case CsvToken.DoubleQuote:
 theme.Set(output, ConsoleThemeStyle.TertiaryText);
 output.Write('"');
 theme.Reset(output);
 break;
 case CsvToken.Boolean:
 theme.Set(output, ConsoleThemeStyle.Boolean);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Null:
 theme.Set(output, ConsoleThemeStyle.Null);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Number:
 theme.Set(output, ConsoleThemeStyle.Number);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.EscapedDoubleQuote:
 theme.Set(output, ConsoleThemeStyle.Scalar);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 case CsvToken.Text:
 theme.Set(output, isHeaderRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text);
 output.Write(token.ToStringValue());
 theme.Reset(output);
 break;
 default:
 throw new ArgumentException($"Unrecognized token `{token}`.");
 }
 }
 }
 }
}

1 change: 1 addition & 0 deletions
src/SeqCli/SeqCli.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
 <PackageReference Include="Autofac" Version="4.0.0" />
 <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-981901" />
 <PackageReference Include="Superpower" Version="1.1.0" />
 <PackageReference Include="System.Reactive" Version="3.1.1" />
 <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
 <PackageReference Include="Seq.Api" Version="4.2.2" />
Expand Down

54 changes: 54 additions & 0 deletions
test/SeqCli.Tests/Csv/CsvTokenizerTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.Linq;
using SeqCli.Csv;
using Superpower.Model;
using Xunit;

namespace SeqCli.Tests.Csv
{
 public class CsvTokenizerTests
 {
 [Fact]
 public void AnEmptyStringYieldsNoTokens()
 {
 Assert.Empty(Tokenize(""));
 }

 [Fact]
 public void TokenizesATextCell()
 {
 var tokens = Tokenize("\"abc\"");
 Assert.Equal(tokens.Count(), 3);
 Assert.Equal(tokens.Select(t => t.Kind), new[]{CsvToken.DoubleQuote, CsvToken.Text, CsvToken.DoubleQuote});
 }

 [Fact]
 public void TokenizesARow()
 {
 var tokens = Tokenize("\"abc\",\"def\"\r\n");
 Assert.Equal(tokens.Count(), 8);
 }

 [Theory]
 [InlineData(CsvToken.Text, "abc")]
 [InlineData(CsvToken.Text, "1a")]
 [InlineData(CsvToken.Text, "1\"\"")]
 [InlineData(CsvToken.Number, "1")]
 [InlineData(CsvToken.Number, "-123.45")]
 [InlineData(CsvToken.Number, "0xa123")]
 [InlineData(CsvToken.Boolean, "true")]
 [InlineData(CsvToken.Boolean, "false")]
 [InlineData(CsvToken.Null, "null")]
 public void DetectsSpecialTokenTypes(object o, string cell)
 {
 var tokenKind = (CsvToken) o;
 var content = Tokenize($"\"{cell}\"").ElementAt(1);
 Assert.Equal(tokenKind, content.Kind);
 }

 static TokenList<CsvToken> Tokenize(string csv)
 {
 return new CsvTokenizer().Tokenize(csv);
 }
 }
}

11 changes: 3 additions & 8 deletions
test/SeqCli.Tests/SeqCli.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup> 
 <TargetFramework>netcoreapp2.0</TargetFramework> 
 <PropertyGroup>
 <TargetFramework>netcoreapp2.0</TargetFramework>
 <Platforms>x64</Platforms>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
 <PackageReference Include="xunit" Version="2.2.0" />
 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
 </ItemGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />
 </ItemGroup>

 <ItemGroup>
 <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 </ItemGroup>

</Project>
</Project>