Refactor

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -12,6 +12,7 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Exporting.Partitioning;
 using DiscordChatExporter.Core.Utils.Extensions;
 using Tyrrrz.Extensions;
 
@@ -31,9 +32,8 @@ namespace DiscordChatExporter.Cli.Commands.Base
         [CommandOption("before", Description = "Only include messages sent before this date or message ID.")]
         public Snowflake? Before { get; init; }
 
-        [CommandOption("partition", 'p', Converter = typeof(PartitionConverter),
+        [CommandOption("partition", 'p', Description = "Split output into partitions, each limited to this number of message (e.g. 100) or file size (e.g. 10mb).")]
-            Description = "Split output into partitions limited to this number of messages or a maximum file size (e.g. \"25mb\").")]
+        public PartitionLimit PartitionLimit { get; init; } = NullPartitionLimit.Instance;
-        public IPartitioner Partitoner { get; init; } = new NullPartitioner();
 
         [CommandOption("parallel", Description = "Limits how many channels can be exported in parallel.")]
         public int ParallelLimit { get; init; } = 1;
@@ -75,7 +75,7 @@ namespace DiscordChatExporter.Cli.Commands.Base
                                 ExportFormat,
                                 After,
                                 Before,
-                                Partitoner,
+                                PartitionLimit,
                                 ShouldDownloadMedia,
                                 ShouldReuseMedia,
                                 DateFormat

DiscordChatExporter.Cli/Commands/Base/PartitionConverter.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ByteSizeLib;
-using CliFx.Extensibility;
-using DiscordChatExporter.Core;
-using DiscordChatExporter.Core.Exporting;
-
-namespace DiscordChatExporter.Cli.Commands.Base
-{
-    public class PartitionConverter : BindingConverter<IPartitioner>
-    {
-        public override IPartitioner Convert(string? rawValue)
-        {
-            if (rawValue == null) return new NullPartitioner();
-
-            if (ByteSize.TryParse(rawValue, out ByteSize filesize))
-            {
-                return new FileSizePartitioner((long)filesize.Bytes);
-            }
-            else
-            {
-                int messageLimit = int.Parse(rawValue);
-                return new MessageCountPartitioner(messageLimit);
-            }
-        }
-    }
-}

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -12,7 +12,7 @@ namespace DiscordChatExporter.Cli.Commands
     [Command("export", Description = "Export one or multiple channels.")]
     public class ExportChannelsCommand : ExportCommandBase
     {
-        // TODO: change this to plural with a breaking change
+        // TODO: change this to plural (breaking change)
         [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID(s).")]
         public IReadOnlyList<Snowflake> ChannelIds { get; init; } = Array.Empty<Snowflake>();
 

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -9,7 +9,6 @@
     <PackageReference Include="CliFx" Version="2.0.1" />
     <PackageReference Include="Spectre.Console" Version="0.38.0" />
     <PackageReference Include="Gress" Version="1.2.0" />
-    <PackageReference Include="OneOf" Version="3.0.174" />
     <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
   </ItemGroup>
 

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -5,7 +5,6 @@ using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using FileSize = DiscordChatExporter.Core.Discord.Data.Common.FileSize;
 
 namespace DiscordChatExporter.Core.Discord.Data
 {

DiscordChatExporter.Core/Discord/Data/Common/FileSize.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Globalization;
+using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Discord.Data.Common
 {
@@ -61,5 +63,37 @@ namespace DiscordChatExporter.Core.Discord.Data.Common
     public partial struct FileSize
     {
         public static FileSize FromBytes(long bytes) => new(bytes);
+
+        public static FileSize? TryParse(string value)
+        {
+            var match = Regex.Match(value, @"^(\d+[\.,]?\d*)\s*(\w)?b$", RegexOptions.IgnoreCase);
+
+            // Number part
+            if (!double.TryParse(
+                match.Groups[1].Value,
+                NumberStyles.Float,
+                CultureInfo.InvariantCulture,
+                out var number))
+            {
+                return null;
+            }
+
+            // Magnitude part
+            var magnitude = match.Groups[2].Value.ToUpperInvariant() switch
+            {
+                "G" => 1_000_000_000,
+                "M" => 1_000_000,
+                "K" => 1_000,
+                "" => 1,
+                _ => -1
+            };
+
+            if (magnitude < 0)
+            {
+                return null;
+            }
+
+            return FromBytes((long) (number * magnitude));
+        }
     }
 }

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -48,7 +48,7 @@ namespace DiscordChatExporter.Core.Discord
         }
 
         public static Snowflake Parse(string str, IFormatProvider? formatProvider) =>
-            TryParse(str, formatProvider) ?? throw new FormatException($"Invalid snowflake: {str}.");
+            TryParse(str, formatProvider) ?? throw new FormatException($"Invalid snowflake '{str}'.");
 
         public static Snowflake Parse(string str) => Parse(str, null);
     }

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ByteSize" Version="2.0.0" />
     <PackageReference Include="JsonExtensions" Version="1.0.1" />
     <PackageReference Include="MiniRazor.CodeGen" Version="2.1.2" />
     <PackageReference Include="Polly" Version="7.2.1" />

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -4,6 +4,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Partitioning;
 using DiscordChatExporter.Core.Utils;
 
 namespace DiscordChatExporter.Core.Exporting
@@ -28,7 +29,7 @@ namespace DiscordChatExporter.Core.Exporting
 
         public Snowflake? Before { get; }
 
-        public IPartitioner Partitoner { get; }
+        public PartitionLimit PartitionLimit { get; }
 
         public bool ShouldDownloadMedia { get; }
 
@@ -43,7 +44,7 @@ namespace DiscordChatExporter.Core.Exporting
             ExportFormat format,
             Snowflake? after,
             Snowflake? before,
-            IPartitioner partitioner,
+            PartitionLimit partitionLimit,
             bool shouldDownloadMedia,
             bool shouldReuseMedia,
             string dateFormat)
@@ -54,7 +55,7 @@ namespace DiscordChatExporter.Core.Exporting
             Format = format;
             After = after;
             Before = before;
-            Partitoner = partitioner;
+            PartitionLimit = partitionLimit;
             ShouldDownloadMedia = shouldDownloadMedia;
             ShouldReuseMedia = shouldReuseMedia;
             DateFormat = dateFormat;

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -1,21 +1,15 @@
 using System;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using ByteSizeLib;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Exporting;
-using DiscordChatExporter.Core.Exporting.Partitioners;
 using DiscordChatExporter.Core.Exporting.Writers;
 
 namespace DiscordChatExporter.Core.Exporting
 {
     internal partial class MessageExporter : IAsyncDisposable
     {
-
         private readonly ExportContext _context;
 
-        private long _messageCount;
         private int _partitionIndex;
         private MessageWriter? _writer;
 
@@ -24,17 +18,6 @@ namespace DiscordChatExporter.Core.Exporting
             _context = context;
         }
 
-        private bool IsPartitionLimitReached()
-        {
-            if (_writer is null)
-            {
-                return false;
-            }
-
-            return _context.Request.Partitoner.IsLimitReached(
-                new ExportPartitioningContext(_messageCount, _writer.SizeInBytes));
-        }
-
         private async ValueTask ResetWriterAsync()
         {
             if (_writer is not null)
@@ -48,7 +31,8 @@ namespace DiscordChatExporter.Core.Exporting
         private async ValueTask<MessageWriter> GetWriterAsync()
         {
             // Ensure partition limit has not been exceeded
-            if (_writer != null && IsPartitionLimitReached())
+            if (_writer is not null &&
+                _context.Request.PartitionLimit.IsReached(_writer.MessagesWritten, _writer.BytesWritten))
             {
                 await ResetWriterAsync();
                 _partitionIndex++;
@@ -74,7 +58,6 @@ namespace DiscordChatExporter.Core.Exporting
         {
             var writer = await GetWriterAsync();
             await writer.WriteMessageAsync(message);
-            _messageCount++;
         }
 
         public async ValueTask DisposeAsync() => await ResetWriterAsync();
@@ -82,9 +65,7 @@ namespace DiscordChatExporter.Core.Exporting
 
     internal partial class MessageExporter
     {
-        private static string GetPartitionFilePath(
+        private static string GetPartitionFilePath(string baseFilePath, int partitionIndex)
-            string baseFilePath,
-            int partitionIndex)
         {
             // First partition - don't change file name
             if (partitionIndex <= 0)

DiscordChatExporter.Core/Exporting/Partitioners/ExportPartitioningContext.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DiscordChatExporter.Core.Exporting.Partitioners
-{
-    public class ExportPartitioningContext
-    {
-        public long MessageCount { get; } 
-        public long SizeInBytes { get; }
-
-        public ExportPartitioningContext(long messageCount, long sizeInBytes)
-        {
-            MessageCount = messageCount;
-            SizeInBytes = sizeInBytes;
-        }
-    }
-}

DiscordChatExporter.Core/Exporting/Partitioners/FileSizePartitioner.cs

@@ -1,21 +0,0 @@
-using DiscordChatExporter.Core.Exporting.Partitioners;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DiscordChatExporter.Core.Exporting
-{
-    public class FileSizePartitioner : IPartitioner
-    {
-        private long _bytesPerFile;
-
-        public FileSizePartitioner(long bytesPerFile)
-        {
-            _bytesPerFile = bytesPerFile;
-        }
-        public bool IsLimitReached(ExportPartitioningContext context)
-        {
-            return context.SizeInBytes >= _bytesPerFile;
-        }
-    }
-}

DiscordChatExporter.Core/Exporting/Partitioners/IPartitioner.cs

@@ -1,12 +0,0 @@
-using DiscordChatExporter.Core.Exporting.Partitioners;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DiscordChatExporter.Core.Exporting
-{
-    public interface IPartitioner
-    {
-        bool IsLimitReached(ExportPartitioningContext context);
-    }
-}

DiscordChatExporter.Core/Exporting/Partitioners/MessageCountPartitioner.cs

@@ -1,25 +0,0 @@
-using DiscordChatExporter.Core.Exporting.Partitioners;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DiscordChatExporter.Core.Exporting
-{
-    public class MessageCountPartitioner : IPartitioner
-    {
-
-        private int _messagesPerPartition;
-
-        public MessageCountPartitioner(int messagesPerPartition)
-        {
-            _messagesPerPartition = messagesPerPartition;
-        }
-
-        public bool IsLimitReached(ExportPartitioningContext context)
-        {
-            return context.MessageCount > 0 &&
-            _messagesPerPartition != 0 &&
-            context.MessageCount % _messagesPerPartition == 0;
-        }
-    }
-}

DiscordChatExporter.Core/Exporting/Partitioners/NullPartitioner.cs

@@ -1,16 +0,0 @@
-using DiscordChatExporter.Core.Exporting;
-using DiscordChatExporter.Core.Exporting.Partitioners;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DiscordChatExporter.Core.Exporting
-{
-    public class NullPartitioner : IPartitioner
-    {
-        public bool IsLimitReached(ExportPartitioningContext context)
-        {
-            return false;
-        }
-    }
-}

DiscordChatExporter.Core/Exporting/Partitioning/FileSizePartitionLimit.cs

@@ -0,0 +1,12 @@
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    public class FileSizePartitionLimit : PartitionLimit
+    {
+        private readonly long _limit;
+
+        public FileSizePartitionLimit(long limit) => _limit = limit;
+
+        public override bool IsReached(long messagesWritten, long bytesWritten) =>
+            bytesWritten >= _limit;
+    }
+}

DiscordChatExporter.Core/Exporting/Partitioning/MessageCountPartitionLimit.cs

@@ -0,0 +1,12 @@
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    public class MessageCountPartitionLimit : PartitionLimit
+    {
+        private readonly long _limit;
+
+        public MessageCountPartitionLimit(long limit) => _limit = limit;
+
+        public override bool IsReached(long messagesWritten, long bytesWritten) =>
+            messagesWritten >= _limit;
+    }
+}

DiscordChatExporter.Core/Exporting/Partitioning/NullPartitionLimit.cs

@@ -0,0 +1,9 @@
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    public class NullPartitionLimit : PartitionLimit
+    {
+        public static NullPartitionLimit Instance { get; } = new();
+
+        public override bool IsReached(long messagesWritten, long bytesWritten) => false;
+    }
+}

DiscordChatExporter.Core/Exporting/Partitioning/PartitionLimit.cs

@@ -0,0 +1,22 @@
+using DiscordChatExporter.Core.Discord.Data.Common;
+
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    public abstract partial class PartitionLimit
+    {
+        public abstract bool IsReached(long messagesWritten, long bytesWritten);
+    }
+
+    public partial class PartitionLimit
+    {
+        public static PartitionLimit Parse(string value)
+        {
+            var fileSize = FileSize.TryParse(value);
+            if (fileSize is not null)
+                return new FileSizePartitionLimit(fileSize.Value.TotalBytes);
+
+            var messageCount = int.Parse(value);
+            return new MessageCountPartitionLimit(messageCount);
+        }
+    }
+}

DiscordChatExporter.Core/Exporting/Writers/CsvMessageWriter.cs

@@ -58,6 +58,8 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
         public override async ValueTask WriteMessageAsync(Message message)
         {
+            await base.WriteMessageAsync(message);
+
             // Author ID
             await _writer.WriteAsync(CsvEncode(message.Author.Id.ToString()));
             await _writer.WriteAsync(',');

DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplate.cshtml

@@ -1,10 +1,10 @@
 @namespace DiscordChatExporter.Core.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<DiscordChatExporter.Core.Exporting.Writers.Html.LayoutTemplateContext>
+@inherits MiniRazor.TemplateBase<DiscordChatExporter.Core.Exporting.Writers.Html.PostambleTemplateContext>
 
 </div>
 
 <div class="postamble">
-    <div class="postamble__entry">Exported @Model.MessageCount.ToString("N0") message(s)</div>
+    <div class="postamble__entry">Exported @Model.MessagesWritten.ToString("N0") message(s)</div>
 </div>
 
 </body>

DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplateContext.cs

@@ -0,0 +1,15 @@
+namespace DiscordChatExporter.Core.Exporting.Writers.Html
+{
+    internal class PostambleTemplateContext
+    {
+        public ExportContext ExportContext { get; }
+
+        public long MessagesWritten { get; }
+
+        public PostambleTemplateContext(ExportContext exportContext, long messagesWritten)
+        {
+            ExportContext = exportContext;
+            MessagesWritten = messagesWritten;
+        }
+    }
+}

DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml

@@ -2,7 +2,7 @@
 @using System.Threading.Tasks
 @using Tyrrrz.Extensions
 @namespace DiscordChatExporter.Core.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<DiscordChatExporter.Core.Exporting.Writers.Html.LayoutTemplateContext>
+@inherits MiniRazor.TemplateBase<DiscordChatExporter.Core.Exporting.Writers.Html.PreambleTemplateContext>
 
 @{
     string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);

DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplateContext.cs

@@ -1,18 +1,15 @@
 namespace DiscordChatExporter.Core.Exporting.Writers.Html
 {
-    internal class LayoutTemplateContext
+    internal class PreambleTemplateContext
     {
         public ExportContext ExportContext { get; }
 
         public string ThemeName { get; }
 
-        public long MessageCount { get; }
+        public PreambleTemplateContext(ExportContext exportContext, string themeName)
-
-        public LayoutTemplateContext(ExportContext exportContext, string themeName, long messageCount)
         {
             ExportContext = exportContext;
             ThemeName = themeName;
-            MessageCount = messageCount;
         }
     }
 }

DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs

@@ -14,8 +14,6 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
         private readonly List<Message> _messageGroupBuffer = new();
 
-        private long _messageCount;
-
         public HtmlMessageWriter(Stream stream, ExportContext context, string themeName)
             : base(stream, context)
         {
@@ -25,7 +23,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
         public override async ValueTask WritePreambleAsync()
         {
-            var templateContext = new LayoutTemplateContext(Context, _themeName, _messageCount);
+            var templateContext = new PreambleTemplateContext(Context, _themeName);
 
             await _writer.WriteLineAsync(
                 await PreambleTemplate.RenderAsync(templateContext)
@@ -43,6 +41,8 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
         public override async ValueTask WriteMessageAsync(Message message)
         {
+            await base.WriteMessageAsync(message);
+
             // If message group is empty or the given message can be grouped, buffer the given message
             if (!_messageGroupBuffer.Any() || MessageGroup.CanJoin(_messageGroupBuffer.Last(), message))
             {
@@ -56,9 +56,6 @@ namespace DiscordChatExporter.Core.Exporting.Writers
                 _messageGroupBuffer.Clear();
                 _messageGroupBuffer.Add(message);
             }
-
-            // Increment message count
-            _messageCount++;
         }
 
         public override async ValueTask WritePostambleAsync()
@@ -67,7 +64,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             if (_messageGroupBuffer.Any())
                 await WriteMessageGroupAsync(MessageGroup.Join(_messageGroupBuffer));
 
-            var templateContext = new LayoutTemplateContext(Context, _themeName, _messageCount);
+            var templateContext = new PostambleTemplateContext(Context, MessagesWritten);
 
             await _writer.WriteLineAsync(
                 await PostambleTemplate.RenderAsync(templateContext)

DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs

@@ -13,8 +13,6 @@ namespace DiscordChatExporter.Core.Exporting.Writers
     {
         private readonly Utf8JsonWriter _writer;
 
-        private long _messageCount;
-
         public JsonMessageWriter(Stream stream, ExportContext context)
             : base(stream, context)
         {
@@ -211,6 +209,8 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
         public override async ValueTask WriteMessageAsync(Message message)
         {
+            await base.WriteMessageAsync(message);
+
             _writer.WriteStartObject();
 
             // Metadata
@@ -279,8 +279,6 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
             _writer.WriteEndObject();
             await _writer.FlushAsync();
-
-            _messageCount++;
         }
 
         public override async ValueTask WritePostambleAsync()
@@ -288,7 +286,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             // Message array (end)
             _writer.WriteEndArray();
 
-            _writer.WriteNumber("messageCount", _messageCount);
+            _writer.WriteNumber("messageCount", MessagesWritten);
 
             // Root object (end)
             _writer.WriteEndObject();

DiscordChatExporter.Core/Exporting/Writers/MessageWriter.cs

@@ -11,17 +11,23 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
         protected ExportContext Context { get; }
 
+        public long MessagesWritten { get; private set; }
+
+        public long BytesWritten => Stream.Length;
+
         protected MessageWriter(Stream stream, ExportContext context)
         {
             Stream = stream;
             Context = context;
         }
 
-        public long SizeInBytes => Stream.Length;
-
         public virtual ValueTask WritePreambleAsync() => default;
 
-        public abstract ValueTask WriteMessageAsync(Message message);
+        public virtual ValueTask WriteMessageAsync(Message message)
+        {
+            MessagesWritten++;
+            return default;
+        }
 
         public virtual ValueTask WritePostambleAsync() => default;
 

DiscordChatExporter.Core/Exporting/Writers/PlainTextMessageWriter.cs

@@ -12,8 +12,6 @@ namespace DiscordChatExporter.Core.Exporting.Writers
     {
         private readonly TextWriter _writer;
 
-        private long _messageCount;
-
         public PlainTextMessageWriter(Stream stream, ExportContext context)
             : base(stream, context)
         {
@@ -130,26 +128,29 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
         public override async ValueTask WriteMessageAsync(Message message)
         {
+            await base.WriteMessageAsync(message);
+
+            // Header
             await WriteMessageHeaderAsync(message);
 
+            // Content
             if (!string.IsNullOrWhiteSpace(message.Content))
                 await _writer.WriteLineAsync(FormatMarkdown(message.Content));
 
             await _writer.WriteLineAsync();
 
+            // Attachments, embeds, reactions
             await WriteAttachmentsAsync(message.Attachments);
             await WriteEmbedsAsync(message.Embeds);
             await WriteReactionsAsync(message.Reactions);
 
             await _writer.WriteLineAsync();
-
-            _messageCount++;
         }
 
         public override async ValueTask WritePostambleAsync()
         {
             await _writer.WriteLineAsync('='.Repeat(62));
-            await _writer.WriteLineAsync($"Exported {_messageCount:N0} message(s)");
+            await _writer.WriteLineAsync($"Exported {MessagesWritten:N0} message(s)");
             await _writer.WriteLineAsync('='.Repeat(62));
         }
 

DiscordChatExporter.Gui/Converters/ExportFormatToStringConverter.cs

@@ -15,7 +15,7 @@ namespace DiscordChatExporter.Gui.Converters
             if (value is ExportFormat exportFormatValue)
                 return exportFormatValue.GetDisplayName();
 
-            return default(string);
+            return default(string?);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>

DiscordChatExporter.Gui/Converters/PartitionFormatToStringConverter.cs

@@ -1,27 +0,0 @@
-using DiscordChatExporter.Core.Exporting;
-using DiscordChatExporter.Gui.Internal;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Data;
-
-namespace DiscordChatExporter.Gui.Converters
-{
-    [ValueConversion(typeof(ExportFormat), typeof(string))]
-    public class PartitionFormatToStringConverter : IValueConverter
-    {
-        public static PartitionFormatToStringConverter Instance { get; } = new();
-
-        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is PartitionFormat partitionFormatValue)
-                return partitionFormatValue.GetDisplayName();
-
-            return default(string);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
-            throw new NotSupportedException();
-    }
-}

DiscordChatExporter.Gui/Converters/PartitionFormatToTextBoxHintConverter.cs

@@ -1,33 +0,0 @@
-using DiscordChatExporter.Gui.Internal;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Data;
-
-namespace DiscordChatExporter.Gui.Converters
-{
-    [ValueConversion(typeof(DateTimeOffset?), typeof(DateTime?))]
-    public class PartitionFormatToTextBoxHintConverter : IValueConverter
-    {
-        public static PartitionFormatToTextBoxHintConverter Instance { get; } = new();
-
-        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is PartitionFormat partitionFormat)
-                return partitionFormat switch
-                {
-                    PartitionFormat.FileSize => "MB per partition",
-                    PartitionFormat.MessageCount => "Messages per partition",
-                    _ => default(string)
-                };
-
-            return default(DateTime?);
-        }
-
-        public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}

DiscordChatExporter.Gui/Converters/PartitionFormatToTooltipConverter.cs

@@ -1,33 +0,0 @@
-using DiscordChatExporter.Gui.Internal;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Data;
-
-namespace DiscordChatExporter.Gui.Converters
-{
-    [ValueConversion(typeof(DateTimeOffset?), typeof(DateTime?))]
-    public class PartitionFormatToTooltipConverter : IValueConverter
-    {
-        public static PartitionFormatToTextBoxHintConverter Instance { get; } = new();
-
-        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is PartitionFormat partitionFormat)
-                return partitionFormat switch
-                {
-                    PartitionFormat.FileSize => "Split output into partitions close to this file size",
-                    PartitionFormat.MessageCount => "Split output into partitions limited to this number of messages",
-                    _ => default(string)
-                };
-
-            return default(DateTime?);
-        }
-
-        public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}

DiscordChatExporter.Gui/Services/SettingsService.cs

@@ -1,6 +1,6 @@
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Exporting;
-using DiscordChatExporter.Gui.Internal;
+using DiscordChatExporter.Core.Exporting.Partitioning;
 using Tyrrrz.Settings;
 
 namespace DiscordChatExporter.Gui.Services
@@ -23,9 +23,7 @@ namespace DiscordChatExporter.Gui.Services
 
         public ExportFormat LastExportFormat { get; set; } = ExportFormat.HtmlDark;
 
-        public PartitionFormat LastPartitionFormat { get; set; } = PartitionFormat.MessageCount;
+        public string? LastPartitionLimitValue { get; set; }
-
-        public int? LastPartitionLimit { get; set; }
 
         public bool LastShouldDownloadMedia { get; set; }
 

DiscordChatExporter.Gui/Utils/PartitionFormat.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DiscordChatExporter.Gui.Internal
-{
-    public enum PartitionFormat
-    {
-        MessageCount,
-        FileSize,
-    }
-
-    public static class PartitionFormatExtensions
-    {
-        public static string GetDisplayName(this PartitionFormat format) => format switch
-        {
-            PartitionFormat.MessageCount => "Message count",
-            PartitionFormat.FileSize => "File size (MB)",
-            _ => throw new ArgumentOutOfRangeException(nameof(format))
-        };
-    }
-}

DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DiscordChatExporter.Gui.Internal;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting;
@@ -47,12 +46,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
 
         public DateTimeOffset? Before => BeforeDate?.Add(BeforeTime ?? TimeSpan.Zero);
 
-        public IReadOnlyList<PartitionFormat> AvailablePartitionFormats =>
+        public string? PartitionLimitValue { get; set; }
-            Enum.GetValues(typeof(PartitionFormat)).Cast<PartitionFormat>().ToArray();
-
-        public PartitionFormat SelectedPartitionFormat { get; set; }
-
-        public int? PartitionLimit { get; set; }
 
         public bool ShouldDownloadMedia { get; set; }
 
@@ -61,7 +55,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
         public bool IsAdvancedSectionDisplayedByDefault =>
             After != default ||
             Before != default ||
-            PartitionLimit != default ||
+            !string.IsNullOrWhiteSpace(PartitionLimitValue) ||
             ShouldDownloadMedia != default;
 
         public ExportSetupViewModel(DialogManager dialogManager, SettingsService settingsService)
@@ -71,18 +65,15 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
 
             // Persist preferences
             SelectedFormat = _settingsService.LastExportFormat;
-            PartitionLimit = _settingsService.LastPartitionLimit;
+            PartitionLimitValue = _settingsService.LastPartitionLimitValue;
             ShouldDownloadMedia = _settingsService.LastShouldDownloadMedia;
-            SelectedPartitionFormat = _settingsService.LastPartitionFormat;
-
         }
 
         public void Confirm()
         {
             // Persist preferences
             _settingsService.LastExportFormat = SelectedFormat;
-            _settingsService.LastPartitionLimit = PartitionLimit;
+            _settingsService.LastPartitionLimitValue = PartitionLimitValue;
-            _settingsService.LastPartitionFormat = SelectedPartitionFormat;
             _settingsService.LastShouldDownloadMedia = ShouldDownloadMedia;
 
             // If single channel - prompt file path

DiscordChatExporter.Gui/ViewModels/RootViewModel.cs

@@ -7,8 +7,8 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Exporting.Partitioning;
 using DiscordChatExporter.Core.Utils.Extensions;
-using DiscordChatExporter.Gui.Internal;
 using DiscordChatExporter.Gui.Services;
 using DiscordChatExporter.Gui.Utils;
 using DiscordChatExporter.Gui.ViewModels.Dialogs;
@@ -65,18 +65,16 @@ namespace DiscordChatExporter.Gui.ViewModels
             DisplayName = $"{App.Name} v{App.VersionString}";
 
             // Update busy state when progress manager changes
-            ProgressManager.Bind(o => o.IsActive,
+            ProgressManager.Bind(o => o.IsActive, (_, _) =>
-                (sender, args) => IsBusy = ProgressManager.IsActive
+                IsBusy = ProgressManager.IsActive
             );
 
-            ProgressManager.Bind(o => o.IsActive,
+            ProgressManager.Bind(o => o.IsActive, (_, _) =>
-                (sender, args) => IsProgressIndeterminate =
+                IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1)
-                    ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1)
             );
 
-            ProgressManager.Bind(o => o.Progress,
+            ProgressManager.Bind(o => o.Progress, (_, _) =>
-                (sender, args) => IsProgressIndeterminate =
+                IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1)
-                    ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1)
             );
         }
 
@@ -207,6 +205,10 @@ namespace DiscordChatExporter.Gui.ViewModels
 
                 try
                 {
+                    var partitionLimit = !string.IsNullOrWhiteSpace(dialog.PartitionLimitValue)
+                        ? PartitionLimit.Parse(dialog.PartitionLimitValue)
+                        : NullPartitionLimit.Instance;
+
                     var request = new ExportRequest(
                         dialog.Guild!,
                         channel!,
@@ -214,7 +216,7 @@ namespace DiscordChatExporter.Gui.ViewModels
                         dialog.SelectedFormat,
                         dialog.After?.Pipe(Snowflake.FromDate),
                         dialog.Before?.Pipe(Snowflake.FromDate),
-                        CreatePartitioner(),
+                        partitionLimit,
                         dialog.ShouldDownloadMedia,
                         _settingsService.ShouldReuseMedia,
                         _settingsService.DateFormat
@@ -237,19 +239,6 @@ namespace DiscordChatExporter.Gui.ViewModels
             // Notify of overall completion
             if (successfulExportCount > 0)
                 Notifications.Enqueue($"Successfully exported {successfulExportCount} channel(s)");
-
-            IPartitioner CreatePartitioner()
-            {
-                var partitionFormat = dialog.SelectedPartitionFormat;
-                var partitionLimit = dialog.PartitionLimit;
-
-                return (partitionFormat, partitionLimit) switch
-                {
-                    (PartitionFormat.MessageCount, int messageLimit) => new MessageCountPartitioner(messageLimit),
-                    (PartitionFormat.FileSize, int fileSizeLimit) => new FileSizePartitioner(fileSizeLimit),
-                    _ => new NullPartitioner()
-                };
-            }
         }
     }
 }

DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml

@@ -126,43 +126,12 @@
             </Grid>
 
             <!--  Partitioning  -->
-            <Grid Name="PartitioningGrid">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-
-                <ComboBox
-                    Name="PartitionFormatComboBox"
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Margin="16,8"
-                    materialDesign:HintAssist.Hint="Partition by"
-                    materialDesign:HintAssist.IsFloating="True"
-                    IsReadOnly="True"
-                    ItemsSource="{Binding AvailablePartitionFormats}"
-                    SelectedItem="{Binding SelectedPartitionFormat}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding Converter={x:Static converters:PartitionFormatToStringConverter.Instance}}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-
             <TextBox
-                    Name="PartitionTextBox"
-                    Grid.Row="0"
-                    Grid.Column="1"
                 Margin="16,8"
-                    materialDesign:HintAssist.Hint="{Binding SelectedPartitionFormat, Converter={x:Static converters:PartitionFormatToTooltipConverter.Instance}}"
+                materialDesign:HintAssist.Hint="Partition limit"
                 materialDesign:HintAssist.IsFloating="True"
-                    Text="{Binding PartitionLimit, TargetNullValue=''}"
+                Text="{Binding PartitionLimitValue}"
-                    ToolTip="{Binding SelectedPartitionFormat, Converter={x:Static converters:PartitionFormatToTooltipConverter.Instance}}" />
+                ToolTip="Split output into partitions, each limited to this number of message (e.g. 100) or file size (e.g. 10mb)" />
-
-            </Grid>
 
             <!--  Download media  -->
             <Grid Margin="16,16" ToolTip="Download referenced media content (user avatars, attached files, embedded images, etc)">