mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-19 21:03:17 -07:00
Merge branch 'develop' of https://github.com/tidusjar/ombi into develop
This commit is contained in:
TidusJar
commit
0a63dd0ef5
63 changed files with 1986 additions and 398 deletions
|
|
@ -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 />");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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,39 +42,64 @@ 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)
|
||||
var dogSettings = await DogNzbSettings.GetSettingsAsync();
|
||||
if (dogSettings.Enabled)
|
||||
{
|
||||
await SendToDogNzb(model, dogSettings);
|
||||
return new SenderResult
|
||||
{
|
||||
Success = true,
|
||||
Sent = true,
|
||||
};
|
||||
}
|
||||
|
||||
if (cpSettings.Enabled)
|
||||
{
|
||||
return await SendToCp(model, cpSettings, cpSettings.DefaultProfileId);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return await SendToCp(model, cpSettings, cpSettings.DefaultProfileId);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
//if (watcherSettings.Enabled)
|
||||
//{
|
||||
// return SendToWatcher(model, watcherSettings);
|
||||
//}
|
||||
|
||||
|
||||
return new SenderResult
|
||||
{
|
||||
Success = true,
|
||||
|
|
@ -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 };
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue