From 72815f496f1eebf84748fd057f18464b66bddb19 Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 7 Dec 2017 13:40:13 +0000 Subject: [PATCH 1/3] fixed build --- src/Ombi/ClientApp/app/services/settings.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi/ClientApp/app/services/settings.service.ts b/src/Ombi/ClientApp/app/services/settings.service.ts index 785e4e43f..e2974689f 100644 --- a/src/Ombi/ClientApp/app/services/settings.service.ts +++ b/src/Ombi/ClientApp/app/services/settings.service.ts @@ -116,7 +116,7 @@ export class SettingsService extends ServiceHelpers { } public getThemeContent(themeUrl: string): Observable { - return this.http.get(`${this.url}/themecontent?url=${themeUrl}`, {responseType: 'text', headers: this.headers}); + return this.http.get(`${this.url}/themecontent?url=${themeUrl}`, {responseType: "text", headers: this.headers}); } public getEmailNotificationSettings(): Observable { From 7edc36406ed69835e212d4dda32998129cb3c9ca Mon Sep 17 00:00:00 2001 From: Jamie Date: Fri, 8 Dec 2017 08:01:42 +0000 Subject: [PATCH 2/3] Fixed #1738 --- src/Ombi.Api.Plex/Models/Metadata.cs | 8 ++++---- src/Ombi.Api.Plex/Models/Stream.cs | 2 +- src/Ombi.Core/Senders/TvSender.cs | 9 ++++++++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Ombi.Api.Plex/Models/Metadata.cs b/src/Ombi.Api.Plex/Models/Metadata.cs index e7fda9962..6d1f1f700 100644 --- a/src/Ombi.Api.Plex/Models/Metadata.cs +++ b/src/Ombi.Api.Plex/Models/Metadata.cs @@ -26,7 +26,7 @@ namespace Ombi.Api.Plex.Models public int addedAt { get; set; } public int updatedAt { get; set; } public Genre[] Genre { get; set; } - public Role[] Role { get; set; } + //public Role[] Role { get; set; } public string primaryExtraKey { get; set; } public int parentRatingKey { get; set; } public int grandparentRatingKey { get; set; } @@ -43,8 +43,8 @@ namespace Ombi.Api.Plex.Models public string grandparentArt { get; set; } public string grandparentTheme { get; set; } public string chapterSource { get; set; } - public Medium[] Media { get; set; } - public Director[] Director { get; set; } - public Writer[] Writer { get; set; } + // public Medium[] Media { get; set; } + // public Director[] Director { get; set; } + // public Writer[] Writer { get; set; } } } \ No newline at end of file diff --git a/src/Ombi.Api.Plex/Models/Stream.cs b/src/Ombi.Api.Plex/Models/Stream.cs index 532aaa705..b039a03d2 100644 --- a/src/Ombi.Api.Plex/Models/Stream.cs +++ b/src/Ombi.Api.Plex/Models/Stream.cs @@ -13,7 +13,7 @@ public float frameRate { get; set; } public bool hasScalingMatrix { get; set; } public int height { get; set; } - public int level { get; set; } + public string level { get; set; } public string profile { get; set; } public int refFrames { get; set; } public string scanType { get; set; } diff --git a/src/Ombi.Core/Senders/TvSender.cs b/src/Ombi.Core/Senders/TvSender.cs index e839e2a5b..97728da07 100644 --- a/src/Ombi.Core/Senders/TvSender.cs +++ b/src/Ombi.Core/Senders/TvSender.cs @@ -264,7 +264,14 @@ namespace Ombi.Core.Senders private async Task SendToSickRage(ChildRequests model, SickRageSettings settings, string qualityId = null) { var tvdbid = model.ParentRequest.TvDbId; - if (qualityId.HasValue()) { var id = qualityId; if (settings.Qualities.All(x => x.Value != id)) { qualityId = settings.QualityProfile; } } + if (qualityId.HasValue()) + { + var id = qualityId; + if (settings.Qualities.All(x => x.Value != id)) + { + qualityId = settings.QualityProfile; + } + } // Check if the show exists var existingShow = await SickRageApi.GetShow(tvdbid, settings.ApiKey, settings.FullUri); From 7431ed955746fe40ef045508c9bcdc2d81636ca0 Mon Sep 17 00:00:00 2001 From: Jamie Date: Fri, 8 Dec 2017 08:35:49 +0000 Subject: [PATCH 3/3] Fixed build !wip --- src/Ombi.Api.Plex/Models/Medium.cs | 2 +- src/Ombi.Api.Plex/Models/Metadata.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ombi.Api.Plex/Models/Medium.cs b/src/Ombi.Api.Plex/Models/Medium.cs index b86c5c54d..ff9fab657 100644 --- a/src/Ombi.Api.Plex/Models/Medium.cs +++ b/src/Ombi.Api.Plex/Models/Medium.cs @@ -16,6 +16,6 @@ namespace Ombi.Api.Plex.Models public string videoFrameRate { get; set; } public string audioProfile { get; set; } public string videoProfile { get; set; } - public Part[] Part { get; set; } + //public Part[] Part { get; set; } } } \ No newline at end of file diff --git a/src/Ombi.Api.Plex/Models/Metadata.cs b/src/Ombi.Api.Plex/Models/Metadata.cs index 6d1f1f700..40c3cd5d0 100644 --- a/src/Ombi.Api.Plex/Models/Metadata.cs +++ b/src/Ombi.Api.Plex/Models/Metadata.cs @@ -43,7 +43,7 @@ namespace Ombi.Api.Plex.Models public string grandparentArt { get; set; } public string grandparentTheme { get; set; } public string chapterSource { get; set; } - // public Medium[] Media { get; set; } + public Medium[] Media { get; set; } // public Director[] Director { get; set; } // public Writer[] Writer { get; set; } }