Refactor CLI (#81)

DiscordChatExporter.Gui/App.xaml

@@ -4,8 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     xmlns:local="clr-namespace:DiscordChatExporter.Gui"
-    Exit="App_Exit"
-    Startup="App_Startup"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>

DiscordChatExporter.Gui/App.xaml.cs

@@ -1,19 +1,6 @@
-using System.Windows;
-
-namespace DiscordChatExporter.Gui
+namespace DiscordChatExporter.Gui
 {
     public partial class App
     {
-        private Container Container => (Container) Resources["Container"];
-
-        private void App_Startup(object sender, StartupEventArgs e)
-        {
-            Container.Init();
-        }
-
-        private void App_Exit(object sender, ExitEventArgs e)
-        {
-            Container.Cleanup();
-        }
     }
 }

DiscordChatExporter.Gui/Container.cs

@@ -11,12 +11,7 @@ namespace DiscordChatExporter.Gui
         public IMainViewModel MainViewModel => Resolve<IMainViewModel>();
         public ISettingsViewModel SettingsViewModel => Resolve<ISettingsViewModel>();
 
-        private T Resolve<T>(string key = null)
-        {
-            return ServiceLocator.Current.GetInstance<T>(key);
-        }
-
-        public void Init()
+        public Container()
         {
             ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
             SimpleIoc.Default.Reset();
@@ -34,8 +29,9 @@ namespace DiscordChatExporter.Gui
             SimpleIoc.Default.Register<ISettingsViewModel, SettingsViewModel>(true);
         }
 
-        public void Cleanup()
+        private T Resolve<T>(string key = null)
         {
+            return ServiceLocator.Current.GetInstance<T>(key);
         }
     }
 }

DiscordChatExporter.Gui/ViewModels/MainViewModel.cs

@@ -256,6 +256,7 @@ namespace DiscordChatExporter.Gui.ViewModels
 
             try
             {
+                // TODO: extract this to make it reusable across implementations
                 // Get messages
                 var messages = await _dataService.GetChannelMessagesAsync(token, channel.Id, from, to, progressHandler);