Serraniel/DiscordMediaLoader
1
0
Fork 0
Code Issues 30 Pull requests 16 Packages Projects Releases 18 Wiki Activity

Merge branch 'bugfix/DownloadQueue_stops_working' into develop

Browse source 
* bugfix/DownloadQueue_stops_working:
  Fixed an error which caused null pointer exceptions in discord framework and interrupted the scanning queue permanently Changed message count to acutally count scanned messages even if they already have scanned before
  Contine on exception during scanning
  New Build
This commit is contained in:
Serraniel 2018-01-22 20:14:16 +01:00
parent f7b7ad2d7a ef21b6ed05
commit 0f1b6f8f9b
4 changed files with 64 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Discord Media Loader.Application/Classes/Job.cs
View file

@ -74,7 +74,8 @@ namespace DML.AppCore.Classes
var channel = FindChannelById(guild, ChannelId); var channel = FindChannelById(guild, ChannelId);
Debug("Checking channel access"); Debug("Checking channel access");
if (!channel.Users.Contains(channel.Guild.CurrentUser)) //channel.GetUser(channel.Guild.CurrentUser.Id);
if (channel.GetUser(channel.Guild.CurrentUser.Id) == null)
{ {
Info("Skipping channel without access"); Info("Skipping channel without access");
return result; return result;
@ -126,6 +127,8 @@ namespace DML.AppCore.Classes
if (!IsValid) if (!IsValid)
return null; return null;
Core.Scheduler.MessagesScanned++;
Debug($"Processing message {m.Id}"); Debug($"Processing message {m.Id}");
if (m.Id < lastId) if (m.Id < lastId)
{ {
@ -148,8 +151,6 @@ namespace DML.AppCore.Classes
Trace($"Added message {m.Id}"); Trace($"Added message {m.Id}");
} }
Debug($"Finished message {m.Id}"); Debug($"Finished message {m.Id}");
Core.Scheduler.MessagesScanned++;
} }
finished = finished || messages.Count < limit; finished = finished || messages.Count < limit;

10
Discord Media Loader.Application/Classes/JobScheduler.cs
View file

@ -90,6 +90,8 @@ namespace DML.AppCore.Classes
{ {
Logger.Info("Started JobScheduler..."); Logger.Info("Started JobScheduler...");
while (Run) while (Run)
{
try
{ {
Logger.Debug("Entering job list handler loop..."); Logger.Debug("Entering job list handler loop...");
//foreach (var job in JobList) //foreach (var job in JobList)
@ -144,7 +146,8 @@ namespace DML.AppCore.Classes
Logger.Trace("Locking scheduler..."); Logger.Trace("Locking scheduler...");
lock (this) lock (this)
{ {
Logger.Trace($"Checking thread limit. Running: {RunningThreads}, Max: {Core.Settings.ThreadLimit}"); Logger.Trace(
$"Checking thread limit. Running: {RunningThreads}, Max: {Core.Settings.ThreadLimit}");
if (RunningThreads >= Core.Settings.ThreadLimit) if (RunningThreads >= Core.Settings.ThreadLimit)
continue; continue;
@ -159,6 +162,11 @@ namespace DML.AppCore.Classes
} }
} }
} }
catch (Exception ex)
{
Logger.Error(ex.Message);
}
}
}); });
} }

4
Discord Media Loader.Application/Properties/AssemblyInfo.cs
View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.1.0")]

4
Discord Media Loader/Properties/AssemblyInfo.cs
View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.1.0")]