mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-22 10:55:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update NuGet packages

Browse source
This commit is contained in:
Tyrrrz 2021-09-10 01:03:02 +03:00
parent 471d0d01cf
commit 44f64a2cb3
3 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
View file

@ -8,7 +8,7 @@
<PackageReference Include="JsonExtensions" Version="1.1.0" /> <PackageReference Include="JsonExtensions" Version="1.1.0" />
<PackageReference Include="MiniRazor.CodeGen" Version="2.1.4" /> <PackageReference Include="MiniRazor.CodeGen" Version="2.1.4" />
<PackageReference Include="Polly" Version="7.2.2" /> <PackageReference Include="Polly" Version="7.2.2" />
<PackageReference Include="Superpower" Version="2.3.0" /> <PackageReference Include="Superpower" Version="3.0.0" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" /> <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
</ItemGroup> </ItemGroup>

25
DiscordChatExporter.Core/Exporting/Filtering/Parsing/FilterGrammar.cs
View file

@ -1,5 +1,4 @@
using System.Linq; using DiscordChatExporter.Core.Utils.Extensions;
using DiscordChatExporter.Core.Utils.Extensions;
using Superpower; using Superpower;
using Superpower.Parsers; using Superpower.Parsers;
@ -7,16 +6,12 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
{ {
internal static class FilterGrammar internal static class FilterGrammar
{ {
// Choice(a, b) looks cleaner than a.Or(b)
private static TextParser<T> Choice<T>(params TextParser<T>[] parsers) =>
parsers.Aggregate((current, next) => current.Or(next));
private static readonly TextParser<char> EscapedCharacter = private static readonly TextParser<char> EscapedCharacter =
Character.EqualTo('\\').IgnoreThen(Character.AnyChar); Character.EqualTo('\\').IgnoreThen(Character.AnyChar);
private static readonly TextParser<string> QuotedString = private static readonly TextParser<string> QuotedString =
from open in Character.In('"', '\'') from open in Character.In('"', '\'')
from value in Choice(EscapedCharacter, Character.Except(open)).Many().Text() from value in Parse.OneOf(EscapedCharacter, Character.Except(open)).Many().Text()
from close in Character.EqualTo(open) from close in Character.EqualTo(open)
select value; select value;
@ -29,10 +24,10 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
); );
private static readonly TextParser<string> UnquotedString = private static readonly TextParser<string> UnquotedString =
Choice(EscapedCharacter, FreeCharacter).AtLeastOnce().Text(); Parse.OneOf(EscapedCharacter, FreeCharacter).AtLeastOnce().Text();
private static readonly TextParser<string> String = private static readonly TextParser<string> String =
Choice(QuotedString, UnquotedString).Named("text string"); Parse.OneOf(QuotedString, UnquotedString).Named("text string");
private static readonly TextParser<MessageFilter> ContainsFilter = private static readonly TextParser<MessageFilter> ContainsFilter =
String.Select(v => (MessageFilter) new ContainsMessageFilter(v)); String.Select(v => (MessageFilter) new ContainsMessageFilter(v));
@ -51,7 +46,7 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
private static readonly TextParser<MessageFilter> HasFilter = Span private static readonly TextParser<MessageFilter> HasFilter = Span
.EqualToIgnoreCase("has:") .EqualToIgnoreCase("has:")
.IgnoreThen(Choice( .IgnoreThen(Parse.OneOf(
Span.EqualToIgnoreCase("link").IgnoreThen(Parse.Return(MessageContentMatchKind.Link)), Span.EqualToIgnoreCase("link").IgnoreThen(Parse.Return(MessageContentMatchKind.Link)),
Span.EqualToIgnoreCase("embed").IgnoreThen(Parse.Return(MessageContentMatchKind.Embed)), Span.EqualToIgnoreCase("embed").IgnoreThen(Parse.Return(MessageContentMatchKind.Embed)),
Span.EqualToIgnoreCase("file").IgnoreThen(Parse.Return(MessageContentMatchKind.File)), Span.EqualToIgnoreCase("file").IgnoreThen(Parse.Return(MessageContentMatchKind.File)),
@ -64,16 +59,16 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
private static readonly TextParser<MessageFilter> NegatedFilter = Character private static readonly TextParser<MessageFilter> NegatedFilter = Character
.EqualTo('-') .EqualTo('-')
.IgnoreThen(Parse.Ref(() => StandaloneFilter)) .IgnoreThen(Parse.Ref(() => StandaloneFilter!))
.Select(f => (MessageFilter) new NegatedMessageFilter(f)); .Select(f => (MessageFilter) new NegatedMessageFilter(f));
private static readonly TextParser<MessageFilter> GroupedFilter = private static readonly TextParser<MessageFilter> GroupedFilter =
from open in Character.EqualTo('(') from open in Character.EqualTo('(')
from content in Parse.Ref(() => BinaryExpressionFilter).Token() from content in Parse.Ref(() => BinaryExpressionFilter!).Token()
from close in Character.EqualTo(')') from close in Character.EqualTo(')')
select content; select content;
private static readonly TextParser<MessageFilter> StandaloneFilter = Choice( private static readonly TextParser<MessageFilter> StandaloneFilter = Parse.OneOf(
GroupedFilter, GroupedFilter,
FromFilter, FromFilter,
MentionsFilter, MentionsFilter,
@ -81,13 +76,13 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
ContainsFilter ContainsFilter
); );
private static readonly TextParser<MessageFilter> UnaryExpressionFilter = Choice( private static readonly TextParser<MessageFilter> UnaryExpressionFilter = Parse.OneOf(
NegatedFilter, NegatedFilter,
StandaloneFilter StandaloneFilter
); );
private static readonly TextParser<MessageFilter> BinaryExpressionFilter = Parse.Chain( private static readonly TextParser<MessageFilter> BinaryExpressionFilter = Parse.Chain(
Choice( Parse.OneOf(
// Explicit operator // Explicit operator
Character.In('|', '&').Token().Try(), Character.In('|', '&').Token().Try(),
// Implicit operator (resolves to 'and') // Implicit operator (resolves to 'and')

2
DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
View file

@ -20,7 +20,7 @@
<PackageReference Include="MaterialDesignColors" Version="2.0.1" /> <PackageReference Include="MaterialDesignColors" Version="2.0.1" />
<PackageReference Include="MaterialDesignThemes" Version="4.0.0" /> <PackageReference Include="MaterialDesignThemes" Version="4.0.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
<PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" /> <PackageReference Include="Ookii.Dialogs.Wpf" Version="4.0.0" />
<PackageReference Include="Onova" Version="2.6.2" /> <PackageReference Include="Onova" Version="2.6.2" />
<PackageReference Include="Stylet" Version="1.3.6" /> <PackageReference Include="Stylet" Version="1.3.6" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" /> <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />