Merge branch 'dev' into master

Ombi.Api/ApiRequest.cs

@@ -27,6 +27,7 @@
 
 using System;
 using System.IO;
+using System.Net;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using NLog;
@@ -76,14 +77,7 @@ namespace Ombi.Api
             var client = new RestClient { BaseUrl = baseUri };
 
             var response = client.Execute(request);
-
-            if (response.ErrorException != null)
-            {
-                Log.Error(response.ErrorException);
-                var message = "Error retrieving response. Check inner details for more info.";
-                throw new ApiRequestException(message, response.ErrorException);
-            }
-
+           
             return response;
         }
 

Ombi.Api/CouchPotatoApi.cs

@@ -100,9 +100,9 @@ namespace Ombi.Api
 
             var obj = RetryHandler.Execute<CouchPotatoStatus>(() => Api.Execute<CouchPotatoStatus>(request, url),
                 (exception, timespan) => Log.Error(exception, "Exception when calling GetStatus for CP, Retrying {0}", timespan), new TimeSpan[] {
-                    TimeSpan.FromSeconds (2),
-                    TimeSpan.FromSeconds(5),
-                    TimeSpan.FromSeconds(10)});
+                    TimeSpan.FromSeconds (1),
+                    TimeSpan.FromSeconds(2),
+                    TimeSpan.FromSeconds(3)});
 
             return obj;
         }
@@ -140,9 +140,9 @@ namespace Ombi.Api
             {
                 var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoMovies>(request, baseUrl),
                     (exception, timespan) => Log.Error(exception, "Exception when calling GetMovies for CP, Retrying {0}", timespan), new[] {
-                        TimeSpan.FromSeconds (5),
-                        TimeSpan.FromSeconds(10),
-                        TimeSpan.FromSeconds(30)
+                        TimeSpan.FromSeconds (1),
+                        TimeSpan.FromSeconds(5),
+                        TimeSpan.FromSeconds(5)
                     });
 
                 return obj;

Ombi.Api/EmbyApi.cs

@@ -0,0 +1,314 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2017 Jamie Rees
+//    File: EmbyApi.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using Newtonsoft.Json;
+using NLog;
+using Ombi.Api.Interfaces;
+using Ombi.Api.Models.Emby;
+using Ombi.Helpers;
+using Polly;
+using RestSharp;
+
+namespace Ombi.Api
+{
+    public class EmbyApi : IEmbyApi
+    {
+        public EmbyApi()
+        {
+            Api = new ApiRequest();
+        }
+
+        private ApiRequest Api { get; }
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Returns all users from the Emby Instance
+        /// </summary>
+        /// <param name="baseUri"></param>
+        /// <param name="apiKey"></param>
+        public List<EmbyUser> GetUsers(Uri baseUri, string apiKey)
+        {
+            var request = new RestRequest
+            {
+                Resource = "emby/users",
+                Method = Method.GET
+            };
+
+            AddHeaders(request, apiKey);
+
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetUsers for Emby, Retrying {0}", timespan), new[] {
+                TimeSpan.FromSeconds (1),
+            });
+
+            var obj = policy.Execute(() => Api.ExecuteJson<List<EmbyUser>>(request, baseUri));
+
+            return obj;
+        }
+
+        public EmbySystemInfo GetSystemInformation(string apiKey, Uri baseUrl)
+        {
+            var request = new RestRequest
+            {
+                Resource = "emby/System/Info",
+                Method = Method.GET
+            };
+
+            AddHeaders(request, apiKey);
+
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetSystemInformation for Emby, Retrying {0}", timespan), new[] {
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(5)
+            });
+
+            var obj = policy.Execute(() => Api.ExecuteJson<EmbySystemInfo>(request, baseUrl));
+
+            return obj;
+        }
+
+        public EmbyItemContainer<EmbyLibrary> ViewLibrary(string apiKey, string userId, Uri baseUri)
+        {
+            var request = new RestRequest
+            {
+                Resource = "emby/users/{userId}/items",
+                Method = Method.GET
+            };
+
+            request.AddUrlSegment("userId", userId);
+            AddHeaders(request, apiKey);
+
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling ViewLibrary for Emby, Retrying {0}", timespan), new[] {
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(5)
+            });
+
+            var obj = policy.Execute(() => Api.ExecuteJson<EmbyItemContainer<EmbyLibrary>>(request, baseUri));
+
+            return obj;
+        }
+
+        public EmbyItemContainer<EmbyMovieItem> GetAllMovies(string apiKey, string userId, Uri baseUri)
+        {
+            return GetAll<EmbyMovieItem>("Movie", apiKey, userId, baseUri);
+        }
+
+        public EmbyItemContainer<EmbyEpisodeItem> GetAllEpisodes(string apiKey, string userId, Uri baseUri)
+        {
+            return GetAll<EmbyEpisodeItem>("Episode", apiKey, userId, baseUri);
+        }
+
+        public EmbyItemContainer<EmbyMovieInformation> GetCollection(string mediaId, string apiKey, string userId, Uri baseUrl)
+        {
+            var request = new RestRequest
+            {
+                Resource = "emby/users/{userId}/items?parentId={mediaId}",
+                Method = Method.GET
+            };
+
+            request.AddUrlSegment("userId", userId);
+            request.AddUrlSegment("mediaId", mediaId);
+
+            AddHeaders(request, apiKey);
+
+
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetCollections for Emby, Retrying {0}", timespan), new[] {
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(5)
+            });
+            return policy.Execute(() => Api.ExecuteJson<EmbyItemContainer<EmbyMovieInformation>>(request, baseUrl));
+        }
+
+        public EmbyInformation GetInformation(string mediaId, EmbyMediaType type, string apiKey, string userId, Uri baseUri)
+        {
+            var request = new RestRequest
+            {
+                Resource = "emby/users/{userId}/items/{mediaId}",
+                Method = Method.GET
+            };
+
+            request.AddUrlSegment("userId", userId);
+            request.AddUrlSegment("mediaId", mediaId);
+
+            AddHeaders(request, apiKey);
+
+
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetAll<T>({1}) for Emby, Retrying {0}", timespan, type), new[] {
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(5)
+            });
+
+            IRestResponse response = null;
+            try
+            {
+
+                switch (type)
+                {
+                    case EmbyMediaType.Movie:
+                        response = policy.Execute(() => Api.Execute(request, baseUri));
+                        break;
+
+                    case EmbyMediaType.Series:
+                        response = policy.Execute(() => Api.Execute(request, baseUri));
+                        break;
+                    case EmbyMediaType.Music:
+                        break;
+                    case EmbyMediaType.Episode:
+                        response = policy.Execute(() => Api.Execute(request, baseUri));
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(type), type, null);
+                }
+
+                var info = new EmbyInformation();
+
+                switch (type)
+                {
+                    case EmbyMediaType.Movie:
+                        return new EmbyInformation
+                        {
+                            MovieInformation = JsonConvert.DeserializeObject<EmbyMovieInformation>(response.Content)
+                        };
+                    case EmbyMediaType.Series:
+                        return new EmbyInformation
+                        {
+                            SeriesInformation = JsonConvert.DeserializeObject<EmbySeriesInformation>(response.Content)
+                        };
+                    case EmbyMediaType.Music:
+                        break;
+                    case EmbyMediaType.Episode:
+                        return new EmbyInformation
+                        {
+                            EpisodeInformation = JsonConvert.DeserializeObject<EmbyEpisodeInformation>(response.Content)
+                        };
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(type), type, null);
+                }
+
+            }
+            catch (Exception e)
+            {
+                Log.Error("Could not get the media item's information");
+                Log.Error(e);
+                Log.Debug("ResponseContent");
+                Log.Debug(response?.Content ?? "Empty");
+                Log.Debug("ResponseStatusCode");
+                Log.Debug(response?.StatusCode ?? HttpStatusCode.PreconditionFailed);
+
+                Log.Debug("ResponseError");
+                Log.Debug(response?.ErrorMessage ?? "No Error");
+                Log.Debug("ResponseException");
+                Log.Debug(response?.ErrorException ?? new Exception());
+
+
+
+                throw;
+            }
+            return new EmbyInformation();
+        }
+
+
+        public EmbyItemContainer<EmbySeriesItem> GetAllShows(string apiKey, string userId, Uri baseUri)
+        {
+            return GetAll<EmbySeriesItem>("Series", apiKey, userId, baseUri);
+        }
+
+        public EmbyUser LogIn(string username, string password, string apiKey, Uri baseUri)
+        {
+            var request = new RestRequest
+            {
+                Resource = "emby/users/authenticatebyname",
+                Method = Method.POST
+            };
+
+            var body = new
+            {
+                username,
+                password = StringHasher.GetSha1Hash(password).ToLower(),
+                passwordMd5 = StringHasher.CalcuateMd5Hash(password)
+            };
+
+            request.AddJsonBody(body);
+
+            request.AddHeader("X-Emby-Authorization",
+                $"MediaBrowser Client=\"Ombi\", Device=\"Ombi\", DeviceId=\"{AssemblyHelper.GetProductVersion()}\", Version=\"{AssemblyHelper.GetAssemblyVersion()}\"");
+            AddHeaders(request, apiKey);
+
+
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling LogInfor Emby, Retrying {0}", timespan), new[] {
+                TimeSpan.FromSeconds (1)
+            });
+
+            var obj = policy.Execute(() => Api.Execute(request, baseUri));
+
+            if (obj.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                return null;
+            }
+
+            return JsonConvert.DeserializeObject<EmbyUserLogin>(obj.Content)?.User;
+        }
+
+        private EmbyItemContainer<T> GetAll<T>(string type, string apiKey, string userId, Uri baseUri)
+        {
+            var request = new RestRequest
+            {
+                Resource = "emby/users/{userId}/items",
+                Method = Method.GET
+            };
+
+            request.AddUrlSegment("userId", userId);
+            request.AddQueryParameter("Recursive", true.ToString());
+            request.AddQueryParameter("IncludeItemTypes", type);
+
+            AddHeaders(request, apiKey);
+
+
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetAll<T>({1}) for Emby, Retrying {0}", timespan, type), new[] {
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(5)
+            });
+
+            var obj = policy.Execute(() => Api.ExecuteJson<EmbyItemContainer<T>>(request, baseUri));
+
+            return obj;
+        }
+
+
+        private static void AddHeaders(IRestRequest req, string apiKey)
+        {
+            if (!string.IsNullOrEmpty(apiKey))
+            {
+                req.AddHeader("X-MediaBrowser-Token", apiKey);
+            }
+            req.AddHeader("Accept", "application/json");
+            req.AddHeader("Content-Type", "application/json");
+            req.AddHeader("Device", "Ombi");
+        }
+    }
+}

Ombi.Api/Ombi.Api.csproj

@@ -70,10 +70,14 @@
       <HintPath>..\packages\TraktApiSharp.0.8.0\lib\portable-net45+netcore45+wpa81\TraktApiSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="WebSocket4Net, Version=0.14.1.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiRequest.cs" />
     <Compile Include="DiscordApi.cs" />
+    <Compile Include="EmbyApi.cs" />
     <Compile Include="NetflixRouletteApi.cs" />
     <Compile Include="RadarrApi.cs" />
     <Compile Include="TraktApi.cs" />

Ombi.Api/RadarrApi.cs

@@ -62,6 +62,20 @@ namespace Ombi.Api
 
             return obj;
         }
+        public List<SonarrRootFolder> GetRootFolders(string apiKey, Uri baseUrl)
+        {
+            var request = new RestRequest { Resource = "/api/rootfolder", Method = Method.GET };
+
+            request.AddHeader("X-Api-Key", apiKey);
+            var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetRootFolders for Radarr, Retrying {0}", timespan), new TimeSpan[] {
+                  TimeSpan.FromSeconds (1),
+                  TimeSpan.FromSeconds(2)
+              });
+
+            var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrRootFolder>>(request, baseUrl));
+
+            return obj;
+        }
 
         public RadarrAddMovie AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath, string apiKey, Uri baseUrl, bool searchNow = false)
         {

Ombi.Api/SonarrApi.cs

@@ -52,9 +52,9 @@ namespace Ombi.Api
 
             request.AddHeader("X-Api-Key", apiKey);
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetProfiles for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
-                TimeSpan.FromSeconds (2),
-                TimeSpan.FromSeconds(5),
-                TimeSpan.FromSeconds(10)
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(2),
+                TimeSpan.FromSeconds(5)
             });
 
             var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrProfile>>(request, baseUrl));
@@ -68,9 +68,9 @@ namespace Ombi.Api
 
             request.AddHeader("X-Api-Key", apiKey);
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetRootFolders for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
-                  TimeSpan.FromSeconds (2),
-                  TimeSpan.FromSeconds(5),
-                  TimeSpan.FromSeconds(10)
+                  TimeSpan.FromSeconds (1),
+                  TimeSpan.FromSeconds(2),
+                  TimeSpan.FromSeconds(5)
               });
 
             var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrRootFolder>>(request, baseUrl));

Ombi.Api/TvMazeApi.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using NLog;
 using Ombi.Api.Models.Tv;
 using RestSharp;
@@ -90,21 +91,29 @@ namespace Ombi.Api
             };
             request.AddUrlSegment("id", theTvDbId.ToString());
             request.AddHeader("Content-Type", "application/json");
-
-            var obj = Api.Execute<TvMazeShow>(request, new Uri(Uri));
-
-            var episodes = EpisodeLookup(obj.id).ToList();
-
-            foreach (var e in episodes)
+            try
             {
-                obj.Season.Add(new TvMazeCustomSeason
+                var result = Api.Execute(request, new Uri(Uri));
+                var obj = JsonConvert.DeserializeObject<TvMazeShow>(result.Content);
+
+                var episodes = EpisodeLookup(obj.id).ToList();
+
+                foreach (var e in episodes)
                 {
-                    SeasonNumber = e.season,
-                    EpisodeNumber = e.number
-                });
+                    obj.Season.Add(new TvMazeCustomSeason
+                    {
+                        SeasonNumber = e.season,
+                        EpisodeNumber = e.number
+                    });
+                }
+
+                return obj;
             }
-            
-            return obj;
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return null;
+            }           
         }
 
         public List<TvMazeSeasons> GetSeasons(int id)

Ombi.Api/packages.config

@@ -9,4 +9,5 @@
   <package id="System.Net.Http" version="4.0.0" targetFramework="net45" />
   <package id="TMDbLib" version="0.9.0.0-alpha" targetFramework="net45" />
   <package id="TraktApiSharp" version="0.8.0" targetFramework="net45" />
+  <package id="WebSocket4Net" version="0.14.1" targetFramework="net45" />
 </packages>