Merge pull request #2672 from tidusjar/feature/request-queue

Feature/request queue

src/Ombi.Core/Engine/VoteEngine.cs

@@ -11,7 +11,7 @@ using Ombi.Core.Models;
 using Ombi.Core.Models.UI;
 using Ombi.Core.Rule.Interfaces;
 using Ombi.Core.Settings;
-using Ombi.Schedule.Jobs.Ombi;
+using Ombi.Helpers;
 using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
@@ -114,7 +114,7 @@ namespace Ombi.Core.Engine
                     foreach (var epInformation in childRequests.SeasonRequests.OrderBy(x => x.SeasonNumber))
                     {
                         var orderedEpisodes = epInformation.Episodes.OrderBy(x => x.EpisodeNumber).ToList();
-                        var episodeString = NewsletterJob.BuildEpisodeList(orderedEpisodes.Select(x => x.EpisodeNumber));
+                        var episodeString = StringHelper.BuildEpisodeList(orderedEpisodes.Select(x => x.EpisodeNumber));
                         finalsb.Append($"Season: {epInformation.SeasonNumber} - Episodes: {episodeString}");
                         finalsb.Append("<br />");
                     }

src/Ombi.Core/Ombi.Core.csproj

@@ -20,16 +20,18 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Ombi.Api.CouchPotato\Ombi.Api.CouchPotato.csproj" />
     <ProjectReference Include="..\Ombi.Api.DogNzb\Ombi.Api.DogNzb.csproj" />
+    <ProjectReference Include="..\Ombi.Api.Emby\Ombi.Api.Emby.csproj" />
     <ProjectReference Include="..\Ombi.Api.Lidarr\Ombi.Api.Lidarr.csproj" />
     <ProjectReference Include="..\Ombi.Api.Plex\Ombi.Api.Plex.csproj" />
+    <ProjectReference Include="..\Ombi.Api.Radarr\Ombi.Api.Radarr.csproj" />
     <ProjectReference Include="..\Ombi.Api.SickRage\Ombi.Api.SickRage.csproj" />
     <ProjectReference Include="..\Ombi.Api.Sonarr\Ombi.Api.Sonarr.csproj" />
     <ProjectReference Include="..\Ombi.Api.Trakt\Ombi.Api.Trakt.csproj" />
     <ProjectReference Include="..\Ombi.Api.TvMaze\Ombi.Api.TvMaze.csproj" />
     <ProjectReference Include="..\Ombi.Helpers\Ombi.Helpers.csproj" />
     <ProjectReference Include="..\Ombi.Notifications\Ombi.Notifications.csproj" />
-    <ProjectReference Include="..\Ombi.Schedule\Ombi.Schedule.csproj" />
     <ProjectReference Include="..\Ombi.Settings\Ombi.Settings.csproj" />
     <ProjectReference Include="..\Ombi.Store\Ombi.Store.csproj" />
     <ProjectReference Include="..\Ombi.TheMovieDbApi\Ombi.Api.TheMovieDb.csproj" />

src/Ombi.Core/Senders/MovieSender.cs

@@ -20,7 +20,7 @@ namespace Ombi.Core.Senders
     {
         public MovieSender(ISettingsService<RadarrSettings> radarrSettings, IRadarrApi api, ILogger<MovieSender> log,
             ISettingsService<DogNzbSettings> dogSettings, IDogNzbApi dogApi, ISettingsService<CouchPotatoSettings> cpSettings,
-            ICouchPotatoApi cpApi, IRepository<UserQualityProfiles> userProfiles)
+            ICouchPotatoApi cpApi, IRepository<UserQualityProfiles> userProfiles, IRepository<RequestQueue> requestQueue, INotificationHelper notify)
         {
             RadarrSettings = radarrSettings;
             RadarrApi = api;
@@ -30,6 +30,8 @@ namespace Ombi.Core.Senders
             CouchPotatoSettings = cpSettings;
             CouchPotatoApi = cpApi;
             _userProfiles = userProfiles;
+            _requestQueuRepository = requestQueue;
+            _notificationHelper = notify;
         }
 
         private ISettingsService<RadarrSettings> RadarrSettings { get; }
@@ -40,38 +42,63 @@ namespace Ombi.Core.Senders
         private ISettingsService<CouchPotatoSettings> CouchPotatoSettings { get; }
         private ICouchPotatoApi CouchPotatoApi { get; }
         private readonly IRepository<UserQualityProfiles> _userProfiles;
+        private readonly IRepository<RequestQueue> _requestQueuRepository;
+        private readonly INotificationHelper _notificationHelper;
 
         public async Task<SenderResult> Send(MovieRequests model)
         {
-            var cpSettings = await CouchPotatoSettings.GetSettingsAsync();
-            //var watcherSettings = await WatcherSettings.GetSettingsAsync();
-            var radarrSettings = await RadarrSettings.GetSettingsAsync();
-            if (radarrSettings.Enabled)
+            try
             {
-                return await SendToRadarr(model, radarrSettings);
-            }
 
-            var dogSettings = await DogNzbSettings.GetSettingsAsync();
-            if (dogSettings.Enabled)
-            {
-                await SendToDogNzb(model, dogSettings);
-                return new SenderResult
+                var cpSettings = await CouchPotatoSettings.GetSettingsAsync();
+                //var watcherSettings = await WatcherSettings.GetSettingsAsync();
+                var radarrSettings = await RadarrSettings.GetSettingsAsync();
+                if (radarrSettings.Enabled)
                 {
-                    Success = true,
-                    Sent = true,
-                };
-            }
+                    return await SendToRadarr(model, radarrSettings);
+                }
 
-            if (cpSettings.Enabled)
-            {
-                return await SendToCp(model, cpSettings, cpSettings.DefaultProfileId);
-            }
+                var dogSettings = await DogNzbSettings.GetSettingsAsync();
+                if (dogSettings.Enabled)
+                {
+                    await SendToDogNzb(model, dogSettings);
+                    return new SenderResult
+                    {
+                        Success = true,
+                        Sent = true,
+                    };
+                }
 
-            //if (watcherSettings.Enabled)
-            //{
-            //    return SendToWatcher(model, watcherSettings);
-            //}
+                if (cpSettings.Enabled)
+                {
+                    return await SendToCp(model, cpSettings, cpSettings.DefaultProfileId);
+                }
+            }
+            catch (Exception e)
+            {
+                Log.LogError(e, "Error when seing 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);
+                if (existingQueue != null)
+                {
+                    existingQueue.RetryCount++;
+                    existingQueue.Error = e.Message;
+                    await _requestQueuRepository.SaveChangesAsync();
+                }
+                else
+                {
+                    await _requestQueuRepository.Add(new RequestQueue
+                    {
+                        Dts = DateTime.UtcNow,
+                        Error = e.Message,
+                        RequestId = model.Id,
+                        Type = RequestType.Movie,
+                        RetryCount = 0
+                    });
+                    _notificationHelper.Notify(model, NotificationType.ItemAddedToFaultQueue);
+                }
+            }
 
             return new SenderResult
             {
@@ -94,9 +121,9 @@ namespace Ombi.Core.Senders
 
         private async Task<SenderResult> SendToRadarr(MovieRequests model, RadarrSettings settings)
         {
- 
+
             var qualityToUse = int.Parse(settings.DefaultQualityProfile);
-       
+
             var rootFolderPath = settings.DefaultRootPath;
 
             var profiles = await _userProfiles.GetAll().FirstOrDefaultAsync(x => x.UserId == model.RequestedUserId);
@@ -155,7 +182,7 @@ namespace Ombi.Core.Senders
                 // Search for it
                 if (!settings.AddOnly)
                 {
-                    await RadarrApi.MovieSearch(new[] {existingMovie.id}, settings.ApiKey, settings.FullUri);
+                    await RadarrApi.MovieSearch(new[] { existingMovie.id }, settings.ApiKey, settings.FullUri);
                 }
 
                 return new SenderResult { Success = true, Sent = true };

src/Ombi.Core/Senders/MusicSender.cs

@@ -1,37 +1,75 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using Ombi.Api.Lidarr;
 using Ombi.Api.Lidarr.Models;
-using Ombi.Api.Radarr;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
 using Ombi.Settings.Settings.Models.External;
+using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
-using Serilog;
+using Ombi.Store.Repository;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace Ombi.Core.Senders
 {
     public class MusicSender : IMusicSender
     {
-        public MusicSender(ISettingsService<LidarrSettings> lidarr, ILidarrApi lidarrApi)
+        public MusicSender(ISettingsService<LidarrSettings> lidarr, ILidarrApi lidarrApi, ILogger<MusicSender> log,
+            IRepository<RequestQueue> requestQueue, INotificationHelper notify)
         {
             _lidarrSettings = lidarr;
             _lidarrApi = lidarrApi;
+            _log = log;
+            _requestQueueRepository = requestQueue;
+            _notificationHelper = notify;
         }
 
         private readonly ISettingsService<LidarrSettings> _lidarrSettings;
         private readonly ILidarrApi _lidarrApi;
+        private readonly ILogger _log;
+        private readonly IRepository<RequestQueue> _requestQueueRepository;
+        private readonly INotificationHelper _notificationHelper;
 
         public async Task<SenderResult> Send(AlbumRequest model)
         {
-            var settings = await _lidarrSettings.GetSettingsAsync();
-            if (settings.Enabled)
+            try
             {
-                return await SendToLidarr(model, settings);
+                var settings = await _lidarrSettings.GetSettingsAsync();
+                if (settings.Enabled)
+                {
+                    return await SendToLidarr(model, settings);
+                }
+
+                return new SenderResult { Success = false, Sent = false, Message = "Lidarr is not enabled" };
             }
+            catch (Exception e)
+            {
+                _log.LogError(e, "Exception thrown when sending a music to DVR app, added to the request queue");
+                var existingQueue = await _requestQueueRepository.FirstOrDefaultAsync(x => x.RequestId == model.Id);
+                if (existingQueue != null)
+                {
+                    existingQueue.RetryCount++;
+                    existingQueue.Error = e.Message;
+                    await _requestQueueRepository.SaveChangesAsync();
+                }
+                else
+                {
+                    await _requestQueueRepository.Add(new RequestQueue
+                    {
+                        Dts = DateTime.UtcNow,
+                        Error = e.Message,
+                        RequestId = model.Id,
+                        Type = RequestType.Album,
+                        RetryCount = 0
+                    });
+                    _notificationHelper.Notify(model, NotificationType.ItemAddedToFaultQueue);
+                }
+            }
+
 
-            return new SenderResult { Success = false, Sent = false, Message = "Lidarr is not enabled" };
+            return new SenderResult { Success = false, Sent = false, Message = "Something went wrong!" };
         }
 
         private async Task<SenderResult> SendToLidarr(AlbumRequest model, LidarrSettings settings)

src/Ombi.Core/Senders/TvSender.cs

@@ -23,7 +23,7 @@ namespace Ombi.Core.Senders
     {
         public TvSender(ISonarrApi sonarrApi, ISonarrV3Api sonarrV3Api, ILogger<TvSender> log, ISettingsService<SonarrSettings> sonarrSettings,
             ISettingsService<DogNzbSettings> dog, IDogNzbApi dogApi, ISettingsService<SickRageSettings> srSettings,
-            ISickRageApi srApi, IRepository<UserQualityProfiles> userProfiles)
+            ISickRageApi srApi, IRepository<UserQualityProfiles> userProfiles, IRepository<RequestQueue> requestQueue, INotificationHelper notify)
         {
             SonarrApi = sonarrApi;
             SonarrV3Api = sonarrV3Api;
@@ -34,6 +34,8 @@ namespace Ombi.Core.Senders
             SickRageSettings = srSettings;
             SickRageApi = srApi;
             UserQualityProfiles = userProfiles;
+            _requestQueueRepository = requestQueue;
+            _notificationHelper = notify;
         }
 
         private ISonarrApi SonarrApi { get; }
@@ -45,59 +47,94 @@ namespace Ombi.Core.Senders
         private ISettingsService<DogNzbSettings> DogNzbSettings { get; }
         private ISettingsService<SickRageSettings> SickRageSettings { get; }
         private IRepository<UserQualityProfiles> UserQualityProfiles { get; }
+        private readonly IRepository<RequestQueue> _requestQueueRepository;
+        private readonly INotificationHelper _notificationHelper;
 
         public async Task<SenderResult> Send(ChildRequests model)
         {
-            var sonarr = await SonarrSettings.GetSettingsAsync();
-            if (sonarr.Enabled)
+            try
             {
-                var result = await SendToSonarr(model);
-                if (result != null)
+                var sonarr = await SonarrSettings.GetSettingsAsync();
+                if (sonarr.Enabled)
                 {
+                    var result = await SendToSonarr(model);
+                    if (result != null)
+                    {
+                        return new SenderResult
+                        {
+                            Sent = true,
+                            Success = true
+                        };
+                    }
+                }
+                var dog = await DogNzbSettings.GetSettingsAsync();
+                if (dog.Enabled)
+                {
+                    var result = await SendToDogNzb(model, dog);
+                    if (!result.Failure)
+                    {
+                        return new SenderResult
+                        {
+                            Sent = true,
+                            Success = true
+                        };
+                    }
                     return new SenderResult
                     {
-                        Sent = true,
-                        Success = true
+                        Message = result.ErrorMessage
                     };
                 }
-            }
-            var dog = await DogNzbSettings.GetSettingsAsync();
-            if (dog.Enabled)
-            {
-                var result = await SendToDogNzb(model, dog);
-                if (!result.Failure)
+                var sr = await SickRageSettings.GetSettingsAsync();
+                if (sr.Enabled)
                 {
+                    var result = await SendToSickRage(model, sr);
+                    if (result)
+                    {
+                        return new SenderResult
+                        {
+                            Sent = true,
+                            Success = true
+                        };
+                    }
                     return new SenderResult
                     {
-                        Sent = true,
-                        Success = true
+                        Message = "Could not send to SickRage!"
                     };
                 }
                 return new SenderResult
                 {
-                    Message = result.ErrorMessage
+                    Success = true
                 };
             }
-            var sr = await SickRageSettings.GetSettingsAsync();
-            if (sr.Enabled)
+            catch (Exception e)
             {
-                var result = await SendToSickRage(model, sr);
-                if (result)
+                Logger.LogError(e, "Exception thrown when sending a movie to DVR app, added to the request queue");
+                // Check if already in request quee
+                var existingQueue = await _requestQueueRepository.FirstOrDefaultAsync(x => x.RequestId == model.Id);
+                if (existingQueue != null)
                 {
-                    return new SenderResult
-                    {
-                        Sent = true,
-                        Success = true
-                    };
+                    existingQueue.RetryCount++;
+                    existingQueue.Error = e.Message;
+                    await _requestQueueRepository.SaveChangesAsync();
                 }
-                return new SenderResult
+                else
                 {
-                    Message = "Could not send to SickRage!"
-                };
+                    await _requestQueueRepository.Add(new RequestQueue
+                    {
+                        Dts = DateTime.UtcNow,
+                        Error = e.Message,
+                        RequestId = model.Id,
+                        Type = RequestType.TvShow,
+                        RetryCount = 0
+                    });
+                    _notificationHelper.Notify(model, NotificationType.ItemAddedToFaultQueue);
+                }
             }
+
             return new SenderResult
             {
-                Success = true
+                Success = false,
+                Message = "Something wen't wrong!"
             };
         }
 
@@ -145,7 +182,7 @@ namespace Ombi.Core.Senders
                     }
                     if (profiles.SonarrQualityProfileAnime > 0)
                     {
-                       qualityToUse = profiles.SonarrQualityProfileAnime;
+                        qualityToUse = profiles.SonarrQualityProfileAnime;
                     }
                 }
                 seriesType = "anime";
@@ -165,7 +202,7 @@ namespace Ombi.Core.Senders
                     }
                     if (profiles.SonarrQualityProfile > 0)
                     {
-                       qualityToUse = profiles.SonarrQualityProfile;
+                        qualityToUse = profiles.SonarrQualityProfile;
                     }
                 }
                 seriesType = "standard";
@@ -176,8 +213,7 @@ namespace Ombi.Core.Senders
             {
                 qualityToUse = model.ParentRequest.QualityOverride.Value;
             }
-            
-            
+      
             // Are we using v3 sonarr?
             var sonarrV3 = s.V3;
             var languageProfileId = s.LanguageProfile;
@@ -280,7 +316,7 @@ namespace Ombi.Core.Senders
                 }
             }
             var seriesChanges = false;
-            
+
             foreach (var season in model.SeasonRequests)
             {
                 var sonarrSeason = sonarrEpList.Where(x => x.seasonNumber == season.SeasonNumber);

src/Ombi.DependencyInjection/IocExtensions.cs

@@ -199,6 +199,7 @@ namespace Ombi.DependencyInjection
             services.AddTransient<ILidarrArtistSync, LidarrArtistSync>();
             services.AddTransient<ILidarrAvailabilityChecker, LidarrAvailabilityChecker>();
             services.AddTransient<IIssuesPurge, IssuesPurge>();
+            services.AddTransient<IResendFailedRequests, ResendFailedRequests>();
         }
     }
 }

src/Ombi.Helpers/StringHelper.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Security;
@@ -76,6 +77,49 @@ namespace Ombi.Helpers
             return -1;
         }
 
+        public static string BuildEpisodeList(IEnumerable<int> orderedEpisodes)
+        {
+            var epSb = new StringBuilder();
+            var previousEpisodes = new List<int>();
+            var previousEpisode = -1;
+            foreach (var ep in orderedEpisodes)
+            {
+                if (ep - 1 == previousEpisode)
+                {
+                    // This is the next one
+                    previousEpisodes.Add(ep);
+                }
+                else
+                {
+                    if (previousEpisodes.Count > 1)
+                    {
+                        // End it
+                        epSb.Append($"{previousEpisodes.First()}-{previousEpisodes.Last()}, ");
+                    }
+                    else if (previousEpisodes.Count == 1)
+                    {
+                        epSb.Append($"{previousEpisodes.FirstOrDefault()}, ");
+                    }
+                    // New one
+                    previousEpisodes.Clear();
+                    previousEpisodes.Add(ep);
+                }
+                previousEpisode = ep;
+            }
+
+            if (previousEpisodes.Count > 1)
+            {
+                // Got some left over
+                epSb.Append($"{previousEpisodes.First()}-{previousEpisodes.Last()}");
+            }
+            else if (previousEpisodes.Count == 1)
+            {
+                epSb.Append(previousEpisodes.FirstOrDefault());
+            }
+
+            return epSb.ToString();
+        }
+
         public static string RemoveSpaces(this string str)
         {
             return str.Replace(" ", "");

src/Ombi.Notifications/Agents/DiscordNotification.cs

@@ -6,7 +6,6 @@ using Ombi.Api.Discord;
 using Ombi.Api.Discord.Models;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;

src/Ombi.Notifications/Agents/EmailNotification.cs

@@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
 using MimeKit;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Notifications.Templates;
 using Ombi.Settings.Settings.Models;

src/Ombi.Notifications/Agents/MattermostNotification.cs

@@ -2,13 +2,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Ombi.Api.Discord;
-using Ombi.Api.Discord.Models;
 using Ombi.Api.Mattermost;
 using Ombi.Api.Mattermost.Models;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;

src/Ombi.Notifications/Agents/MobileNotification.cs

@@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
 using Ombi.Api.Notifications;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;

src/Ombi.Notifications/Agents/PushbulletNotification.cs

@@ -4,7 +4,6 @@ using Microsoft.Extensions.Logging;
 using Ombi.Api.Pushbullet;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;

src/Ombi.Notifications/Agents/PushoverNotification.cs

@@ -5,7 +5,6 @@ using Ombi.Api.Pushbullet;
 using Ombi.Api.Pushover;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;

src/Ombi.Notifications/Agents/SlackNotification.cs

@@ -5,7 +5,6 @@ using Ombi.Api.Slack;
 using Ombi.Api.Slack.Models;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;

src/Ombi.Notifications/Agents/TelegramNotification.cs

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Ombi.Core.Settings;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;

src/Ombi.Notifications/BaseNotification.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -14,7 +13,7 @@ using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
 using Ombi.Store.Repository.Requests;
 
-namespace Ombi.Notifications.Interfaces
+namespace Ombi.Notifications
 {
     public abstract class BaseNotification<T> : INotification where T : Settings.Settings.Models.Settings, new()
     {

src/Ombi.Notifications/NotificationService.cs

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Ombi.Core.Notifications;
 using Ombi.Helpers;
-using Ombi.Notifications.Interfaces;
 using Ombi.Notifications.Models;
 
 namespace Ombi.Notifications

src/Ombi.Schedule.Tests/NewsletterTests.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using NUnit.Framework;
+using Ombi.Helpers;
 using static Ombi.Schedule.Jobs.Ombi.NewsletterJob;
 
 namespace Ombi.Schedule.Tests
@@ -15,7 +17,7 @@ namespace Ombi.Schedule.Tests
             {
                 ep.Add(i);
             }
-            var result = BuildEpisodeList(ep);
+            var result = StringHelper.BuildEpisodeList(ep);
             return result;
         }
 

src/Ombi.Schedule/JobSetup.cs

@@ -21,7 +21,7 @@ namespace Ombi.Schedule
             IEmbyUserImporter embyUserImporter, ISonarrSync cache, ICouchPotatoSync cpCache,
             ISettingsService<JobSettings> jobsettings, ISickRageSync srSync, IRefreshMetadata refresh,
             INewsletterJob newsletter, IPlexRecentlyAddedSync recentlyAddedPlex, ILidarrArtistSync artist,
-            IIssuesPurge purge)
+            IIssuesPurge purge, IResendFailedRequests resender)
         {
             _plexContentSync = plexContentSync;
             _radarrSync = radarrSync;
@@ -38,6 +38,7 @@ namespace Ombi.Schedule
             _plexRecentlyAddedSync = recentlyAddedPlex;
             _lidarrArtistSync = artist;
             _issuesPurge = purge;
+            _resender = resender;
         }
 
         private readonly IPlexContentSync _plexContentSync;
@@ -55,6 +56,7 @@ namespace Ombi.Schedule
         private readonly INewsletterJob _newsletter;
         private readonly ILidarrArtistSync _lidarrArtistSync;
         private readonly IIssuesPurge _issuesPurge;
+        private readonly IResendFailedRequests _resender;
 
         public void Setup()
         {
@@ -76,6 +78,8 @@ namespace Ombi.Schedule
             RecurringJob.AddOrUpdate(() => _embyUserImporter.Start(), JobSettingsHelper.UserImporter(s));
             RecurringJob.AddOrUpdate(() => _plexUserImporter.Start(), JobSettingsHelper.UserImporter(s));
             RecurringJob.AddOrUpdate(() => _newsletter.Start(), JobSettingsHelper.Newsletter(s));
+            RecurringJob.AddOrUpdate(() => _newsletter.Start(), JobSettingsHelper.Newsletter(s));
+            RecurringJob.AddOrUpdate(() => _resender.Start(), JobSettingsHelper.ResendFailedRequests(s));
         }
 
 

src/Ombi.Schedule/Jobs/Ombi/IResendFailedRequests.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Ombi.Schedule.Jobs.Ombi
+{
+    public interface IResendFailedRequests
+    {
+        Task Start();
+    }
+}

src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs

@@ -677,7 +677,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                     foreach (var epInformation in results.OrderBy(x => x.SeasonNumber))
                     {
                         var orderedEpisodes = epInformation.Episodes.OrderBy(x => x.EpisodeNumber).ToList();
-                        var episodeString = BuildEpisodeList(orderedEpisodes.Select(x => x.EpisodeNumber));
+                        var episodeString = StringHelper.BuildEpisodeList(orderedEpisodes.Select(x => x.EpisodeNumber));
                         finalsb.Append($"Season: {epInformation.SeasonNumber} - Episodes: {episodeString}");
                         finalsb.Append("<br />");
                     }
@@ -715,48 +715,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             }
         }
 
-        public static string BuildEpisodeList(IEnumerable<int> orderedEpisodes)
-        {
-            var epSb = new StringBuilder();
-            var previousEpisodes = new List<int>();
-            var previousEpisode = -1;
-            foreach (var ep in orderedEpisodes)
-            {
-                if (ep - 1 == previousEpisode)
-                {
-                    // This is the next one
-                    previousEpisodes.Add(ep);
-                }
-                else
-                {
-                    if (previousEpisodes.Count > 1)
-                    {
-                        // End it
-                        epSb.Append($"{previousEpisodes.First()}-{previousEpisodes.Last()}, ");
-                    }
-                    else if (previousEpisodes.Count == 1)
-                    {
-                        epSb.Append($"{previousEpisodes.FirstOrDefault()}, ");
-                    }
-                    // New one
-                    previousEpisodes.Clear();
-                    previousEpisodes.Add(ep);
-                }
-                previousEpisode = ep;
-            }
-
-            if (previousEpisodes.Count > 1)
-            {
-                // Got some left over
-                epSb.Append($"{previousEpisodes.First()}-{previousEpisodes.Last()}");
-            }
-            else if(previousEpisodes.Count == 1)
-            {
-                epSb.Append(previousEpisodes.FirstOrDefault());
-            }
-
-            return epSb.ToString();
-        }
+        
 
         private async Task ProcessEmbyTv(HashSet<EmbyEpisode> embyContent, StringBuilder sb)
         {
@@ -841,7 +800,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                     foreach (var epInformation in results.OrderBy(x => x.SeasonNumber))
                     {
                         var orderedEpisodes = epInformation.Episodes.OrderBy(x => x.EpisodeNumber).ToList();
-                        var episodeString = BuildEpisodeList(orderedEpisodes.Select(x => x.EpisodeNumber));
+                        var episodeString = StringHelper.BuildEpisodeList(orderedEpisodes.Select(x => x.EpisodeNumber));
                         finalsb.Append($"Season: {epInformation.SeasonNumber} - Episodes: {episodeString}");
                         finalsb.Append("<br />");
                     }

src/Ombi.Schedule/Jobs/Ombi/ResendFailedRequests.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Ombi.Core;
+using Ombi.Core.Senders;
+using Ombi.Store.Entities;
+using Ombi.Store.Repository;
+using Ombi.Store.Repository.Requests;
+
+namespace Ombi.Schedule.Jobs.Ombi
+{
+    public class ResendFailedRequests : IResendFailedRequests
+    {
+        public ResendFailedRequests(IRepository<RequestQueue> queue, IMovieSender movieSender, ITvSender tvSender, IMusicSender musicSender,
+            IMovieRequestRepository movieRepo, ITvRequestRepository tvRepo, IMusicRequestRepository music)
+        {
+            _requestQueue = queue;
+            _movieSender = movieSender;
+            _tvSender = tvSender;
+            _musicSender = musicSender;
+            _movieRequestRepository = movieRepo;
+            _tvRequestRepository = tvRepo;
+            _musicRequestRepository = music;
+        }
+
+        private readonly IRepository<RequestQueue> _requestQueue;
+        private readonly IMovieSender _movieSender;
+        private readonly ITvSender _tvSender;
+        private readonly IMusicSender _musicSender;
+        private readonly IMovieRequestRepository _movieRequestRepository;
+        private readonly ITvRequestRepository _tvRequestRepository;
+        private readonly IMusicRequestRepository _musicRequestRepository;
+
+        public async Task Start()
+        {
+            // Get all the failed ones!
+            var failedRequests = _requestQueue.GetAll().Where(x => !x.Completed.HasValue);
+
+            foreach (var request in failedRequests)
+            {
+                if (request.Type == RequestType.Movie)
+                {
+                    var movieRequest = await _movieRequestRepository.GetAll().FirstOrDefaultAsync(x => x.Id == request.RequestId);
+                    var result = await _movieSender.Send(movieRequest);
+                    if (result.Success)
+                    {
+                        request.Completed = DateTime.UtcNow;
+                        await _requestQueue.SaveChangesAsync();
+                    }
+                }
+                if (request.Type == RequestType.TvShow)
+                {
+                    var tvRequest = await _tvRequestRepository.GetChild().FirstOrDefaultAsync(x => x.Id == request.RequestId);
+                    var result = await _tvSender.Send(tvRequest);
+                    if (result.Success)
+                    {
+                        request.Completed = DateTime.UtcNow;
+                        await _requestQueue.SaveChangesAsync();
+                    }
+                }
+                if (request.Type == RequestType.Album)
+                {
+                    var musicRequest = await _musicRequestRepository.GetAll().FirstOrDefaultAsync(x => x.Id == request.RequestId);
+                    var result = await _musicSender.Send(musicRequest);
+                    if (result.Success)
+                    {
+                        request.Completed = DateTime.UtcNow;
+                        await _requestQueue.SaveChangesAsync();
+                    }
+                }
+            }
+        }
+    }
+}

src/Ombi.Schedule/Ombi.Schedule.csproj

@@ -34,6 +34,7 @@
     <ProjectReference Include="..\Ombi.Api.SickRage\Ombi.Api.SickRage.csproj" />
     <ProjectReference Include="..\Ombi.Api.Sonarr\Ombi.Api.Sonarr.csproj" />
     <ProjectReference Include="..\Ombi.Api.TvMaze\Ombi.Api.TvMaze.csproj" />
+    <ProjectReference Include="..\Ombi.Core\Ombi.Core.csproj" />
     <ProjectReference Include="..\Ombi.Notifications\Ombi.Notifications.csproj" />
     <ProjectReference Include="..\Ombi.Settings\Ombi.Settings.csproj" />
     <ProjectReference Include="..\Ombi.TheMovieDbApi\Ombi.Api.TheMovieDb.csproj" />

src/Ombi.Settings/Settings/Models/JobSettings.cs

@@ -15,5 +15,6 @@
         public string Newsletter { get; set; }
         public string LidarrArtistSync { get; set; }
         public string IssuesPurge { get; set; }
+        public string RetryRequests { get; set; }
     }
 }

src/Ombi.Settings/Settings/Models/JobSettingsHelper.cs

@@ -61,6 +61,10 @@ namespace Ombi.Settings.Settings.Models
         {
             return Get(s.IssuesPurge, Cron.Daily());
         }
+        public static string ResendFailedRequests(JobSettings s)
+        {
+            return Get(s.RetryRequests, Cron.Daily(6));
+        }
 
         private static string Get(string settings, string defaultCron)
         {

src/Ombi.Store/Context/OmbiContext.cs

@@ -56,6 +56,7 @@ namespace Ombi.Store.Context
         public DbSet<RequestSubscription> RequestSubscription { get; set; }
         public DbSet<UserNotificationPreferences> UserNotificationPreferences { get; set; }
         public DbSet<UserQualityProfiles> UserQualityProfileses { get; set; }
+        public DbSet<RequestQueue> RequestQueue { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {

src/Ombi.Store/Entities/RequestQueue.cs

@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Ombi.Store.Entities
+{
+    [Table("RequestQueue")]
+    public class RequestQueue : Entity
+    {
+        public int RequestId { get; set; }
+        public RequestType Type { get; set; }
+        public DateTime Dts { get; set; }
+        public string Error { get; set; }
+        public DateTime? Completed { get; set; }
+        public int RetryCount { get; set; }
+    }
+}

src/Ombi.Store/Entities/RequestType.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Ombi.Store.Entities
+namespace Ombi.Store.Entities
 {
     public enum RequestType
     {

src/Ombi.Store/Migrations/20181204084915_RequestQueue.cs

@@ -0,0 +1,35 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Ombi.Store.Migrations
+{
+    public partial class RequestQueue : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "RequestQueue",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    RequestId = table.Column<int>(nullable: false),
+                    Type = table.Column<int>(nullable: false),
+                    Dts = table.Column<DateTime>(nullable: false),
+                    Error = table.Column<string>(nullable: true),
+                    Completed = table.Column<DateTime>(nullable: true),
+                    RetryCount = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RequestQueue", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "RequestQueue");
+        }
+    }
+}

src/Ombi.Store/Migrations/OmbiContextModelSnapshot.cs

@@ -14,7 +14,7 @@ namespace Ombi.Store.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.3-rtm-32065");
+                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {
@@ -508,6 +508,28 @@ namespace Ombi.Store.Migrations
                     b.ToTable("RecentlyAddedLog");
                 });
 
+            modelBuilder.Entity("Ombi.Store.Entities.RequestQueue", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime?>("Completed");
+
+                    b.Property<DateTime>("Dts");
+
+                    b.Property<string>("Error");
+
+                    b.Property<int>("RequestId");
+
+                    b.Property<int>("RetryCount");
+
+                    b.Property<int>("Type");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RequestQueue");
+                });
+
             modelBuilder.Entity("Ombi.Store.Entities.Requests.AlbumRequest", b =>
                 {
                     b.Property<int>("Id")

src/Ombi/ClientApp/app/interfaces/IFailedRequests.ts

@@ -0,0 +1,11 @@
+import { RequestType } from ".";
+export interface IFailedRequestsViewModel {
+    failedId: number;
+    title: string;
+    releaseYear: Date;
+    requestId: number;
+    type: RequestType;
+    dts: Date;
+    error: string;
+    retryCount: number;
+}

src/Ombi/ClientApp/app/interfaces/IRequestModel.ts

@@ -1,9 +1,9 @@
 import { IUser } from "./IUser";
 
 export enum RequestType {
+  tvShow = 0,
   movie = 1,
-  tvShow = 2,
-  
+  album = 2,
 }
 
 // NEW WORLD

src/Ombi/ClientApp/app/interfaces/ISettings.ts

@@ -147,6 +147,7 @@ export interface IJobSettings {
   plexRecentlyAddedSync: string;
   lidarrArtistSync: string;
   issuesPurge: string;
+  retryRequests: string;
 }
 
 export interface IIssueSettings extends ISettings {

src/Ombi/ClientApp/app/interfaces/index.ts

@@ -17,3 +17,4 @@ export * from "./IRecentlyAdded";
 export * from "./ILidarr";
 export * from "./ISearchMusicResult";
 export * from "./IVote";
+export * from "./IFailedRequests";

src/Ombi/ClientApp/app/services/index.ts

@@ -15,3 +15,4 @@ export * from "./mobile.service";
 export * from "./notificationMessage.service";
 export * from "./recentlyAdded.service";
 export * from "./vote.service";
+export * from "./requestretry.service";

src/Ombi/ClientApp/app/services/requestretry.service.ts

@@ -0,0 +1,21 @@
+import { PlatformLocation } from "@angular/common";
+import { Injectable } from "@angular/core";
+
+import { HttpClient } from "@angular/common/http";
+import { Observable } from "rxjs";
+
+import { IFailedRequestsViewModel } from "../interfaces";
+import { ServiceHelpers } from "./service.helpers";
+
+@Injectable()
+export class RequestRetryService extends ServiceHelpers {
+    constructor(http: HttpClient, public platformLocation: PlatformLocation) {
+        super(http, "/api/v1/requestretry/", platformLocation);
+    }
+    public getFailedRequests(): Observable<IFailedRequestsViewModel[]> {
+        return this.http.get<IFailedRequestsViewModel[]>(this.url, {headers: this.headers});
+    }
+    public deleteFailedRequest(failedId: number): Observable<boolean> {
+        return this.http.delete<boolean>(`${this.url}/${failedId}`, {headers: this.headers});
+    }
+}

src/Ombi/ClientApp/app/settings/failedrequests/failedrequest.component.html

@@ -0,0 +1,26 @@
+
+<settings-menu></settings-menu>
+
+
+<table class="table table-striped table-hover table-responsive table-condensed">
+    <thead>
+        <tr>
+            <td>Title</td>
+            <td>Type</td>
+            <td>Retry Count</td>
+            <td>Error Description</td>
+            <td>Delete</td>
+        </tr>
+    </thead>
+    <tbody>
+        <tr *ngFor="let v of vm">
+            <td class="vcenter">
+                {{v.title}}
+            </td>
+            <td>{{RequestType[v.type] | humanize}}</td>
+            <td class="vcenter">{{v.retryCount}}</td>
+            <td class="vcenter"> <i [pTooltip]="v.error" class="fa fa-info-circle"></i></td>
+            <td class="vcenter"><button class="btn btn-sm btn-danger-outline" (click)="remove(v)">Remove</button></td>
+        </tr>
+    </tbody>
+</table>

src/Ombi/ClientApp/app/settings/failedrequests/failedrequests.component.ts

@@ -0,0 +1,27 @@
+import { Component, OnInit } from "@angular/core";
+import { IFailedRequestsViewModel, RequestType } from "../../interfaces";
+import { RequestRetryService } from "../../services";
+
+@Component({
+    templateUrl: "./failedrequest.component.html",
+})
+export class FailedRequestsComponent implements OnInit {
+
+    public vm: IFailedRequestsViewModel[];
+    public RequestType = RequestType;
+
+    constructor(private retry: RequestRetryService) { }
+
+    public ngOnInit() {
+        this.retry.getFailedRequests().subscribe(x => this.vm = x);
+    }
+
+    public remove(failed: IFailedRequestsViewModel) {
+        this.retry.deleteFailedRequest(failed.failedId).subscribe(x => {
+            if(x) {
+                const index = this.vm.indexOf(failed);
+                this.vm.splice(index,1);
+            }
+        });
+    }
+}

src/Ombi/ClientApp/app/settings/jobs/jobs.component.html

@@ -48,6 +48,13 @@
                         <small *ngIf="form.get('automaticUpdater').hasError('required')" class="error-text">The Automatic Update is required</small>
                         <button type="button" class="btn btn-sm btn-primary-outline" (click)="testCron(form.get('automaticUpdater')?.value)">Test</button>
                 </div>
+
+                <div class="form-group">
+                    <label for="retryRequests" class="control-label">Retry Failed Requests</label>              
+                        <input type="text" class="form-control form-control-custom" [ngClass]="{'form-error': form.get('retryRequests').hasError('required')}" id="retryRequests" name="retryRequests" formControlName="retryRequests">
+                        <small *ngIf="form.get('retryRequests').hasError('required')" class="error-text">The Retry Requests is required</small>
+                        <button type="button" class="btn btn-sm btn-primary-outline" (click)="testCron(form.get('retryRequests')?.value)">Test</button>
+                </div>
             </div>
             <div class="col-md-6">
                 <div class="form-group">

src/Ombi/ClientApp/app/settings/jobs/jobs.component.ts

@@ -36,6 +36,7 @@ export class JobsComponent implements OnInit {
                 plexRecentlyAddedSync:    [x.plexRecentlyAddedSync, Validators.required],
                 lidarrArtistSync:         [x.lidarrArtistSync, Validators.required],
                 issuesPurge:              [x.issuesPurge, Validators.required],
+                retryRequests:            [x.retryRequests, Validators.required],
             });  
         });
     }

src/Ombi/ClientApp/app/settings/settings.module.ts

@@ -9,7 +9,7 @@ import { AuthGuard } from "../auth/auth.guard";
 import { AuthService } from "../auth/auth.service";
 import {
     CouchPotatoService, EmbyService, IssuesService, JobService, LidarrService, MobileService, NotificationMessageService, PlexService, RadarrService,
-    SonarrService, TesterService, ValidationService,
+    RequestRetryService, SonarrService, TesterService, ValidationService,
 } from "../services";
 
 import { PipeModule } from "../pipes/pipe.module";
@@ -19,6 +19,7 @@ import { CouchPotatoComponent } from "./couchpotato/couchpotato.component";
 import { CustomizationComponent } from "./customization/customization.component";
 import { DogNzbComponent } from "./dognzb/dognzb.component";
 import { EmbyComponent } from "./emby/emby.component";
+import { FailedRequestsComponent } from "./failedrequests/failedrequests.component";
 import { IssuesComponent } from "./issues/issues.component";
 import { JobsComponent } from "./jobs/jobs.component";
 import { LandingPageComponent } from "./landingpage/landingpage.component";
@@ -77,6 +78,7 @@ const routes: Routes = [
     { path: "Newsletter", component: NewsletterComponent, canActivate: [AuthGuard] },
     { path: "Lidarr", component: LidarrComponent, canActivate: [AuthGuard] },
     { path: "Vote", component: VoteComponent, canActivate: [AuthGuard] },
+    { path: "FailedRequests", component: FailedRequestsComponent, canActivate: [AuthGuard] },
 ];
 
 @NgModule({
@@ -130,6 +132,7 @@ const routes: Routes = [
         NewsletterComponent,
         LidarrComponent,
         VoteComponent,
+        FailedRequestsComponent,
     ],
     exports: [
         RouterModule,
@@ -149,6 +152,7 @@ const routes: Routes = [
         MobileService,
         NotificationMessageService,
         LidarrService,
+        RequestRetryService,
     ],
 
 })

src/Ombi/ClientApp/app/settings/settingsmenu.component.html

@@ -84,6 +84,7 @@
         </a>
         <ul class="dropdown-menu">
             <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/About']">About</a></li>
+            <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/FailedRequests']">Failed Requests</a></li>
             <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Update']">Update</a></li>
             <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Jobs']">Jobs</a></li>
             <!-- <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Logs']">Logs (Not available)</a></li>

src/Ombi/ClientApp/styles/base.scss

@@ -843,6 +843,7 @@ body {
     padding: 10px 15px;
     border-bottom: 1px solid transparent;
     background: $form-color;
+    height: 40px;
 }
 
 .card-header > a {

src/Ombi/Controllers/RequestRetryController.cs

@@ -0,0 +1,92 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Ombi.Store.Entities.Requests;
+using Ombi.Store.Repository;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Ombi.Attributes;
+using Ombi.Models;
+using Ombi.Store.Entities;
+using Ombi.Store.Repository.Requests;
+
+namespace Ombi.Controllers
+{
+    [ApiV1]
+    [Admin]
+    [Produces("application/json")]
+    public class RequestRetryController : Controller
+    {
+        public RequestRetryController(IRepository<RequestQueue> requestQueue, IMovieRequestRepository movieRepo,
+            ITvRequestRepository tvRepo, IMusicRequestRepository musicRepo)
+        {
+            _requestQueueRepository = requestQueue;
+            _movieRequestRepository = movieRepo;
+            _tvRequestRepository = tvRepo;
+            _musicRequestRepository = musicRepo;
+        }
+
+        private readonly IRepository<RequestQueue> _requestQueueRepository;
+        private readonly IMovieRequestRepository _movieRequestRepository;
+        private readonly ITvRequestRepository _tvRequestRepository;
+        private readonly IMusicRequestRepository _musicRequestRepository;
+
+        /// <summary>
+        /// Get's all the failed requests that are currently in the queue
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<IEnumerable<FailedRequestViewModel>> GetFailedRequests()
+        {
+            var failed = await _requestQueueRepository.GetAll().Where(x => !x.Completed.HasValue).ToListAsync();
+
+            var vm = new List<FailedRequestViewModel>();
+            foreach (var f in failed)
+            {
+                var vmModel = new FailedRequestViewModel
+                {
+                    RequestId = f.RequestId,
+                    RetryCount = f.RetryCount,
+                    Dts = f.Dts,
+                    Error = f.Error,
+                    FailedId = f.Id,
+                    Type = f.Type
+                };
+
+                if (f.Type == RequestType.Movie)
+                {
+                    var request = await _movieRequestRepository.Find(f.RequestId);
+                    vmModel.Title = request.Title;
+                    vmModel.ReleaseYear = request.ReleaseDate;
+                }
+
+                if (f.Type == RequestType.Album)
+                {
+                    var request = await _musicRequestRepository.Find(f.RequestId);
+                    vmModel.Title = request.Title;
+                    vmModel.ReleaseYear = request.ReleaseDate;
+                }
+
+                if (f.Type == RequestType.TvShow)
+                {
+                    var request = await _tvRequestRepository.GetChild().Include(x => x.ParentRequest).FirstOrDefaultAsync(x => x.Id == f.RequestId);
+                    vmModel.Title = request.Title;
+                    vmModel.ReleaseYear = request.ParentRequest.ReleaseDate;
+                }
+                vm.Add(vmModel);
+            }
+
+            return vm;
+        }
+
+        [HttpDelete("{queueId:int}")]
+        public async Task<IActionResult> Delete(int queueId)
+        {
+            var queueItem = await _requestQueueRepository.GetAll().FirstOrDefaultAsync(x => x.Id == queueId);
+            await _requestQueueRepository.Delete(queueItem);
+            return Json(true);
+        }
+
+    }
+}

src/Ombi/Controllers/SettingsController.cs

@@ -520,6 +520,7 @@ namespace Ombi.Controllers
             j.Newsletter = j.Newsletter.HasValue() ? j.Newsletter : JobSettingsHelper.Newsletter(j);
             j.LidarrArtistSync = j.LidarrArtistSync.HasValue() ? j.LidarrArtistSync : JobSettingsHelper.LidarrArtistSync(j);
             j.IssuesPurge = j.IssuesPurge.HasValue() ? j.IssuesPurge : JobSettingsHelper.IssuePurge(j);
+            j.RetryRequests = j.RetryRequests.HasValue() ? j.RetryRequests : JobSettingsHelper.ResendFailedRequests(j);
 
             return j;
         }

src/Ombi/Models/FailedRequestViewModel.cs

@@ -0,0 +1,17 @@
+using System;
+using Ombi.Store.Entities;
+
+namespace Ombi.Models
+{
+    public class FailedRequestViewModel
+    {
+        public int FailedId { get; set; }
+        public string Title { get; set; }
+        public DateTime ReleaseYear { get; set; }
+        public int RequestId { get; set; }
+        public RequestType Type { get; set; }
+        public DateTime Dts { get; set; }
+        public string Error { get; set; }
+        public int RetryCount { get; set; }
+    }
+}