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

Merge branch 'DotNetCore' of https://github.com/tidusjar/Ombi into DotNetCore

Browse source
This commit is contained in:
tidusjar 2017-12-08 23:50:55 +00:00
commit 442092e93b
5 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Api.Plex/Models/Medium.cs
View file

@ -16,6 +16,6 @@ namespace Ombi.Api.Plex.Models
public string videoFrameRate { get; set; } public string videoFrameRate { get; set; }
public string audioProfile { get; set; } public string audioProfile { get; set; }
public string videoProfile { get; set; } public string videoProfile { get; set; }
public Part[] Part { get; set; } //public Part[] Part { get; set; }
} }
} }

6
src/Ombi.Api.Plex/Models/Metadata.cs
View file

@ -26,7 +26,7 @@ namespace Ombi.Api.Plex.Models
public int addedAt { get; set; } public int addedAt { get; set; }
public int updatedAt { get; set; } public int updatedAt { get; set; }
public Genre[] Genre { get; set; } public Genre[] Genre { get; set; }
public Role[] Role { get; set; } //public Role[] Role { get; set; }
public string primaryExtraKey { get; set; } public string primaryExtraKey { get; set; }
public int parentRatingKey { get; set; } public int parentRatingKey { get; set; }
public int grandparentRatingKey { get; set; } public int grandparentRatingKey { get; set; }
@ -44,7 +44,7 @@ namespace Ombi.Api.Plex.Models
public string grandparentTheme { get; set; } public string grandparentTheme { get; set; }
public string chapterSource { get; set; } public string chapterSource { get; set; }
public Medium[] Media { get; set; } public Medium[] Media { get; set; }
public Director[] Director { get; set; } // public Director[] Director { get; set; }
public Writer[] Writer { get; set; } // public Writer[] Writer { get; set; }
} }
} }

2
src/Ombi.Api.Plex/Models/Stream.cs
View file

@ -13,7 +13,7 @@
public float frameRate { get; set; } public float frameRate { get; set; }
public bool hasScalingMatrix { get; set; } public bool hasScalingMatrix { get; set; }
public int height { get; set; } public int height { get; set; }
public int level { get; set; } public string level { get; set; }
public string profile { get; set; } public string profile { get; set; }
public int refFrames { get; set; } public int refFrames { get; set; }
public string scanType { get; set; } public string scanType { get; set; }

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

@ -264,7 +264,14 @@ namespace Ombi.Core.Senders
private async Task<bool> SendToSickRage(ChildRequests model, SickRageSettings settings, string qualityId = null) private async Task<bool> SendToSickRage(ChildRequests model, SickRageSettings settings, string qualityId = null)
{ {
var tvdbid = model.ParentRequest.TvDbId; 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 // Check if the show exists
var existingShow = await SickRageApi.GetShow(tvdbid, settings.ApiKey, settings.FullUri); var existingShow = await SickRageApi.GetShow(tvdbid, settings.ApiKey, settings.FullUri);

2
src/Ombi/ClientApp/app/services/settings.service.ts
View file

@ -116,7 +116,7 @@ export class SettingsService extends ServiceHelpers {
} }
public getThemeContent(themeUrl: string): Observable<string> { public getThemeContent(themeUrl: string): Observable<string> {
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<IEmailNotificationSettings> { public getEmailNotificationSettings(): Observable<IEmailNotificationSettings> {