diff --git a/Discord Media Loader.Application/Classes/Job.cs b/Discord Media Loader.Application/Classes/Job.cs
index ce8aa33..149e298 100644
--- a/Discord Media Loader.Application/Classes/Job.cs
+++ b/Discord Media Loader.Application/Classes/Job.cs
@@ -6,7 +6,6 @@ using Discord;
using Discord.WebSocket;
using DML.Application.Classes;
using DML.Client;
-using SweetLib.Utils;
using SweetLib.Utils.Extensions;
using static SweetLib.Utils.Logger.Logger;
@@ -18,7 +17,7 @@ namespace DML.AppCore.Classes
public ulong GuildId { get; set; }
public ulong ChannelId { get; set; }
public double KnownTimestamp { get; set; } = 0;
- private double StopTimestamp { get; set; } = 0;
+ private double StopTimestamp { get; set; }
private bool IsValid { get; set; } = true;
internal void Store()
@@ -30,13 +29,9 @@ namespace DML.AppCore.Classes
Trace("Adding new value...");
if (jobDb.Find(x => x.ChannelId == ChannelId && x.GuildId == GuildId).Any())
- {
jobDb.Update(this);
- }
else
- {
jobDb.Insert(this);
- }
}
public void Delete()
@@ -98,27 +93,20 @@ namespace DML.AppCore.Classes
var realMessages = await channel.GetMessagesAsync(limit).ToArrayAsync();
foreach (var realMessageArray in realMessages)
- {
- foreach (var realMessage in realMessageArray)
- {
- messages.Add(realMessage);
- }
- }
+ foreach (var realMessage in realMessageArray)
+ messages.Add(realMessage);
}
else
{
var realMessages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArrayAsync();
foreach (var realMessageArray in realMessages)
- {
- foreach (var realMessage in realMessageArray)
- {
- messages.Add(realMessage);
- }
- }
+ foreach (var realMessage in realMessageArray)
+ messages.Add(realMessage);
//messages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArray() as SocketMessage[];
}
+
Trace($"Downloaded {messages.Count} messages.");
isFirst = false;
@@ -148,14 +136,16 @@ namespace DML.AppCore.Classes
if (m.Attachments.Count > 0)
{
result.Add(m);
- Core.Scheduler.TotalAttachments += (ulong)m.Attachments.Count;
+ Core.Scheduler.TotalAttachments += (ulong) m.Attachments.Count;
Trace($"Added message {m.Id}");
}
+
Debug($"Finished message {m.Id}");
}
finished = finished || messages.Count < limit;
}
+
Trace($"Downloaded all messages for guild {GuildId} channel {ChannelId}.");
Trace("Sorting messages...");
@@ -187,4 +177,4 @@ namespace DML.AppCore.Classes
return jobDb.FindAll();
}
}
-}
+}
\ No newline at end of file
diff --git a/Discord Media Loader.Application/DML.Application.csproj b/Discord Media Loader.Application/DML.Application.csproj
index 474cae7..62a635d 100644
--- a/Discord Media Loader.Application/DML.Application.csproj
+++ b/Discord Media Loader.Application/DML.Application.csproj
@@ -41,12 +41,6 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll
-
-
- ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.6\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll
@@ -56,116 +50,35 @@
..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
-
- ..\packages\Nito.AsyncEx.Context.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll
-
-
- ..\packages\Nito.AsyncEx.Coordination.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Coordination.dll
-
-
- ..\packages\Nito.AsyncEx.Interop.WaitHandles.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll
-
-
- ..\packages\Nito.AsyncEx.Oop.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll
-
-
- ..\packages\Nito.AsyncEx.Tasks.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll
-
-
- ..\packages\Nito.Cancellation.1.0.5\lib\netstandard2.0\Nito.Cancellation.dll
-
-
- ..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll
-
-
- ..\packages\Nito.Disposables.2.1.0\lib\net461\Nito.Disposables.dll
-
-
- ..\packages\Octokit.0.48.0\lib\net46\Octokit.dll
-
-
- ..\packages\RestSharp.106.11.4\lib\net452\RestSharp.dll
-
..\packages\SharpRaven.2.4.0\lib\net45\SharpRaven.dll
-
- ..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll
-
..\packages\SweetLib.0.2.1-alpha\lib\netstandard1.3\SweetLib.dll
-
- ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll
-
..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll
-
- ..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll
- True
- True
-
-
- ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll
- True
- True
-
-
- ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll
-
-
- ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll
-
-
- ..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll
-
-
- ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
- True
-
-
- ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll
-
-
- ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll
-
-
- ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll
-
-
- ..\packages\System.Linq.Async.4.1.1\lib\net461\System.Linq.Async.dll
+
+ ..\packages\System.Linq.Async.5.0.0\lib\net461\System.Linq.Async.dll
..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
-
- ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll
- True
- True
-
-
- ..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll
- True
- True
-
..\packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll
True
True
-
- ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll
-
..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
@@ -210,14 +123,6 @@
-
- ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll
- True
- True
-
-
- ..\packages\WebSocket4Net.0.15.2\lib\net45\WebSocket4Net.dll
-
diff --git a/Discord Media Loader.Application/Helper/IdentifiedString.cs b/Discord Media Loader.Application/Helper/IdentifiedString.cs
index 828d6cf..98e671f 100644
--- a/Discord Media Loader.Application/Helper/IdentifiedString.cs
+++ b/Discord Media Loader.Application/Helper/IdentifiedString.cs
@@ -1,22 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DML.Application.Helper
+namespace DML.Application.Helper
{
internal class IdentifiedString
{
- internal T Id { get; set; }
- internal string Caption { get; set; }
-
internal IdentifiedString(T id, string caption)
{
Id = id;
Caption = caption;
}
- public override string ToString() => Caption;
+ internal T Id { get; set; }
+ internal string Caption { get; set; }
+
+ public override string ToString()
+ {
+ return Caption;
+ }
}
-}
+}
\ No newline at end of file
diff --git a/Discord Media Loader.Application/MainForm.cs b/Discord Media Loader.Application/MainForm.cs
index ddf87c6..9b434fb 100644
--- a/Discord Media Loader.Application/MainForm.cs
+++ b/Discord Media Loader.Application/MainForm.cs
@@ -1,37 +1,37 @@
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
-using System.Threading.Tasks;
using System.Windows.Forms;
using Discord;
using Discord.WebSocket;
using DML.AppCore.Classes;
using DML.Application.Classes;
using DML.Application.Helper;
+using DML.Application.Properties;
using DML.Client;
-using static DML.Client.DMLClient;
using static SweetLib.Utils.Logger.Logger;
namespace DML.Application
{
- enum OnlineState
+ internal enum OnlineState
{
Online,
Idle,
DoNotDisturb,
Invisible
}
+
public partial class MainForm : Form
{
- private bool IsInitialized { get; set; } = false;
public MainForm()
{
InitializeComponent();
}
- private void MainForm_Shown(object sender, System.EventArgs e)
+ private bool IsInitialized { get; set; }
+
+ private void MainForm_Shown(object sender, EventArgs e)
{
Trace("MainForm shown executed.");
RefreshComponents();
@@ -61,7 +61,8 @@ namespace DML.Application
{
Trace("Adding guilds to component...");
- cbGuild.Items.AddRange(DMLClient.Client.Guilds.Where(g => g.Name != null).OrderBy(g => g.Name).Select(g => new IdentifiedString(g.Id, g.Name)).ToArray());
+ cbGuild.Items.AddRange(DMLClient.Client.Guilds.Where(g => g.Name != null).OrderBy(g => g.Name)
+ .Select(g => new IdentifiedString(g.Id, g.Name)).ToArray());
cbGuild.SelectedIndex = 0;
Trace("Guild component initialized.");
@@ -71,15 +72,14 @@ namespace DML.Application
var oldIndex = lbxJobs.SelectedIndex;
lbxJobs.Items.Clear();
foreach (var job in Core.Scheduler.JobList)
- {
- lbxJobs.Items.Add(new IdentifiedString(job.Id, $"{FindServerById(job.GuildId)?.Name}:{FindChannelById(FindServerById(job.GuildId), job.ChannelId)?.Name}"));
- }
+ lbxJobs.Items.Add(new IdentifiedString(job.Id,
+ $"{FindServerById(job.GuildId)?.Name}:{FindChannelById(FindServerById(job.GuildId), job.ChannelId)?.Name}"));
lbxJobs.SelectedIndex = oldIndex;
lbStatus.Text = DMLClient.Client.CurrentUser.Status.ToString();
}
- private void DoSomethingChanged(object sender, System.EventArgs e)
+ private void DoSomethingChanged(object sender, EventArgs e)
{
Debug($"DoSomethingChanged excuted by {sender}.");
if (!IsInitialized)
@@ -98,7 +98,7 @@ namespace DML.Application
Core.Settings.SkipExistingFiles = cbSkipExisting.Checked;
Trace("Updating thread limit...");
- Core.Settings.ThreadLimit = (int)edThreadLimit.Value;
+ Core.Settings.ThreadLimit = (int) edThreadLimit.Value;
Trace("Storing new settings...");
Core.Settings.Store();
@@ -106,7 +106,7 @@ namespace DML.Application
Info("New settings have been saved.");
}
- private void btnSearchFolders_Click(object sender, System.EventArgs e)
+ private void btnSearchFolders_Click(object sender, EventArgs e)
{
Trace("Operating folder button pressed.");
using (var browserDialog = new FolderBrowserDialog())
@@ -149,7 +149,7 @@ namespace DML.Application
return (from c in server.TextChannels where c.Id == id select c).FirstOrDefault();
}
- private void cbGuild_SelectedIndexChanged(object sender, System.EventArgs e)
+ private void cbGuild_SelectedIndexChanged(object sender, EventArgs e)
{
Trace("Guild index changed.");
Debug("Updating channel dropdown component...");
@@ -157,7 +157,7 @@ namespace DML.Application
UseWaitCursor = true;
try
{
- var guild = FindServerById(((IdentifiedString)cbGuild.SelectedItem).Id);
+ var guild = FindServerById(((IdentifiedString) cbGuild.SelectedItem).Id);
if (guild != null)
{
@@ -166,7 +166,8 @@ namespace DML.Application
Trace("Adding new channels...");
- cbChannel.Items.AddRange(guild.TextChannels.OrderBy(c => c.Position).Select(c => new IdentifiedString(c.Id, c.Name)).ToArray());
+ cbChannel.Items.AddRange(guild.TextChannels.OrderBy(c => c.Position)
+ .Select(c => new IdentifiedString(c.Id, c.Name)).ToArray());
Trace($"Added {cbChannel.Items.Count} channels.");
@@ -185,17 +186,17 @@ namespace DML.Application
Debug("Finished updating channel dropdown component.");
}
- private void btnAddJob_Click(object sender, System.EventArgs e)
+ private void btnAddJob_Click(object sender, EventArgs e)
{
var job = new Job
{
- GuildId = ((IdentifiedString)cbGuild.SelectedItem).Id,
- ChannelId = ((IdentifiedString)cbChannel.SelectedItem).Id
+ GuildId = ((IdentifiedString) cbGuild.SelectedItem).Id,
+ ChannelId = ((IdentifiedString) cbChannel.SelectedItem).Id
};
if (!(from j in Core.Scheduler.JobList
- where j.GuildId == job.GuildId && j.ChannelId == job.ChannelId
- select j).Any())
+ where j.GuildId == job.GuildId && j.ChannelId == job.ChannelId
+ select j).Any())
{
job.Store();
Core.Scheduler.JobList.Add(job);
@@ -204,7 +205,7 @@ namespace DML.Application
RefreshComponents();
}
- private void btnDelete_Click(object sender, System.EventArgs e)
+ private void btnDelete_Click(object sender, EventArgs e)
{
Trace("Deleting job pressed.");
@@ -214,7 +215,7 @@ namespace DML.Application
MessageBox.Show("No job has been seleted.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
- var jobId = ((IdentifiedString)lbxJobs.SelectedItem).Id;
+ var jobId = ((IdentifiedString) lbxJobs.SelectedItem).Id;
var job = Core.Scheduler.JobList.FirstOrDefault(j => j.Id == jobId);
if (job != null)
@@ -229,13 +230,13 @@ namespace DML.Application
RefreshComponents();
}
- private void tmrRefreshProgress_Tick(object sender, System.EventArgs e)
+ private void tmrRefreshProgress_Tick(object sender, EventArgs e)
{
var scanned = Core.Scheduler.MessagesScanned;
var totalAttachments = Core.Scheduler.TotalAttachments;
var done = Core.Scheduler.AttachmentsDownloaded;
- var progress = totalAttachments > 0 ? (int)(100 * done / totalAttachments) : 0;
+ var progress = totalAttachments > 0 ? (int) (100 * done / totalAttachments) : 0;
progress = Math.Min(Math.Max(0, progress), 100);
pgbProgress.Maximum = 100;
pgbProgress.Value = progress;
@@ -243,19 +244,19 @@ namespace DML.Application
lbProgress.Text = $"Scanned: {scanned} Downloaded: {done} Open: {totalAttachments - done}";
}
- private void aboutToolStripMenuItem_Click(object sender, System.EventArgs e)
+ private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
- MessageBox.Show(Properties.Resources.AboutString);
+ MessageBox.Show(Resources.AboutString);
}
- private void visitGithubToolStripMenuItem_Click(object sender, System.EventArgs e)
+ private void visitGithubToolStripMenuItem_Click(object sender, EventArgs e)
{
Process.Start("https://github.com/Serraniel/DiscordMediaLoader/");
}
private async void toolStripDropDownButton1_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
- OnlineState state = (OnlineState)Convert.ToInt32(e.ClickedItem.Tag);
+ var state = (OnlineState) Convert.ToInt32(e.ClickedItem.Tag);
lbStatus.Text = state.ToString();
tmrTriggerRefresh.Start();
@@ -292,7 +293,7 @@ namespace DML.Application
private void btnFileNameHelp_Click(object sender, EventArgs e)
{
- MessageBox.Show(Properties.Resources.FileNameInfo);
+ MessageBox.Show(Resources.FileNameInfo);
}
}
-}
+}
\ No newline at end of file
diff --git a/Discord Media Loader.Application/Properties/AssemblyInfo.cs b/Discord Media Loader.Application/Properties/AssemblyInfo.cs
index 21791d3..4126abc 100644
--- a/Discord Media Loader.Application/Properties/AssemblyInfo.cs
+++ b/Discord Media Loader.Application/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
@@ -33,4 +32,4 @@ using System.Runtime.InteropServices;
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
\ No newline at end of file
diff --git a/Discord Media Loader.Application/packages.config b/Discord Media Loader.Application/packages.config
index 1d19ee8..071a83b 100644
--- a/Discord Media Loader.Application/packages.config
+++ b/Discord Media Loader.Application/packages.config
@@ -2,83 +2,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Discord Media Loader/App.config b/Discord Media Loader/App.config
index 9bd9a4c..2905c51 100644
--- a/Discord Media Loader/App.config
+++ b/Discord Media Loader/App.config
@@ -7,7 +7,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
diff --git a/Discord Media Loader/Discord Media Loader.csproj b/Discord Media Loader/Discord Media Loader.csproj
index b546eac..279a67c 100644
--- a/Discord Media Loader/Discord Media Loader.csproj
+++ b/Discord Media Loader/Discord Media Loader.csproj
@@ -45,49 +45,40 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll
-
-
- ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.6\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll
..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
-
- ..\packages\Nito.AsyncEx.Context.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll
+
+ ..\packages\Nito.AsyncEx.Context.5.1.2\lib\net461\Nito.AsyncEx.Context.dll
-
- ..\packages\Nito.AsyncEx.Coordination.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Coordination.dll
+
+ ..\packages\Nito.AsyncEx.Coordination.5.1.2\lib\net461\Nito.AsyncEx.Coordination.dll
-
- ..\packages\Nito.AsyncEx.Interop.WaitHandles.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll
+
+ ..\packages\Nito.AsyncEx.Interop.WaitHandles.5.1.2\lib\net461\Nito.AsyncEx.Interop.WaitHandles.dll
-
- ..\packages\Nito.AsyncEx.Oop.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll
+
+ ..\packages\Nito.AsyncEx.Oop.5.1.2\lib\net461\Nito.AsyncEx.Oop.dll
-
- ..\packages\Nito.AsyncEx.Tasks.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll
+
+ ..\packages\Nito.AsyncEx.Tasks.5.1.2\lib\net461\Nito.AsyncEx.Tasks.dll
-
- ..\packages\Nito.Cancellation.1.0.5\lib\netstandard2.0\Nito.Cancellation.dll
+
+ ..\packages\Nito.Cancellation.1.1.2\lib\net461\Nito.Cancellation.dll
-
- ..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll
+
+ ..\packages\Nito.Collections.Deque.1.1.1\lib\net461\Nito.Collections.Deque.dll
-
- ..\packages\Nito.Disposables.2.1.0\lib\net461\Nito.Disposables.dll
+
+ ..\packages\Nito.Disposables.2.2.1\lib\net461\Nito.Disposables.dll
..\packages\Octokit.0.48.0\lib\net46\Octokit.dll
-
- ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll
-
..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
@@ -95,49 +86,11 @@
..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll
-
- ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll
- True
- True
-
-
- ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll
-
-
- ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll
-
-
- ..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll
-
-
- ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
- True
-
-
- ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll
-
-
- ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll
-
-
- ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll
-
-
- ..\packages\System.Linq.Async.4.1.1\lib\net461\System.Linq.Async.dll
-
..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
-
- ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll
- True
- True
-
-
- ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll
-
..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
@@ -176,11 +129,6 @@
-
- ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll
- True
- True
-
diff --git a/Discord Media Loader/Program.cs b/Discord Media Loader/Program.cs
index 7ce9201..f0082cb 100644
--- a/Discord Media Loader/Program.cs
+++ b/Discord Media Loader/Program.cs
@@ -5,23 +5,19 @@ using Nito.AsyncEx;
namespace Discord_Media_Loader
{
- static class Program
+ internal static class Program
{
[STAThread]
- static void Main(string[] paramStrings)
+ private static void Main(string[] paramStrings)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
var splashScreen = new FrmSplash();
if (splashScreen.ShowDialog() == DialogResult.OK)
- {
- DoLaunch(paramStrings);
- }
+ DoLaunch(paramStrings);
else
- {
Application.Restart();
- }
}
private static void DoLaunch(string[] paramStrings)
@@ -29,4 +25,4 @@ namespace Discord_Media_Loader
AsyncContext.Run(() => Core.Run(paramStrings));
}
}
-}
+}
\ No newline at end of file
diff --git a/Discord Media Loader/Properties/AssemblyInfo.cs b/Discord Media Loader/Properties/AssemblyInfo.cs
index 91f52f3..5c976a9 100644
--- a/Discord Media Loader/Properties/AssemblyInfo.cs
+++ b/Discord Media Loader/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
@@ -33,4 +32,4 @@ using System.Runtime.InteropServices;
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
\ No newline at end of file
diff --git a/Discord Media Loader/packages.config b/Discord Media Loader/packages.config
index cf2d651..d3d08d4 100644
--- a/Discord Media Loader/packages.config
+++ b/Discord Media Loader/packages.config
@@ -1,72 +1,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libs/Discord.Net b/libs/Discord.Net
index 06155e0..373318d 160000
--- a/libs/Discord.Net
+++ b/libs/Discord.Net
@@ -1 +1 @@
-Subproject commit 06155e03a23e9fca0c865f65d0675d3dd79c90a8
+Subproject commit 373318d3eae295f789c11a24948d86690db91a0f