Merge pull request #3049 from tidusjar/develop

Develop

README.md

@@ -15,7 +15,7 @@ ___
 
 Follow me developing Ombi!
 
-[![Twitch](https://img.shields.io/badge/Twitch-Watch-blue.svg?style=flat-square&logo=twitch)](https://twitch.tv/tiusjar)
+[![Twitch](https://img.shields.io/badge/Twitch-Watch-blue.svg?style=flat-square&logo=twitch)](https://www.twitch.tv/tidusjar)
 
 
 ___
@@ -68,6 +68,7 @@ We integrate with the following applications:
 Supported notifications:
 * SMTP Notifications (Email)
 * Discord
+* Gotify
 * Slack
 * Pushbullet
 * Pushover

build.cake

@@ -3,7 +3,7 @@
 #addin "Cake.Gulp"
 #addin "SharpZipLib"
 #addin nuget:?package=Cake.Compression&version=0.1.4
-#addin "Cake.Incubator"
+#addin "Cake.Incubator&version=3.1.0"
 #addin "Cake.Yarn"
 
 //////////////////////////////////////////////////////////////////////
@@ -81,9 +81,9 @@ Task("SetVersionInfo")
 
  versionInfo = GitVersion(settings);
  
- Information("GitResults -> {0}", versionInfo.Dump());
+// Information("GitResults -> {0}", versionInfo.Dump());
 
- Information(@"Build:{0}",AppVeyor.Environment.Build.Dump());
+//Information(@"Build:{0}",AppVeyor.Environment.Build.Dump());
 
  var buildVersion = string.Empty;
  if(string.IsNullOrEmpty(AppVeyor.Environment.Build.Version))

src/Ombi.Api.Emby/Models/Media/Tv/EmbyEpisodes.cs

@@ -16,6 +16,7 @@ public class EmbyEpisodes
  public int ProductionYear { get; set; }
  public bool IsPlaceHolder { get; set; }
  public int IndexNumber { get; set; }
+ public int? IndexNumberEnd { get; set; }
  public int ParentIndexNumber { get; set; }
  public bool IsHD { get; set; }
  public bool IsFolder { get; set; }

src/Ombi.Api.Gotify/GotifyApi.cs

@@ -0,0 +1,36 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Ombi.Api.Gotify
+{
+ public class GotifyApi : IGotifyApi
+ {
+ public GotifyApi(IApi api)
+ {
+ _api = api;
+ }
+
+ private readonly IApi _api;
+
+ public async Task PushAsync(string baseUrl, string accessToken, string subject, string body, sbyte priority)
+ {
+ var request = new Request("/message", baseUrl, HttpMethod.Post);
+ request.AddQueryString("token", accessToken);
+
+ request.AddHeader("Access-Token", accessToken);
+ request.ApplicationJsonContentType();
+
+
+ var jsonBody = new
+ {
+ message = body,
+ title = subject,
+ priority = priority
+ };
+
+ request.AddJsonBody(jsonBody);
+
+ await _api.Request(request);
+ }
+ }
+}

src/Ombi.Api.Gotify/IGotifyApi.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Ombi.Api.Gotify
+{
+ public interface IGotifyApi
+ {
+ Task PushAsync(string endpoint, string accessToken, string subject, string body, sbyte priority);
+ }
+}

src/Ombi.Api.Gotify/Ombi.Api.Gotify.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>netstandard2.0</TargetFramework>
+ <AssemblyVersion>3.0.0.0</AssemblyVersion>
+ <FileVersion>3.0.0.0</FileVersion>
+ <Version></Version>
+ <PackageVersion></PackageVersion>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\Ombi.Api\Ombi.Api.csproj" />
+ </ItemGroup>
+
+</Project>

src/Ombi.Api.Lidarr/ILidarrApi.cs

@@ -23,5 +23,6 @@ public interface ILidarrApi
  Task<List<LanguageProfiles>> GetLanguageProfile(string apiKey, string baseUrl);
  Task<LidarrStatus> Status(string apiKey, string baseUrl);
  Task<CommandResult> AlbumSearch(int[] albumIds, string apiKey, string baseUrl);
+ Task<AlbumByForeignId> AlbumInformation(string albumId, string apiKey, string baseUrl);
  }
 }

src/Ombi.Api.Lidarr/LidarrApi.cs

@@ -84,7 +84,7 @@ public async Task<AlbumLookup> GetAlbumByForeignId(string foreignArtistId, strin
 
  public Task<AlbumByArtistResponse> GetAlbumsByArtist(string foreignArtistId)
  {
- var request = new Request(string.Empty, $"https://api.lidarr.audio/api/v0.3/artist/{foreignArtistId}",
+ var request = new Request(string.Empty, $"https://api.lidarr.audio/api/v0.4/artist/{foreignArtistId}",
  HttpMethod.Get) {IgnoreBaseUrlAppend = true};
  return Api.Request<AlbumByArtistResponse>(request);
  }
@@ -105,6 +105,31 @@ public Task<List<AlbumResponse>> GetAllAlbums(string apiKey, string baseUrl)
  return Api.Request<List<AlbumResponse>>(request);
  }
 
+ public async Task<AlbumByForeignId> AlbumInformation(string albumId, string apiKey, string baseUrl)
+ {
+ var request = new Request($"{ApiVersion}/album", baseUrl, HttpMethod.Get);
+ request.AddQueryString("foreignAlbumId", albumId);
+ AddHeaders(request, apiKey);
+ var albums = await Api.Request<List<AlbumByForeignId>>(request);
+ return albums.FirstOrDefault();
+ }
+
+
+ /// <summary>
+ /// THIS ONLY SUPPORTS ALBUMS THAT THE ARTIST IS IN LIDARR
+ /// </summary>
+ /// <param name="albumId"></param>
+ /// <param name="apiKey"></param>
+ /// <param name="baseUrl"></param>
+ /// <returns></returns>
+ public Task<List<LidarrTrack>> GetTracksForAlbum(int albumId, string apiKey, string baseUrl)
+ {
+ var request = new Request($"{ApiVersion}/album", baseUrl, HttpMethod.Get);
+ request.AddQueryString("albumId", albumId.ToString());
+ AddHeaders(request, apiKey);
+ return Api.Request<List<LidarrTrack>>(request);
+ }
+
  public Task<ArtistResult> AddArtist(ArtistAdd artist, string apiKey, string baseUrl)
  {
  var request = new Request($"{ApiVersion}/artist", baseUrl, HttpMethod.Post);

src/Ombi.Api.Lidarr/Models/AlbumByForeignId.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Net.Mime;
+
+namespace Ombi.Api.Lidarr.Models
+{ 
+ public class AlbumByForeignId
+ {
+ public string title { get; set; }
+ public string disambiguation { get; set; }
+ public string overview { get; set; }
+ public int artistId { get; set; }
+ public string foreignAlbumId { get; set; }
+ public bool monitored { get; set; }
+ public bool anyReleaseOk { get; set; }
+ public int profileId { get; set; }
+ public int duration { get; set; }
+ public string albumType { get; set; }
+ public object[] secondaryTypes { get; set; }
+ public int mediumCount { get; set; }
+ public Ratings ratings { get; set; }
+ public DateTime releaseDate { get; set; }
+ public Release[] releases { get; set; }
+ public object[] genres { get; set; }
+ public Medium[] media { get; set; }
+ public Artist artist { get; set; }
+ public Image[] images { get; set; }
+ public Link[] links { get; set; }
+ public Statistics statistics { get; set; }
+ public int id { get; set; }
+ }
+}

src/Ombi.Api.Lidarr/Models/AlbumLookup.cs

@@ -1,10 +1,15 @@
 using System;
+using System.Collections.Generic;
 
 namespace Ombi.Api.Lidarr.Models
 {
  public class AlbumLookup
  {
  public string title { get; set; }
+ public string status { get; set; }
+ public string artistType { get; set; }
+ public string disambiguation { get; set; }
+ public List<LidarrLinks> links { get; set; }
  public int artistId { get; set; }
  public string foreignAlbumId { get; set; }
  public bool monitored { get; set; }

src/Ombi.Api.Lidarr/Models/LidarrLinks.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ombi.Api.Lidarr.Models
+{
+ public class LidarrLinks
+ {
+ public string url { get; set; }
+ public string name { get; set; }
+ }
+}

src/Ombi.Api.Lidarr/Models/LidarrRatings.cs

@@ -0,0 +1,8 @@
+namespace Ombi.Api.Lidarr.Models
+{
+ public class LidarrRatings
+ {
+ public int votes { get; set; }
+ public decimal value { get; set; }
+ }
+}

src/Ombi.Api.Lidarr/Models/LidarrTrack.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ombi.Api.Lidarr.Models
+{
+ public class LidarrTrack
+ {
+ public int artistId { get; set; }
+ public int trackFileId { get; set; }
+ public int albumId { get; set; }
+ public bool _explicit { get; set; }
+ public int absoluteTrackNumber { get; set; }
+ public string trackNumber { get; set; }
+ public string title { get; set; }
+ public int duration { get; set; }
+ public int mediumNumber { get; set; }
+ public bool hasFile { get; set; }
+ public bool monitored { get; set; }
+ public int id { get; set; }
+ }
+}

src/Ombi.Api.Pushover/PushoverApi.cs

@@ -2,6 +2,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using System.Web;
 using Ombi.Api.Pushover.Models;
 
 namespace Ombi.Api.Pushover
@@ -18,11 +19,7 @@ public PushoverApi(IApi api)
 
  public async Task<PushoverResponse> PushAsync(string accessToken, string message, string userToken, sbyte priority, string sound)
  {
- if (message.Contains("'"))
- {
- message = message.Replace("'", "&#39;");
- }
- var request = new Request($"messages.json?token={accessToken}&user={userToken}&priority={priority}&sound={sound}&message={WebUtility.HtmlEncode(message)}", PushoverEndpoint, HttpMethod.Post);
+ var request = new Request($"messages.json?token={accessToken}&user={userToken}&priority={priority}&sound={sound}&message={WebUtility.UrlEncode(message)}", PushoverEndpoint, HttpMethod.Post);
 
  var result = await _api.Request<PushoverResponse>(request);
  return result;

src/Ombi.Api/Api.cs

@@ -72,6 +72,7 @@ public async Task<T> Request<T>(Request request)
 
  // do something with the response
  var receivedString = await httpResponseMessage.Content.ReadAsStringAsync();
+ LogDebugContent(receivedString);
  if (request.ContentType == ContentType.Json)
  {
  request.OnBeforeDeserialization?.Invoke(receivedString);
@@ -110,7 +111,7 @@ public async Task<string> RequestContent(Request request)
  }
  // do something with the response
  var data = httpResponseMessage.Content;
-
+ await LogDebugContent(httpResponseMessage);
  return await data.ReadAsStringAsync();
  }
 
@@ -122,6 +123,7 @@ public async Task Request(Request request)
  {
  AddHeadersBody(request, httpRequestMessage);
  var httpResponseMessage = await _client.SendAsync(httpRequestMessage);
+ await LogDebugContent(httpResponseMessage);
  if (!httpResponseMessage.IsSuccessStatusCode)
  {
  if (!request.IgnoreErrors)
@@ -132,11 +134,12 @@ public async Task Request(Request request)
  }
  }
 
- private static void AddHeadersBody(Request request, HttpRequestMessage httpRequestMessage)
+ private void AddHeadersBody(Request request, HttpRequestMessage httpRequestMessage)
  {
  // Add the Json Body
  if (request.JsonBody != null)
  {
+ LogDebugContent("REQUEST: " + request.JsonBody);
  httpRequestMessage.Content = new JsonContent(request.JsonBody);
  httpRequestMessage.Content.Headers.ContentType =
  new MediaTypeHeaderValue("application/json"); // Emby connect fails if we have the charset in the header
@@ -153,11 +156,24 @@ private async Task LogError(Request request, HttpResponseMessage httpResponseMes
  {
  Logger.LogError(LoggingEvents.Api,
  $"StatusCode: {httpResponseMessage.StatusCode}, Reason: {httpResponseMessage.ReasonPhrase}, RequestUri: {request.FullUri}");
+ await LogDebugContent(httpResponseMessage);
+ }
+
+ private async Task LogDebugContent(HttpResponseMessage message)
+ {
  if (Logger.IsEnabled(LogLevel.Debug))
  {
- var content = await httpResponseMessage.Content.ReadAsStringAsync();
+ var content = await message.Content.ReadAsStringAsync();
  Logger.LogDebug(content);
  }
  }
+
+ private void LogDebugContent(string message)
+ {
+ if (Logger.IsEnabled(LogLevel.Debug))
+ {
+ Logger.LogDebug(message);
+ }
+ }
  }
 }

src/Ombi.Api/Ombi.Api.csproj

@@ -11,7 +11,7 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
  <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
- <PackageReference Include="Polly" Version="6.1.0" />
+ <PackageReference Include="Polly" Version="7.1.0" />
  <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
  </ItemGroup>
 

src/Ombi.Core.Tests/Rule/Request/AutoApproveRuleTests.cs

@@ -4,6 +4,7 @@
 using Ombi.Core.Rule.Rules.Request;
 using Ombi.Store.Entities.Requests;
 using NUnit.Framework;
+using Ombi.Core.Authentication;
 using Ombi.Helpers;
 
 namespace Ombi.Core.Tests.Rule.Request
@@ -16,7 +17,7 @@ public void Setup()
  {
 
  PrincipalMock = new Mock<IPrincipal>();
- Rule = new AutoApproveRule(PrincipalMock.Object);
+ Rule = new AutoApproveRule(PrincipalMock.Object, null);
  }
 
 

src/Ombi.Core.Tests/Rule/Request/CanRequestRuleTests.cs

@@ -3,6 +3,7 @@
 using Moq;
 using NUnit.Framework;
 using Ombi.Core.Rule.Rules;
+using Ombi.Core.Rule.Rules.Request;
 using Ombi.Helpers;
 using Ombi.Store.Entities.Requests;
 
@@ -15,7 +16,7 @@ public void Setup()
  {
 
  PrincipalMock = new Mock<IPrincipal>();
- Rule = new CanRequestRule(PrincipalMock.Object);
+ Rule = new CanRequestRule(PrincipalMock.Object, null);
  }
 
 

src/Ombi.Core.Tests/Rule/Search/EmbyAvailabilityRuleTests.cs

@@ -16,7 +16,7 @@ public class EmbyAvailabilityRuleTests
  public void Setup()
  {
  ContextMock = new Mock<IEmbyContentRepository>();
- Rule = new EmbyAvailabilityRule(ContextMock.Object);
+ Rule = new EmbyAvailabilityRule(ContextMock.Object, null);
  }
 
  private EmbyAvailabilityRule Rule { get; set; }