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

Merge pull request #4470 from Ombi-app/small-changes

Browse source 
Small changes
This commit is contained in:
Jamie 2022-01-14 13:01:33 +00:00 • committed by GitHub
commit 97e939de19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Ombi.Core/Senders/TvSender.cs
View file

@ -309,6 +309,22 @@ namespace Ombi.Core.Senders
private async Task SendToSonarr(ChildRequests model, SonarrSeries result, SonarrSettings s)
{
// Check to ensure we have the all the seasons, ensure the Sonarr metadata has grabbed all the data
Season existingSeason = null;
foreach (var season in model.SeasonRequests)
{
var attempt = 0;
existingSeason = result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
while (existingSeason == null && attempt < 5)
{
attempt++;
Logger.LogInformation("There was no season numer {0} in Sonarr for title {1}. Will try again as the metadata did not get created", season.SeasonNumber, model.ParentRequest.Title);
result = await SonarrApi.GetSeriesById(result.id, s.ApiKey, s.FullUri);
existingSeason = result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
await Task.Delay(500);
}
}
var episodesToUpdate = new List<Episode>();
// Ok, now let's sort out the episodes.
@ -327,24 +343,20 @@ namespace Ombi.Core.Senders
await Task.Delay(500);
}
var seriesChanges = false;
foreach (var req in model.SeasonRequests)
foreach (var season in model.SeasonRequests)
{
foreach (var ep in req.Episodes)
foreach (var ep in season.Episodes)
{
var sonarrEp = sonarrEpList.FirstOrDefault(x =>
x.episodeNumber == ep.EpisodeNumber && x.seasonNumber == req.SeasonNumber);
x.episodeNumber == ep.EpisodeNumber && x.seasonNumber == season.SeasonNumber);
if (sonarrEp != null && !sonarrEp.monitored)
{
sonarrEp.monitored = true;
episodesToUpdate.Add(sonarrEp);
}
}
}
var seriesChanges = false;
foreach (var season in model.SeasonRequests)
{
var sonarrEpisodeList = sonarrEpList.Where(x => x.seasonNumber == season.SeasonNumber).ToList();
var sonarrEpCount = sonarrEpisodeList.Count;
var ourRequestCount = season.Episodes.Count;
@ -358,14 +370,6 @@ namespace Ombi.Core.Senders
//var distinctEpisodes = ourEpisodes.Distinct().ToList();
//var missingEpisodes = Enumerable.Range(distinctEpisodes.Min(), distinctEpisodes.Count).Except(distinctEpisodes);
var existingSeason =
result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
if (existingSeason == null)
{
Logger.LogError("There was no season numer {0} in Sonarr for title {1}", season.SeasonNumber, model.ParentRequest.Title);
continue;
}
if (sonarrEpCount == ourRequestCount /*|| !missingEpisodes.Any()*/)
{

36
src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.ts
View file

@ -1,11 +1,12 @@
import { AfterViewInit, Component, OnInit, ViewChild } from "@angular/core";
import { Router } from "@angular/router";
import { IdentityService, NotificationService, SettingsService } from "../../services";
import { CustomizationFacade } from "../../state/customization/customization.facade";
import { ICreateWizardUser } from "../../interfaces";
import { IdentityService, NotificationService } from "../../services";
import { IOmbiConfigModel } from "../models/OmbiConfigModel";
import { WizardService } from "../services/wizard.service";
import { MatHorizontalStepper } from'@angular/material/stepper';
import { StepperSelectionEvent } from "@angular/cdk/stepper";
import { Router } from "@angular/router";
import { WizardService } from "../services/wizard.service";
@Component({
templateUrl: "./welcome.component.html",
@ -18,7 +19,8 @@ export class WelcomeComponent implements OnInit {
public config: IOmbiConfigModel;
constructor(private router: Router, private identityService: IdentityService,
private notificationService: NotificationService, private WizardService: WizardService) { }
private notificationService: NotificationService, private WizardService: WizardService,
private settingsService: SettingsService, private customizationFacade: CustomizationFacade) { }
public ngOnInit(): void {
this.localUser = {
@ -34,10 +36,27 @@ export class WelcomeComponent implements OnInit {
}
public createUser() {
this.WizardService.addOmbiConfig(this.config).subscribe(config => {
if (this.config.applicationUrl) {
this.settingsService.verifyUrl(this.config.applicationUrl).subscribe(x => {
if (!x) {
this.notificationService.error(`The URL "${this.config.applicationUrl}" is not valid. Please format it correctly e.g. http://www.google.com/`);
this.stepper.selectedIndex = 3;
return;
}
this.saveConfig();
});
} else {
this.saveConfig();
}
}
private saveConfig() {
this.WizardService.addOmbiConfig(this.config).subscribe({
next: (config) => {
if(config != null) {
this.identityService.createWizardUser(this.localUser).subscribe(x => {
if (x.result) {
this.customizationFacade.loadCustomziationSettings().subscribe();
// save the config
this.router.navigate(["login"]);
} else {
@ -48,6 +67,9 @@ export class WelcomeComponent implements OnInit {
}
});
}
}, configErr => this.notificationService.error(configErr));
},
error: (configErr) => this.notificationService.error(configErr)
});
}
}

1
src/Ombi/Controllers/V1/SettingsController.cs
View file

@ -334,6 +334,7 @@ namespace Ombi.Controllers.V1
[ApiExplorerSettings(IgnoreApi = true)]
[HttpPost("customization/urlverify")]
[AllowAnonymous]
public bool VerifyUrl([FromBody]UrlVerifyModel url)
{
return Uri.TryCreate(url.Url, UriKind.Absolute, out var __);