Merge pull request #902 from tidusjar/EAP

2.0 Release

.travis.yml

@@ -1,7 +1,7 @@
 language: csharp
-solution: PlexRequests.sln
+solution: Ombi.sln
 install:
- - mono Tools/nuget.exe restore PlexRequests.sln
+ - mono Tools/nuget.exe restore Ombi.sln
  - nuget install NUnit.Runners -OutputDirectory testrunner  
 script:
- - xbuild /p:Configuration=Release PlexRequests.sln /p:TargetFrameworkVersion="v4.5"
+ - xbuild /p:Configuration=Release Ombi.sln /p:TargetFrameworkVersion="v4.5"

Ombi.Api.Interfaces/IApiRequest.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using System;
 
+using System;
 using RestSharp;
 
-namespace PlexRequests.Api.Interfaces
+namespace Ombi.Api.Interfaces
 {
     public interface IApiRequest
     {

Ombi.Api.Interfaces/ICouchPotatoApi.cs

@@ -26,10 +26,9 @@
 #endregion
 
 using System;
+using Ombi.Api.Models.Movie;
 
-using PlexRequests.Api.Models.Movie;
+namespace Ombi.Api.Interfaces
-
-namespace PlexRequests.Api.Interfaces
 {
     public interface ICouchPotatoApi
     {

Ombi.Api.Interfaces/IHeadphonesApi.cs

@@ -24,13 +24,13 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Ombi.Api.Models.Music;
 
-using PlexRequests.Api.Models.Music;
+namespace Ombi.Api.Interfaces
-
-namespace PlexRequests.Api.Interfaces
 {
     public interface IHeadphonesApi
     {

Ombi.Api.Interfaces/IMusicBrainzApi.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using PlexRequests.Api.Models.Music;
 
-namespace PlexRequests.Api.Interfaces
+using Ombi.Api.Models.Music;
+
+namespace Ombi.Api.Interfaces
 {
     public interface IMusicBrainzApi
     {

Ombi.Api.Interfaces/IPlexApi.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
+using Ombi.Api.Models.Plex;
 
-using PlexRequests.Api.Models.Plex;
+namespace Ombi.Api.Interfaces
-
-namespace PlexRequests.Api.Interfaces
 {
     public interface IPlexApi
     {

Ombi.Api.Interfaces/IPushbulletApi.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Threading.Tasks;
+using Ombi.Api.Models.Notifications;
 
-using PlexRequests.Api.Models.Notifications;
+namespace Ombi.Api.Interfaces
-
-namespace PlexRequests.Api.Interfaces
 {
     public interface IPushbulletApi
     {

Ombi.Api.Interfaces/IPushoverApi.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Threading.Tasks;
+using Ombi.Api.Models.Notifications;
 
-using PlexRequests.Api.Models.Notifications;
+namespace Ombi.Api.Interfaces
-
-namespace PlexRequests.Api.Interfaces
 {
     public interface IPushoverApi
     {

Ombi.Api.Interfaces/ISickRageApi.cs

@@ -27,9 +27,9 @@
 
 using System;
 using System.Threading.Tasks;
-using PlexRequests.Api.Models.SickRage;
+using Ombi.Api.Models.SickRage;
 
-namespace PlexRequests.Api.Interfaces
+namespace Ombi.Api.Interfaces
 {
     public interface ISickRageApi
     {

Ombi.Api.Interfaces/ISlackApi.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Threading.Tasks;
+using Ombi.Api.Models.Notifications;
 
-using PlexRequests.Api.Models.Notifications;
+namespace Ombi.Api.Interfaces
-
-namespace PlexRequests.Api.Interfaces
 {
     public interface ISlackApi
     {

Ombi.Api.Interfaces/ISonarrApi.cs

@@ -24,12 +24,12 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Collections.Generic;
+using Ombi.Api.Models.Sonarr;
 
-using PlexRequests.Api.Models.Sonarr;
+namespace Ombi.Api.Interfaces
-
-namespace PlexRequests.Api.Interfaces
 {
     public interface ISonarrApi
     {

Ombi.Api.Interfaces/IWatcherApi.cs

@@ -1,7 +1,7 @@
 #region Copyright
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
-//    File: WebDriverSetup.cs
+//    File: IWatcherApi.cs
 //    Created By: Jamie Rees
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
@@ -24,30 +24,18 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
+using System.Collections.Generic;
+using Ombi.Api.Models.Watcher;
 
-using OpenQA.Selenium;
+namespace Ombi.Api.Interfaces
-using OpenQA.Selenium.Firefox;
-
-namespace PlexRequests.Automation
 {
-
+    public interface IWatcherApi
-    public static class WebDriverSetup
     {
-        private static IWebDriver _webDriver;
+        WatcherAddMovieResult AddMovie(string imdbId, string apiKey, Uri baseUrl);
-        
+        WatcherListStatusResultContainer ListMovies(string apiKey, Uri baseUrl);
-        public static IWebDriver SetUp(string url)
+        WatcherListStatusResultContainer ListMovies(string apiKey, Uri baseUrl, string imdbId);
-        {
+        WatcherVersion Version(string apiKey, Uri baseUri);
-            var driverService = FirefoxDriverService.CreateDefaultService("C:\\Tools\\WebDriver");
-            driverService.FirefoxBinaryPath = @"C:\Program Files (x86)\Mozilla Firefox\firefox.exe";
-            driverService.HideCommandPromptWindow = true;
-            driverService.SuppressInitialDiagnosticInformation = true;
-            _webDriver = new FirefoxDriver(driverService, new FirefoxOptions(), TimeSpan.FromSeconds(60));
-            _webDriver.Navigate().GoToUrl(url);
-            _webDriver.Manage().Timeouts().SetPageLoadTimeout(TimeSpan.FromMinutes(1));
-            _webDriver.Manage().Window.Maximize();
-            return _webDriver;
-        }
     }
-
 }

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

@@ -7,8 +7,8 @@
     <ProjectGuid>{95834072-A675-415D-AA8F-877C91623810}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PlexRequests.Api.Interfaces</RootNamespace>
+    <RootNamespace>Ombi.Api.Interfaces</RootNamespace>
-    <AssemblyName>PlexRequests.Api.Interfaces</AssemblyName>
+    <AssemblyName>Ombi.Api.Interfaces</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -55,12 +55,13 @@
     <Compile Include="IPushoverApi.cs" />
     <Compile Include="ISickRageApi.cs" />
     <Compile Include="ISonarrApi.cs" />
+    <Compile Include="IWatcherApi.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+    <ProjectReference Include="..\Ombi.Api.Models\Ombi.Api.Models.csproj">
       <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
-      <Name>PlexRequests.Api.Models</Name>
+      <Name>Ombi.Api.Models</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Ombi.Api.Interfaces/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("PlexRequests.Api.Interfaces")]
+[assembly: AssemblyTitle("Ombi.Api.Interfaces")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PlexRequests.Api.Interfaces")]
+[assembly: AssemblyProduct("Ombi.Api.Interfaces")]
 [assembly: AssemblyCopyright("Copyright © 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Ombi.Api.Models/Movie/CouchPotatoAdd.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Movie
+namespace Ombi.Api.Models.Movie
 {
     public class CouchPotatoAdd
     {

Ombi.Api.Models/Movie/CouchPotatoApiKey.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using Newtonsoft.Json;
 
-namespace PlexRequests.Api.Models.Movie
+namespace Ombi.Api.Models.Movie
 {
     public class CouchPotatoApiKey
     {

Ombi.Api.Models/Movie/CouchPotatoMovies.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Movie
+namespace Ombi.Api.Models.Movie
 {
     public class CouchPotatoMovies
     {

Ombi.Api.Models/Movie/CouchPotatoProfiles.cs

@@ -26,11 +26,9 @@
 #endregion
 
 using System.Collections.Generic;
-
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 
-namespace PlexRequests.Api.Models.Movie
+namespace Ombi.Api.Models.Movie
 {
     public class ProfileList
     {

Ombi.Api.Models/Movie/CouchPotatoStatus.cs

@@ -0,0 +1,7 @@
+namespace Ombi.Api.Models.Movie
+{
+    public class CouchPotatoStatus
+    {
+        public bool success { get; set; }
+    }
+}

Ombi.Api.Models/Music/HeadphonesAlbumSearchResult.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Music
+namespace Ombi.Api.Models.Music
 {
     public class HeadphonesAlbumSearchResult
     {

Ombi.Api.Models/Music/HeadphonesArtistSearchResult.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Music
+namespace Ombi.Api.Models.Music
 {
     public class HeadphonesArtistSearchResult
     {

Ombi.Api.Models/Music/HeadphonesGetIndex.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Music
+namespace Ombi.Api.Models.Music
 {
     public class HeadphonesGetIndex
     {

Ombi.Api.Models/Music/HeadphonesVersion.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Music
+namespace Ombi.Api.Models.Music
 {
     public class HeadphonesVersion
     {

Ombi.Api.Models/Music/MusicBrainzCoverArt.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Music
+namespace Ombi.Api.Models.Music
 {
     public class Thumbnails
     {

Ombi.Api.Models/Music/MusicBrainzReleaseInfo.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using System.Collections.Generic;
 
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace PlexRequests.Api.Models.Music
+namespace Ombi.Api.Models.Music
 {
     public class CoverArtArchive
     {

Ombi.Api.Models/Music/MusicBrainzSearchResults.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using System.Collections.Generic;
 
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace PlexRequests.Api.Models.Music
+namespace Ombi.Api.Models.Music
 {
     public class TextRepresentation
     {

Ombi.Api.Models/Notifications/PushbulletPush.cs

@@ -24,9 +24,8 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using Newtonsoft.Json;
 
-namespace PlexRequests.Api.Models.Notifications
+namespace Ombi.Api.Models.Notifications
 {
     public class PushbulletPush
     {

Ombi.Api.Models/Notifications/PushbulletResponse.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Notifications
+namespace Ombi.Api.Models.Notifications
 {
     public class PushbulletResponse
     {

Ombi.Api.Models/Notifications/PushoverResponse.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Notifications
+namespace Ombi.Api.Models.Notifications
 {
     public class PushoverResponse
     {

Ombi.Api.Models/Notifications/SlackNotificationBody.cs

@@ -24,16 +24,17 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using Newtonsoft.Json;
 
-namespace PlexRequests.Api.Models.Notifications
+namespace Ombi.Api.Models.Notifications
 {
     public class SlackNotificationBody
     {
         [JsonConstructor]
         public SlackNotificationBody()
         {
-            username = "Plex Requests";
+            username = "Ombi";
         }
 
         [JsonIgnore]

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

@@ -7,8 +7,8 @@
     <ProjectGuid>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PlexRequests.Api.Models</RootNamespace>
+    <RootNamespace>Ombi.Api.Models</RootNamespace>
-    <AssemblyName>PlexRequests.Api.Models</AssemblyName>
+    <AssemblyName>Ombi.Api.Models</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -35,6 +35,10 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -102,6 +106,9 @@
     <Compile Include="Tv\TvSearchResult.cs" />
     <Compile Include="Tv\TvShow.cs" />
     <Compile Include="Tv\TvShowImages.cs" />
+    <Compile Include="Watcher\WatcherAddMovieResult.cs" />
+    <Compile Include="Watcher\WatcherListStatusResult.cs" />
+    <Compile Include="Watcher\WatcherVersion.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -110,9 +117,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PlexRequests.Helpers\PlexRequests.Helpers.csproj">
+    <ProjectReference Include="..\Ombi.Helpers\Ombi.Helpers.csproj">
       <Project>{1252336D-42A3-482A-804C-836E60173DFA}</Project>
-      <Name>PlexRequests.Helpers</Name>
+      <Name>Ombi.Helpers</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Ombi.Api.Models/Plex/PlexAccount.cs

@@ -1,6 +1,6 @@
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "user")]
     public class PlexAccount

Ombi.Api.Models/Plex/PlexAuthentication.cs

@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     public class PlexAuthentication
     {

Ombi.Api.Models/Plex/PlexEpisodeMetadata.cs

@@ -24,11 +24,12 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Plex
-{
-    using System.Xml.Serialization;
-    using System.Collections.Generic;
 
+using System.Collections.Generic;
+using System.Xml.Serialization;
+
+namespace Ombi.Api.Models.Plex
+{
     [XmlRoot(ElementName = "MediaContainer")]
     public class PlexEpisodeMetadata
     {

Ombi.Api.Models/Plex/PlexError.cs

@@ -27,7 +27,7 @@
 
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "errors")]
     public class PlexError

Ombi.Api.Models/Plex/PlexFriends.cs

@@ -27,7 +27,7 @@
 
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "Server")]
     public class Server

Ombi.Api.Models/Plex/PlexLibraries.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "MediaContainer")]
     public class PlexLibraries

Ombi.Api.Models/Plex/PlexMediaType.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Services
+namespace Ombi.Api.Models.Plex
 {
     public enum PlexMediaType 
     {

Ombi.Api.Models/Plex/PlexMetadata.cs

@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "MediaContainer")]
     public class PlexMetadata

Ombi.Api.Models/Plex/PlexSearch.cs

@@ -24,10 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "Part")]
     public class Part

Ombi.Api.Models/Plex/PlexServer.cs

@@ -24,10 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "Server")]
     public class ServerInfo

Ombi.Api.Models/Plex/PlexStatus.cs

@@ -1,11 +1,7 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Serialization;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     [XmlRoot(ElementName = "Directory")]
     public class Directory

Ombi.Api.Models/Plex/PlexUserRequest.cs

@@ -25,7 +25,7 @@
 //  ************************************************************************/
 #endregion
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     public class PlexUserRequest
     {

Ombi.Api.Models/Plex/RecentlyAddedModelOld.cs

@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Plex
+namespace Ombi.Api.Models.Plex
 {
     public class RecentlyAddedChild
     {

Ombi.Api.Models/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("PlexRequests.Api.Models")]
+[assembly: AssemblyTitle("Ombi.Api.Models")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PlexRequests.Api.Models")]
+[assembly: AssemblyProduct("Ombi.Api.Models")]
 [assembly: AssemblyCopyright("Copyright © 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Ombi.Api.Models/SickRage/SickRageBase.cs

@@ -1,4 +1,4 @@
-namespace PlexRequests.Api.Models.SickRage
+namespace Ombi.Api.Models.SickRage
 {
     public abstract class SickRageBase<T>
     {

Ombi.Api.Models/SickRage/SickRagePing.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.SickRage
+namespace Ombi.Api.Models.SickRage
 {
     public class SickRagePingData
     {

Ombi.Api.Models/SickRage/SickRageSeasonList.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
-using PlexRequests.Helpers;
+using Ombi.Helpers;
 
-namespace PlexRequests.Api.Models.SickRage
+namespace Ombi.Api.Models.SickRage
 {
     public class SickRageSeasonList : SickRageBase<object>
     {

Ombi.Api.Models/SickRage/SickRageShowInformation.cs

@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.SickRage
+namespace Ombi.Api.Models.SickRage
 {
     public class Cache
     {

Ombi.Api.Models/SickRage/SickRageStatus.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.SickRage
+namespace Ombi.Api.Models.SickRage
 {
     public static class SickRageStatus
     {

Ombi.Api.Models/SickRage/SickRageTvAdd.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.SickRage
+namespace Ombi.Api.Models.SickRage
 {
     public class SickRageTvAddData
     {

Ombi.Api.Models/SickRage/SickrageShows.cs

@@ -25,10 +25,9 @@
 //  ************************************************************************/
 #endregion
 
-using System;
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.SickRage
+namespace Ombi.Api.Models.SickRage
 {
     public class SickrageShows : SickRageBase<Dictionary<int, Item>>
     {

Ombi.Api.Models/Sonarr/SonarrAddEpisodeBody.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class SonarrAddEpisodeBody
     {

Ombi.Api.Models/Sonarr/SonarrAddEpisodeResult.cs

@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class Body
     {

Ombi.Api.Models/Sonarr/SonarrAddSeries.cs

@@ -1,9 +1,8 @@
-using System.Collections.Generic;
+using System;
-
+using System.Collections.Generic;
 using Newtonsoft.Json;
-using System;
 
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class Season
     {

Ombi.Api.Models/Sonarr/SonarrAllSeries.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class SonarrAllSeries
     {

Ombi.Api.Models/Sonarr/SonarrEpisode.cs

@@ -25,7 +25,7 @@
 //  ************************************************************************/
 #endregion
 
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
 
     public class Revision

Ombi.Api.Models/Sonarr/SonarrEpisodes.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class SonarrEpisodes
     {

Ombi.Api.Models/Sonarr/SonarrError.cs

@@ -25,10 +25,7 @@
 //  ************************************************************************/
 #endregion
 
-using System.Collections.Generic;
+namespace Ombi.Api.Models.Sonarr
-using Newtonsoft.Json;
-
-namespace PlexRequests.Api.Models.Sonarr
 {
     public class SonarrError
     {

Ombi.Api.Models/Sonarr/SonarrProfile.cs

@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class Cutoff
     {

Ombi.Api.Models/Sonarr/SonarrSearchCommand.cs

@@ -25,9 +25,7 @@
 //  ************************************************************************/
 #endregion
 
-using System.Xml.Linq;
+namespace Ombi.Api.Models.Sonarr
-
-namespace PlexRequests.Api.Models.Sonarr
 {
     public class SonarrSearchCommand
     {

Ombi.Api.Models/Sonarr/SonarrSeasonSearchResult.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class SeasonBody
     {

Ombi.Api.Models/Sonarr/SonarrSeriesSearchResult.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class SeriesBody
     {

Ombi.Api.Models/Sonarr/SystemStatus.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Sonarr
+namespace Ombi.Api.Models.Sonarr
 {
     public class SystemStatus
     {

Ombi.Api.Models/Tv/Authentication.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Tv
+namespace Ombi.Api.Models.Tv
 {
     public class Authentication
     {

Ombi.Api.Models/Tv/TVMazeShow.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Tv
+namespace Ombi.Api.Models.Tv
 {
     public class TvMazeShow
     {

Ombi.Api.Models/Tv/TvMazeEpisodes.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api.Models.Tv
+namespace Ombi.Api.Models.Tv
 {
     public class TvMazeEpisodes
     {

Ombi.Api.Models/Tv/TvMazeSearch.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Tv
+namespace Ombi.Api.Models.Tv
 {
     public class Schedule
     {

Ombi.Api.Models/Tv/TvMazeSeasons.cs

@@ -0,0 +1,7 @@
+namespace Ombi.Api.Models.Tv
+{
+    public class TvMazeSeasons : TvMazeShow
+    {
+        public int number { get; set; }
+    }
+}

Ombi.Api.Models/Tv/TvSearchResult.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Tv
+namespace Ombi.Api.Models.Tv
 {
     public class TvShowSearchResult
     {

Ombi.Api.Models/Tv/TvShow.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Tv
+namespace Ombi.Api.Models.Tv
 {
     public class TvShow
     {

Ombi.Api.Models/Tv/TvShowImages.cs

@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace PlexRequests.Api.Models.Tv
+namespace Ombi.Api.Models.Tv
 {
     public class RatingsInfo
     {

Ombi.Api.Models/Watcher/WatcherAddMovieResult.cs

@@ -1,7 +1,7 @@
 #region Copyright
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
-//    File: BasePage.cs
+//    File: WatcherAddMovieResult.cs
 //    Created By: Jamie Rees
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
@@ -24,15 +24,19 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using OpenQA.Selenium;
-using OpenQA.Selenium.Support.PageObjects;
 
-namespace PlexRequests.Automation.Pages
+using Newtonsoft.Json;
+
+namespace Ombi.Api.Models.Watcher
 {
-    public class BasePage
+    public class WatcherAddMovieResult
     {
-        [FindsBy(How = How.XPath, Using = "/html/body/div[5]")]
+        public bool response { get; set; }
-        public IWebElement Notificaiton { get; set; }
+        public string message { get; set; }
-        protected IWebDriver WebDriver { get; set; }
+
+        [JsonIgnore]
+        public string ErrorMessage { get; set; }
+        [JsonIgnore]
+        public bool Error { get; set; }
     }
 }

Ombi.Api.Models/Watcher/WatcherListStatusResult.cs

@@ -0,0 +1,90 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: WatcherListStatusResult.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.Collections.Generic;
+using Newtonsoft.Json;
+using RestSharp.Deserializers;
+
+namespace Ombi.Api.Models.Watcher
+{
+    public class Quality2
+    {
+        [JsonProperty("720P")]
+        public List<string> Q720P { get; set; }
+        [JsonProperty("1080P")]
+        public List<string> Q1080P { get; set; }
+        [JsonProperty("4K")]
+        public List<string> Q4K { get; set; }
+        public List<string> SD { get; set; }
+    }
+
+    public class Filters
+    {
+        public string preferredwords { get; set; }
+        public string ignoredwords { get; set; }
+        public string requiredwords { get; set; }
+    }
+
+    public class Quality
+    {
+        [JsonProperty("Quality")]
+        public Quality2 quality { get; set; }
+        public Filters Filters { get; set; }
+    }
+
+    public class WatcherListStatusResult
+    {
+        public string status { get; set; }
+        public string plot { get; set; }
+        public string rated { get; set; }
+        public string title { get; set; }
+        public object finishedscore { get; set; }
+        public string predb { get; set; }
+        public string year { get; set; }
+        public string poster { get; set; }
+        public string tomatourl { get; set; }
+        public string released { get; set; }
+        public object finisheddate { get; set; }
+        public string dvd { get; set; }
+        public string tomatorating { get; set; }
+        public string imdbid { get; set; }
+        public Quality quality { get; set; }
+
+    }
+
+    public class WatcherListStatusResultContainer
+    {
+        [JsonProperty("movies")]
+        public List<WatcherListStatusResult> Movies { get; set; }
+        [JsonProperty("response")]
+        public bool Response { get; set; }
+        [JsonIgnore]
+        public string ErrorMessage { get; set; }
+        [JsonIgnore]
+        public bool Error { get; set; }
+    }
+}

Ombi.Api.Models/Watcher/WatcherResponse.cs

@@ -0,0 +1,8 @@
+using System;
+namespace Ombi.Api.Models
+{
+	public class WatcherResponse<T>
+	{
+		
+	}
+}

Ombi.Api.Models/Watcher/WatcherVersion.cs

@@ -0,0 +1,35 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2017 Jamie Rees
+//    File: WatcherVersion.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
+namespace Ombi.Api.Models.Watcher
+{
+    public class WatcherVersion
+    {
+        public string version { get; set; }
+        public bool response { get; set; }
+        public string ErrorMessage { get; set; }
+    }
+}

Ombi.Api.Models/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net45" />
 </packages>

Ombi.Api/ApiRequest.cs

@@ -24,20 +24,17 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.IO;
 using System.Xml.Serialization;
-
 using Newtonsoft.Json;
-
 using NLog;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Helpers.Exceptions;
-using PlexRequests.Helpers.Exceptions;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class ApiRequest : IApiRequest
     {

Ombi.Api/CouchPotatoApi.cs

@@ -24,19 +24,16 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
-
 using Newtonsoft.Json.Linq;
-
 using NLog;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Models.Movie;
+using Ombi.Api.Models.Movie;
-using PlexRequests.Helpers;
+using Ombi.Helpers;
-using PlexRequests.Helpers.Exceptions;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class CouchPotatoApi : ICouchPotatoApi
     {

Ombi.Api/HeadphonesApi.cs

@@ -24,21 +24,18 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-
 using Newtonsoft.Json;
-
 using NLog;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Models.Music;
-using PlexRequests.Api.Models.Music;
+using Ombi.Helpers;
-using PlexRequests.Helpers;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class HeadphonesApi : IHeadphonesApi
     {

Ombi.Api/MovieBase.cs

@@ -24,9 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using PlexRequests.Helpers;
 
-namespace PlexRequests.Api
+using Ombi.Helpers;
+
+namespace Ombi.Api
 {
     public abstract class MovieBase
     {

Ombi.Api/MusicBrainzApi.cs

@@ -24,18 +24,15 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
-
 using Newtonsoft.Json;
-
 using NLog;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Models.Music;
-using PlexRequests.Api.Models.Music;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class MusicBrainzApi : IMusicBrainzApi
     {

Ombi.Api/Ombi.Api.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{8CB8D235-2674-442D-9C6A-35FCAEEB160D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PlexRequests.Api</RootNamespace>
+    <RootNamespace>Ombi.Api</RootNamespace>
-    <AssemblyName>PlexRequests.Api</AssemblyName>
+    <AssemblyName>Ombi.Api</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -69,6 +69,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiRequest.cs" />
+    <Compile Include="WatcherApi.cs" />
     <Compile Include="MusicBrainzApi.cs" />
     <Compile Include="SlackApi.cs" />
     <Compile Include="PushoverApi.cs" />
@@ -92,17 +93,17 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PlexRequests.Api.Interfaces\PlexRequests.Api.Interfaces.csproj">
+    <ProjectReference Include="..\Ombi.Api.Interfaces\Ombi.Api.Interfaces.csproj">
       <Project>{95834072-A675-415D-AA8F-877C91623810}</Project>
-      <Name>PlexRequests.Api.Interfaces</Name>
+      <Name>Ombi.Api.Interfaces</Name>
     </ProjectReference>
-    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+    <ProjectReference Include="..\Ombi.Api.Models\Ombi.Api.Models.csproj">
       <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
-      <Name>PlexRequests.Api.Models</Name>
+      <Name>Ombi.Api.Models</Name>
     </ProjectReference>
-    <ProjectReference Include="..\PlexRequests.Helpers\PlexRequests.Helpers.csproj">
+    <ProjectReference Include="..\Ombi.Helpers\Ombi.Helpers.csproj">
       <Project>{1252336D-42A3-482A-804C-836E60173DFA}</Project>
-      <Name>PlexRequests.Helpers</Name>
+      <Name>Ombi.Helpers</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Ombi.Api/PlexApi.cs

@@ -23,21 +23,18 @@
 //    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
-using Polly;
 
 
 #endregion
+
 using System;
-
 using NLog;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Models.Plex;
-using PlexRequests.Api.Models.Plex;
+using Ombi.Helpers;
-using PlexRequests.Helpers;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class PlexApi : IPlexApi
     {
@@ -420,8 +417,8 @@ namespace PlexRequests.Api
 
         private void AddHeaders(ref RestRequest request, bool json)
         {
-            request.AddHeader("X-Plex-Client-Identifier", $"PlexRequests.Net{Version}");
+            request.AddHeader("X-Plex-Client-Identifier", $"Ombi{Version}");
-            request.AddHeader("X-Plex-Product", "Plex Requests .Net");
+            request.AddHeader("X-Plex-Product", "Ombi");
             request.AddHeader("X-Plex-Version", Version);
             request.AddHeader("Content-Type", json ? "application/json" : "application/xml");
             request.AddHeader("Accept", json ? "application/json" : "application/xml");

Ombi.Api/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("PlexRequests.Api")]
+[assembly: AssemblyTitle("Ombi.Api")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PlexRequests.Api")]
+[assembly: AssemblyProduct("Ombi.Api")]
 [assembly: AssemblyCopyright("Copyright © 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Ombi.Api/PushbulletApi.cs

@@ -24,15 +24,14 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Threading.Tasks;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Models.Notifications;
-using PlexRequests.Api.Models.Notifications;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class PushbulletApi : IPushbulletApi
     {

Ombi.Api/PushoverApi.cs

@@ -24,15 +24,14 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Threading.Tasks;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Models.Notifications;
-using PlexRequests.Api.Models.Notifications;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class PushoverApi : IPushoverApi
     {

Ombi.Api/RetryHandler.cs

@@ -24,12 +24,12 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using System;
 
+using System;
 using Polly;
 using Polly.Retry;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public static class RetryHandler
     {

Ombi.Api/SickrageApi.cs

@@ -24,23 +24,20 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using System.Linq;
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-
 using NLog;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Models.SickRage;
-using PlexRequests.Api.Models.SickRage;
+using Ombi.Helpers;
-using PlexRequests.Helpers;
+using Ombi.Helpers.Exceptions;
-using PlexRequests.Helpers.Exceptions;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class SickrageApi : ISickRageApi
     {

Ombi.Api/SlackApi.cs

@@ -24,15 +24,14 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Threading.Tasks;
-
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Models.Notifications;
-using PlexRequests.Api.Models.Notifications;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class SlackApi : ISlackApi
     {

Ombi.Api/SonarrApi.cs

@@ -24,20 +24,18 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using Newtonsoft.Json;
-
 using NLog;
-using PlexRequests.Api.Interfaces;
+using Ombi.Api.Interfaces;
-using PlexRequests.Api.Models.Sonarr;
+using Ombi.Api.Models.Sonarr;
-using PlexRequests.Helpers;
+using Ombi.Helpers;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class SonarrApi : ISonarrApi
     {

Ombi.Api/TheMovieDbApi.cs

@@ -24,17 +24,15 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-using System;
+
 using System.Collections.Generic;
 using System.Threading.Tasks;
-
 using TMDbLib.Client;
 using TMDbLib.Objects.General;
 using TMDbLib.Objects.Movies;
 using TMDbLib.Objects.Search;
-using TMDbLib.Objects.TvShows;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class TheMovieDbApi : MovieBase
     {

Ombi.Api/TheTvDbApi.cs

@@ -24,13 +24,12 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
-
+using Ombi.Api.Models.Tv;
-using PlexRequests.Api.Models.Tv;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     [Obsolete("Use TVMazeAPP")]
     public class TheTvDbApi : TvBase

Ombi.Api/TvBase.cs

@@ -24,11 +24,11 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
+using Ombi.Helpers;
 
-using PlexRequests.Helpers;
+namespace Ombi.Api
-
-namespace PlexRequests.Api
 {
     public abstract class TvBase
     {

Ombi.Api/TvMazeApi.cs

@@ -24,16 +24,15 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
-
+using Ombi.Api.Models.Tv;
-using PlexRequests.Api.Models.Tv;
-
 using RestSharp;
 
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class TvMazeApi : TvMazeBase
     {

Ombi.Api/TvMazeBase.cs

@@ -24,7 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-namespace PlexRequests.Api
+namespace Ombi.Api
 {
     public class TvMazeBase
     {

Ombi.Api/WatcherApi.cs

@@ -0,0 +1,151 @@
+#region Copyright
+
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: WatcherApi.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 Newtonsoft.Json;
+using NLog;
+using Ombi.Api.Interfaces;
+using Ombi.Api.Models.Watcher;
+using RestSharp;
+
+namespace Ombi.Api
+{
+    public class WatcherApi : IWatcherApi
+    {
+        public WatcherApi()
+        {
+            Api = new ApiRequest();
+        }
+
+        private ApiRequest Api { get; set; }
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+        public WatcherAddMovieResult AddMovie(string imdbId, string apiKey, Uri baseUrl)
+        {
+            var response =  Send("addmovie", apiKey, baseUrl, imdbId);
+            try
+            {
+                return JsonConvert.DeserializeObject<WatcherAddMovieResult>(response.Content);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return new WatcherAddMovieResult
+                {
+                    Error = true,
+                    ErrorMessage = e.Message
+                };
+            }
+        }
+        public WatcherVersion Version(string apiKey, Uri baseUri)
+        {
+            var response = Send("version", apiKey, baseUri);
+            try
+            {
+                return JsonConvert.DeserializeObject<WatcherVersion>(response.Content);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return new WatcherVersion
+                {
+                    response = false,
+                    ErrorMessage = e.Message
+                };
+            }
+        }
+
+        public WatcherListStatusResultContainer ListMovies(string apiKey, Uri baseUrl)
+        {
+           var response = Send("liststatus", apiKey, baseUrl);
+            try
+            {
+                if (response.Content.Contains("No movies found"))
+                {
+                    return new WatcherListStatusResultContainer();
+                }
+                var items = JsonConvert.DeserializeObject<WatcherListStatusResultContainer>(response.Content);
+                return items;
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return new WatcherListStatusResultContainer
+                {
+                    Error = true,
+                    ErrorMessage = e.Message
+                };
+            }
+        }
+
+        public WatcherListStatusResultContainer ListMovies(string apiKey, Uri baseUrl, string imdbId)
+        {
+            var response = Send("liststatus", apiKey, baseUrl, imdbId);
+            try
+            {
+                if (response.Content.Contains("No movies found"))
+                {
+                    return new WatcherListStatusResultContainer();
+                }
+                return JsonConvert.DeserializeObject<WatcherListStatusResultContainer>(response.Content);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return new WatcherListStatusResultContainer
+                {
+                    Error = true,
+                    ErrorMessage = e.Message
+                };
+            }
+        }
+
+
+        private IRestResponse Send(string mode, string apiKey, Uri baseUrl, string imdbid = "")
+        {
+            RestRequest request;
+            request = new RestRequest
+            {
+                Resource = string.IsNullOrEmpty(imdbid) ? "/api?apikey={apikey}&mode={mode}" : "/api?apikey={apikey}&mode={mode}&imdbid={imdbid}"
+            };
+
+            
+            request.AddUrlSegment("apikey", apiKey);
+            if (!string.IsNullOrEmpty(imdbid))
+            {
+                request.AddUrlSegment("imdbid", imdbid);
+            }
+            request.AddUrlSegment("mode", mode);
+
+            return Api.Execute(request, baseUrl);
+        }
+    }
+
+}