github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the Radarr issues, we are now no longer using the old Radarr API's that have now been removed #4215

Browse source
This commit is contained in:
tidusjar 2021-06-09 09:37:42 +01:00
commit 7e7c00e2cf
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Api.Radarr/RadarrV3Api.cs
View file

@ -41,7 +41,7 @@ namespace Ombi.Api.Radarr
public async Task<SystemStatus> SystemStatus(string apiKey, string baseUrl) public async Task<SystemStatus> SystemStatus(string apiKey, string baseUrl)
{ {
var request = new Request("/api/v3/status", baseUrl, HttpMethod.Get); var request = new Request("/api/v3/system/status", baseUrl, HttpMethod.Get);
AddHeaders(request, apiKey); AddHeaders(request, apiKey);
return await Api.Request<SystemStatus>(request); return await Api.Request<SystemStatus>(request);

2
src/Ombi.HealthChecks/Checks/RadarrHealthCheck.cs
View file

@ -21,7 +21,7 @@ namespace Ombi.HealthChecks.Checks
using (var scope = CreateScope()) using (var scope = CreateScope())
{ {
var settingsProvider = scope.ServiceProvider.GetRequiredService<ISettingsService<RadarrSettings>>(); var settingsProvider = scope.ServiceProvider.GetRequiredService<ISettingsService<RadarrSettings>>();
var api = scope.ServiceProvider.GetRequiredService<IRadarrApi>(); var api = scope.ServiceProvider.GetRequiredService<IRadarrV3Api>();
var settings = await settingsProvider.GetSettingsAsync(); var settings = await settingsProvider.GetSettingsAsync();
if (!settings.Enabled) if (!settings.Enabled)
{ {

4
src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs
View file

@ -17,7 +17,7 @@ namespace Ombi.Schedule.Jobs.Radarr
{ {
public class RadarrSync : IRadarrSync public class RadarrSync : IRadarrSync
{ {
public RadarrSync(ISettingsService<RadarrSettings> radarr, IRadarrApi radarrApi, ILogger<RadarrSync> log, ExternalContext ctx) public RadarrSync(ISettingsService<RadarrSettings> radarr, IRadarrV3Api radarrApi, ILogger<RadarrSync> log, ExternalContext ctx)
{ {
RadarrSettings = radarr; RadarrSettings = radarr;
RadarrApi = radarrApi; RadarrApi = radarrApi;
@ -27,7 +27,7 @@ namespace Ombi.Schedule.Jobs.Radarr
} }
private ISettingsService<RadarrSettings> RadarrSettings { get; } private ISettingsService<RadarrSettings> RadarrSettings { get; }
private IRadarrApi RadarrApi { get; } private IRadarrV3Api RadarrApi { get; }
private ILogger<RadarrSync> Logger { get; } private ILogger<RadarrSync> Logger { get; }
private readonly ExternalContext _ctx; private readonly ExternalContext _ctx;

4
src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
View file

@ -56,7 +56,7 @@
<label for="username" class="control-label"><h3>Radarr Interface</h3></label> <label for="username" class="control-label"><h3>Radarr Interface</h3></label>
<div class="md-form-field"> <div class="md-form-field">
<div class="md-form-field" style="display:inline;"> <div class="md-form-field" style="display:inline;">
<button mat-raised-button (click)="getProfiles(form)" color="primary">Load Profiles <span *ngIf="profilesRunning" class="fas fa-spinner fa-spin"></span></button> <button mat-raised-button (click)="getProfiles(form)" type="button" color="primary">Load Profiles <span *ngIf="profilesRunning" class="fas fa-spinner fa-spin"></span></button>
</div> </div>
<div class="md-form-field" style="margin-top:1em;"></div> <div class="md-form-field" style="margin-top:1em;"></div>
<mat-form-field appearance="outline" > <mat-form-field appearance="outline" >
@ -71,7 +71,7 @@
</div> </div>
<div class="md-form-field"> <div class="md-form-field">
<div class="md-form-field" style="display:inline;"> <div class="md-form-field" style="display:inline;">
<button mat-raised-button (click)="getRootFolders(form)" color="primary">Load Root Folders <span *ngIf="rootFoldersRunning" class="fas fa-spinner fa-spin"></span></button> <button mat-raised-button (click)="getRootFolders(form)" type="button" color="primary">Load Root Folders <span *ngIf="rootFoldersRunning" class="fas fa-spinner fa-spin"></span></button>
</div> </div>
<div class="md-form-field" style="margin-top:1em;"></div> <div class="md-form-field" style="margin-top:1em;"></div>
<mat-form-field appearance="outline" > <mat-form-field appearance="outline" >

4
src/Ombi/Controllers/V1/External/TesterController.cs vendored
View file

@ -45,7 +45,7 @@ namespace Ombi.Controllers.V1.External
/// </summary> /// </summary>
public TesterController(INotificationService service, IDiscordNotification notification, IEmailNotification emailN, public TesterController(INotificationService service, IDiscordNotification notification, IEmailNotification emailN,
IPushbulletNotification pushbullet, ISlackNotification slack, IPushoverNotification po, IMattermostNotification mm, IPushbulletNotification pushbullet, ISlackNotification slack, IPushoverNotification po, IMattermostNotification mm,
IPlexApi plex, IEmbyApiFactory emby, IRadarrApi radarr, ISonarrApi sonarr, ILogger<TesterController> log, IEmailProvider provider, IPlexApi plex, IEmbyApiFactory emby, IRadarrV3Api radarr, ISonarrApi sonarr, ILogger<TesterController> log, IEmailProvider provider,
ICouchPotatoApi cpApi, ITelegramNotification telegram, ISickRageApi srApi, INewsletterJob newsletter, ILegacyMobileNotification mobileNotification, ICouchPotatoApi cpApi, ITelegramNotification telegram, ISickRageApi srApi, INewsletterJob newsletter, ILegacyMobileNotification mobileNotification,
ILidarrApi lidarrApi, IGotifyNotification gotifyNotification, IWhatsAppApi whatsAppApi, OmbiUserManager um, IWebhookNotification webhookNotification, ILidarrApi lidarrApi, IGotifyNotification gotifyNotification, IWhatsAppApi whatsAppApi, OmbiUserManager um, IWebhookNotification webhookNotification,
IJellyfinApi jellyfinApi) IJellyfinApi jellyfinApi)
@ -86,7 +86,7 @@ namespace Ombi.Controllers.V1.External
private IWebhookNotification WebhookNotification { get; } private IWebhookNotification WebhookNotification { get; }
private IMattermostNotification MattermostNotification { get; } private IMattermostNotification MattermostNotification { get; }
private IPlexApi PlexApi { get; } private IPlexApi PlexApi { get; }
private IRadarrApi RadarrApi { get; } private IRadarrV3Api RadarrApi { get; }
private IEmbyApiFactory EmbyApi { get; } private IEmbyApiFactory EmbyApi { get; }
private ISonarrApi SonarrApi { get; } private ISonarrApi SonarrApi { get; }
private ICouchPotatoApi CouchPotatoApi { get; } private ICouchPotatoApi CouchPotatoApi { get; }