Update readme

Fixes #6

DiscordChatExporter/Container.cs

@@ -19,9 +19,10 @@ namespace DiscordChatExporter
 
             // View models
             SimpleIoc.Default.Register<IErrorViewModel, ErrorViewModel>(true);
+            SimpleIoc.Default.Register<IExportDoneViewModel, ExportDoneViewModel>(true);
+            SimpleIoc.Default.Register<IExportSetupViewModel, ExportSetupViewModel>(true);
             SimpleIoc.Default.Register<IMainViewModel, MainViewModel>(true);
             SimpleIoc.Default.Register<ISettingsViewModel, SettingsViewModel>(true);
-            SimpleIoc.Default.Register<IExportDoneViewModel, ExportDoneViewModel>(true);
 
             // Load settings
             ServiceLocator.Current.GetInstance<ISettingsService>().Load();
@@ -34,8 +35,9 @@ namespace DiscordChatExporter
         }
 
         public IErrorViewModel ErrorViewModel => ServiceLocator.Current.GetInstance<IErrorViewModel>();
+        public IExportDoneViewModel ExportDoneViewModel => ServiceLocator.Current.GetInstance<IExportDoneViewModel>();
+        public IExportSetupViewModel ExportSetupViewModel => ServiceLocator.Current.GetInstance<IExportSetupViewModel>();
         public IMainViewModel MainViewModel => ServiceLocator.Current.GetInstance<IMainViewModel>();
         public ISettingsViewModel SettingsViewModel => ServiceLocator.Current.GetInstance<ISettingsViewModel>();
-        public IExportDoneViewModel ExportDoneViewModel => ServiceLocator.Current.GetInstance<IExportDoneViewModel>();
     }
 }

DiscordChatExporter/DiscordChatExporter.csproj

@@ -84,14 +84,20 @@
     <Compile Include="Exceptions\HttpErrorStatusCodeException.cs" />
     <Compile Include="Messages\ShowErrorMessage.cs" />
     <Compile Include="Messages\ShowExportDoneMessage.cs" />
+    <Compile Include="Messages\ShowExportSetupMessage.cs" />
     <Compile Include="Messages\ShowSettingsMessage.cs" />
+    <Compile Include="Messages\StartExportMessage.cs" />
     <Compile Include="Models\AttachmentType.cs" />
     <Compile Include="Models\ChannelChatLog.cs" />
     <Compile Include="Models\ChannelType.cs" />
+    <Compile Include="Models\ExportFormat.cs" />
+    <Compile Include="Models\Extensions.cs" />
     <Compile Include="Services\IMessageGroupService.cs" />
     <Compile Include="Services\MessageGroupService.cs" />
     <Compile Include="ViewModels\ErrorViewModel.cs" />
+    <Compile Include="ViewModels\ExportSetupViewModel.cs" />
     <Compile Include="ViewModels\IErrorViewModel.cs" />
+    <Compile Include="ViewModels\IExportSetupViewModel.cs" />
     <Compile Include="ViewModels\ISettingsViewModel.cs" />
     <Compile Include="ViewModels\IExportDoneViewModel.cs" />
     <Compile Include="ViewModels\SettingsViewModel.cs" />
@@ -102,6 +108,9 @@
     <Compile Include="Views\ExportDoneDialog.ammy.cs">
       <DependentUpon>ExportDoneDialog.ammy</DependentUpon>
     </Compile>
+    <Compile Include="Views\ExportSetupDialog.ammy.cs">
+      <DependentUpon>ExportSetupDialog.ammy</DependentUpon>
+    </Compile>
     <Compile Include="Views\SettingsDialog.ammy.cs">
       <DependentUpon>SettingsDialog.ammy</DependentUpon>
     </Compile>
@@ -120,6 +129,11 @@
       <Generator>MSBuild:Compile</Generator>
       <DependentUpon>ExportDoneDialog.ammy</DependentUpon>
     </Page>
+    <Page Include="Views\ExportSetupDialog.g.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <DependentUpon>ExportSetupDialog.ammy</DependentUpon>
+    </Page>
     <Page Include="Views\MainWindow.g.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -174,6 +188,7 @@
     </None>
     <None Include="Views\ErrorDialog.ammy" />
     <None Include="Views\ExportDoneDialog.ammy" />
+    <None Include="Views\ExportSetupDialog.ammy" />
     <None Include="Views\MainWindow.ammy" />
     <None Include="Views\SettingsDialog.ammy" />
   </ItemGroup>

DiscordChatExporter/Messages/ShowExportSetupMessage.cs

@@ -0,0 +1,17 @@
+using DiscordChatExporter.Models;
+
+namespace DiscordChatExporter.Messages
+{
+    public class ShowExportSetupMessage
+    {
+        public Guild Guild { get; }
+
+        public Channel Channel { get; }
+
+        public ShowExportSetupMessage(Guild guild, Channel channel)
+        {
+            Guild = guild;
+            Channel = channel;
+        }
+    }
+}

DiscordChatExporter/Messages/StartExportMessage.cs

@@ -0,0 +1,28 @@
+using System;
+using DiscordChatExporter.Models;
+
+namespace DiscordChatExporter.Messages
+{
+    public class StartExportMessage
+    {
+        public Channel Channel { get; }
+
+        public string FilePath { get; }
+
+        public ExportFormat Format { get; }
+
+        public DateTime? From { get; }
+
+        public DateTime? To { get; }
+
+        public StartExportMessage(Channel channel, string filePath, ExportFormat format,
+            DateTime? from, DateTime? to)
+        {
+            Channel = channel;
+            FilePath = filePath;
+            Format = format;
+            From = from;
+            To = to;
+        }
+    }
+}

DiscordChatExporter/Models/ExportFormat.cs

@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Models
+{
+    public enum ExportFormat
+    {
+        Text,
+        Html
+    }
+}

DiscordChatExporter/Models/Extensions.cs

@@ -0,0 +1,14 @@
+namespace DiscordChatExporter.Models
+{
+    public static class Extensions
+    {
+        public static string GetFileExtension(this ExportFormat format)
+        {
+            if (format == ExportFormat.Text)
+                return "txt";
+            if (format == ExportFormat.Html)
+                return "html";
+            return null;
+        }
+    }
+}

DiscordChatExporter/Properties/AssemblyInfo.cs

@@ -3,5 +3,5 @@
 [assembly: AssemblyTitle("DiscordChatExporter")]
 [assembly: AssemblyCompany("Tyrrrz")]
 [assembly: AssemblyCopyright("Copyright (c) 2017 Alexey Golub")]
-[assembly: AssemblyVersion("2.1")]
-[assembly: AssemblyFileVersion("2.1")]
+[assembly: AssemblyVersion("2.2")]
+[assembly: AssemblyFileVersion("2.2")]

DiscordChatExporter/Resources/ExportService/DarkTheme.css

@@ -14,8 +14,11 @@ a:hover { text-decoration: underline; }
 
 div.pre {
     background-color: #2F3136;
+    color: rgb(131, 148, 150);
     font-family: Consolas, Courier New, Courier, Monospace;
+    margin-top: 4px;
     padding: 8px;
+    white-space: pre;
 }
 
 span.pre {
@@ -23,6 +26,7 @@ span.pre {
     font-family: Consolas, Courier New, Courier, Monospace;
     padding-left: 2px;
     padding-right: 2px;
+    white-space: pre;
 }
 
 div#info {

DiscordChatExporter/Resources/ExportService/LightTheme.css

@@ -14,7 +14,9 @@ a:hover { text-decoration: underline; }
 
 div.pre {
     background-color: #F9F9F9;
+    color: rgb(101, 123, 131);
     font-family: Consolas, Courier New, Courier, Monospace;
+    margin-top: 4px;
     padding: 8px;
 }
 

DiscordChatExporter/Services/DataService.cs

@@ -71,7 +71,7 @@ namespace DiscordChatExporter.Services
             return channels;
         }
 
-        public async Task<IReadOnlyList<Message>> GetChannelMessagesAsync(string token, string channelId)
+        public async Task<IReadOnlyList<Message>> GetChannelMessagesAsync(string token, string channelId, DateTime? from, DateTime? to)
         {
             var result = new List<Message>();
 
@@ -102,6 +102,9 @@ namespace DiscordChatExporter.Services
                 // If no messages - break
                 if (currentMessageId == null) break;
 
+                // If last message is older than from date - break
+                if (from != null && result.Last().TimeStamp < from) break;
+
                 // Otherwise offset the next request
                 beforeId = currentMessageId;
             }
@@ -109,6 +112,12 @@ namespace DiscordChatExporter.Services
             // Messages appear newest first, we need to reverse
             result.Reverse();
 
+            // Filter
+            if (from != null)
+                result.RemoveAll(m => m.TimeStamp < from);
+            if (to != null)
+                result.RemoveAll(m => m.TimeStamp > to);
+
             return result;
         }
 

DiscordChatExporter/Services/ExportService.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Net;
 using System.Reflection;
 using System.Resources;
@@ -19,12 +20,53 @@ namespace DiscordChatExporter.Services
             _settingsService = settingsService;
         }
 
-        public async Task ExportAsync(string filePath, ChannelChatLog log, Theme theme)
+        public async Task ExportAsTextAsync(string filePath, ChannelChatLog log)
+        {
+            var dateFormat = _settingsService.DateFormat;
+
+            using (var writer = new StreamWriter(filePath, false, Encoding.UTF8, 128 * 1024))
+            {
+                // Guild and channel info
+                await writer.WriteLineAsync("=".Repeat(16));
+                await writer.WriteLineAsync($"Guild: {log.Guild}");
+                await writer.WriteLineAsync($"Channel: {log.Channel}");
+                await writer.WriteLineAsync($"Messages: {log.TotalMessageCount:N0}");
+                await writer.WriteLineAsync("=".Repeat(16));
+                await writer.WriteLineAsync();
+
+                // Chat log
+                foreach (var group in log.MessageGroups)
+                {
+                    var timeStampFormatted = group.TimeStamp.ToString(dateFormat);
+                    await writer.WriteLineAsync($"{group.Author}  [{timeStampFormatted}]");
+
+                    // Messages
+                    foreach (var message in group.Messages)
+                    {
+                        if (message.Content.IsNotBlank())
+                        {
+                            var contentFormatted = message.Content.Replace("\n", Environment.NewLine);
+                            await writer.WriteLineAsync(contentFormatted);
+                        }
+
+                        // Attachments
+                        foreach (var attachment in message.Attachments)
+                        {
+                            await writer.WriteLineAsync(attachment.Url);
+                        }
+                    }
+
+                    await writer.WriteLineAsync();
+                }
+            }
+        }
+
+        public async Task ExportAsHtmlAsync(string filePath, ChannelChatLog log, Theme theme)
         {
             var themeCss = GetThemeCss(theme);
             var dateFormat = _settingsService.DateFormat;
 
-            using (var writer = new StreamWriter(filePath, false, Encoding.UTF8, 128*1024))
+            using (var writer = new StreamWriter(filePath, false, Encoding.UTF8, 128 * 1024))
             {
                 // Generation info
                 await writer.WriteLineAsync("<!-- https://github.com/Tyrrrz/DiscordChatExporter -->");
@@ -35,7 +77,7 @@ namespace DiscordChatExporter.Services
 
                 // HEAD
                 await writer.WriteLineAsync("<head>");
-                await writer.WriteLineAsync($"<title>{log.Guild.Name} - {log.Channel.Name}</title>");
+                await writer.WriteLineAsync($"<title>{log.Guild} - {log.Channel}</title>");
                 await writer.WriteLineAsync("<meta charset=\"utf-8\" />");
                 await writer.WriteLineAsync("<meta name=\"viewport\" content=\"width=device-width\" />");
                 await writer.WriteLineAsync($"<style>{themeCss}</style>");
@@ -50,8 +92,8 @@ namespace DiscordChatExporter.Services
                 await writer.WriteLineAsync($"<img class=\"guild-icon\" src=\"{log.Guild.IconUrl}\" />");
                 await writer.WriteLineAsync("</div>"); // info-left
                 await writer.WriteLineAsync("<div class=\"info-right\">");
-                await writer.WriteLineAsync($"<div class=\"guild-name\">{log.Guild.Name}</div>");
-                await writer.WriteLineAsync($"<div class=\"channel-name\">{log.Channel.Name}</div>");
+                await writer.WriteLineAsync($"<div class=\"guild-name\">{log.Guild}</div>");
+                await writer.WriteLineAsync($"<div class=\"channel-name\">{log.Channel}</div>");
                 await writer.WriteLineAsync($"<div class=\"misc\">{log.TotalMessageCount:N0} messages</div>");
                 await writer.WriteLineAsync("</div>"); // info-right
                 await writer.WriteLineAsync("</div>"); // info
@@ -66,18 +108,20 @@ namespace DiscordChatExporter.Services
                     await writer.WriteLineAsync("</div>");
 
                     await writer.WriteLineAsync("<div class=\"msg-right\">");
-                    await writer.WriteLineAsync($"<span class=\"msg-user\">{HtmlEncode(group.Author.Name)}</span>");
+                    await writer.WriteAsync($"<span class=\"msg-user\" title=\"{HtmlEncode(group.Author)}\">");
+                    await writer.WriteAsync(HtmlEncode(group.Author.Name));
+                    await writer.WriteLineAsync("</span>");
                     var timeStampFormatted = HtmlEncode(group.TimeStamp.ToString(dateFormat));
                     await writer.WriteLineAsync($"<span class=\"msg-date\">{timeStampFormatted}</span>");
 
-                    // Message
+                    // Messages
                     foreach (var message in group.Messages)
                     {
                         // Content
                         if (message.Content.IsNotBlank())
                         {
                             await writer.WriteLineAsync("<div class=\"msg-content\">");
-                            var contentFormatted = FormatMessageContent(message.Content);
+                            var contentFormatted = FormatMessageContentHtml(message.Content);
                             await writer.WriteAsync(contentFormatted);
 
                             // Edited timestamp
@@ -99,7 +143,8 @@ namespace DiscordChatExporter.Services
                             {
                                 await writer.WriteLineAsync("<div class=\"msg-attachment\">");
                                 await writer.WriteLineAsync($"<a href=\"{attachment.Url}\">");
-                                await writer.WriteLineAsync($"<img class=\"msg-attachment\" src=\"{attachment.Url}\" />");
+                                await writer.WriteLineAsync(
+                                    $"<img class=\"msg-attachment\" src=\"{attachment.Url}\" />");
                                 await writer.WriteLineAsync("</a>");
                                 await writer.WriteLineAsync("</div>");
                             }
@@ -148,6 +193,11 @@ namespace DiscordChatExporter.Services
             return WebUtility.HtmlEncode(str);
         }
 
+        private static string HtmlEncode(object obj)
+        {
+            return WebUtility.HtmlEncode(obj.ToString());
+        }
+
         private static string FormatFileSize(long fileSize)
         {
             string[] units = {"B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
@@ -163,23 +213,23 @@ namespace DiscordChatExporter.Services
             return $"{size:0.#} {units[unit]}";
         }
 
-        private static string FormatMessageContent(string content)
+        private static string FormatMessageContentHtml(string content)
         {
             // Encode HTML
             content = HtmlEncode(content);
 
+            // Preformatted div
+            content = Regex.Replace(content, "```+(?:[^`]*?\\n)?([^`]+)\\n?```+",
+                m => "<div class=\"pre\">" + m.Groups[1].Value + "</div>");
+
+            // Preformatted span
+            content = Regex.Replace(content, "`([^`]+)`",
+                m => "<span class=\"pre\">" + m.Groups[1].Value + "</span>");
+
             // Links from URLs
             content = Regex.Replace(content, "((https?|ftp)://[^\\s/$.?#].[^\\s]*)",
                 "<a href=\"$1\">$1</a>");
 
-            // Preformatted multiline
-            content = Regex.Replace(content, "```([^`]*?)```",
-                m => "<div class=\"pre\">" + m.Groups[1].Value.Trim('\n') + "</div>");
-
-            // Preformatted inline
-            content = Regex.Replace(content, "`([^`]*?)`",
-                m => "<span class=\"pre\">" + m.Groups[1].Value + "</span>");
-
             // Bold
             content = Regex.Replace(content, "\\*\\*([^\\*]*?)\\*\\*", "<b>$1</b>");
 

DiscordChatExporter/Services/IDataService.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using DiscordChatExporter.Models;
 
@@ -12,6 +13,7 @@ namespace DiscordChatExporter.Services
 
         Task<IReadOnlyList<Channel>> GetGuildChannelsAsync(string token, string guildId);
 
-        Task<IReadOnlyList<Message>> GetChannelMessagesAsync(string token, string channelId);
+        Task<IReadOnlyList<Message>> GetChannelMessagesAsync(string token, string channelId,
+            DateTime? from, DateTime? to);
     }
 }

DiscordChatExporter/Services/IExportService.cs

@@ -5,6 +5,7 @@ namespace DiscordChatExporter.Services
 {
     public interface IExportService
     {
-        Task ExportAsync(string filePath, ChannelChatLog log, Theme theme);
+        Task ExportAsTextAsync(string filePath, ChannelChatLog log);
+        Task ExportAsHtmlAsync(string filePath, ChannelChatLog log, Theme theme);
     }
 }

DiscordChatExporter/Services/ISettingsService.cs

@@ -4,11 +4,13 @@ namespace DiscordChatExporter.Services
 {
     public interface ISettingsService
     {
-        string Token { get; set; }
         Theme Theme { get; set; }
         string DateFormat { get; set; }
         int MessageGroupLimit { get; set; }
 
+        string LastToken { get; set; }
+        ExportFormat LastExportFormat { get; set; }
+
         void Load();
         void Save();
     }

DiscordChatExporter/Services/SettingsService.cs

@@ -5,11 +5,13 @@ namespace DiscordChatExporter.Services
 {
     public class SettingsService : SettingsManager, ISettingsService
     {
-        public string Token { get; set; }
         public Theme Theme { get; set; }
         public string DateFormat { get; set; } = "dd-MMM-yy hh:mm";
         public int MessageGroupLimit { get; set; } = 20;
 
+        public string LastToken { get; set; }
+        public ExportFormat LastExportFormat { get; set; } = ExportFormat.Html;
+
         public SettingsService()
         {
             Configuration.StorageSpace = StorageSpace.Instance;

DiscordChatExporter/ViewModels/ErrorViewModel.cs

@@ -9,7 +9,11 @@ namespace DiscordChatExporter.ViewModels
 
         public ErrorViewModel()
         {
-            MessengerInstance.Register<ShowErrorMessage>(this, m => Message = m.Message);
+            // Messages
+            MessengerInstance.Register<ShowErrorMessage>(this, m =>
+            {
+                Message = m.Message;
+            });
         }
     }
 }

DiscordChatExporter/ViewModels/ExportDoneViewModel.cs

@@ -14,10 +14,14 @@ namespace DiscordChatExporter.ViewModels
 
         public ExportDoneViewModel()
         {
-            MessengerInstance.Register<ShowExportDoneMessage>(this, m => _filePath = m.FilePath);
-
             // Commands
             OpenCommand = new RelayCommand(Open);
+
+            // Messages
+            MessengerInstance.Register<ShowExportDoneMessage>(this, m =>
+            {
+                _filePath = m.FilePath;
+            });
         }
 
         private void Open()

DiscordChatExporter/ViewModels/ExportSetupViewModel.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using DiscordChatExporter.Messages;
+using DiscordChatExporter.Models;
+using DiscordChatExporter.Services;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.CommandWpf;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.ViewModels
+{
+    public class ExportSetupViewModel : ViewModelBase, IExportSetupViewModel
+    {
+        private readonly ISettingsService _settingsService;
+
+        private string _filePath;
+        private ExportFormat _format;
+        private DateTime? _from;
+        private DateTime? _to;
+
+        public Guild Guild { get; private set; }
+
+        public Channel Channel { get; private set; }
+
+        public string FilePath
+        {
+            get => _filePath;
+            set
+            {
+                Set(ref _filePath, value);
+                ExportCommand.RaiseCanExecuteChanged();
+            }
+        }
+
+        public IReadOnlyList<ExportFormat> AvailableFormats { get; }
+
+        public ExportFormat SelectedFormat
+        {
+            get => _format;
+            set => Set(ref _format, value);
+        }
+
+        public DateTime? From
+        {
+            get => _from;
+            set => Set(ref _from, value);
+        }
+
+        public DateTime? To
+        {
+            get => _to;
+            set => Set(ref _to, value);
+        }
+
+        // Commands
+        public RelayCommand ExportCommand { get; }
+
+        public ExportSetupViewModel(ISettingsService settingsService)
+        {
+            _settingsService = settingsService;
+
+            // Defaults
+            AvailableFormats = Enum.GetValues(typeof(ExportFormat)).Cast<ExportFormat>().ToArray();
+
+            // Commands
+            ExportCommand = new RelayCommand(Export, () => FilePath.IsNotBlank());
+
+            // Messages
+            MessengerInstance.Register<ShowExportSetupMessage>(this, m =>
+            {
+                Guild = m.Guild;
+                Channel = m.Channel;
+                SelectedFormat = _settingsService.LastExportFormat;
+                FilePath = $"{Guild} - {Channel}.{SelectedFormat.GetFileExtension()}"
+                    .Replace(Path.GetInvalidFileNameChars(), '_');
+                From = null;
+                To = null;
+            });
+        }
+
+        private void Export()
+        {
+            _settingsService.LastExportFormat = SelectedFormat;
+            MessengerInstance.Send(new StartExportMessage(Channel, FilePath, SelectedFormat, From, To));
+        }
+    }
+}

DiscordChatExporter/ViewModels/IExportSetupViewModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using DiscordChatExporter.Models;
+using GalaSoft.MvvmLight.CommandWpf;
+
+namespace DiscordChatExporter.ViewModels
+{
+    public interface IExportSetupViewModel
+    {
+        Guild Guild { get; }
+        Channel Channel { get; }
+        string FilePath { get; set; }
+        IReadOnlyList<ExportFormat> AvailableFormats { get; }
+        ExportFormat SelectedFormat { get; set; }
+        DateTime? From { get; set; }
+        DateTime? To { get; set; }
+
+        RelayCommand ExportCommand { get; }
+    }
+}

DiscordChatExporter/ViewModels/IMainViewModel.cs

@@ -16,8 +16,8 @@ namespace DiscordChatExporter.ViewModels
         IReadOnlyList<Channel> AvailableChannels { get; }
 
         RelayCommand PullDataCommand { get; }
-        RelayCommand<Channel> ExportChannelCommand { get; }
         RelayCommand ShowSettingsCommand { get; }
         RelayCommand ShowAboutCommand { get; }
+        RelayCommand<Channel> ShowExportSetupCommand { get; }
     }
 }

DiscordChatExporter/ViewModels/MainViewModel.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Net;
 using DiscordChatExporter.Exceptions;
@@ -9,7 +9,6 @@ using DiscordChatExporter.Models;
 using DiscordChatExporter.Services;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.CommandWpf;
-using Microsoft.Win32;
 using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.ViewModels
@@ -36,7 +35,7 @@ namespace DiscordChatExporter.ViewModels
             {
                 Set(ref _isBusy, value);
                 PullDataCommand.RaiseCanExecuteChanged();
-                ExportChannelCommand.RaiseCanExecuteChanged();
+                ShowExportSetupCommand.RaiseCanExecuteChanged();
             }
         }
 
@@ -44,13 +43,13 @@ namespace DiscordChatExporter.ViewModels
 
         public string Token
         {
-            get => _settingsService.Token;
+            get => _settingsService.LastToken;
             set
             {
                 // Remove invalid chars
                 value = value?.Trim('"');
 
-                _settingsService.Token = value;
+                _settingsService.LastToken = value;
                 PullDataCommand.RaiseCanExecuteChanged();
             }
         }
@@ -72,7 +71,7 @@ namespace DiscordChatExporter.ViewModels
             {
                 Set(ref _selectedGuild, value);
                 AvailableChannels = value != null ? _guildChannelsMap[value] : new Channel[0];
-                ExportChannelCommand.RaiseCanExecuteChanged();
+                ShowExportSetupCommand.RaiseCanExecuteChanged();
             }
         }
 
@@ -83,9 +82,9 @@ namespace DiscordChatExporter.ViewModels
         }
 
         public RelayCommand PullDataCommand { get; }
-        public RelayCommand<Channel> ExportChannelCommand { get; }
         public RelayCommand ShowSettingsCommand { get; }
         public RelayCommand ShowAboutCommand { get; }
+        public RelayCommand<Channel> ShowExportSetupCommand { get; }
 
         public MainViewModel(ISettingsService settingsService, IDataService dataService,
             IMessageGroupService messageGroupService, IExportService exportService)
@@ -99,9 +98,15 @@ namespace DiscordChatExporter.ViewModels
 
             // Commands
             PullDataCommand = new RelayCommand(PullData, () => Token.IsNotBlank() && !IsBusy);
-            ExportChannelCommand = new RelayCommand<Channel>(ExportChannel, _ => !IsBusy);
             ShowSettingsCommand = new RelayCommand(ShowSettings);
             ShowAboutCommand = new RelayCommand(ShowAbout);
+            ShowExportSetupCommand = new RelayCommand<Channel>(ShowExportSetup, _ => !IsBusy);
+
+            // Messages
+            MessengerInstance.Register<StartExportMessage>(this, m =>
+            {
+                Export(m.Channel, m.FilePath, m.Format, m.From, m.To);
+            });
         }
 
         private async void PullData()
@@ -133,7 +138,12 @@ namespace DiscordChatExporter.ViewModels
             }
             catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Unauthorized)
             {
-                const string message = "Could not authorize using the given token. Make sure it's valid.";
+                const string message = "Unauthorized to perform request. Make sure token is valid.";
+                MessengerInstance.Send(new ShowErrorMessage(message));
+            }
+            catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
+            {
+                const string message = "Forbidden to perform request. The account may be locked by 2FA.";
                 MessengerInstance.Send(new ShowErrorMessage(message));
             }
 
@@ -142,55 +152,6 @@ namespace DiscordChatExporter.ViewModels
             IsBusy = false;
         }
 
-        private async void ExportChannel(Channel channel)
-        {
-            IsBusy = true;
-            
-            // Get safe file names
-            var safeGuildName = SelectedGuild.Name.Replace(Path.GetInvalidFileNameChars(), '_');
-            var safeChannelName = channel.Name.Replace(Path.GetInvalidFileNameChars(), '_');
-
-            // Ask for path
-            var sfd = new SaveFileDialog
-            {
-                FileName = $"{safeGuildName} - {safeChannelName}.html",
-                Filter = "HTML files (*.html)|*.html|All files (*.*)|*.*",
-                DefaultExt = "html",
-                AddExtension = true
-            };
-            if (sfd.ShowDialog() != true)
-            {
-                IsBusy = false;
-                return;
-            }
-
-            // Export
-            try
-            {
-                // Get messages
-                var messages = await _dataService.GetChannelMessagesAsync(_cachedToken, channel.Id);
-
-                // Group them
-                var messageGroups = _messageGroupService.GroupMessages(messages);
-
-                // Create log
-                var chatLog = new ChannelChatLog(SelectedGuild, channel, messageGroups, messages.Count);
-
-                // Export
-                await _exportService.ExportAsync(sfd.FileName, chatLog, _settingsService.Theme);
-
-                // Show dialog
-                MessengerInstance.Send(new ShowExportDoneMessage(sfd.FileName));
-            }
-            catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
-            {
-                const string message = "You don't have access to the messages in that channel.";
-                MessengerInstance.Send(new ShowErrorMessage(message));
-            }
-
-            IsBusy = false;
-        }
-
         private void ShowSettings()
         {
             MessengerInstance.Send(new ShowSettingsMessage());
@@ -200,5 +161,43 @@ namespace DiscordChatExporter.ViewModels
         {
             Process.Start("https://github.com/Tyrrrz/DiscordChatExporter");
         }
+
+        private void ShowExportSetup(Channel channel)
+        {
+            MessengerInstance.Send(new ShowExportSetupMessage(SelectedGuild, channel));
+        }
+
+        private async void Export(Channel channel, string filePath, ExportFormat format, DateTime? from, DateTime? to)
+        {
+            IsBusy = true;
+
+            try
+            {
+                // Get messages
+                var messages = await _dataService.GetChannelMessagesAsync(_cachedToken, channel.Id, from, to);
+
+                // Group them
+                var messageGroups = _messageGroupService.GroupMessages(messages);
+
+                // Create log
+                var chatLog = new ChannelChatLog(SelectedGuild, channel, messageGroups, messages.Count);
+
+                // Export
+                if (format == ExportFormat.Text)
+                    await _exportService.ExportAsTextAsync(filePath, chatLog);
+                else if (format == ExportFormat.Html)
+                    await _exportService.ExportAsHtmlAsync(filePath, chatLog, _settingsService.Theme);
+
+                // Notify completion
+                MessengerInstance.Send(new ShowExportDoneMessage(filePath));
+            }
+            catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
+            {
+                const string message = "Forbidden to view messages in that channel.";
+                MessengerInstance.Send(new ShowErrorMessage(message));
+            }
+
+            IsBusy = false;
+        }
     }
 }

DiscordChatExporter/Views/ErrorDialog.ammy.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Views
+namespace DiscordChatExporter.Views
 {
     public partial class ErrorDialog
     {
@@ -13,4 +7,4 @@ namespace DiscordChatExporter.Views
             InitializeComponent();
         }
     }
-}
+}

DiscordChatExporter/Views/ExportDoneDialog.ammy

@@ -18,7 +18,8 @@ UserControl "DiscordChatExporter.Views.ExportDoneDialog" {
       HorizontalAlignment: Right
 
       // Open
-      Button {
+      Button "OpenButton" {
+        Click: OpenButton_Click
         Command: bind OpenCommand
         Content: "OPEN IT"
         Margin: 8

DiscordChatExporter/Views/ExportDoneDialog.ammy.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Windows;
+using MaterialDesignThemes.Wpf;
 
 namespace DiscordChatExporter.Views
 {
@@ -12,5 +9,10 @@ namespace DiscordChatExporter.Views
         {
             InitializeComponent();
         }
+
+        public void OpenButton_Click(object sender, RoutedEventArgs args)
+        {
+            DialogHost.CloseDialogCommand.Execute(null, null);
+        }
     }
 }

DiscordChatExporter/Views/ExportSetupDialog.ammy

@@ -0,0 +1,69 @@
+using MaterialDesignThemes.Wpf
+
+UserControl "DiscordChatExporter.Views.ExportSetupDialog" {
+  DataContext: bind ExportSetupViewModel from $resource Container
+  Width: 350
+
+  StackPanel {
+    // File path
+    TextBox {
+      Margin: "16 16 16 8"
+      HintAssist.Hint: "Output file"
+      HintAssist.IsFloating: true
+      IsReadOnly: true
+      Text: bind FilePath
+            set [ UpdateSourceTrigger: PropertyChanged ]
+    }
+
+    // Date range
+    Grid {
+      #TwoColumns("*", "*")
+
+      DatePicker {
+        Grid.Column: 0
+        Margin: "16 16 8 8"
+        HintAssist.Hint: "From"
+        HintAssist.IsFloating: true
+        SelectedDate: bind From
+      }
+
+      DatePicker {
+        Grid.Column: 1
+        Margin: "8 16 16 8"
+        HintAssist.Hint: "To"
+        HintAssist.IsFloating: true
+        SelectedDate: bind To
+      }
+    }
+
+    // Buttons
+    @StackPanelHorizontal {
+      HorizontalAlignment: Right
+
+      // Export
+      Button "ExportButton" {
+        Click: ExportButton_Click
+        Command: bind ExportCommand
+        Content: "EXPORT"
+        Margin: 8
+        Style: resource dyn "MaterialDesignFlatButton"
+      }
+
+      // Browse
+      Button "BrowseButton" {
+        Click: BrowseButton_Click
+        Content: "BROWSE"
+        Margin: 8
+        Style: resource dyn "MaterialDesignFlatButton"
+      }
+
+      // Cancel
+      Button {
+        Command: DialogHost.CloseDialogCommand
+        Content: "CANCEL"
+        Margin: 8
+        Style: resource dyn "MaterialDesignFlatButton"
+      }
+    }
+  }
+}

DiscordChatExporter/Views/ExportSetupDialog.ammy.cs

@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using System.Windows;
+using DiscordChatExporter.Models;
+using DiscordChatExporter.ViewModels;
+using MaterialDesignThemes.Wpf;
+using Microsoft.Win32;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Views
+{
+    public partial class ExportSetupDialog
+    {
+        private IExportSetupViewModel ViewModel => (IExportSetupViewModel) DataContext;
+
+        public ExportSetupDialog()
+        {
+            InitializeComponent();
+        }
+
+        private string GetFilter()
+        {
+            var filters = new List<string>();
+            foreach (var format in ViewModel.AvailableFormats)
+            {
+                var ext = format.GetFileExtension();
+                filters.Add($"{format} (*.{ext})|*.{ext}");
+            }
+
+            return filters.JoinToString("|");
+        }
+
+        public void ExportButton_Click(object sender, RoutedEventArgs args)
+        {
+            DialogHost.CloseDialogCommand.Execute(null, null);
+        }
+
+        public void BrowseButton_Click(object sender, RoutedEventArgs args)
+        {
+            var sfd = new SaveFileDialog
+            {
+                FileName = ViewModel.FilePath,
+                Filter = GetFilter(),
+                FilterIndex = ViewModel.AvailableFormats.IndexOf(ViewModel.SelectedFormat) + 1,
+                AddExtension = true,
+                Title = "Select output file"
+            };
+
+            if (sfd.ShowDialog() == true)
+            {
+                ViewModel.FilePath = sfd.FileName;
+                ViewModel.SelectedFormat = ViewModel.AvailableFormats[sfd.FilterIndex - 1];
+            }
+        }
+    }
+}

DiscordChatExporter/Views/MainWindow.ammy

@@ -167,7 +167,7 @@ Window "DiscordChatExporter.Views.MainWindow" {
                     Cursor: CursorType.Hand
                     InputBindings: [
                       MouseBinding {
-                        Command: bind DataContext.ExportChannelCommand from $ancestor<ItemsControl>
+                        Command: bind DataContext.ShowExportSetupCommand from $ancestor<ItemsControl>
                         CommandParameter: bind
                         MouseAction: LeftClick
                       }

DiscordChatExporter/Views/MainWindow.ammy.cs

@@ -18,8 +18,9 @@ namespace DiscordChatExporter.Views
             Title += $" v{Assembly.GetExecutingAssembly().GetName().Version}";
 
             Messenger.Default.Register<ShowErrorMessage>(this, m => DialogHost.Show(new ErrorDialog()).Forget());
-            Messenger.Default.Register<ShowSettingsMessage>(this, m => DialogHost.Show(new SettingsDialog()).Forget());
             Messenger.Default.Register<ShowExportDoneMessage>(this, m => DialogHost.Show(new ExportDoneDialog()).Forget());
+            Messenger.Default.Register<ShowExportSetupMessage>(this, m => DialogHost.Show(new ExportSetupDialog()).Forget());
+            Messenger.Default.Register<ShowSettingsMessage>(this, m => DialogHost.Show(new SettingsDialog()).Forget());
         }
 
         public void TokenTextBox_KeyDown(object sender, KeyEventArgs e)

Readme.md

@@ -1,10 +1,11 @@
 # DiscordChatExporter
 
-DiscordChatExporter can be used to export message history from [Discord](https://discordapp.com) to an HTML file. It works for both direct message chats and guild chats, supports markdown, message grouping, and attachments. There are options to configure the output, such as date format, color theme, message grouping limit, etc.
+DiscordChatExporter can be used to export message history from a [Discord](https://discordapp.com) channel to a file. It works for both direct message chats and guild chats, supports markdown, message grouping, and attachments. The tool also lets you select from/to dates to limit the exported messages. There are options to configure the output, such as date format, color theme, message grouping limit, etc.
 
 ## Screenshots
 
-![](http://www.tyrrrz.me/Projects/DiscordChatExporter/Images/3.png)
+![](http://www.tyrrrz.me/Projects/DiscordChatExporter/Images/1.png)
+![](http://www.tyrrrz.me/Projects/DiscordChatExporter/Images/4.png)
 
 ## Download
 
@@ -12,15 +13,17 @@ DiscordChatExporter can be used to export message history from [Discord](https:/
 
 ## Features
 
-- Exports to a self-contained HTML file
-- Supports both dark and light theme
-- Displays user avatars
+- Intuitive GUI that displays available guilds and channels
+- Date ranges to limit messages
 - Groups messages by author and time
-- Handles Discord markdown characters
-- Converts URLs to links
-- Inlines attached images with a link to the full version
-- Inserts download links for other types of attached files
-- Marks edited messages with a timestamp
+- Export to a plain text file
+- Export to an HTML file
+  - Dark and light themes
+  - User avatars
+  - Inline image attachments
+  - Full markdown support
+  - Automatic links
+  - Styled similarly to the app
 
 ## Libraries used