mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-12 08:16:05 -07:00
Started adding Emby, Lots of backend work done. Need a few more services done and login and user management. #435
This commit is contained in:
parent
2ab7aaa4b9
commit
868301f552
43 changed files with 1495 additions and 18 deletions
16
Ombi.Api.Interfaces/IEmbyApi.cs
Normal file
16
Ombi.Api.Interfaces/IEmbyApi.cs
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Ombi.Api.Models.Emby;
|
||||||
|
|
||||||
|
namespace Ombi.Api.Interfaces
|
||||||
|
{
|
||||||
|
public interface IEmbyApi
|
||||||
|
{
|
||||||
|
string ApiKey { get; }
|
||||||
|
|
||||||
|
EmbyItemContainer<EmbyMovieItem> GetAllMovies(string apiKey, string userId, Uri baseUri);
|
||||||
|
EmbyItemContainer<EmbySeriesItem> GetAllShows(string apiKey, string userId, Uri baseUri);
|
||||||
|
List<EmbyUser> GetUsers(Uri baseUri, string apiKey);
|
||||||
|
EmbyItemContainer<EmbyLibrary> ViewLibrary(string apiKey, string userId, Uri baseUri);
|
||||||
|
}
|
||||||
|
}
|
|
@ -56,6 +56,7 @@
|
||||||
<Compile Include="IApiRequest.cs" />
|
<Compile Include="IApiRequest.cs" />
|
||||||
<Compile Include="ICouchPotatoApi.cs" />
|
<Compile Include="ICouchPotatoApi.cs" />
|
||||||
<Compile Include="IDiscordApi.cs" />
|
<Compile Include="IDiscordApi.cs" />
|
||||||
|
<Compile Include="IEmbyApi.cs" />
|
||||||
<Compile Include="IHeadphonesApi.cs" />
|
<Compile Include="IHeadphonesApi.cs" />
|
||||||
<Compile Include="IMusicBrainzApi.cs" />
|
<Compile Include="IMusicBrainzApi.cs" />
|
||||||
<Compile Include="INetflixApi.cs" />
|
<Compile Include="INetflixApi.cs" />
|
||||||
|
|
47
Ombi.Api.Models/Emby/EmbyConfiguration.cs
Normal file
47
Ombi.Api.Models/Emby/EmbyConfiguration.cs
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyUser.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.Emby
|
||||||
|
{
|
||||||
|
public class EmbyConfiguration
|
||||||
|
{
|
||||||
|
public bool PlayDefaultAudioTrack { get; set; }
|
||||||
|
public bool DisplayMissingEpisodes { get; set; }
|
||||||
|
public bool DisplayUnairedEpisodes { get; set; }
|
||||||
|
public object[] GroupedFolders { get; set; }
|
||||||
|
public string SubtitleMode { get; set; }
|
||||||
|
public bool DisplayCollectionsView { get; set; }
|
||||||
|
public bool EnableLocalPassword { get; set; }
|
||||||
|
public object[] OrderedViews { get; set; }
|
||||||
|
public object[] LatestItemsExcludes { get; set; }
|
||||||
|
public bool HidePlayedInLatest { get; set; }
|
||||||
|
public bool RememberAudioSelections { get; set; }
|
||||||
|
public bool RememberSubtitleSelections { get; set; }
|
||||||
|
public bool EnableNextEpisodeAutoPlay { get; set; }
|
||||||
|
}
|
||||||
|
}
|
37
Ombi.Api.Models/Emby/EmbyImagetags.cs
Normal file
37
Ombi.Api.Models/Emby/EmbyImagetags.cs
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyLibrary.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.Emby
|
||||||
|
{
|
||||||
|
public class EmbyImagetags
|
||||||
|
{
|
||||||
|
public string Primary { get; set; }
|
||||||
|
public string Logo { get; set; }
|
||||||
|
public string Thumb { get; set; }
|
||||||
|
|
||||||
|
public string Banner { get; set; }
|
||||||
|
}
|
||||||
|
}
|
47
Ombi.Api.Models/Emby/EmbyItem.cs
Normal file
47
Ombi.Api.Models/Emby/EmbyItem.cs
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyLibrary.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.Emby
|
||||||
|
{
|
||||||
|
public class EmbyLibrary
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string ServerId { get; set; }
|
||||||
|
public string Id { get; set; }
|
||||||
|
public bool HasDynamicCategories { get; set; }
|
||||||
|
public string PlayAccess { get; set; }
|
||||||
|
public bool IsFolder { get; set; }
|
||||||
|
public string Type { get; set; }
|
||||||
|
public EmbyUserdata UserData { get; set; }
|
||||||
|
public int ChildCount { get; set; }
|
||||||
|
public string CollectionType { get; set; }
|
||||||
|
public string OriginalCollectionType { get; set; }
|
||||||
|
public EmbyImagetags ImageTags { get; set; }
|
||||||
|
public object[] BackdropImageTags { get; set; }
|
||||||
|
public string LocationType { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
37
Ombi.Api.Models/Emby/EmbyItemContainer.cs
Normal file
37
Ombi.Api.Models/Emby/EmbyItemContainer.cs
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyItemContainer.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;
|
||||||
|
|
||||||
|
namespace Ombi.Api.Models.Emby
|
||||||
|
{
|
||||||
|
public class EmbyItemContainer<T>
|
||||||
|
{
|
||||||
|
public List<T> Items { get; set; }
|
||||||
|
public int TotalRecordCount { get; set; }
|
||||||
|
}
|
||||||
|
}
|
59
Ombi.Api.Models/Emby/EmbyMovieItem.cs
Normal file
59
Ombi.Api.Models/Emby/EmbyMovieItem.cs
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyMovieItem.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;
|
||||||
|
|
||||||
|
namespace Ombi.Api.Models.Emby
|
||||||
|
{
|
||||||
|
public class EmbyMovieItem
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string ServerId { get; set; }
|
||||||
|
public string Id { get; set; }
|
||||||
|
public string Container { get; set; }
|
||||||
|
public DateTime PremiereDate { get; set; }
|
||||||
|
public object[] ProductionLocations { get; set; }
|
||||||
|
public string OfficialRating { get; set; }
|
||||||
|
public float CommunityRating { get; set; }
|
||||||
|
public long RunTimeTicks { get; set; }
|
||||||
|
public string PlayAccess { get; set; }
|
||||||
|
public int ProductionYear { get; set; }
|
||||||
|
public bool IsPlaceHolder { get; set; }
|
||||||
|
public bool IsHD { get; set; }
|
||||||
|
public bool IsFolder { get; set; }
|
||||||
|
public string Type { get; set; }
|
||||||
|
public int LocalTrailerCount { get; set; }
|
||||||
|
public EmbyUserdata UserData { get; set; }
|
||||||
|
public string VideoType { get; set; }
|
||||||
|
public EmbyImagetags ImageTags { get; set; }
|
||||||
|
public string[] BackdropImageTags { get; set; }
|
||||||
|
public string LocationType { get; set; }
|
||||||
|
public string MediaType { get; set; }
|
||||||
|
public bool HasSubtitles { get; set; }
|
||||||
|
public int CriticRating { get; set; }
|
||||||
|
}
|
||||||
|
}
|
63
Ombi.Api.Models/Emby/EmbyPolicy.cs
Normal file
63
Ombi.Api.Models/Emby/EmbyPolicy.cs
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyUser.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.Emby
|
||||||
|
{
|
||||||
|
public class EmbyPolicy
|
||||||
|
{
|
||||||
|
public bool IsAdministrator { get; set; }
|
||||||
|
public bool IsHidden { get; set; }
|
||||||
|
public bool IsDisabled { get; set; }
|
||||||
|
public object[] BlockedTags { get; set; }
|
||||||
|
public bool EnableUserPreferenceAccess { get; set; }
|
||||||
|
public object[] AccessSchedules { get; set; }
|
||||||
|
public object[] BlockUnratedItems { get; set; }
|
||||||
|
public bool EnableRemoteControlOfOtherUsers { get; set; }
|
||||||
|
public bool EnableSharedDeviceControl { get; set; }
|
||||||
|
public bool EnableLiveTvManagement { get; set; }
|
||||||
|
public bool EnableLiveTvAccess { get; set; }
|
||||||
|
public bool EnableMediaPlayback { get; set; }
|
||||||
|
public bool EnableAudioPlaybackTranscoding { get; set; }
|
||||||
|
public bool EnableVideoPlaybackTranscoding { get; set; }
|
||||||
|
public bool EnablePlaybackRemuxing { get; set; }
|
||||||
|
public bool EnableContentDeletion { get; set; }
|
||||||
|
public bool EnableContentDownloading { get; set; }
|
||||||
|
public bool EnableSync { get; set; }
|
||||||
|
public bool EnableSyncTranscoding { get; set; }
|
||||||
|
public object[] EnabledDevices { get; set; }
|
||||||
|
public bool EnableAllDevices { get; set; }
|
||||||
|
public object[] EnabledChannels { get; set; }
|
||||||
|
public bool EnableAllChannels { get; set; }
|
||||||
|
public object[] EnabledFolders { get; set; }
|
||||||
|
public bool EnableAllFolders { get; set; }
|
||||||
|
public int InvalidLoginAttemptCount { get; set; }
|
||||||
|
public bool EnablePublicSharing { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
56
Ombi.Api.Models/Emby/EmbySeriesItem.cs
Normal file
56
Ombi.Api.Models/Emby/EmbySeriesItem.cs
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbySeriesItem.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;
|
||||||
|
|
||||||
|
namespace Ombi.Api.Models.Emby
|
||||||
|
{
|
||||||
|
public class EmbySeriesItem
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string ServerId { get; set; }
|
||||||
|
public string Id { get; set; }
|
||||||
|
public DateTime PremiereDate { get; set; }
|
||||||
|
public string OfficialRating { get; set; }
|
||||||
|
public float CommunityRating { get; set; }
|
||||||
|
public long RunTimeTicks { get; set; }
|
||||||
|
public string PlayAccess { get; set; }
|
||||||
|
public int ProductionYear { get; set; }
|
||||||
|
public bool IsFolder { get; set; }
|
||||||
|
public string Type { get; set; }
|
||||||
|
public int LocalTrailerCount { get; set; }
|
||||||
|
public EmbyUserdata UserData { get; set; }
|
||||||
|
public int ChildCount { get; set; }
|
||||||
|
public string Status { get; set; }
|
||||||
|
public string AirTime { get; set; }
|
||||||
|
public string[] AirDays { get; set; }
|
||||||
|
public EmbyImagetags ImageTags { get; set; }
|
||||||
|
public string[] BackdropImageTags { get; set; }
|
||||||
|
public string LocationType { get; set; }
|
||||||
|
public DateTime EndDate { get; set; }
|
||||||
|
}
|
||||||
|
}
|
48
Ombi.Api.Models/Emby/EmbyUser.cs
Normal file
48
Ombi.Api.Models/Emby/EmbyUser.cs
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyUser.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;
|
||||||
|
|
||||||
|
namespace Ombi.Api.Models.Emby
|
||||||
|
{
|
||||||
|
public class EmbyUser
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string ServerId { get; set; }
|
||||||
|
public string ConnectUserName { get; set; }
|
||||||
|
public string ConnectUserId { get; set; }
|
||||||
|
public string ConnectLinkType { get; set; }
|
||||||
|
public string Id { get; set; }
|
||||||
|
public bool HasPassword { get; set; }
|
||||||
|
public bool HasConfiguredPassword { get; set; }
|
||||||
|
public bool HasConfiguredEasyPassword { get; set; }
|
||||||
|
public DateTime LastLoginDate { get; set; }
|
||||||
|
public DateTime LastActivityDate { get; set; }
|
||||||
|
public EmbyConfiguration Configuration { get; set; }
|
||||||
|
public EmbyPolicy Policy { get; set; }
|
||||||
|
}
|
||||||
|
}
|
42
Ombi.Api.Models/Emby/EmbyUserdata.cs
Normal file
42
Ombi.Api.Models/Emby/EmbyUserdata.cs
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyLibrary.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;
|
||||||
|
|
||||||
|
namespace Ombi.Api.Models.Emby
|
||||||
|
{
|
||||||
|
public class EmbyUserdata
|
||||||
|
{
|
||||||
|
public int PlaybackPositionTicks { get; set; }
|
||||||
|
public int PlayCount { get; set; }
|
||||||
|
public bool IsFavorite { get; set; }
|
||||||
|
public bool Played { get; set; }
|
||||||
|
public string Key { get; set; }
|
||||||
|
public DateTime LastPlayedDate { get; set; }
|
||||||
|
public int UnplayedItemCount { get; set; }
|
||||||
|
}
|
||||||
|
}
|
|
@ -49,6 +49,15 @@
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="Emby\EmbyConfiguration.cs" />
|
||||||
|
<Compile Include="Emby\EmbyImagetags.cs" />
|
||||||
|
<Compile Include="Emby\EmbyItem.cs" />
|
||||||
|
<Compile Include="Emby\EmbyItemContainer.cs" />
|
||||||
|
<Compile Include="Emby\EmbyMovieItem.cs" />
|
||||||
|
<Compile Include="Emby\EmbyPolicy.cs" />
|
||||||
|
<Compile Include="Emby\EmbySeriesItem.cs" />
|
||||||
|
<Compile Include="Emby\EmbyUser.cs" />
|
||||||
|
<Compile Include="Emby\EmbyUserdata.cs" />
|
||||||
<Compile Include="Movie\CouchPotatoAdd.cs" />
|
<Compile Include="Movie\CouchPotatoAdd.cs" />
|
||||||
<Compile Include="Movie\CouchPotatoMovies.cs" />
|
<Compile Include="Movie\CouchPotatoMovies.cs" />
|
||||||
<Compile Include="Movie\CouchPotatoProfiles.cs" />
|
<Compile Include="Movie\CouchPotatoProfiles.cs" />
|
||||||
|
|
138
Ombi.Api/EmbyApi.cs
Normal file
138
Ombi.Api/EmbyApi.cs
Normal file
|
@ -0,0 +1,138 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyApi.cs
|
||||||
|
// Created By: Jamie Rees
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
// a copy of this software and associated documentation files (the
|
||||||
|
// "Software"), to deal in the Software without restriction, including
|
||||||
|
// without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
// permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
// the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
// ************************************************************************/
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using NLog;
|
||||||
|
using Ombi.Api.Interfaces;
|
||||||
|
using Ombi.Api.Models.Emby;
|
||||||
|
using RestSharp;
|
||||||
|
|
||||||
|
namespace Ombi.Api
|
||||||
|
{
|
||||||
|
public class EmbyApi : IEmbyApi
|
||||||
|
{
|
||||||
|
public string ApiKey => "4aa083121ab646bfa38aa5f7196056cf";
|
||||||
|
|
||||||
|
public EmbyApi()
|
||||||
|
{
|
||||||
|
Api = new ApiRequest();
|
||||||
|
}
|
||||||
|
|
||||||
|
private ApiRequest Api { get; }
|
||||||
|
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns all users from the Emby Instance
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="baseUri"></param>
|
||||||
|
/// <param name="apiKey"></param>
|
||||||
|
public List<EmbyUser> GetUsers(Uri baseUri, string apiKey)
|
||||||
|
{
|
||||||
|
var request = new RestRequest
|
||||||
|
{
|
||||||
|
Resource = "emby/users",
|
||||||
|
Method = Method.GET
|
||||||
|
};
|
||||||
|
|
||||||
|
AddHeaders(request, ApiKey);
|
||||||
|
|
||||||
|
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetUsers for Emby, Retrying {0}", timespan), new[] {
|
||||||
|
TimeSpan.FromSeconds (1),
|
||||||
|
TimeSpan.FromSeconds(5)
|
||||||
|
});
|
||||||
|
|
||||||
|
var obj = policy.Execute(() => Api.ExecuteJson<List<EmbyUser>>(request, baseUri));
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbyItemContainer<EmbyLibrary> ViewLibrary(string apiKey, string userId, Uri baseUri)
|
||||||
|
{
|
||||||
|
var request = new RestRequest
|
||||||
|
{
|
||||||
|
Resource = "emby/users/{userId}/items",
|
||||||
|
Method = Method.GET
|
||||||
|
};
|
||||||
|
|
||||||
|
request.AddUrlSegment("userId", userId);
|
||||||
|
AddHeaders(request, ApiKey);
|
||||||
|
|
||||||
|
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling ViewLibrary for Emby, Retrying {0}", timespan), new[] {
|
||||||
|
TimeSpan.FromSeconds (1),
|
||||||
|
TimeSpan.FromSeconds(5)
|
||||||
|
});
|
||||||
|
|
||||||
|
var obj = policy.Execute(() => Api.ExecuteJson<EmbyItemContainer<EmbyLibrary>>(request, baseUri));
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbyItemContainer<EmbyMovieItem> GetAllMovies(string apiKey, string userId, Uri baseUri)
|
||||||
|
{
|
||||||
|
return GetAll<EmbyMovieItem>("Movie", apiKey, userId, baseUri);
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbyItemContainer<EmbySeriesItem> GetAllShows(string apiKey, string userId, Uri baseUri)
|
||||||
|
{
|
||||||
|
return GetAll<EmbySeriesItem>("Series", apiKey, userId, baseUri);
|
||||||
|
}
|
||||||
|
|
||||||
|
private EmbyItemContainer<T> GetAll<T>(string type, string apiKey, string userId, Uri baseUri)
|
||||||
|
{
|
||||||
|
var request = new RestRequest
|
||||||
|
{
|
||||||
|
Resource = "emby/users/{userId}/items",
|
||||||
|
Method = Method.GET
|
||||||
|
};
|
||||||
|
|
||||||
|
request.AddUrlSegment("userId", userId);
|
||||||
|
request.AddQueryParameter("Recursive", true.ToString());
|
||||||
|
request.AddQueryParameter("IncludeItemTypes", type);
|
||||||
|
|
||||||
|
AddHeaders(request, ApiKey);
|
||||||
|
|
||||||
|
|
||||||
|
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetAll<T>({1}) for Emby, Retrying {0}", timespan, type), new[] {
|
||||||
|
TimeSpan.FromSeconds (1),
|
||||||
|
TimeSpan.FromSeconds(5)
|
||||||
|
});
|
||||||
|
|
||||||
|
var obj = policy.Execute(() => Api.ExecuteJson<EmbyItemContainer<T>>(request, baseUri));
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private static void AddHeaders(IRestRequest req, string apiKey)
|
||||||
|
{
|
||||||
|
req.AddHeader("X-MediaBrowser-Token", apiKey);
|
||||||
|
req.AddHeader("Accept", "application/json");
|
||||||
|
req.AddHeader("Content-Type", "application/json");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -70,10 +70,14 @@
|
||||||
<HintPath>..\packages\TraktApiSharp.0.8.0\lib\portable-net45+netcore45+wpa81\TraktApiSharp.dll</HintPath>
|
<HintPath>..\packages\TraktApiSharp.0.8.0\lib\portable-net45+netcore45+wpa81\TraktApiSharp.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="WebSocket4Net, Version=0.14.1.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="ApiRequest.cs" />
|
<Compile Include="ApiRequest.cs" />
|
||||||
<Compile Include="DiscordApi.cs" />
|
<Compile Include="DiscordApi.cs" />
|
||||||
|
<Compile Include="EmbyApi.cs" />
|
||||||
<Compile Include="NetflixRouletteApi.cs" />
|
<Compile Include="NetflixRouletteApi.cs" />
|
||||||
<Compile Include="RadarrApi.cs" />
|
<Compile Include="RadarrApi.cs" />
|
||||||
<Compile Include="TraktApi.cs" />
|
<Compile Include="TraktApi.cs" />
|
||||||
|
|
|
@ -9,4 +9,5 @@
|
||||||
<package id="System.Net.Http" version="4.0.0" targetFramework="net45" />
|
<package id="System.Net.Http" version="4.0.0" targetFramework="net45" />
|
||||||
<package id="TMDbLib" version="0.9.0.0-alpha" targetFramework="net45" />
|
<package id="TMDbLib" version="0.9.0.0-alpha" targetFramework="net45" />
|
||||||
<package id="TraktApiSharp" version="0.8.0" targetFramework="net45" />
|
<package id="TraktApiSharp" version="0.8.0" targetFramework="net45" />
|
||||||
|
<package id="WebSocket4Net" version="0.14.1" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
|
@ -36,23 +36,32 @@ namespace Ombi.Core.Migration.Migrations
|
||||||
[Migration(22000, "v2.20.0.0")]
|
[Migration(22000, "v2.20.0.0")]
|
||||||
public class Version2200 : BaseMigration, IMigration
|
public class Version2200 : BaseMigration, IMigration
|
||||||
{
|
{
|
||||||
public Version2200(ISettingsService<CustomizationSettings> custom)
|
public Version2200(ISettingsService<CustomizationSettings> custom, ISettingsService<PlexSettings> ps)
|
||||||
{
|
{
|
||||||
Customization = custom;
|
Customization = custom;
|
||||||
|
PlexSettings = ps;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Version => 22000;
|
public int Version => 22000;
|
||||||
private ISettingsService<CustomizationSettings> Customization { get; set; }
|
private ISettingsService<CustomizationSettings> Customization { get; set; }
|
||||||
|
private ISettingsService<PlexSettings> PlexSettings { get; set; }
|
||||||
|
|
||||||
|
|
||||||
private static Logger Logger = LogManager.GetCurrentClassLogger();
|
private static Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
public void Start(IDbConnection con)
|
public void Start(IDbConnection con)
|
||||||
{
|
{
|
||||||
|
UpdatePlexSettings();
|
||||||
//UpdateCustomSettings(); Turned off the migration for now until the search has been improved on.
|
//UpdateCustomSettings(); Turned off the migration for now until the search has been improved on.
|
||||||
//UpdateSchema(con, Version);
|
//UpdateSchema(con, Version);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void UpdatePlexSettings()
|
||||||
|
{
|
||||||
|
var s = PlexSettings.GetSettings();
|
||||||
|
s.Enable = true;
|
||||||
|
PlexSettings.SaveSettings(s);
|
||||||
|
}
|
||||||
private void UpdateCustomSettings()
|
private void UpdateCustomSettings()
|
||||||
{
|
{
|
||||||
var settings = Customization.GetSettings();
|
var settings = Customization.GetSettings();
|
||||||
|
|
|
@ -123,6 +123,7 @@
|
||||||
<Compile Include="SecurityExtensions.cs" />
|
<Compile Include="SecurityExtensions.cs" />
|
||||||
<Compile Include="SettingModels\AuthenticationSettings.cs" />
|
<Compile Include="SettingModels\AuthenticationSettings.cs" />
|
||||||
<Compile Include="SettingModels\DiscordNotificationSettings.cs" />
|
<Compile Include="SettingModels\DiscordNotificationSettings.cs" />
|
||||||
|
<Compile Include="SettingModels\EmbySettings.cs" />
|
||||||
<Compile Include="SettingModels\RadarrSettings.cs" />
|
<Compile Include="SettingModels\RadarrSettings.cs" />
|
||||||
<Compile Include="SettingModels\WatcherSettings.cs" />
|
<Compile Include="SettingModels\WatcherSettings.cs" />
|
||||||
<Compile Include="SettingModels\ExternalSettings.cs" />
|
<Compile Include="SettingModels\ExternalSettings.cs" />
|
||||||
|
|
37
Ombi.Core/SettingModels/EmbySettings.cs
Normal file
37
Ombi.Core/SettingModels/EmbySettings.cs
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2016 Jamie Rees
|
||||||
|
// File: CouchPotatoSettings.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.Core.SettingModels
|
||||||
|
{
|
||||||
|
public sealed class EmbySettings : ExternalSettings
|
||||||
|
{
|
||||||
|
public bool Enable { get; set; }
|
||||||
|
public string ApiKey { get; set; }
|
||||||
|
public string AdministratorId { get; set; }
|
||||||
|
public bool EnableEpisodeSearching { get; set; }
|
||||||
|
}
|
||||||
|
}
|
|
@ -33,6 +33,8 @@ namespace Ombi.Core.SettingModels
|
||||||
{
|
{
|
||||||
AdvancedSearch = true;
|
AdvancedSearch = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool Enable { get; set; }
|
||||||
public bool AdvancedSearch { get; set; }
|
public bool AdvancedSearch { get; set; }
|
||||||
public bool EnableTvEpisodeSearching { get; set; }
|
public bool EnableTvEpisodeSearching { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,7 @@
|
||||||
// });
|
// });
|
||||||
// CacheMock.Setup(x => x.Get<List<PlexSearch>>(CacheKeys.PlexLibaries)).Returns(cachedMovies);
|
// CacheMock.Setup(x => x.Get<List<PlexSearch>>(CacheKeys.PlexLibaries)).Returns(cachedMovies);
|
||||||
// SettingsMock.Setup(x => x.GetSettings()).Returns(F.Create<PlexSettings>());
|
// SettingsMock.Setup(x => x.GetSettings()).Returns(F.Create<PlexSettings>());
|
||||||
// var movies = Checker.GetPlexMovies();
|
// var movies = Checker.GetEmbyMovies();
|
||||||
|
|
||||||
// Assert.That(movies.Any(x => x.ProviderId == "1212"));
|
// Assert.That(movies.Any(x => x.ProviderId == "1212"));
|
||||||
// }
|
// }
|
||||||
|
@ -267,7 +267,7 @@
|
||||||
// });
|
// });
|
||||||
// SettingsMock.Setup(x => x.GetSettings()).Returns(F.Create<PlexSettings>());
|
// SettingsMock.Setup(x => x.GetSettings()).Returns(F.Create<PlexSettings>());
|
||||||
// CacheMock.Setup(x => x.Get<List<PlexSearch>>(CacheKeys.PlexLibaries)).Returns(cachedTv);
|
// CacheMock.Setup(x => x.Get<List<PlexSearch>>(CacheKeys.PlexLibaries)).Returns(cachedTv);
|
||||||
// var movies = Checker.GetPlexTvShows();
|
// var movies = Checker.GetEmbyTvShows();
|
||||||
|
|
||||||
// Assert.That(movies.Any(x => x.ProviderId == "1212"));
|
// Assert.That(movies.Any(x => x.ProviderId == "1212"));
|
||||||
// }
|
// }
|
||||||
|
|
357
Ombi.Services/Jobs/EmbyAvailabilityChecker.cs
Normal file
357
Ombi.Services/Jobs/EmbyAvailabilityChecker.cs
Normal file
|
@ -0,0 +1,357 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2016 Jamie Rees
|
||||||
|
// File: PlexAvailabilityChecker.cs
|
||||||
|
// Created By: Jamie Rees
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
// a copy of this software and associated documentation files (the
|
||||||
|
// "Software"), to deal in the Software without restriction, including
|
||||||
|
// without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
// permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
// the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
// ************************************************************************/
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Dapper;
|
||||||
|
using NLog;
|
||||||
|
using Ombi.Api.Interfaces;
|
||||||
|
using Ombi.Api.Models.Plex;
|
||||||
|
using Ombi.Core;
|
||||||
|
using Ombi.Core.Models;
|
||||||
|
using Ombi.Core.SettingModels;
|
||||||
|
using Ombi.Helpers;
|
||||||
|
using Ombi.Services.Interfaces;
|
||||||
|
using Ombi.Services.Models;
|
||||||
|
using Ombi.Store;
|
||||||
|
using Ombi.Store.Models;
|
||||||
|
using Ombi.Store.Models.Emby;
|
||||||
|
using Ombi.Store.Models.Plex;
|
||||||
|
using Ombi.Store.Repository;
|
||||||
|
using Quartz;
|
||||||
|
using PlexMediaType = Ombi.Api.Models.Plex.PlexMediaType;
|
||||||
|
|
||||||
|
namespace Ombi.Services.Jobs
|
||||||
|
{
|
||||||
|
public class EmbyAvailabilityChecker : IJob, IEmbyAvailabilityChecker
|
||||||
|
{
|
||||||
|
public EmbyAvailabilityChecker(ISettingsService<EmbySettings> embySettings, IRequestService request, IEmbyApi emby, ICacheProvider cache,
|
||||||
|
INotificationService notify, IJobRecord rec, IRepository<UsersToNotify> users, IRepository<EmbyEpisodes> repo, INotificationEngine e, IRepository<EmbyContent> content)
|
||||||
|
{
|
||||||
|
Emby = embySettings;
|
||||||
|
RequestService = request;
|
||||||
|
EmbyApi = emby;
|
||||||
|
Cache = cache;
|
||||||
|
Notification = notify;
|
||||||
|
Job = rec;
|
||||||
|
UserNotifyRepo = users;
|
||||||
|
EpisodeRepo = repo;
|
||||||
|
NotificationEngine = e;
|
||||||
|
EmbyContent = content;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ISettingsService<EmbySettings> Emby { get; }
|
||||||
|
private IRepository<EmbyEpisodes> EpisodeRepo { get; }
|
||||||
|
private IRequestService RequestService { get; }
|
||||||
|
private static Logger Log = LogManager.GetCurrentClassLogger();
|
||||||
|
private IEmbyApi EmbyApi { get; }
|
||||||
|
private ICacheProvider Cache { get; }
|
||||||
|
private INotificationService Notification { get; }
|
||||||
|
private IJobRecord Job { get; }
|
||||||
|
private IRepository<UsersToNotify> UserNotifyRepo { get; }
|
||||||
|
private INotificationEngine NotificationEngine { get; }
|
||||||
|
private IRepository<EmbyContent> EmbyContent { get; }
|
||||||
|
|
||||||
|
public void CheckAndUpdateAll()
|
||||||
|
{
|
||||||
|
var embySettings = Emby.GetSettings();
|
||||||
|
|
||||||
|
if (!ValidateSettings(embySettings))
|
||||||
|
{
|
||||||
|
Log.Debug("Validation of the Emby settings failed.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var content = EmbyContent.GetAll().ToList();
|
||||||
|
|
||||||
|
var movies = GetEmbyMovies(content).ToArray();
|
||||||
|
var shows = GetEmbyTvShows(content).ToArray();
|
||||||
|
var albums = GetEmbyMusic(content).ToArray();
|
||||||
|
|
||||||
|
var requests = RequestService.GetAll();
|
||||||
|
var requestedModels = requests as RequestedModel[] ?? requests.Where(x => !x.Available).ToArray();
|
||||||
|
|
||||||
|
if (!requestedModels.Any())
|
||||||
|
{
|
||||||
|
Log.Debug("There are no requests to check.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var modifiedModel = new List<RequestedModel>();
|
||||||
|
foreach (var r in requestedModels)
|
||||||
|
{
|
||||||
|
var releaseDate = r.ReleaseDate == DateTime.MinValue ? string.Empty : r.ReleaseDate.ToString("yyyy");
|
||||||
|
bool matchResult;
|
||||||
|
|
||||||
|
switch (r.Type)
|
||||||
|
{
|
||||||
|
case RequestType.Movie:
|
||||||
|
matchResult = IsMovieAvailable(movies, r.Title, releaseDate, r.ImdbId);
|
||||||
|
break;
|
||||||
|
case RequestType.TvShow:
|
||||||
|
if (!embySettings.EnableEpisodeSearching)
|
||||||
|
{
|
||||||
|
matchResult = IsTvShowAvailable(shows, r.Title, releaseDate, r.TvDbId, r.SeasonList);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
matchResult = r.Episodes.Any() ?
|
||||||
|
r.Episodes.All(x => IsEpisodeAvailable(r.TvDbId, x.SeasonNumber, x.EpisodeNumber)) :
|
||||||
|
IsTvShowAvailable(shows, r.Title, releaseDate, r.TvDbId, r.SeasonList);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case RequestType.Album:
|
||||||
|
//matchResult = IsAlbumAvailable(albums, r.Title, r.ReleaseDate.Year.ToString(), r.ArtistName); // TODO Emby
|
||||||
|
matchResult = false;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (matchResult)
|
||||||
|
{
|
||||||
|
r.Available = true;
|
||||||
|
modifiedModel.Add(r);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.Debug("Requests that will be updated count {0}", modifiedModel.Count);
|
||||||
|
|
||||||
|
if (modifiedModel.Any())
|
||||||
|
{
|
||||||
|
NotificationEngine.NotifyUsers(modifiedModel, embySettings.ApiKey, NotificationType.RequestAvailable); // TODO Emby
|
||||||
|
RequestService.BatchUpdate(modifiedModel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<EmbyContent> GetEmbyMovies(IEnumerable<EmbyContent> content)
|
||||||
|
{
|
||||||
|
return content.Where(x => x.Type == EmbyMediaType.Movie);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsMovieAvailable(EmbyContent[] embyMovies, string title, string year, string providerId)
|
||||||
|
{
|
||||||
|
var movie = GetMovie(embyMovies, title, year, providerId);
|
||||||
|
return movie != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public EmbyContent GetMovie(EmbyContent[] embyMovies, string title, string year, string providerId)
|
||||||
|
{
|
||||||
|
if (embyMovies.Length == 0)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
foreach (var movie in embyMovies)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(movie.Title) || movie.PremierDate == DateTime.MinValue)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(movie.ProviderId) &&
|
||||||
|
movie.ProviderId.Equals(providerId, StringComparison.InvariantCultureIgnoreCase))
|
||||||
|
{
|
||||||
|
return movie;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (movie.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase) &&
|
||||||
|
movie.PremierDate.Year.ToString().Equals(year, StringComparison.CurrentCultureIgnoreCase))
|
||||||
|
{
|
||||||
|
return movie;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<EmbyContent> GetEmbyTvShows(IEnumerable<EmbyContent> content)
|
||||||
|
{
|
||||||
|
return content.Where(x => x.Type == EmbyMediaType.Series);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsTvShowAvailable(EmbyContent[] embyShows, string title, string year, string providerId, int[] seasons = null)
|
||||||
|
{
|
||||||
|
var show = GetTvShow(embyShows, title, year, providerId, seasons);
|
||||||
|
return show != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public EmbyContent GetTvShow(EmbyContent[] embyShows, string title, string year, string providerId,
|
||||||
|
int[] seasons = null)
|
||||||
|
{
|
||||||
|
foreach (var show in embyShows)
|
||||||
|
{
|
||||||
|
//if (show.ProviderId == providerId && seasons != null) // TODO Emby
|
||||||
|
//{
|
||||||
|
// var showSeasons = ByteConverterHelper.ReturnObject<int[]>(show.Seasons);
|
||||||
|
// if (seasons.Any(season => showSeasons.Contains(season)))
|
||||||
|
// {
|
||||||
|
// return show;
|
||||||
|
// }
|
||||||
|
// return null;
|
||||||
|
//}
|
||||||
|
if (!string.IsNullOrEmpty(show.ProviderId) &&
|
||||||
|
show.ProviderId.Equals(providerId, StringComparison.InvariantCultureIgnoreCase))
|
||||||
|
{
|
||||||
|
return show;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (show.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase) &&
|
||||||
|
show.PremierDate.Year.ToString().Equals(year, StringComparison.CurrentCultureIgnoreCase))
|
||||||
|
{
|
||||||
|
return show;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsEpisodeAvailable(string theTvDbId, int season, int episode)
|
||||||
|
{
|
||||||
|
var ep = EpisodeRepo.Custom(
|
||||||
|
connection =>
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
var result = connection.Query<EmbyEpisodes>("select * from EmbyEpisodes where ProviderId = @ProviderId", new { ProviderId = theTvDbId });
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
if (!ep.Any())
|
||||||
|
{
|
||||||
|
Log.Info("Episode cache info is not available. tvdbid: {0}, season: {1}, episode: {2}", theTvDbId, season, episode);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
foreach (var result in ep)
|
||||||
|
{
|
||||||
|
if (result.ProviderId.Equals(theTvDbId) && result.EpisodeNumber == episode && result.SeasonNumber == season)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the episode's db in the cache.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<IEnumerable<EmbyEpisodes>> GetEpisodes()
|
||||||
|
{
|
||||||
|
var episodes = await EpisodeRepo.GetAllAsync();
|
||||||
|
if (episodes == null)
|
||||||
|
{
|
||||||
|
return new HashSet<EmbyEpisodes>();
|
||||||
|
}
|
||||||
|
return episodes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the episode's stored in the db and then filters on the TheTvDBId.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="theTvDbId">The tv database identifier.</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<IEnumerable<EmbyEpisodes>> GetEpisodes(int theTvDbId)
|
||||||
|
{
|
||||||
|
var ep = await EpisodeRepo.CustomAsync(async connection =>
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
var result = await connection.QueryAsync<EmbyEpisodes>("select * from EmbyEpisodes where ProviderId = @ProviderId", new { ProviderId = theTvDbId });
|
||||||
|
|
||||||
|
return result;
|
||||||
|
});
|
||||||
|
|
||||||
|
var embyEpisodes = ep as EmbyEpisodes[] ?? ep.ToArray();
|
||||||
|
if (!embyEpisodes.Any())
|
||||||
|
{
|
||||||
|
Log.Info("Episode db info is not available.");
|
||||||
|
return new List<EmbyEpisodes>();
|
||||||
|
}
|
||||||
|
|
||||||
|
return embyEpisodes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<EmbyContent> GetEmbyMusic(IEnumerable<EmbyContent> content)
|
||||||
|
{
|
||||||
|
return content.Where(x => x.Type == EmbyMediaType.Music);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private bool ValidateSettings(EmbySettings emby)
|
||||||
|
{
|
||||||
|
if (emby.Enable)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(emby?.Ip) || string.IsNullOrEmpty(emby?.ApiKey) || string.IsNullOrEmpty(emby?.AdministratorId))
|
||||||
|
{
|
||||||
|
Log.Warn("A setting is null, Ensure Emby is configured correctly");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return emby.Enable;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Execute(IJobExecutionContext context)
|
||||||
|
{
|
||||||
|
|
||||||
|
Job.SetRunning(true, JobNames.EmbyChecker);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CheckAndUpdateAll();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log.Error(e);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Job.Record(JobNames.EmbyChecker);
|
||||||
|
Job.SetRunning(false, JobNames.EmbyChecker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
Job.SetRunning(true, JobNames.EmbyChecker);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CheckAndUpdateAll();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log.Error(e);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Job.Record(JobNames.EmbyChecker);
|
||||||
|
Job.SetRunning(false, JobNames.EmbyChecker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
24
Ombi.Services/Jobs/IEmbyAvailabilityChecker.cs
Normal file
24
Ombi.Services/Jobs/IEmbyAvailabilityChecker.cs
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Ombi.Store.Models.Emby;
|
||||||
|
using Quartz;
|
||||||
|
|
||||||
|
namespace Ombi.Services.Jobs
|
||||||
|
{
|
||||||
|
public interface IEmbyAvailabilityChecker
|
||||||
|
{
|
||||||
|
void CheckAndUpdateAll();
|
||||||
|
void Execute(IJobExecutionContext context);
|
||||||
|
IEnumerable<EmbyContent> GetEmbyMovies(IEnumerable<EmbyContent> content);
|
||||||
|
IEnumerable<EmbyContent> GetEmbyMusic(IEnumerable<EmbyContent> content);
|
||||||
|
IEnumerable<EmbyContent> GetEmbyTvShows(IEnumerable<EmbyContent> content);
|
||||||
|
Task<IEnumerable<EmbyEpisodes>> GetEpisodes();
|
||||||
|
Task<IEnumerable<EmbyEpisodes>> GetEpisodes(int theTvDbId);
|
||||||
|
EmbyContent GetMovie(EmbyContent[] embyMovies, string title, string year, string providerId);
|
||||||
|
EmbyContent GetTvShow(EmbyContent[] embyShows, string title, string year, string providerId, int[] seasons = null);
|
||||||
|
bool IsEpisodeAvailable(string theTvDbId, int season, int episode);
|
||||||
|
bool IsMovieAvailable(EmbyContent[] embyMovies, string title, string year, string providerId);
|
||||||
|
bool IsTvShowAvailable(EmbyContent[] embyShows, string title, string year, string providerId, int[] seasons = null);
|
||||||
|
void Start();
|
||||||
|
}
|
||||||
|
}
|
|
@ -35,6 +35,7 @@ namespace Ombi.Services.Jobs
|
||||||
public const string RadarrCacher = "Radarr Cacher";
|
public const string RadarrCacher = "Radarr Cacher";
|
||||||
public const string SrCacher = "SickRage Cacher";
|
public const string SrCacher = "SickRage Cacher";
|
||||||
public const string PlexChecker = "Plex Availability Cacher";
|
public const string PlexChecker = "Plex Availability Cacher";
|
||||||
|
public const string EmbyChecker = "Emby Availability Cacher";
|
||||||
public const string PlexCacher = "Plex Cacher";
|
public const string PlexCacher = "Plex Cacher";
|
||||||
public const string StoreCleanup = "Database Cleanup";
|
public const string StoreCleanup = "Database Cleanup";
|
||||||
public const string RequestLimitReset = "Request Limit Reset";
|
public const string RequestLimitReset = "Request Limit Reset";
|
||||||
|
|
|
@ -388,7 +388,7 @@ namespace Ombi.Services.Jobs
|
||||||
currentItem.RatingKey);
|
currentItem.RatingKey);
|
||||||
|
|
||||||
// We do not want "all episodes" this as a season
|
// We do not want "all episodes" this as a season
|
||||||
var filtered = seasons.Directory.Where( x => !x.Title.Equals("All episodes", StringComparison.CurrentCultureIgnoreCase));
|
var filtered = seasons.Directory.Where(x => !x.Title.Equals("All episodes", StringComparison.CurrentCultureIgnoreCase));
|
||||||
|
|
||||||
t1.Seasons.AddRange(filtered);
|
t1.Seasons.AddRange(filtered);
|
||||||
}
|
}
|
||||||
|
@ -447,12 +447,15 @@ namespace Ombi.Services.Jobs
|
||||||
|
|
||||||
private bool ValidateSettings(PlexSettings plex)
|
private bool ValidateSettings(PlexSettings plex)
|
||||||
{
|
{
|
||||||
if (plex?.Ip == null || plex?.PlexAuthToken == null)
|
if (plex.Enable)
|
||||||
{
|
{
|
||||||
Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
|
if (plex?.Ip == null || plex?.PlexAuthToken == null)
|
||||||
return false;
|
{
|
||||||
|
Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return plex.Enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Execute(IJobExecutionContext context)
|
public void Execute(IJobExecutionContext context)
|
||||||
|
|
|
@ -385,12 +385,15 @@ namespace Ombi.Services.Jobs
|
||||||
|
|
||||||
private bool ValidateSettings(PlexSettings plex)
|
private bool ValidateSettings(PlexSettings plex)
|
||||||
{
|
{
|
||||||
if (plex?.Ip == null || plex?.PlexAuthToken == null)
|
if (plex.Enable)
|
||||||
{
|
{
|
||||||
Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
|
if (plex?.Ip == null || plex?.PlexAuthToken == null)
|
||||||
return false;
|
{
|
||||||
|
Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return plex.Enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Execute(IJobExecutionContext context)
|
public void Execute(IJobExecutionContext context)
|
||||||
|
|
|
@ -75,7 +75,7 @@ namespace Ombi.Services.Jobs
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var settings = PlexSettings.GetSettings();
|
var settings = PlexSettings.GetSettings();
|
||||||
if (string.IsNullOrEmpty(settings.PlexAuthToken))
|
if (string.IsNullOrEmpty(settings.PlexAuthToken) || !settings.Enable)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,9 +93,11 @@
|
||||||
<Compile Include="Interfaces\IStoreBackup.cs" />
|
<Compile Include="Interfaces\IStoreBackup.cs" />
|
||||||
<Compile Include="Interfaces\IStoreCleanup.cs" />
|
<Compile Include="Interfaces\IStoreCleanup.cs" />
|
||||||
<Compile Include="Interfaces\IUserRequestLimitResetter.cs" />
|
<Compile Include="Interfaces\IUserRequestLimitResetter.cs" />
|
||||||
|
<Compile Include="Jobs\IEmbyAvailabilityChecker.cs" />
|
||||||
<Compile Include="Jobs\IFaultQueueHandler.cs" />
|
<Compile Include="Jobs\IFaultQueueHandler.cs" />
|
||||||
<Compile Include="Jobs\IPlexEpisodeCacher.cs" />
|
<Compile Include="Jobs\IPlexEpisodeCacher.cs" />
|
||||||
<Compile Include="Jobs\IPlexUserChecker.cs" />
|
<Compile Include="Jobs\IPlexUserChecker.cs" />
|
||||||
|
<Compile Include="Jobs\EmbyAvailabilityChecker.cs" />
|
||||||
<Compile Include="Jobs\RadarrCacher.cs" />
|
<Compile Include="Jobs\RadarrCacher.cs" />
|
||||||
<Compile Include="Jobs\WatcherCacher.cs" />
|
<Compile Include="Jobs\WatcherCacher.cs" />
|
||||||
<Compile Include="Jobs\HtmlTemplateGenerator.cs" />
|
<Compile Include="Jobs\HtmlTemplateGenerator.cs" />
|
||||||
|
|
43
Ombi.Store/Models/Emby/EmbyContent.cs
Normal file
43
Ombi.Store/Models/Emby/EmbyContent.cs
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: Emby.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 Dapper.Contrib.Extensions;
|
||||||
|
using Ombi.Store.Models.Plex;
|
||||||
|
|
||||||
|
namespace Ombi.Store.Models.Emby
|
||||||
|
{
|
||||||
|
[Table(nameof(EmbyContent))]
|
||||||
|
public class EmbyContent : Entity
|
||||||
|
{
|
||||||
|
public string Title { get; set; }
|
||||||
|
public string EmbyId { get; set; }
|
||||||
|
public DateTime PremierDate { get; set; }
|
||||||
|
public string ProviderId { get; set; }
|
||||||
|
public EmbyMediaType Type { get; set; }
|
||||||
|
}
|
||||||
|
}
|
43
Ombi.Store/Models/Emby/EmbyEpisodes.cs
Normal file
43
Ombi.Store/Models/Emby/EmbyEpisodes.cs
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2017 Jamie Rees
|
||||||
|
// File: EmbyEpisodes.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 Dapper.Contrib.Extensions;
|
||||||
|
|
||||||
|
namespace Ombi.Store.Models.Emby
|
||||||
|
{
|
||||||
|
[Table(nameof(EmbyEpisodes))]
|
||||||
|
public class EmbyEpisodes : Entity
|
||||||
|
{
|
||||||
|
public string EpisodeTitle { get; set; }
|
||||||
|
public string ShowTitle { get; set; }
|
||||||
|
public string EmbyId { get; set; }
|
||||||
|
public int EpisodeNumber { get; set; }
|
||||||
|
public int SeasonNumber { get; set; }
|
||||||
|
public string ParentId { get; set; }
|
||||||
|
public string ProviderId { get; set; }
|
||||||
|
}
|
||||||
|
}
|
35
Ombi.Store/Models/Emby/EmbyMediaType.cs
Normal file
35
Ombi.Store/Models/Emby/EmbyMediaType.cs
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2016 Jamie Rees
|
||||||
|
// File: PlexMediaType .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.Store.Models.Plex
|
||||||
|
{
|
||||||
|
public enum EmbyMediaType
|
||||||
|
{
|
||||||
|
Movie = 0,
|
||||||
|
Series = 1,
|
||||||
|
Music = 2
|
||||||
|
}
|
||||||
|
}
|
|
@ -65,11 +65,14 @@
|
||||||
<Compile Include="DbConfiguration.cs" />
|
<Compile Include="DbConfiguration.cs" />
|
||||||
<Compile Include="Entity.cs" />
|
<Compile Include="Entity.cs" />
|
||||||
<Compile Include="IPlexDatabase.cs" />
|
<Compile Include="IPlexDatabase.cs" />
|
||||||
|
<Compile Include="Models\Emby\EmbyContent.cs" />
|
||||||
|
<Compile Include="Models\Emby\EmbyEpisodes.cs" />
|
||||||
<Compile Include="Models\IssueBlobs.cs" />
|
<Compile Include="Models\IssueBlobs.cs" />
|
||||||
<Compile Include="Models\PlexEpisodes.cs" />
|
<Compile Include="Models\PlexEpisodes.cs" />
|
||||||
<Compile Include="Models\PlexUsers.cs" />
|
<Compile Include="Models\PlexUsers.cs" />
|
||||||
<Compile Include="Models\Plex\MetadataItems.cs" />
|
<Compile Include="Models\Plex\MetadataItems.cs" />
|
||||||
<Compile Include="Models\Plex\PlexContent.cs" />
|
<Compile Include="Models\Plex\PlexContent.cs" />
|
||||||
|
<Compile Include="Models\Emby\EmbyMediaType.cs" />
|
||||||
<Compile Include="Models\Plex\PlexMediaType .cs" />
|
<Compile Include="Models\Plex\PlexMediaType .cs" />
|
||||||
<Compile Include="Models\RequestQueue.cs" />
|
<Compile Include="Models\RequestQueue.cs" />
|
||||||
<Compile Include="Models\ScheduledJobs.cs" />
|
<Compile Include="Models\ScheduledJobs.cs" />
|
||||||
|
|
|
@ -164,4 +164,29 @@ CREATE TABLE IF NOT EXISTS PlexContent
|
||||||
);
|
);
|
||||||
CREATE UNIQUE INDEX IF NOT EXISTS PlexContent_Id ON PlexContent (Id);
|
CREATE UNIQUE INDEX IF NOT EXISTS PlexContent_Id ON PlexContent (Id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS EmbyEpisodes
|
||||||
|
(
|
||||||
|
Id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
EpisodeTitle VARCHAR(100) NOT NULL,
|
||||||
|
ShowTitle VARCHAR(100) NOT NULL,
|
||||||
|
EmbyId VARCHAR(100) NOT NULL,
|
||||||
|
SeasonNumber INTEGER NOT NULL,
|
||||||
|
EpisodeNumber INTEGER NOT NULL,
|
||||||
|
ParentId VARCHAR(100) NOT NULL,
|
||||||
|
ProviderId VARCHAR(100) NOT NULL
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX IF NOT EXISTS EmbyEpisodes_Id ON EmbyEpisodes (Id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS EmbyContent
|
||||||
|
(
|
||||||
|
Id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
Title VARCHAR(100) NOT NULL,
|
||||||
|
PremierDate VARCHAR(100) NOT NULL,
|
||||||
|
EmbyId VARCHAR(100) NOT NULL,
|
||||||
|
ProviderId VARCHAR(100) NOT NULL,
|
||||||
|
Type INTEGER NOT NULL
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX IF NOT EXISTS EmbyEpisodes_Id ON EmbyEpisodes (Id);
|
||||||
|
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
|
@ -97,6 +97,8 @@ namespace Ombi.UI.Modules.Admin
|
||||||
private IDiscordApi DiscordApi { get; }
|
private IDiscordApi DiscordApi { get; }
|
||||||
private ISettingsService<RadarrSettings> RadarrSettings { get; }
|
private ISettingsService<RadarrSettings> RadarrSettings { get; }
|
||||||
private IRadarrApi RadarrApi { get; }
|
private IRadarrApi RadarrApi { get; }
|
||||||
|
private ISettingsService<EmbySettings> EmbySettings { get; }
|
||||||
|
private IEmbyApi EmbyApi { get; }
|
||||||
|
|
||||||
private static Logger Log = LogManager.GetCurrentClassLogger();
|
private static Logger Log = LogManager.GetCurrentClassLogger();
|
||||||
public AdminModule(ISettingsService<PlexRequestSettings> prService,
|
public AdminModule(ISettingsService<PlexRequestSettings> prService,
|
||||||
|
@ -124,7 +126,8 @@ namespace Ombi.UI.Modules.Admin
|
||||||
ISettingsService<NotificationSettingsV2> notifyService, IRecentlyAdded recentlyAdded,
|
ISettingsService<NotificationSettingsV2> notifyService, IRecentlyAdded recentlyAdded,
|
||||||
ISettingsService<WatcherSettings> watcherSettings ,
|
ISettingsService<WatcherSettings> watcherSettings ,
|
||||||
ISettingsService<DiscordNotificationSettings> discord,
|
ISettingsService<DiscordNotificationSettings> discord,
|
||||||
IDiscordApi discordapi, ISettingsService<RadarrSettings> settings, IRadarrApi radarrApi
|
IDiscordApi discordapi, ISettingsService<RadarrSettings> settings, IRadarrApi radarrApi,
|
||||||
|
ISettingsService<EmbySettings> embySettings, IEmbyApi emby
|
||||||
, ISecurityExtensions security) : base("admin", prService, security)
|
, ISecurityExtensions security) : base("admin", prService, security)
|
||||||
{
|
{
|
||||||
PrService = prService;
|
PrService = prService;
|
||||||
|
@ -160,6 +163,8 @@ namespace Ombi.UI.Modules.Admin
|
||||||
DiscordApi = discordapi;
|
DiscordApi = discordapi;
|
||||||
RadarrSettings = settings;
|
RadarrSettings = settings;
|
||||||
RadarrApi = radarrApi;
|
RadarrApi = radarrApi;
|
||||||
|
EmbyApi = emby;
|
||||||
|
EmbySettings = embySettings;
|
||||||
|
|
||||||
Before += (ctx) => Security.AdminLoginRedirect(Permissions.Administrator, ctx);
|
Before += (ctx) => Security.AdminLoginRedirect(Permissions.Administrator, ctx);
|
||||||
|
|
||||||
|
@ -180,6 +185,10 @@ namespace Ombi.UI.Modules.Admin
|
||||||
Get["/plex"] = _ => Plex();
|
Get["/plex"] = _ => Plex();
|
||||||
Post["/plex", true] = async (x, ct) => await SavePlex();
|
Post["/plex", true] = async (x, ct) => await SavePlex();
|
||||||
|
|
||||||
|
Get["/emby", true] = async (x, ct) => await Emby();
|
||||||
|
Post["/emby", true] = async (x, ct) => await SaveEmby();
|
||||||
|
|
||||||
|
|
||||||
Get["/sonarr"] = _ => Sonarr();
|
Get["/sonarr"] = _ => Sonarr();
|
||||||
Post["/sonarr"] = _ => SaveSonarr();
|
Post["/sonarr"] = _ => SaveSonarr();
|
||||||
Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
|
Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
|
||||||
|
@ -438,6 +447,13 @@ namespace Ombi.UI.Modules.Admin
|
||||||
return Response.AsJson(valid.SendJsonError());
|
return Response.AsJson(valid.SendJsonError());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var embySettings = await EmbySettings.GetSettingsAsync();
|
||||||
|
|
||||||
|
if (embySettings.Enable)
|
||||||
|
{
|
||||||
|
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Emby is enabled, we cannot enable Plex and Emby" });
|
||||||
|
}
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(plexSettings.MachineIdentifier))
|
if (string.IsNullOrEmpty(plexSettings.MachineIdentifier))
|
||||||
{
|
{
|
||||||
//Lookup identifier
|
//Lookup identifier
|
||||||
|
@ -453,6 +469,41 @@ namespace Ombi.UI.Modules.Admin
|
||||||
: new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
|
: new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task<Negotiator> Emby()
|
||||||
|
{
|
||||||
|
var settings = await EmbySettings.GetSettingsAsync();
|
||||||
|
|
||||||
|
return View["Emby", settings];
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<Response> SaveEmby()
|
||||||
|
{
|
||||||
|
var emby = this.Bind<EmbySettings>();
|
||||||
|
var valid = this.Validate(emby);
|
||||||
|
if (!valid.IsValid)
|
||||||
|
{
|
||||||
|
return Response.AsJson(valid.SendJsonError());
|
||||||
|
}
|
||||||
|
|
||||||
|
var plexSettings = await PlexService.GetSettingsAsync();
|
||||||
|
if (plexSettings.Enable)
|
||||||
|
{
|
||||||
|
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Plex is enabled, we cannot enable Plex and Emby" });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the users
|
||||||
|
var users = EmbyApi.GetUsers(emby.FullUri, emby.ApiKey);
|
||||||
|
// Find admin
|
||||||
|
var admin = users.FirstOrDefault(x => x.Policy.IsAdministrator);
|
||||||
|
emby.AdministratorId = admin?.Id;
|
||||||
|
|
||||||
|
var result = await EmbySettings.SaveSettingsAsync(emby);
|
||||||
|
|
||||||
|
return Response.AsJson(result
|
||||||
|
? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Emby!" }
|
||||||
|
: new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
|
||||||
|
}
|
||||||
|
|
||||||
private Negotiator Sonarr()
|
private Negotiator Sonarr()
|
||||||
{
|
{
|
||||||
var settings = SonarrService.GetSettings();
|
var settings = SonarrService.GetSettings();
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace Ombi.UI.Modules
|
||||||
|
|
||||||
public ApplicationTesterModule(ICouchPotatoApi cpApi, ISonarrApi sonarrApi, IPlexApi plexApi,
|
public ApplicationTesterModule(ICouchPotatoApi cpApi, ISonarrApi sonarrApi, IPlexApi plexApi,
|
||||||
ISickRageApi srApi, IHeadphonesApi hpApi, ISettingsService<PlexRequestSettings> pr, ISecurityExtensions security,
|
ISickRageApi srApi, IHeadphonesApi hpApi, ISettingsService<PlexRequestSettings> pr, ISecurityExtensions security,
|
||||||
IWatcherApi watcherApi, IRadarrApi radarrApi) : base("test", pr, security)
|
IWatcherApi watcherApi, IRadarrApi radarrApi, IEmbyApi emby) : base("test", pr, security)
|
||||||
{
|
{
|
||||||
this.RequiresAuthentication();
|
this.RequiresAuthentication();
|
||||||
|
|
||||||
|
@ -57,6 +57,7 @@ namespace Ombi.UI.Modules
|
||||||
HeadphonesApi = hpApi;
|
HeadphonesApi = hpApi;
|
||||||
WatcherApi = watcherApi;
|
WatcherApi = watcherApi;
|
||||||
RadarrApi = radarrApi;
|
RadarrApi = radarrApi;
|
||||||
|
Emby = emby;
|
||||||
|
|
||||||
Post["/cp"] = _ => CouchPotatoTest();
|
Post["/cp"] = _ => CouchPotatoTest();
|
||||||
Post["/sonarr"] = _ => SonarrTest();
|
Post["/sonarr"] = _ => SonarrTest();
|
||||||
|
@ -66,6 +67,7 @@ namespace Ombi.UI.Modules
|
||||||
Post["/headphones"] = _ => HeadphonesTest();
|
Post["/headphones"] = _ => HeadphonesTest();
|
||||||
Post["/plexdb"] = _ => TestPlexDb();
|
Post["/plexdb"] = _ => TestPlexDb();
|
||||||
Post["/watcher"] = _ => WatcherTest();
|
Post["/watcher"] = _ => WatcherTest();
|
||||||
|
Post["/emby"] = _ => EmbyTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
|
||||||
|
@ -76,6 +78,7 @@ namespace Ombi.UI.Modules
|
||||||
private IHeadphonesApi HeadphonesApi { get; }
|
private IHeadphonesApi HeadphonesApi { get; }
|
||||||
private IWatcherApi WatcherApi { get; }
|
private IWatcherApi WatcherApi { get; }
|
||||||
private IRadarrApi RadarrApi { get; }
|
private IRadarrApi RadarrApi { get; }
|
||||||
|
private IEmbyApi Emby { get; set; }
|
||||||
|
|
||||||
private Response CouchPotatoTest()
|
private Response CouchPotatoTest()
|
||||||
{
|
{
|
||||||
|
@ -213,7 +216,7 @@ namespace Ombi.UI.Modules
|
||||||
: Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not connect to Plex, please check your settings." });
|
: Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not connect to Plex, please check your settings." });
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception e) // Exceptions are expected, if we cannot connect so we will just log and swallow them.
|
catch (Exception e) // Exceptions are expected, if we cannot connect so we will just log and swallow them.
|
||||||
{
|
{
|
||||||
Log.Warn("Exception thrown when attempting to get Plex's status: ");
|
Log.Warn("Exception thrown when attempting to get Plex's status: ");
|
||||||
Log.Warn(e);
|
Log.Warn(e);
|
||||||
|
@ -225,6 +228,35 @@ namespace Ombi.UI.Modules
|
||||||
return Response.AsJson(new JsonResponseModel { Result = false, Message = message });
|
return Response.AsJson(new JsonResponseModel { Result = false, Message = message });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private Response EmbyTest()
|
||||||
|
{
|
||||||
|
var emby = this.Bind<EmbySettings>();
|
||||||
|
var valid = this.Validate(emby);
|
||||||
|
if (!valid.IsValid)
|
||||||
|
{
|
||||||
|
return Response.AsJson(valid.SendJsonError());
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var status = Emby.GetUsers(emby?.FullUri, emby?.ApiKey);
|
||||||
|
return status != null
|
||||||
|
? Response.AsJson(new JsonResponseModel { Result = true, Message = "Connected to Emby successfully!" })
|
||||||
|
: Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not connect to Emby, please check your settings." });
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception e) // Exceptions are expected, if we cannot connect so we will just log and swallow them.
|
||||||
|
{
|
||||||
|
Log.Warn("Exception thrown when attempting to get Emby's users: ");
|
||||||
|
Log.Warn(e);
|
||||||
|
var message = $"Could not connect to Emby, please check your settings. <strong>Exception Message:</strong> {e.Message}";
|
||||||
|
if (e.InnerException != null)
|
||||||
|
{
|
||||||
|
message = $"Could not connect to Emby, please check your settings. <strong>Exception Message:</strong> {e.InnerException.Message}";
|
||||||
|
}
|
||||||
|
return Response.AsJson(new JsonResponseModel { Result = false, Message = message });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private Response SickRageTest()
|
private Response SickRageTest()
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,6 +34,7 @@ using Nancy;
|
||||||
using Nancy.Extensions;
|
using Nancy.Extensions;
|
||||||
using Nancy.Linker;
|
using Nancy.Linker;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using Ombi.Api;
|
||||||
using Ombi.Api.Interfaces;
|
using Ombi.Api.Interfaces;
|
||||||
using Ombi.Api.Models.Plex;
|
using Ombi.Api.Models.Plex;
|
||||||
using Ombi.Core;
|
using Ombi.Core;
|
||||||
|
|
|
@ -50,6 +50,7 @@ namespace Ombi.UI.NinjectModules
|
||||||
Bind<IDiscordApi>().To<DiscordApi>();
|
Bind<IDiscordApi>().To<DiscordApi>();
|
||||||
Bind<IRadarrApi>().To<RadarrApi>();
|
Bind<IRadarrApi>().To<RadarrApi>();
|
||||||
Bind<ITraktApi>().To<TraktApi>();
|
Bind<ITraktApi>().To<TraktApi>();
|
||||||
|
Bind<IEmbyApi>().To<EmbyApi>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -59,6 +59,9 @@ namespace Ombi.UI.NinjectModules
|
||||||
Bind<IFaultQueueHandler>().To<FaultQueueHandler>();
|
Bind<IFaultQueueHandler>().To<FaultQueueHandler>();
|
||||||
Bind<IPlexUserChecker>().To<PlexUserChecker>();
|
Bind<IPlexUserChecker>().To<PlexUserChecker>();
|
||||||
|
|
||||||
|
Bind<IEmbyAvailabilityChecker>().To<EmbyAvailabilityChecker>();
|
||||||
|
|
||||||
|
|
||||||
Bind<IAnalytics>().To<Analytics>();
|
Bind<IAnalytics>().To<Analytics>();
|
||||||
Bind<ISchedulerFactory>().To<StdSchedulerFactory>();
|
Bind<ISchedulerFactory>().To<StdSchedulerFactory>();
|
||||||
Bind<IJobScheduler>().To<Scheduler>();
|
Bind<IJobScheduler>().To<Scheduler>();
|
||||||
|
|
|
@ -295,6 +295,7 @@
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Start\StartupOptions.cs" />
|
<Compile Include="Start\StartupOptions.cs" />
|
||||||
<Compile Include="Start\UpdateValue.cs" />
|
<Compile Include="Start\UpdateValue.cs" />
|
||||||
|
<Compile Include="Validators\EmbyValidator.cs" />
|
||||||
<Compile Include="Validators\RadarrValidator.cs" />
|
<Compile Include="Validators\RadarrValidator.cs" />
|
||||||
<Compile Include="Validators\WatcherValidator.cs" />
|
<Compile Include="Validators\WatcherValidator.cs" />
|
||||||
<Compile Include="Validators\SlackSettingsValidator.cs" />
|
<Compile Include="Validators\SlackSettingsValidator.cs" />
|
||||||
|
@ -803,6 +804,9 @@
|
||||||
<Content Include="Views\Integration\Radarr.cshtml">
|
<Content Include="Views\Integration\Radarr.cshtml">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="Views\Admin\Emby.cshtml">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<None Include="Web.Debug.config">
|
<None Include="Web.Debug.config">
|
||||||
<DependentUpon>web.config</DependentUpon>
|
<DependentUpon>web.config</DependentUpon>
|
||||||
</None>
|
</None>
|
||||||
|
|
|
@ -31,6 +31,7 @@ using Ninject;
|
||||||
using Ninject.Planning.Bindings.Resolvers;
|
using Ninject.Planning.Bindings.Resolvers;
|
||||||
using Ninject.Syntax;
|
using Ninject.Syntax;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using Ombi.Api;
|
||||||
using Ombi.Api.Interfaces;
|
using Ombi.Api.Interfaces;
|
||||||
using Ombi.Core;
|
using Ombi.Core;
|
||||||
using Ombi.Core.Migration;
|
using Ombi.Core.Migration;
|
||||||
|
@ -83,6 +84,7 @@ namespace Ombi.UI
|
||||||
var scheduler = new Scheduler();
|
var scheduler = new Scheduler();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Reset any jobs running
|
// Reset any jobs running
|
||||||
var jobSettings = kernel.Get<IRepository<ScheduledJobs>>();
|
var jobSettings = kernel.Get<IRepository<ScheduledJobs>>();
|
||||||
var all = jobSettings.GetAll();
|
var all = jobSettings.GetAll();
|
||||||
|
|
42
Ombi.UI/Validators/EmbyValidator.cs
Normal file
42
Ombi.UI/Validators/EmbyValidator.cs
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2016 Jamie Rees
|
||||||
|
// File: SonarrValidator.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 FluentValidation;
|
||||||
|
using Ombi.Core.SettingModels;
|
||||||
|
|
||||||
|
namespace Ombi.UI.Validators
|
||||||
|
{
|
||||||
|
public class EmbyValidator : AbstractValidator<EmbySettings>
|
||||||
|
{
|
||||||
|
public EmbyValidator()
|
||||||
|
{
|
||||||
|
RuleFor(request => request.Ip).NotNull().WithMessage("You must specify a IP/Host name.");
|
||||||
|
RuleFor(request => request.Port).NotNull().WithMessage("You must specify a Port.");
|
||||||
|
RuleFor(request => request.ApiKey).NotNull().WithMessage("You must specify a Api Key.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
146
Ombi.UI/Views/Admin/Emby.cshtml
Normal file
146
Ombi.UI/Views/Admin/Emby.cshtml
Normal file
|
@ -0,0 +1,146 @@
|
||||||
|
@using Ombi.UI.Helpers
|
||||||
|
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<Ombi.Core.SettingModels.EmbySettings>
|
||||||
|
@Html.Partial("Shared/Partial/_Sidebar")
|
||||||
|
@{
|
||||||
|
int port;
|
||||||
|
if (Model.Port == 0)
|
||||||
|
{
|
||||||
|
port = 8096;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
port = Model.Port;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
<div class="col-sm-8 col-sm-push-1">
|
||||||
|
<form class="form-horizontal" method="POST" id="mainForm">
|
||||||
|
<fieldset>
|
||||||
|
<legend>Emby Settings</legend>
|
||||||
|
|
||||||
|
@Html.Checkbox(Model.Enable, "Enable", "Enabled")
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="Ip" class="control-label">Emby Hostname or IP</label>
|
||||||
|
<div>
|
||||||
|
<input type="text" class="form-control form-control-custom " id="Ip" name="Ip" placeholder="localhost" value="@Model.Ip">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="portNumber" class="control-label">Port</label>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="@port">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="checkbox">
|
||||||
|
|
||||||
|
@if (Model.Ssl)
|
||||||
|
{
|
||||||
|
<input type="checkbox" id="Ssl" name="Ssl" checked="checked"><label for="Ssl">SSL</label>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<input type="checkbox" id="Ssl" name="Ssl"><label for="Ssl">SSL</label>
|
||||||
|
}
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="SubDir" class="control-label">Emby Base Url</label>
|
||||||
|
<div>
|
||||||
|
<input type="text" class="form-control form-control-custom " id="SubDir" name="SubDir" value="@Model.SubDir">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="ApiKey" class="control-label">Emby Api Key</label>
|
||||||
|
<div class="">
|
||||||
|
<input type="text" class="form-control-custom form-control" id="ApiKey" name="ApiKey" placeholder="Api Key" value="@Model.ApiKey">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div>
|
||||||
|
<button id="testEmby" type="submit" class="btn btn-primary-outline">Test Connectivity <div id="spinner"></div></button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div>
|
||||||
|
<button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$(function () {
|
||||||
|
var base = '@Html.GetBaseUrl()';
|
||||||
|
|
||||||
|
$('#testEmby').click(function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
var url = createBaseUrl(base, '/test/emby');
|
||||||
|
var $form = $("#mainForm");
|
||||||
|
|
||||||
|
$('#spinner').attr("class", "fa fa-spinner fa-spin");
|
||||||
|
$.ajax({
|
||||||
|
type: $form.prop("method"),
|
||||||
|
url: url,
|
||||||
|
data: $form.serialize(),
|
||||||
|
dataType: "json",
|
||||||
|
success: function (response) {
|
||||||
|
$('#spinner').attr("class", "");
|
||||||
|
console.log(response);
|
||||||
|
if (response.result === true) {
|
||||||
|
generateNotify(response.message, "success");
|
||||||
|
|
||||||
|
$('#spinner').attr("class", "fa fa-check");
|
||||||
|
} else {
|
||||||
|
generateNotify(response.message, "warning");
|
||||||
|
$('#spinner').attr("class", "fa fa-times");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (e) {
|
||||||
|
|
||||||
|
$('#spinner').attr("class", "fa fa-times");
|
||||||
|
console.log(e);
|
||||||
|
generateNotify("Something went wrong!", "danger");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
$('#save').click(function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
var port = $('#portNumber').val();
|
||||||
|
if (isNaN(port)) {
|
||||||
|
generateNotify("You must specify a Port.", "warning");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var $form = $("#mainForm");
|
||||||
|
$.ajax({
|
||||||
|
type: $form.prop("method"),
|
||||||
|
data: $form.serialize(),
|
||||||
|
url: $form.prop("action"),
|
||||||
|
dataType: "json",
|
||||||
|
success: function (response) {
|
||||||
|
if (response.result === true) {
|
||||||
|
generateNotify(response.message, "success");
|
||||||
|
} else {
|
||||||
|
generateNotify(response.message, "warning");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (e) {
|
||||||
|
console.log(e);
|
||||||
|
generateNotify("Something went wrong!", "danger");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
</script>
|
|
@ -17,6 +17,8 @@
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Plex Settings</legend>
|
<legend>Plex Settings</legend>
|
||||||
@*<input id="advancedToggle" type="checkbox"/>*@ @*TODO*@
|
@*<input id="advancedToggle" type="checkbox"/>*@ @*TODO*@
|
||||||
|
|
||||||
|
@Html.Checkbox(Model.Enable, "Enable", "Enable")
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="Ip" class="control-label">Plex Hostname or IP</label>
|
<label for="Ip" class="control-label">Plex Hostname or IP</label>
|
||||||
<div>
|
<div>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue