Merge branch 'develop'

* develop:
  Cleanup of uses directives
  Fix for automatic update. Versionhelper has loaded the application dll :/

DML.Client/DMLClient.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
 

Discord Media Loader.Application/Classes/Core.cs

@@ -6,7 +6,6 @@ using System.Runtime;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Discord;
-using Discord.Net;
 using Discord.WebSocket;
 using DML.AppCore.Classes;
 using DML.Application.Dialogs;

Discord Media Loader.Application/Classes/JobScheduler.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;

Discord Media Loader.Application/Classes/Settings.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics;
+using SweetLib.Utils.Logger;
-using SweetLib.Utils.Logger;
 
 namespace DML.Application.Classes
 {

Discord Media Loader.Application/Dialogs/LoginDialog.cs

@@ -1,11 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using DML.Application.Classes;
 using static SweetLib.Utils.Logger.Logger;

Discord Media Loader.Application/FrmInternalSplash.cs

@@ -1,12 +1,4 @@
-using System;
+using System.Windows.Forms;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace DML.Application
 {

Discord Media Loader.Application/MainForm.cs

@@ -2,11 +2,8 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Windows.Forms;
-using Discord;
 using Discord.WebSocket;
-using DML.AppCore;
 using DML.AppCore.Classes;
 using DML.Application.Classes;
 using DML.Client;

Discord Media Loader/FrmDownload.cs

@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Globalization;
-using System.Linq;
 using System.Net;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 

Discord Media Loader/FrmSplash.cs

@@ -1,13 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using Discord_Media_Loader.Helper;
 
@@ -35,7 +28,7 @@ namespace Discord_Media_Loader
                     downloadManager.ShowDialog();
 
                     var tmpFolder = Path.GetTempFileName();
-                    tmpFolder = Path.Combine(Path.GetFullPath(tmpFolder).Replace(Path.GetFileName(tmpFolder),""), Path.GetFileNameWithoutExtension(tmpFolder));
+                    tmpFolder = Path.Combine(Path.GetFullPath(tmpFolder).Replace(Path.GetFileName(tmpFolder), ""), Path.GetFileNameWithoutExtension(tmpFolder));
 
                     var di = Directory.CreateDirectory(tmpFolder);
 
@@ -52,6 +45,7 @@ namespace Discord_Media_Loader
                     }
 
                     File.Delete(tmpFile);
+                    DialogResult = DialogResult.Cancel;
                 }
             }
             finally
@@ -59,7 +53,7 @@ namespace Discord_Media_Loader
                 UseWaitCursor = false;
             }
 
-            Close();
+            DialogResult = DialogResult.OK;
         }
     }
 }

Discord Media Loader/Helper/VersionHelper.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Threading.Tasks;
-using DML.Application.Classes;
 using Octokit;
 
 namespace Discord_Media_Loader.Helper
@@ -13,7 +9,8 @@ namespace Discord_Media_Loader.Helper
     internal class VersionHelper
     {
         internal static Version CurrentVersion => Assembly.GetExecutingAssembly().GetName().Version;
-        internal static Version AppVersion => typeof(Core).Assembly.GetName().Version;
+
+        internal static Version AppVersion => AssemblyName.GetAssemblyName("Discord Media Loader.Application.dll").Version;
 
         internal static async Task<Version> GetReleaseVersion()
         {
@@ -35,7 +32,7 @@ namespace Discord_Media_Loader.Helper
         {
             var github = new GitHubClient(new ProductHeaderValue("DiscordMediaLoader"));
             var releaseVersion = (from release in (await github.Repository.Release.GetAll("Serraniel", "DiscordMediaLoader")) where release.TagName == $"v{version.Major}.{version.Minor}.{version.Build}.{version.Revision}" select release).First();
-            
+
             return releaseVersion.Assets.FirstOrDefault()?.BrowserDownloadUrl;
         }
     }

Discord Media Loader/Program.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using Discord_Media_Loader.Helper;
-using DML.Application;
 using DML.Application.Classes;
 using Nito.AsyncEx;
 
@@ -20,10 +14,19 @@ namespace Discord_Media_Loader
             Application.SetCompatibleTextRenderingDefault(false);
 
             var splashScreen = new FrmSplash();
-            splashScreen.ShowDialog();
+            if (splashScreen.ShowDialog() == DialogResult.OK)
+            {
+               DoLaunch(paramStrings);
+            }
+            else
+            {
+                Application.Restart();
+            }
+        }
 
+        private static void DoLaunch(string[] paramStrings)
+        {
             AsyncContext.Run(() => Core.Run(paramStrings));
-            Console.WriteLine("Ende");
         }
     }
 }