diff --git a/src/Ombi.Core/Senders/MovieSender.cs b/src/Ombi.Core/Senders/MovieSender.cs
index 9124eb9c9..567df43b5 100644
--- a/src/Ombi.Core/Senders/MovieSender.cs
+++ b/src/Ombi.Core/Senders/MovieSender.cs
@@ -49,7 +49,6 @@ namespace Ombi.Core.Senders
{
try
{
-
var cpSettings = await CouchPotatoSettings.GetSettingsAsync();
//var watcherSettings = await WatcherSettings.GetSettingsAsync();
var radarrSettings = await RadarrSettings.GetSettingsAsync();
@@ -76,7 +75,7 @@ namespace Ombi.Core.Senders
}
catch (Exception e)
{
- Log.LogError(e, "Error when seing movie to DVR app, added to the request queue");
+ Log.LogError(e, "Error when sending movie to DVR app, added to the request queue");
// Check if already in request quee
var existingQueue = await _requestQueuRepository.FirstOrDefaultAsync(x => x.RequestId == model.Id);
diff --git a/src/Ombi.Core/Senders/TvSender.cs b/src/Ombi.Core/Senders/TvSender.cs
index f0784a4ca..3edc34e1b 100644
--- a/src/Ombi.Core/Senders/TvSender.cs
+++ b/src/Ombi.Core/Senders/TvSender.cs
@@ -57,7 +57,7 @@ namespace Ombi.Core.Senders
var sonarr = await SonarrSettings.GetSettingsAsync();
if (sonarr.Enabled)
{
- var result = await SendToSonarr(model);
+ var result = await SendToSonarr(model, sonarr);
if (result != null)
{
return new SenderResult
@@ -109,7 +109,7 @@ namespace Ombi.Core.Senders
catch (Exception e)
{
Logger.LogError(e, "Exception thrown when sending a movie to DVR app, added to the request queue");
- // Check if already in request quee
+ // Check if already in request queue
var existingQueue = await _requestQueueRepository.FirstOrDefaultAsync(x => x.RequestId == model.Id);
if (existingQueue != null)
{
@@ -134,7 +134,7 @@ namespace Ombi.Core.Senders
return new SenderResult
{
Success = false,
- Message = "Something wen't wrong!"
+ Message = "Something went wrong!"
};
}
@@ -150,13 +150,8 @@ namespace Ombi.Core.Senders
///
///
///
- public async Task SendToSonarr(ChildRequests model)
+ public async Task SendToSonarr(ChildRequests model, SonarrSettings s)
{
- var s = await SonarrSettings.GetSettingsAsync();
- if (!s.Enabled)
- {
- return null;
- }
if (string.IsNullOrEmpty(s.ApiKey))
{
return null;
diff --git a/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IssuesPurge.cs b/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IssuesPurge.cs
index 92ca31071..077fcb7e2 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IssuesPurge.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IssuesPurge.cs
@@ -28,9 +28,9 @@ namespace Ombi.Schedule.Jobs.Ombi
return;
}
- var now = DateTime.Now.AddDays(-settings.DaysAfterResolvedToDelete).Date;
+ var now = DateTime.Now.AddDays(settings.DaysAfterResolvedToDelete).Date;
var resolved = _issuesRepository.GetAll().Where(x => x.Status == IssueStatus.Resolved);
- var toDelete = resolved.Where(x => x.ResovledDate.HasValue && x.ResovledDate.Value.Date <= now);
+ var toDelete = resolved.Where(x => x.ResovledDate.HasValue && x.ResovledDate.Value.Date >= now);
foreach (var d in toDelete)
{
diff --git a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs
index 28155cf25..c9ba5c6b3 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs
@@ -58,7 +58,7 @@ namespace Ombi.Schedule.Jobs.Ombi
{
await StartPlex();
}
-
+
var embySettings = await _embySettings.GetSettingsAsync();
if (embySettings.Enable)
{
@@ -162,7 +162,7 @@ namespace Ombi.Schedule.Jobs.Ombi
_plexRepo.UpdateWithoutSave(show);
}
tvCount++;
- if (tvCount >= 20)
+ if (tvCount >= 75)
{
await _plexRepo.SaveChangesAsync();
tvCount = 0;
@@ -202,7 +202,7 @@ namespace Ombi.Schedule.Jobs.Ombi
_embyRepo.UpdateWithoutSave(show);
}
tvCount++;
- if (tvCount >= 20)
+ if (tvCount >= 75)
{
await _embyRepo.SaveChangesAsync();
tvCount = 0;
@@ -233,7 +233,7 @@ namespace Ombi.Schedule.Jobs.Ombi
_plexRepo.UpdateWithoutSave(movie);
}
movieCount++;
- if (movieCount >= 20)
+ if (movieCount >= 75)
{
await _plexRepo.SaveChangesAsync();
movieCount = 0;
@@ -292,7 +292,7 @@ namespace Ombi.Schedule.Jobs.Ombi
_embyRepo.UpdateWithoutSave(movie);
}
movieCount++;
- if (movieCount >= 20)
+ if (movieCount >= 75)
{
await _embyRepo.SaveChangesAsync();
movieCount = 0;
diff --git a/src/Ombi/Controllers/IssuesController.cs b/src/Ombi/Controllers/IssuesController.cs
index 1a5af5446..0ac4d77bb 100644
--- a/src/Ombi/Controllers/IssuesController.cs
+++ b/src/Ombi/Controllers/IssuesController.cs
@@ -267,6 +267,11 @@ namespace Ombi.Controllers
}
issue.Status = model.Status;
+
+ if (model.Status == IssueStatus.Resolved)
+ {
+ issue.ResovledDate = DateTime.UtcNow;
+ }
await _issues.SaveChangesAsync();
if (issue.Status == IssueStatus.Resolved)