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

Merge pull request #902 from tidusjar/EAP

Browse source 
2.0 Release
This commit is contained in:
Jamie 2017-01-14 20:59:18 +00:00 • committed by GitHub
commit a1cc3b6690
667 changed files with 4569 additions and 3393 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -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"

4
PlexRequests.Api.Interfaces/IApiRequest.cs → Ombi.Api.Interfaces/IApiRequest.cs
View file

@ -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
{

5
PlexRequests.Api.Interfaces/ICouchPotatoApi.cs → Ombi.Api.Interfaces/ICouchPotatoApi.cs
View file

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

6
PlexRequests.Api.Interfaces/IHeadphonesApi.cs → Ombi.Api.Interfaces/IHeadphonesApi.cs
View file

@ -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 PlexRequests.Api.Interfaces
namespace Ombi.Api.Interfaces
{
public interface IHeadphonesApi
{

5
PlexRequests.Api.Interfaces/IMusicBrainzApi.cs → Ombi.Api.Interfaces/IMusicBrainzApi.cs
View file

@ -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
{

6
PlexRequests.Api.Interfaces/IPlexApi.cs → Ombi.Api.Interfaces/IPlexApi.cs
View file

@ -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 PlexRequests.Api.Interfaces
namespace Ombi.Api.Interfaces
{
public interface IPlexApi
{

6
PlexRequests.Api.Interfaces/IPushbulletApi.cs → Ombi.Api.Interfaces/IPushbulletApi.cs
View file

@ -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 PlexRequests.Api.Interfaces
namespace Ombi.Api.Interfaces
{
public interface IPushbulletApi
{

6
PlexRequests.Api.Interfaces/IPushoverApi.cs → Ombi.Api.Interfaces/IPushoverApi.cs
View file

@ -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 PlexRequests.Api.Interfaces
namespace Ombi.Api.Interfaces
{
public interface IPushoverApi
{

4
PlexRequests.Api.Interfaces/ISickRageApi.cs → Ombi.Api.Interfaces/ISickRageApi.cs
View file

@ -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
{

6
PlexRequests.Api.Interfaces/ISlackApi.cs → Ombi.Api.Interfaces/ISlackApi.cs
View file

@ -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 PlexRequests.Api.Interfaces
namespace Ombi.Api.Interfaces
{
public interface ISlackApi
{

6
PlexRequests.Api.Interfaces/ISonarrApi.cs → Ombi.Api.Interfaces/ISonarrApi.cs
View file

@ -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 PlexRequests.Api.Interfaces
namespace Ombi.Api.Interfaces
{
public interface ISonarrApi
{

32
PlexRequests.Automation/WebDriverSetup.cs → Ombi.Api.Interfaces/IWatcherApi.cs
View file

@ -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;
using OpenQA.Selenium.Firefox;
namespace PlexRequests.Automation
namespace Ombi.Api.Interfaces
{
public static class WebDriverSetup
public interface IWatcherApi
{
private static IWebDriver _webDriver;
public static IWebDriver SetUp(string url)
{
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;
}
WatcherAddMovieResult AddMovie(string imdbId, string apiKey, Uri baseUrl);
WatcherListStatusResultContainer ListMovies(string apiKey, Uri baseUrl);
WatcherListStatusResultContainer ListMovies(string apiKey, Uri baseUrl, string imdbId);
WatcherVersion Version(string apiKey, Uri baseUri);
}
}

9
PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj → Ombi.Api.Interfaces/Ombi.Api.Interfaces.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{95834072-A675-415D-AA8F-877C91623810}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PlexRequests.Api.Interfaces</RootNamespace>
<AssemblyName>PlexRequests.Api.Interfaces</AssemblyName>
<RootNamespace>Ombi.Api.Interfaces</RootNamespace>
<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>

4
PlexRequests.Api.Interfaces/Properties/AssemblyInfo.cs → Ombi.Api.Interfaces/Properties/AssemblyInfo.cs
View file

@ -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("")]

0
PlexRequests.Api.Interfaces/app.config → Ombi.Api.Interfaces/app.config
View file

0
PlexRequests.Api.Interfaces/packages.config → Ombi.Api.Interfaces/packages.config
View file

3
PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs → Ombi.Api.Models/Movie/CouchPotatoAdd.cs
View file

@ -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
{

3
PlexRequests.Api.Models/Movie/CouchPotatoApiKey.cs → Ombi.Api.Models/Movie/CouchPotatoApiKey.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs → Ombi.Api.Models/Movie/CouchPotatoMovies.cs
View file

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

4
PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs → Ombi.Api.Models/Movie/CouchPotatoProfiles.cs
View file

@ -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
{

7
Ombi.Api.Models/Movie/CouchPotatoStatus.cs Normal file
View file

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

2
PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs → Ombi.Api.Models/Music/HeadphonesAlbumSearchResult.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs → Ombi.Api.Models/Music/HeadphonesArtistSearchResult.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Music/HeadphonesGetIndex.cs → Ombi.Api.Models/Music/HeadphonesGetIndex.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Music/HeadphonesVersion.cs → Ombi.Api.Models/Music/HeadphonesVersion.cs
View file

@ -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
{

3
PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs → Ombi.Api.Models/Music/MusicBrainzCoverArt.cs
View file

@ -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
{

4
PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs → Ombi.Api.Models/Music/MusicBrainzReleaseInfo.cs
View file

@ -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
{

4
PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs → Ombi.Api.Models/Music/MusicBrainzSearchResults.cs
View file

@ -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
{

3
PlexRequests.Api.Models/Notifications/PushbulletPush.cs → Ombi.Api.Models/Notifications/PushbulletPush.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Notifications/PushbulletResponse.cs → Ombi.Api.Models/Notifications/PushbulletResponse.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Notifications/PushoverResponse.cs → Ombi.Api.Models/Notifications/PushoverResponse.cs
View file

@ -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
{

5
PlexRequests.Api.Models/Notifications/SlackNotificationBody.cs → Ombi.Api.Models/Notifications/SlackNotificationBody.cs
View file

@ -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]

15
PlexRequests.Api.Models/PlexRequests.Api.Models.csproj → Ombi.Api.Models/Ombi.Api.Models.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PlexRequests.Api.Models</RootNamespace>
<AssemblyName>PlexRequests.Api.Models</AssemblyName>
<RootNamespace>Ombi.Api.Models</RootNamespace>
<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" />

2
PlexRequests.Api.Models/Plex/PlexAccount.cs → Ombi.Api.Models/Plex/PlexAccount.cs
View file

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

2
PlexRequests.Api.Models/Plex/PlexAuthentication.cs → Ombi.Api.Models/Plex/PlexAuthentication.cs
View file

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

9
PlexRequests.Api.Models/Plex/PlexEpisodeMetadata.cs → Ombi.Api.Models/Plex/PlexEpisodeMetadata.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Plex/PlexError.cs → Ombi.Api.Models/Plex/PlexError.cs
View file

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

2
PlexRequests.Api.Models/Plex/PlexFriends.cs → Ombi.Api.Models/Plex/PlexFriends.cs
View file

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

2
PlexRequests.Api.Models/Plex/PlexLibraries.cs → Ombi.Api.Models/Plex/PlexLibraries.cs
View file

@ -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

2
PlexRequests.Api.Models/Plex/PlexMediaType.cs → Ombi.Api.Models/Plex/PlexMediaType.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Plex/PlexMetadata.cs → Ombi.Api.Models/Plex/PlexMetadata.cs
View file

@ -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

3
PlexRequests.Api.Models/Plex/PlexSearch.cs → Ombi.Api.Models/Plex/PlexSearch.cs
View file

@ -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

3
PlexRequests.Api.Models/Plex/PlexServer.cs → Ombi.Api.Models/Plex/PlexServer.cs
View file

@ -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

8
PlexRequests.Api.Models/Plex/PlexStatus.cs → Ombi.Api.Models/Plex/PlexStatus.cs
View file

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

2
PlexRequests.Api.Models/Plex/PlexUserRequest.cs → Ombi.Api.Models/Plex/PlexUserRequest.cs
View file

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

2
PlexRequests.Api.Models/Plex/RecentlyAddedModelOld.cs → Ombi.Api.Models/Plex/RecentlyAddedModelOld.cs
View file

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

4
PlexRequests.Api.Models/Properties/AssemblyInfo.cs → Ombi.Api.Models/Properties/AssemblyInfo.cs
View file

@ -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("")]

2
PlexRequests.Api.Models/SickRage/SickRageBase.cs → Ombi.Api.Models/SickRage/SickRageBase.cs
View file

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

2
PlexRequests.Api.Models/SickRage/SickRagePing.cs → Ombi.Api.Models/SickRage/SickRagePing.cs
View file

@ -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
{

4
PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs → Ombi.Api.Models/SickRage/SickRageSeasonList.cs
View file

@ -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>
{

2
PlexRequests.Api.Models/SickRage/SickRageShowInformation.cs → Ombi.Api.Models/SickRage/SickRageShowInformation.cs
View file

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

2
PlexRequests.Api.Models/SickRage/SickRageStatus.cs → Ombi.Api.Models/SickRage/SickRageStatus.cs
View file

@ -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
{

2
PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs → Ombi.Api.Models/SickRage/SickRageTvAdd.cs
View file

@ -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
{

3
PlexRequests.Api.Models/SickRage/SickrageShows.cs → Ombi.Api.Models/SickRage/SickrageShows.cs
View file

@ -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>>
{

2
PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeBody.cs → Ombi.Api.Models/Sonarr/SonarrAddEpisodeBody.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeResult.cs → Ombi.Api.Models/Sonarr/SonarrAddEpisodeResult.cs
View file

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

7
PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs → Ombi.Api.Models/Sonarr/SonarrAddSeries.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs → Ombi.Api.Models/Sonarr/SonarrAllSeries.cs
View file

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

2
PlexRequests.Api.Models/Sonarr/SonarrEpisode.cs → Ombi.Api.Models/Sonarr/SonarrEpisode.cs
View file

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

2
PlexRequests.Api.Models/Sonarr/SonarrEpisodes.cs → Ombi.Api.Models/Sonarr/SonarrEpisodes.cs
View file

@ -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
{

5
PlexRequests.Api.Models/Sonarr/SonarrError.cs → Ombi.Api.Models/Sonarr/SonarrError.cs
View file

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

2
PlexRequests.Api.Models/Sonarr/SonarrProfile.cs → Ombi.Api.Models/Sonarr/SonarrProfile.cs
View file

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

4
PlexRequests.Api.Models/Sonarr/SonarrSearchCommand.cs → Ombi.Api.Models/Sonarr/SonarrSearchCommand.cs
View file

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

2
PlexRequests.Api.Models/Sonarr/SonarrSeasonSearchResult.cs → Ombi.Api.Models/Sonarr/SonarrSeasonSearchResult.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Sonarr/SonarrSeriesSearchResult.cs → Ombi.Api.Models/Sonarr/SonarrSeriesSearchResult.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Sonarr/SystemStatus.cs → Ombi.Api.Models/Sonarr/SystemStatus.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Tv/Authentication.cs → Ombi.Api.Models/Tv/Authentication.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Tv/TVMazeShow.cs → Ombi.Api.Models/Tv/TVMazeShow.cs
View file

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

2
PlexRequests.Api.Models/Tv/TvMazeEpisodes.cs → Ombi.Api.Models/Tv/TvMazeEpisodes.cs
View file

@ -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
{

3
PlexRequests.Api.Models/Tv/TvMazeSearch.cs → Ombi.Api.Models/Tv/TvMazeSearch.cs
View file

@ -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
{

7
Ombi.Api.Models/Tv/TvMazeSeasons.cs Normal file
View file

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

3
PlexRequests.Api.Models/Tv/TvSearchResult.cs → Ombi.Api.Models/Tv/TvSearchResult.cs
View file

@ -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
{

3
PlexRequests.Api.Models/Tv/TvShow.cs → Ombi.Api.Models/Tv/TvShow.cs
View file

@ -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
{

2
PlexRequests.Api.Models/Tv/TvShowImages.cs → Ombi.Api.Models/Tv/TvShowImages.cs
View file

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

20
PlexRequests.Automation.Pages/BasePage.cs → Ombi.Api.Models/Watcher/WatcherAddMovieResult.cs
View file

@ -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 IWebElement Notificaiton { get; set; }
protected IWebDriver WebDriver { get; set; }
public bool response { get; set; }
public string message { get; set; }
[JsonIgnore]
public string ErrorMessage { get; set; }
[JsonIgnore]
public bool Error { get; set; }
}
}

90
Ombi.Api.Models/Watcher/WatcherListStatusResult.cs Normal file
View file

@ -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; }
}
}

8
Ombi.Api.Models/Watcher/WatcherResponse.cs Normal file
View file

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

35
Ombi.Api.Models/Watcher/WatcherVersion.cs Normal file
View file

@ -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; }
}
}

0
PlexRequests.Api.Models/app.config → Ombi.Api.Models/app.config
View file

1
PlexRequests.Api.Models/packages.config → Ombi.Api.Models/packages.config
View file

@ -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>

11
PlexRequests.Api/ApiRequest.cs → Ombi.Api/ApiRequest.cs
View file

@ -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 PlexRequests.Api.Interfaces;
using PlexRequests.Helpers.Exceptions;
using Ombi.Api.Interfaces;
using Ombi.Helpers.Exceptions;
using RestSharp;
namespace PlexRequests.Api
namespace Ombi.Api
{
public class ApiRequest : IApiRequest
{

13
PlexRequests.Api/CouchPotatoApi.cs → Ombi.Api/CouchPotatoApi.cs
View file

@ -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 PlexRequests.Api.Models.Movie;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Exceptions;
using Ombi.Api.Interfaces;
using Ombi.Api.Models.Movie;
using Ombi.Helpers;
using RestSharp;
namespace PlexRequests.Api
namespace Ombi.Api
{
public class CouchPotatoApi : ICouchPotatoApi
{

13
PlexRequests.Api/HeadphonesApi.cs → Ombi.Api/HeadphonesApi.cs
View file

@ -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 PlexRequests.Api.Interfaces;
using PlexRequests.Api.Models.Music;
using PlexRequests.Helpers;
using Ombi.Api.Interfaces;
using Ombi.Api.Models.Music;
using Ombi.Helpers;
using RestSharp;
namespace PlexRequests.Api
namespace Ombi.Api
{
public class HeadphonesApi : IHeadphonesApi
{

5
PlexRequests.Api/MovieBase.cs → Ombi.Api/MovieBase.cs
View file

@ -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
{

11
PlexRequests.Api/MusicBrainzApi.cs → Ombi.Api/MusicBrainzApi.cs
View file

@ -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 PlexRequests.Api.Interfaces;
using PlexRequests.Api.Models.Music;
using Ombi.Api.Interfaces;
using Ombi.Api.Models.Music;
using RestSharp;
namespace PlexRequests.Api
namespace Ombi.Api
{
public class MusicBrainzApi : IMusicBrainzApi
{

17
PlexRequests.Api/PlexRequests.Api.csproj → Ombi.Api/Ombi.Api.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{8CB8D235-2674-442D-9C6A-35FCAEEB160D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PlexRequests.Api</RootNamespace>
<AssemblyName>PlexRequests.Api</AssemblyName>
<RootNamespace>Ombi.Api</RootNamespace>
<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" />

17
PlexRequests.Api/PlexApi.cs → Ombi.Api/PlexApi.cs
View file

@ -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 PlexRequests.Api.Interfaces;
using PlexRequests.Api.Models.Plex;
using PlexRequests.Helpers;
using Ombi.Api.Interfaces;
using Ombi.Api.Models.Plex;
using Ombi.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-Product", "Plex Requests .Net");
request.AddHeader("X-Plex-Client-Identifier", $"Ombi{Version}");
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");

4
PlexRequests.Api/Properties/AssemblyInfo.cs → Ombi.Api/Properties/AssemblyInfo.cs
View file

@ -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("")]

9
PlexRequests.Api/PushbulletApi.cs → Ombi.Api/PushbulletApi.cs
View file

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

9
PlexRequests.Api/PushoverApi.cs → Ombi.Api/PushoverApi.cs
View file

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

4
PlexRequests.Api/RetryHandler.cs → Ombi.Api/RetryHandler.cs
View file

@ -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
{

15
PlexRequests.Api/SickrageApi.cs → Ombi.Api/SickrageApi.cs
View file

@ -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 PlexRequests.Api.Interfaces;
using PlexRequests.Api.Models.SickRage;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Exceptions;
using Ombi.Api.Interfaces;
using Ombi.Api.Models.SickRage;
using Ombi.Helpers;
using Ombi.Helpers.Exceptions;
using RestSharp;
namespace PlexRequests.Api
namespace Ombi.Api
{
public class SickrageApi : ISickRageApi
{

9
PlexRequests.Api/SlackApi.cs → Ombi.Api/SlackApi.cs
View file

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

12
PlexRequests.Api/SonarrApi.cs → Ombi.Api/SonarrApi.cs
View file

@ -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 PlexRequests.Api.Models.Sonarr;
using PlexRequests.Helpers;
using Ombi.Api.Interfaces;
using Ombi.Api.Models.Sonarr;
using Ombi.Helpers;
using RestSharp;
namespace PlexRequests.Api
namespace Ombi.Api
{
public class SonarrApi : ISonarrApi
{

6
PlexRequests.Api/TheMovieDbApi.cs → Ombi.Api/TheMovieDbApi.cs
View file

@ -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
{

7
PlexRequests.Api/TheTvDbApi.cs → Ombi.Api/TheTvDbApi.cs
View file

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

6
PlexRequests.Api/TvBase.cs → Ombi.Api/TvBase.cs
View file

@ -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 PlexRequests.Api
namespace Ombi.Api
{
public abstract class TvBase
{

7
PlexRequests.Api/TvMazeApi.cs → Ombi.Api/TvMazeApi.cs
View file

@ -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 PlexRequests.Api.Models.Tv;
using Ombi.Api.Models.Tv;
using RestSharp;
namespace PlexRequests.Api
namespace Ombi.Api
{
public class TvMazeApi : TvMazeBase
{

2
PlexRequests.Api/TvMazeBase.cs → Ombi.Api/TvMazeBase.cs
View file

@ -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
{

151
Ombi.Api/WatcherApi.cs Normal file
View file

@ -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);
}
}
}

Some files were not shown because too many files have changed in this diff Show more