Fixes 11 - unicode input and output#14

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 12, 2018
Merged

Fixes 11 - unicode input and output #14

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
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down
1 change: 0 additions & 1 deletion seqcli.sln
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
{DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
{DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
{5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
{5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
{5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
{5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
EndGlobalSection
Expand Down
2 changes: 1 addition & 1 deletion src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
[Command("help", "Show information about available commands")]
[Command("help", "Show information about available commands", Example = "seqcli help search")]
class HelpCommand : Command
{
readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down
38 changes: 23 additions & 15 deletions src/SeqCli/Cli/Commands/QueryCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
class QueryCommand : Command
{
readonly OutputFormatFeature _output;
readonly SeqConnectionFactory _connectionFactory;
readonly ConnectionFeature _connection;
readonly DateRangeFeature _range;
readonly SignalExpressionFeature _signal;
string _query;
int? _timeoutMS;
bool _noColor;

public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
{
if (config == null) throw new ArgumentNullException(nameof(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;
_output = Enable(new OutputFormatFeature(config.Output));
_connection = Enable<ConnectionFeature>();
}

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

var connection = _connectionFactory.Connect(_connection);

// The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
// The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
// 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);
if (_noColor)
if (_output.Json)
{
Console.Write(result);
return 0;
var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
Console.WriteLine(result);
}
else
{
var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
_output.WriteCsv(result);
}

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

return 0;
}

static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
static async Task<string> QueryAsync(
SeqConnection connection,
string query,
DateTime? rangeStartUtc,
DateTime? rangeEndUtc,
SignalExpressionPart signalExpression,
int? timeoutMS,
string format = null)
{
// From dates should no longer be mandatory for QueryCsvAsync (issue raised)

var parameters = new Dictionary<string, object>
{
["q"] = query,
["format"] = "text/csv"
["q"] = query
};

if (format != null)
parameters.Add(nameof(format), format);
if (rangeStartUtc.HasValue)
parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
if (rangeEndUtc.HasValue)
Expand Down
21 changes: 19 additions & 2 deletions src/SeqCli/Cli/Features/OutputFormatFeature.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
_noColor = outputConfig.DisableColor;
}

public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
public bool Json => _json;

ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

return outputConfiguration.CreateLogger();
}

public void WriteCsv(string csv)
{
if (_noColor)
{
Console.Write(csv);
}
else
{
var tokens = new CsvTokenizer().Tokenize(csv);
CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
}
}
}
}
5 changes: 5 additions & 0 deletions src/SeqCli/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

try
{
Console.InputEncoding =
Console.OutputEncoding =
new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

TaskScheduler.UnobservedTaskException +=
(s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down
, '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
Fixes 11 - unicode input and output#14

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 12, 2018
 Merged


Fixes 11 - unicode input and output
#14
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


8 changes: 8 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down

1 change: 0 additions & 1 deletion
seqcli.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
	EndGlobalSection
Expand Down

2 changes: 1 addition & 1 deletion
src/SeqCli/Cli/Commands/HelpCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
 [Command("help", "Show information about available commands")]
 [Command("help", "Show information about available commands", Example = "seqcli help search")]
 class HelpCommand : Command
 {
 readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down

38 changes: 23 additions & 15 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
 Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
 readonly OutputFormatFeature _output;
 readonly SeqConnectionFactory _connectionFactory;
 readonly ConnectionFeature _connection;
 readonly DateRangeFeature _range;
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 if (config == null) throw new ArgumentNullException(nameof(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;
 _output = Enable(new OutputFormatFeature(config.Output));
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

 var connection = _connectionFactory.Connect(_connection);

 // The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
 // The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
 // 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);
 if (_noColor)
 if (_output.Json)
 {
 Console.Write(result);
 return 0;
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 }
 else
 {
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
 _output.WriteCsv(result);
 }

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

 return 0;
 }

 static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
 static async Task<string> QueryAsync(
 SeqConnection connection, 
 string query, 
 DateTime? rangeStartUtc,
 DateTime? rangeEndUtc,
 SignalExpressionPart signalExpression,
 int? timeoutMS,
 string format = null)
 {
 // From dates should no longer be mandatory for QueryCsvAsync (issue raised)

 var parameters = new Dictionary<string, object>
 {
 ["q"] = query,
 ["format"] = "text/csv"
 ["q"] = query
 };

 if (format != null)
 parameters.Add(nameof(format), format);
 if (rangeStartUtc.HasValue)
 parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
 if (rangeEndUtc.HasValue)
Expand Down

21 changes: 19 additions & 2 deletions
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
 public bool Json => _json;

 ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

 return outputConfiguration.CreateLogger();
 }

 public void WriteCsv(string csv)
 {
 if (_noColor)
 {
 Console.Write(csv);
 }
 else
 {
 var tokens = new CsvTokenizer().Tokenize(csv);
 CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
 }
 }
 }
}

5 changes: 5 additions & 0 deletions
src/SeqCli/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

 try
 {
 Console.InputEncoding =
 Console.OutputEncoding =
 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

 TaskScheduler.UnobservedTaskException += 
 (s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down

, '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
Fixes 11 - unicode input and output#14

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 12, 2018
 Merged


Fixes 11 - unicode input and output
#14
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


8 changes: 8 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down

1 change: 0 additions & 1 deletion
seqcli.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
	EndGlobalSection
Expand Down

2 changes: 1 addition & 1 deletion
src/SeqCli/Cli/Commands/HelpCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
 [Command("help", "Show information about available commands")]
 [Command("help", "Show information about available commands", Example = "seqcli help search")]
 class HelpCommand : Command
 {
 readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down

38 changes: 23 additions & 15 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
 Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
 readonly OutputFormatFeature _output;
 readonly SeqConnectionFactory _connectionFactory;
 readonly ConnectionFeature _connection;
 readonly DateRangeFeature _range;
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 if (config == null) throw new ArgumentNullException(nameof(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;
 _output = Enable(new OutputFormatFeature(config.Output));
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

 var connection = _connectionFactory.Connect(_connection);

 // The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
 // The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
 // 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);
 if (_noColor)
 if (_output.Json)
 {
 Console.Write(result);
 return 0;
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 }
 else
 {
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
 _output.WriteCsv(result);
 }

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

 return 0;
 }

 static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
 static async Task<string> QueryAsync(
 SeqConnection connection, 
 string query, 
 DateTime? rangeStartUtc,
 DateTime? rangeEndUtc,
 SignalExpressionPart signalExpression,
 int? timeoutMS,
 string format = null)
 {
 // From dates should no longer be mandatory for QueryCsvAsync (issue raised)

 var parameters = new Dictionary<string, object>
 {
 ["q"] = query,
 ["format"] = "text/csv"
 ["q"] = query
 };

 if (format != null)
 parameters.Add(nameof(format), format);
 if (rangeStartUtc.HasValue)
 parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
 if (rangeEndUtc.HasValue)
Expand Down

21 changes: 19 additions & 2 deletions
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
 public bool Json => _json;

 ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

 return outputConfiguration.CreateLogger();
 }

 public void WriteCsv(string csv)
 {
 if (_noColor)
 {
 Console.Write(csv);
 }
 else
 {
 var tokens = new CsvTokenizer().Tokenize(csv);
 CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
 }
 }
 }
}

5 changes: 5 additions & 0 deletions
src/SeqCli/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

 try
 {
 Console.InputEncoding =
 Console.OutputEncoding =
 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

 TaskScheduler.UnobservedTaskException += 
 (s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down

, '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
Fixes 11 - unicode input and output#14

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 12, 2018
 Merged


Fixes 11 - unicode input and output
#14
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


8 changes: 8 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down

1 change: 0 additions & 1 deletion
seqcli.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
	EndGlobalSection
Expand Down

2 changes: 1 addition & 1 deletion
src/SeqCli/Cli/Commands/HelpCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
 [Command("help", "Show information about available commands")]
 [Command("help", "Show information about available commands", Example = "seqcli help search")]
 class HelpCommand : Command
 {
 readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down

38 changes: 23 additions & 15 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
 Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
 readonly OutputFormatFeature _output;
 readonly SeqConnectionFactory _connectionFactory;
 readonly ConnectionFeature _connection;
 readonly DateRangeFeature _range;
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 if (config == null) throw new ArgumentNullException(nameof(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;
 _output = Enable(new OutputFormatFeature(config.Output));
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

 var connection = _connectionFactory.Connect(_connection);

 // The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
 // The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
 // 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);
 if (_noColor)
 if (_output.Json)
 {
 Console.Write(result);
 return 0;
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 }
 else
 {
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
 _output.WriteCsv(result);
 }

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

 return 0;
 }

 static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
 static async Task<string> QueryAsync(
 SeqConnection connection, 
 string query, 
 DateTime? rangeStartUtc,
 DateTime? rangeEndUtc,
 SignalExpressionPart signalExpression,
 int? timeoutMS,
 string format = null)
 {
 // From dates should no longer be mandatory for QueryCsvAsync (issue raised)

 var parameters = new Dictionary<string, object>
 {
 ["q"] = query,
 ["format"] = "text/csv"
 ["q"] = query
 };

 if (format != null)
 parameters.Add(nameof(format), format);
 if (rangeStartUtc.HasValue)
 parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
 if (rangeEndUtc.HasValue)
Expand Down

21 changes: 19 additions & 2 deletions
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
 public bool Json => _json;

 ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

 return outputConfiguration.CreateLogger();
 }

 public void WriteCsv(string csv)
 {
 if (_noColor)
 {
 Console.Write(csv);
 }
 else
 {
 var tokens = new CsvTokenizer().Tokenize(csv);
 CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
 }
 }
 }
}

5 changes: 5 additions & 0 deletions
src/SeqCli/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

 try
 {
 Console.InputEncoding =
 Console.OutputEncoding =
 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

 TaskScheduler.UnobservedTaskException += 
 (s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down

, '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
Fixes 11 - unicode input and output#14

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 12, 2018
 Merged


Fixes 11 - unicode input and output
#14
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


8 changes: 8 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down

1 change: 0 additions & 1 deletion
seqcli.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
	EndGlobalSection
Expand Down

2 changes: 1 addition & 1 deletion
src/SeqCli/Cli/Commands/HelpCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
 [Command("help", "Show information about available commands")]
 [Command("help", "Show information about available commands", Example = "seqcli help search")]
 class HelpCommand : Command
 {
 readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down

38 changes: 23 additions & 15 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
 Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
 readonly OutputFormatFeature _output;
 readonly SeqConnectionFactory _connectionFactory;
 readonly ConnectionFeature _connection;
 readonly DateRangeFeature _range;
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 if (config == null) throw new ArgumentNullException(nameof(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;
 _output = Enable(new OutputFormatFeature(config.Output));
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

 var connection = _connectionFactory.Connect(_connection);

 // The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
 // The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
 // 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);
 if (_noColor)
 if (_output.Json)
 {
 Console.Write(result);
 return 0;
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 }
 else
 {
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
 _output.WriteCsv(result);
 }

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

 return 0;
 }

 static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
 static async Task<string> QueryAsync(
 SeqConnection connection, 
 string query, 
 DateTime? rangeStartUtc,
 DateTime? rangeEndUtc,
 SignalExpressionPart signalExpression,
 int? timeoutMS,
 string format = null)
 {
 // From dates should no longer be mandatory for QueryCsvAsync (issue raised)

 var parameters = new Dictionary<string, object>
 {
 ["q"] = query,
 ["format"] = "text/csv"
 ["q"] = query
 };

 if (format != null)
 parameters.Add(nameof(format), format);
 if (rangeStartUtc.HasValue)
 parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
 if (rangeEndUtc.HasValue)
Expand Down

21 changes: 19 additions & 2 deletions
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
 public bool Json => _json;

 ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

 return outputConfiguration.CreateLogger();
 }

 public void WriteCsv(string csv)
 {
 if (_noColor)
 {
 Console.Write(csv);
 }
 else
 {
 var tokens = new CsvTokenizer().Tokenize(csv);
 CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
 }
 }
 }
}

5 changes: 5 additions & 0 deletions
src/SeqCli/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

 try
 {
 Console.InputEncoding =
 Console.OutputEncoding =
 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

 TaskScheduler.UnobservedTaskException += 
 (s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down

, '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
Fixes 11 - unicode input and output#14

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 12, 2018
 Merged


Fixes 11 - unicode input and output
#14
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


8 changes: 8 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down

1 change: 0 additions & 1 deletion
seqcli.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
	EndGlobalSection
Expand Down

2 changes: 1 addition & 1 deletion
src/SeqCli/Cli/Commands/HelpCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
 [Command("help", "Show information about available commands")]
 [Command("help", "Show information about available commands", Example = "seqcli help search")]
 class HelpCommand : Command
 {
 readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down

38 changes: 23 additions & 15 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
 Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
 readonly OutputFormatFeature _output;
 readonly SeqConnectionFactory _connectionFactory;
 readonly ConnectionFeature _connection;
 readonly DateRangeFeature _range;
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 if (config == null) throw new ArgumentNullException(nameof(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;
 _output = Enable(new OutputFormatFeature(config.Output));
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

 var connection = _connectionFactory.Connect(_connection);

 // The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
 // The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
 // 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);
 if (_noColor)
 if (_output.Json)
 {
 Console.Write(result);
 return 0;
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 }
 else
 {
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
 _output.WriteCsv(result);
 }

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

 return 0;
 }

 static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
 static async Task<string> QueryAsync(
 SeqConnection connection, 
 string query, 
 DateTime? rangeStartUtc,
 DateTime? rangeEndUtc,
 SignalExpressionPart signalExpression,
 int? timeoutMS,
 string format = null)
 {
 // From dates should no longer be mandatory for QueryCsvAsync (issue raised)

 var parameters = new Dictionary<string, object>
 {
 ["q"] = query,
 ["format"] = "text/csv"
 ["q"] = query
 };

 if (format != null)
 parameters.Add(nameof(format), format);
 if (rangeStartUtc.HasValue)
 parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
 if (rangeEndUtc.HasValue)
Expand Down

21 changes: 19 additions & 2 deletions
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
 public bool Json => _json;

 ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

 return outputConfiguration.CreateLogger();
 }

 public void WriteCsv(string csv)
 {
 if (_noColor)
 {
 Console.Write(csv);
 }
 else
 {
 var tokens = new CsvTokenizer().Tokenize(csv);
 CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
 }
 }
 }
}

5 changes: 5 additions & 0 deletions
src/SeqCli/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

 try
 {
 Console.InputEncoding =
 Console.OutputEncoding =
 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

 TaskScheduler.UnobservedTaskException += 
 (s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down

, '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
Fixes 11 - unicode input and output#14

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 12, 2018
 Merged


Fixes 11 - unicode input and output
#14
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


8 changes: 8 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down

1 change: 0 additions & 1 deletion
seqcli.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
	EndGlobalSection
Expand Down

2 changes: 1 addition & 1 deletion
src/SeqCli/Cli/Commands/HelpCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
 [Command("help", "Show information about available commands")]
 [Command("help", "Show information about available commands", Example = "seqcli help search")]
 class HelpCommand : Command
 {
 readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down

38 changes: 23 additions & 15 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
 Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
 readonly OutputFormatFeature _output;
 readonly SeqConnectionFactory _connectionFactory;
 readonly ConnectionFeature _connection;
 readonly DateRangeFeature _range;
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 if (config == null) throw new ArgumentNullException(nameof(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;
 _output = Enable(new OutputFormatFeature(config.Output));
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

 var connection = _connectionFactory.Connect(_connection);

 // The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
 // The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
 // 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);
 if (_noColor)
 if (_output.Json)
 {
 Console.Write(result);
 return 0;
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 }
 else
 {
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
 _output.WriteCsv(result);
 }

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

 return 0;
 }

 static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
 static async Task<string> QueryAsync(
 SeqConnection connection, 
 string query, 
 DateTime? rangeStartUtc,
 DateTime? rangeEndUtc,
 SignalExpressionPart signalExpression,
 int? timeoutMS,
 string format = null)
 {
 // From dates should no longer be mandatory for QueryCsvAsync (issue raised)

 var parameters = new Dictionary<string, object>
 {
 ["q"] = query,
 ["format"] = "text/csv"
 ["q"] = query
 };

 if (format != null)
 parameters.Add(nameof(format), format);
 if (rangeStartUtc.HasValue)
 parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
 if (rangeEndUtc.HasValue)
Expand Down

21 changes: 19 additions & 2 deletions
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
 public bool Json => _json;

 ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

 return outputConfiguration.CreateLogger();
 }

 public void WriteCsv(string csv)
 {
 if (_noColor)
 {
 Console.Write(csv);
 }
 else
 {
 var tokens = new CsvTokenizer().Tokenize(csv);
 CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
 }
 }
 }
}

5 changes: 5 additions & 0 deletions
src/SeqCli/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

 try
 {
 Console.InputEncoding =
 Console.OutputEncoding =
 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

 TaskScheduler.UnobservedTaskException += 
 (s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down

, '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
Fixes 11 - unicode input and output#14

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 12, 2018
 Merged


Fixes 11 - unicode input and output
#14
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


8 changes: 8 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,12 @@ View and set fields in the `SeqCli.json` file; run with no arguments to list all

Show information about available commands.

Example:

```
seqcli help search
```

| Option | Description |
| ------ | ----------- |
| `-m`, `--markdown` | Generate markdown for use in documentation |
Expand DownExpand Up@@ -98,6 +104,8 @@ seqcli query -q "select count(*) from stream group by @Level" --start="2018-02-2
| `--end=VALUE` | Date/time to query to |
| `--signal=VALUE` | A signal expression or list of intersected signal ids to apply, for example `signal-1,signal-2` |
| `--timeout=VALUE` | The query execution timeout in milliseconds |
| `--json` | Print events in newline-delimited JSON (the default is plain text) |
| `--no-color` | Don't colorize text output |
| `-s`, `--server=VALUE` | The URL of the Seq server; by default the `connection.serverUrl` value will be used |
| `-a`, `--apikey=VALUE` | The API key to use when connecting to the server; by default `config.apiKey` value will be used |

Expand Down

1 change: 0 additions & 1 deletion
seqcli.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ Global
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.ActiveCfg = Release|x64
 {DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|x64.Build.0 = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.ActiveCfg = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Debug|x64.Build.0 = Debug|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.ActiveCfg = Release|x64
 {5E28D963-3523-49DE-B03B-E76684258415}.Release|x64.Build.0 = Release|x64
	EndGlobalSection
Expand Down

2 changes: 1 addition & 1 deletion
src/SeqCli/Cli/Commands/HelpCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@

namespace SeqCli.Cli.Commands
{
 [Command("help", "Show information about available commands")]
 [Command("help", "Show information about available commands", Example = "seqcli help search")]
 class HelpCommand : Command
 {
 readonly List<Meta<Lazy<Command>, CommandMetadata>> _availableCommands;
Expand Down

38 changes: 23 additions & 15 deletions
src/SeqCli/Cli/Commands/QueryCommand.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@
using SeqCli.Cli.Features;
using SeqCli.Config;
using SeqCli.Connection;
using SeqCli.Csv;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -29,23 +28,23 @@ namespace SeqCli.Cli.Commands
 Example = "seqcli query -q \"select count(*) from stream group by @Level\" --start=\"2018-02-28T13:00Z\"")]
 class QueryCommand : Command
 {
 readonly OutputFormatFeature _output;
 readonly SeqConnectionFactory _connectionFactory;
 readonly ConnectionFeature _connection;
 readonly DateRangeFeature _range;
 readonly SignalExpressionFeature _signal;
 string _query;
 int? _timeoutMS;
 bool _noColor;

 public QueryCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
 {
 if (config == null) throw new ArgumentNullException(nameof(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;
 _output = Enable(new OutputFormatFeature(config.Output));
 _connection = Enable<ConnectionFeature>();
 }

Expand All@@ -59,32 +58,41 @@ protected override async Task<int> Run()

 var connection = _connectionFactory.Connect(_connection);

 // The `rangeStartUtc` parameter of `QueryCsvAsync()` should now be optional; we can
 // The `rangeStartUtc` parameter of `Query[Csv]Async()` should now be optional; we can
 // 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);
 if (_noColor)
 if (_output.Json)
 {
 Console.Write(result);
 return 0;
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS);
 Console.WriteLine(result);
 }
 else
 {
 var result = await QueryAsync(connection, _query, _range.Start, _range.End, _signal.Signal, _timeoutMS, "text/csv");
 _output.WriteCsv(result);
 }

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

 return 0;
 }

 static async Task<string> QueryCsvAsync(SeqConnection connection, string query, DateTime? rangeStartUtc, DateTime? rangeEndUtc, SignalExpressionPart signalExpression, int? timeoutMS)
 static async Task<string> QueryAsync(
 SeqConnection connection, 
 string query, 
 DateTime? rangeStartUtc,
 DateTime? rangeEndUtc,
 SignalExpressionPart signalExpression,
 int? timeoutMS,
 string format = null)
 {
 // From dates should no longer be mandatory for QueryCsvAsync (issue raised)

 var parameters = new Dictionary<string, object>
 {
 ["q"] = query,
 ["format"] = "text/csv"
 ["q"] = query
 };

 if (format != null)
 parameters.Add(nameof(format), format);
 if (rangeStartUtc.HasValue)
 parameters.Add(nameof(rangeEndUtc), rangeStartUtc.Value);
 if (rangeEndUtc.HasValue)
Expand Down

21 changes: 19 additions & 2 deletions
src/SeqCli/Cli/Features/OutputFormatFeature.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using SeqCli.Config;
using SeqCli.Csv;
using SeqCli.Output;
using Serilog;
using Serilog.Core;
Expand All@@ -31,7 +33,9 @@ public OutputFormatFeature(SeqCliOutputConfig outputConfig)
 _noColor = outputConfig.DisableColor;
 }

 public static ConsoleTheme ConsoleTheme => SystemConsoleTheme.Literate;
 public bool Json => _json;

 ConsoleTheme Theme => _noColor ? ConsoleTheme.None : SystemConsoleTheme.Literate;

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

 return outputConfiguration.CreateLogger();
 }

 public void WriteCsv(string csv)
 {
 if (_noColor)
 {
 Console.Write(csv);
 }
 else
 {
 var tokens = new CsvTokenizer().Tokenize(csv);
 CsvWriter.WriteCsv(tokens, Theme, Console.Out, true);
 }
 }
 }
}

5 changes: 5 additions & 0 deletions
src/SeqCli/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Text;
using System.Threading.Tasks;
using Autofac;
using SeqCli.Cli;
Expand All@@ -34,6 +35,10 @@ static async Task<int> Main(string[] args)

 try
 {
 Console.InputEncoding =
 Console.OutputEncoding =
 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);

 TaskScheduler.UnobservedTaskException += 
 (s,e) => Log.Error(e.Exception, "Unobserved task exception: {UnobservedExceptionMessage}");

Expand Down