Merge pull request #938 from tidusjar/EAP

Eap

Ombi.Api.Interfaces/INetflixApi.cs

@@ -0,0 +1,36 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2017 Jamie Rees
+//    File: INetflixApi.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 Ombi.Api.Models.Netflix;
+
+namespace Ombi.Api.Interfaces
+{
+    public interface INetflixApi
+    {
+        NetflixMovieResult GetMovies(string movieName, string year = null);
+    }
+}

Ombi.Api.Interfaces/Ombi.Api.Interfaces.csproj

@@ -49,6 +49,7 @@
     <Compile Include="ICouchPotatoApi.cs" />
     <Compile Include="IHeadphonesApi.cs" />
     <Compile Include="IMusicBrainzApi.cs" />
+    <Compile Include="INetflixApi.cs" />
     <Compile Include="IPlexApi.cs" />
     <Compile Include="IPushbulletApi.cs" />
     <Compile Include="ISlackApi.cs" />

Ombi.Api.Models/Netflix/NetflixMovieResult.cs

@@ -0,0 +1,62 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2017 Jamie Rees
+//    File: NetflixMovieResult.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 Newtonsoft.Json;
+
+namespace Ombi.Api.Models.Netflix
+{
+    public class NetflixMovieResult
+    {
+        [JsonProperty(PropertyName= "unit")]
+        public int Unit { get; set; }
+
+        [JsonProperty(PropertyName = "show_id")]
+        public int ShowId { get; set; }
+
+        [JsonProperty(PropertyName = "show_title")]
+        public string Title { get; set; }
+
+        [JsonProperty(PropertyName = "release_year")]
+        public string ReleaseYear { get; set; }
+        [JsonProperty(PropertyName = "rating")]
+        public string Rating { get; set; }
+        [JsonProperty(PropertyName = "Category")]
+        public string Category { get; set; }
+        [JsonProperty(PropertyName = "show_cast")]
+        public string ShowCast { get; set; }
+        [JsonProperty(PropertyName = "director")]
+        public string Director { get; set; }
+        [JsonProperty(PropertyName = "summary")]
+        public string Summary { get; set; }
+        [JsonProperty(PropertyName = "poster")]
+        public string Poster { get; set; }
+        [JsonProperty(PropertyName = "mediatype")]
+        public string Mediatype { get; set; }
+        [JsonProperty(PropertyName = "runtime")]
+        public string Runtime { get; set; }
+    }
+}

Ombi.Api.Models/Ombi.Api.Models.csproj

@@ -61,6 +61,7 @@
     <Compile Include="Music\MusicBrainzCoverArt.cs" />
     <Compile Include="Music\MusicBrainzReleaseInfo.cs" />
     <Compile Include="Music\MusicBrainzSearchResults.cs" />
+    <Compile Include="Netflix\NetflixMovieResult.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
     <Compile Include="Notifications\PushoverResponse.cs" />

Ombi.Api/NetflixRouletteApi.cs

@@ -0,0 +1,59 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2017 Jamie Rees
+//    File: NetflixRouletteApi.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 Newtonsoft.Json;
+using Ombi.Api.Interfaces;
+using Ombi.Api.Models.Netflix;
+using RestSharp;
+
+namespace Ombi.Api
+{
+    public class NetflixRouletteApi : INetflixApi
+    {
+        public NetflixRouletteApi(IApiRequest req)
+        {
+            Api = req;
+        }
+
+        private IApiRequest Api { get; }
+        private Uri Endpoint => new Uri("http://netflixroulette.net/api/api.php");
+
+        public NetflixMovieResult GetMovies(string movieName, string year = null)
+        {
+            var request = new RestRequest();
+            request.AddQueryParameter("title", movieName);
+            if (!string.IsNullOrEmpty(year))
+            {
+                request.AddQueryParameter("year", year);
+            }
+            var result = Api.Execute(request, Endpoint);
+
+            return JsonConvert.DeserializeObject<NetflixMovieResult>(result.Content);
+        }
+    }
+}

Ombi.Api/Ombi.Api.csproj

@@ -69,6 +69,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiRequest.cs" />
+    <Compile Include="NetflixRouletteApi.cs" />
     <Compile Include="WatcherApi.cs" />
     <Compile Include="MusicBrainzApi.cs" />
     <Compile Include="SlackApi.cs" />

Ombi.UI/Content/search.js

@@ -83,7 +83,7 @@ $(function () {
     });
 
     // Click TV dropdown option
-    $(document).on("click", ".requestTv", function (e) {
+    $(document).on("click", ".dropdownTv", function (e) {
         e.preventDefault();
         var buttonId = e.target.id;
         if ($("#" + buttonId).attr('disabled')) {

Ombi.UI/Views/Search/Index.cshtml

@@ -176,7 +176,7 @@
                         <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> @UI.Search_Available</button><br />
                     {{else}}
                         {{#if_eq enableTvRequestsForOnlySeries true}}
-                            <button id="{{id}}" style="text-align: right" class="btn {{#if available}}btn-success-outline{{else}}btn-primary-outline{{/if}} btn-primary-outline requestTv" season-select="0" type="button"><i class="fa fa-plus"></i> @UI.Search_Request</button>
+                            <button id="{{id}}" style="text-align: right" class="btn {{#if available}}btn-success-outline{{else}}btn-primary-outline{{/if}} btn-primary-outline dropdownTv" season-select="0" type="button"><i class="fa fa-plus"></i> @UI.Search_Request</button>
                         {{else}}
                             <div class="dropdown">
                                 <button id="{{id}}" class="btn {{#if available}}btn-success-outline{{else}}btn-primary-outline{{/if}} dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">

appveyor.yml

@@ -3,9 +3,9 @@ configuration: Release
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
-  assembly_version: '2.0.0'
+  assembly_version: '2.0.1'
   assembly_file_version: '{version}'
-  assembly_informational_version: '2.0.0'
+  assembly_informational_version: '2.0.1'
 before_build:
 - cmd: appveyor-retry nuget restore
 build: