mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-13 08:42:57 -07:00
This commit is contained in:
parent
012a82ca2d
commit
b8224f5895
12 changed files with 358 additions and 21 deletions
|
@ -127,6 +127,8 @@ namespace Ombi.DependencyInjection
|
|||
{
|
||||
services.AddTransient<IPlexContentCacher, PlexContentCacher>();
|
||||
services.AddTransient<IEmbyContentCacher, EmbyContentCacher>();
|
||||
services.AddTransient<IEmbyEpisodeCacher, EmbyEpisodeCacher>();
|
||||
services.AddTransient<IEmbyAvaliabilityChecker, EmbyAvaliabilityChecker>();
|
||||
services.AddTransient<IPlexEpisodeCacher, PlexEpisodeCacher>();
|
||||
services.AddTransient<IPlexAvailabilityChecker, PlexAvailabilityChecker>();
|
||||
services.AddTransient<IJobSetup, JobSetup>();
|
||||
|
|
141
src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs
Normal file
141
src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs
Normal file
|
@ -0,0 +1,141 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2017 Jamie Rees
|
||||
// File: EmbyAvaliabilityCheker.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.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Hangfire;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Ombi.Core.Notifications;
|
||||
using Ombi.Helpers;
|
||||
using Ombi.Notifications.Models;
|
||||
using Ombi.Store.Entities;
|
||||
using Ombi.Store.Repository;
|
||||
using Ombi.Store.Repository.Requests;
|
||||
|
||||
namespace Ombi.Schedule.Jobs.Emby
|
||||
{
|
||||
public class EmbyAvaliabilityChecker : IEmbyAvaliabilityChecker
|
||||
{
|
||||
public EmbyAvaliabilityChecker(IEmbyContentRepository repo, ITvRequestRepository t, IMovieRequestRepository m,
|
||||
INotificationService n)
|
||||
{
|
||||
_repo = repo;
|
||||
_tvRepo = t;
|
||||
_movieRepo = m;
|
||||
_notificationService = n;
|
||||
}
|
||||
|
||||
private readonly ITvRequestRepository _tvRepo;
|
||||
private readonly IMovieRequestRepository _movieRepo;
|
||||
private readonly IEmbyContentRepository _repo;
|
||||
private readonly INotificationService _notificationService;
|
||||
|
||||
public async Task Start()
|
||||
{
|
||||
await ProcessMovies();
|
||||
await ProcessTv();
|
||||
}
|
||||
|
||||
private async Task ProcessMovies()
|
||||
{
|
||||
var movies = _movieRepo.Get().Where(x => !x.Available);
|
||||
|
||||
foreach (var movie in movies)
|
||||
{
|
||||
var embyContent = await _repo.Get(movie.ImdbId);
|
||||
if (embyContent == null)
|
||||
{
|
||||
// We don't have this yet
|
||||
continue;
|
||||
}
|
||||
|
||||
movie.Available = true;
|
||||
if (movie.Available)
|
||||
{
|
||||
BackgroundJob.Enqueue(() => _notificationService.Publish(new NotificationOptions
|
||||
{
|
||||
DateTime = DateTime.Now,
|
||||
NotificationType = NotificationType.RequestAvailable,
|
||||
RequestId = movie.Id,
|
||||
RequestType = RequestType.Movie
|
||||
}));
|
||||
}
|
||||
}
|
||||
await _movieRepo.Save();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// TODO This is EXCATLY the same as the PlexAvailabilityChecker. Refactor Please future Jamie
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private async Task ProcessTv()
|
||||
{
|
||||
var tv = _tvRepo.GetChild().Where(x => !x.Available);
|
||||
var embyEpisodes = _repo.GetAllEpisodes().Include(x => x.Series);
|
||||
|
||||
foreach (var child in tv)
|
||||
{
|
||||
var tvDbId = child.ParentRequest.TvDbId;
|
||||
var seriesEpisodes = embyEpisodes.Where(x => x.Series.ProviderId == tvDbId.ToString());
|
||||
foreach (var season in child.SeasonRequests)
|
||||
{
|
||||
foreach (var episode in season.Episodes)
|
||||
{
|
||||
var foundEp = await seriesEpisodes.FirstOrDefaultAsync(
|
||||
x => x.EpisodeNumber == episode.EpisodeNumber &&
|
||||
x.SeasonNumber == episode.Season.SeasonNumber);
|
||||
|
||||
if (foundEp != null)
|
||||
{
|
||||
episode.Available = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check to see if all of the episodes in all seasons are available for this request
|
||||
var allAvailable = child.SeasonRequests.All(x => x.Episodes.All(c => c.Available));
|
||||
if (allAvailable)
|
||||
{
|
||||
// We have fulfulled this request!
|
||||
child.Available = true;
|
||||
BackgroundJob.Enqueue(() => _notificationService.Publish(new NotificationOptions
|
||||
{
|
||||
DateTime = DateTime.Now,
|
||||
NotificationType = NotificationType.RequestAvailable,
|
||||
RequestId = child.ParentRequestId,
|
||||
RequestType = RequestType.TvShow
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
await _tvRepo.Save();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -2,6 +2,7 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Hangfire;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Ombi.Api.Emby;
|
||||
using Ombi.Api.Emby.Models.Movie;
|
||||
|
@ -18,18 +19,20 @@ namespace Ombi.Schedule.Jobs.Emby
|
|||
public class EmbyContentCacher : IEmbyContentCacher
|
||||
{
|
||||
public EmbyContentCacher(ISettingsService<EmbySettings> settings, IEmbyApi api, ILogger<EmbyContentCacher> logger,
|
||||
IEmbyContentRepository repo)
|
||||
IEmbyContentRepository repo, IEmbyEpisodeCacher epCacher)
|
||||
{
|
||||
_logger = logger;
|
||||
_settings = settings;
|
||||
_api = api;
|
||||
_repo = repo;
|
||||
_episodeCacher = epCacher;
|
||||
}
|
||||
|
||||
private readonly ILogger<EmbyContentCacher> _logger;
|
||||
private readonly ISettingsService<EmbySettings> _settings;
|
||||
private readonly IEmbyApi _api;
|
||||
private readonly IEmbyContentRepository _repo;
|
||||
private readonly IEmbyEpisodeCacher _episodeCacher;
|
||||
|
||||
|
||||
public async Task Start()
|
||||
|
@ -42,7 +45,7 @@ namespace Ombi.Schedule.Jobs.Emby
|
|||
await StartServerCache(server);
|
||||
|
||||
// Episodes
|
||||
//BackgroundJob.Enqueue(() => );
|
||||
BackgroundJob.Enqueue(() => _episodeCacher.Start());
|
||||
}
|
||||
|
||||
|
||||
|
|
109
src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeCacher.cs
Normal file
109
src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeCacher.cs
Normal file
|
@ -0,0 +1,109 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2017 Jamie Rees
|
||||
// File: EmbyEpisodeCacher.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 Hangfire;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Ombi.Api.Emby;
|
||||
using Ombi.Core.Settings;
|
||||
using Ombi.Core.Settings.Models.External;
|
||||
using Ombi.Store.Entities;
|
||||
using Ombi.Store.Repository;
|
||||
|
||||
namespace Ombi.Schedule.Jobs.Emby
|
||||
{
|
||||
public class EmbyEpisodeCacher : IEmbyEpisodeCacher
|
||||
{
|
||||
public EmbyEpisodeCacher(ISettingsService<EmbySettings> s, IEmbyApi api, ILogger<EmbyEpisodeCacher> l, IEmbyContentRepository repo,
|
||||
IEmbyAvaliabilityChecker checker)
|
||||
{
|
||||
_api = api;
|
||||
_logger = l;
|
||||
_settings = s;
|
||||
_repo = repo;
|
||||
_avaliabilityChecker = checker;
|
||||
}
|
||||
|
||||
private readonly ISettingsService<EmbySettings> _settings;
|
||||
private readonly IEmbyApi _api;
|
||||
private readonly ILogger<EmbyEpisodeCacher> _logger;
|
||||
private readonly IEmbyContentRepository _repo;
|
||||
private readonly IEmbyAvaliabilityChecker _avaliabilityChecker;
|
||||
|
||||
|
||||
public async Task Start()
|
||||
{
|
||||
var settings = await _settings.GetSettingsAsync();
|
||||
|
||||
foreach (var server in settings.Servers)
|
||||
{
|
||||
await CacheEpisodes(server);
|
||||
}
|
||||
|
||||
BackgroundJob.Enqueue(() => _avaliabilityChecker.Start());
|
||||
}
|
||||
|
||||
private async Task CacheEpisodes(EmbyServers server)
|
||||
{
|
||||
var allEpisodes = await _api.GetAllEpisodes(server.ApiKey, server.AdministratorId, server.FullUri);
|
||||
var epToAdd = new List<EmbyEpisode>();
|
||||
|
||||
foreach (var ep in allEpisodes.Items)
|
||||
{
|
||||
var epInfo = await _api.GetEpisodeInformation(ep.Id, server.ApiKey, server.AdministratorId, server.FullUri);
|
||||
if (epInfo?.ProviderIds?.Tvdb == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var existingEpisode = await _repo.GetByEmbyId(ep.Id);
|
||||
if (existingEpisode == null)
|
||||
{
|
||||
// add it
|
||||
epToAdd.Add(new EmbyEpisode
|
||||
{
|
||||
EmbyId = ep.Id,
|
||||
EpisodeNumber = ep.IndexNumber,
|
||||
SeasonNumber = ep.ParentIndexNumber,
|
||||
ParentId = ep.SeriesId,
|
||||
ProviderId = epInfo.ProviderIds.Tvdb,
|
||||
Title = ep.Name,
|
||||
AddedAt = DateTime.UtcNow
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (epToAdd.Any())
|
||||
{
|
||||
await _repo.AddRange(epToAdd);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
9
src/Ombi.Schedule/Jobs/Emby/IEmbyAvaliabilityChecker.cs
Normal file
9
src/Ombi.Schedule/Jobs/Emby/IEmbyAvaliabilityChecker.cs
Normal file
|
@ -0,0 +1,9 @@
|
|||
using System.Threading.Tasks;
|
||||
|
||||
namespace Ombi.Schedule.Jobs.Emby
|
||||
{
|
||||
public interface IEmbyAvaliabilityChecker
|
||||
{
|
||||
Task Start();
|
||||
}
|
||||
}
|
9
src/Ombi.Schedule/Jobs/Emby/IEmbyEpisodeCacher.cs
Normal file
9
src/Ombi.Schedule/Jobs/Emby/IEmbyEpisodeCacher.cs
Normal file
|
@ -0,0 +1,9 @@
|
|||
using System.Threading.Tasks;
|
||||
|
||||
namespace Ombi.Schedule.Jobs.Emby
|
||||
{
|
||||
public interface IEmbyEpisodeCacher
|
||||
{
|
||||
Task Start();
|
||||
}
|
||||
}
|
|
@ -18,6 +18,7 @@ namespace Ombi.Store.Context
|
|||
DbSet<PlexEpisode> PlexEpisode { get; set; }
|
||||
DbSet<RadarrCache> RadarrCache { get; set; }
|
||||
DbSet<EmbyContent> EmbyContent { get; set; }
|
||||
DbSet<EmbyEpisode> EmbyEpisode { get; set; }
|
||||
DatabaseFacade Database { get; }
|
||||
EntityEntry<T> Entry<T>(T entry) where T : class;
|
||||
EntityEntry<TEntity> Attach<TEntity>(TEntity entity) where TEntity : class;
|
||||
|
|
|
@ -29,6 +29,7 @@ namespace Ombi.Store.Context
|
|||
public DbSet<PlexEpisode> PlexEpisode { get; set; }
|
||||
public DbSet<RadarrCache> RadarrCache { get; set; }
|
||||
public DbSet<EmbyContent> EmbyContent { get; set; }
|
||||
public DbSet<EmbyEpisode> EmbyEpisode { get; set; }
|
||||
|
||||
public DbSet<MovieRequests> MovieRequests { get; set; }
|
||||
public DbSet<TvRequests> TvRequests { get; set; }
|
||||
|
@ -53,6 +54,12 @@ namespace Ombi.Store.Context
|
|||
.WithMany(b => b.Episodes)
|
||||
.HasPrincipalKey(x => x.Key)
|
||||
.HasForeignKey(p => p.GrandparentKey);
|
||||
|
||||
builder.Entity<EmbyEpisode>()
|
||||
.HasOne(p => p.Series)
|
||||
.WithMany(b => b.Episodes)
|
||||
.HasPrincipalKey(x => x.EmbyId)
|
||||
.HasForeignKey(p => p.ParentId);
|
||||
base.OnModelCreating(builder);
|
||||
}
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Ombi.Store.Entities
|
||||
|
@ -38,6 +39,9 @@ namespace Ombi.Store.Entities
|
|||
public string EmbyId { get; set; }
|
||||
public EmbyMediaType Type { get; set; }
|
||||
public DateTime AddedAt { get; set; }
|
||||
|
||||
|
||||
public ICollection<EmbyEpisode> Episodes { get; set; }
|
||||
}
|
||||
|
||||
public enum EmbyMediaType
|
||||
|
|
47
src/Ombi.Store/Entities/EmbyEpisode.cs
Normal file
47
src/Ombi.Store/Entities/EmbyEpisode.cs
Normal file
|
@ -0,0 +1,47 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2017 Jamie Rees
|
||||
// File: EmbyEpisode.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.ComponentModel.DataAnnotations.Schema;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
|
||||
namespace Ombi.Store.Entities
|
||||
{
|
||||
[Table("EmbyEpisode")]
|
||||
public class EmbyEpisode : Entity
|
||||
{
|
||||
public string Title { 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; }
|
||||
public DateTime AddedAt { get; set; }
|
||||
|
||||
public EmbyContent Series { get; set; }
|
||||
}
|
||||
}
|
|
@ -88,25 +88,26 @@ namespace Ombi.Store.Repository
|
|||
await Db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
//public IQueryable<PlexEpisode> GetAllEpisodes()
|
||||
//{
|
||||
// return Db.PlexEpisode.AsQueryable();
|
||||
//}
|
||||
public IQueryable<EmbyEpisode> GetAllEpisodes()
|
||||
{
|
||||
return Db.EmbyEpisode.AsQueryable();
|
||||
}
|
||||
|
||||
//public async Task<PlexEpisode> Add(PlexEpisode content)
|
||||
//{
|
||||
// await Db.PlexEpisode.AddAsync(content);
|
||||
// await Db.SaveChangesAsync();
|
||||
// return content;
|
||||
//}
|
||||
//public async Task<PlexEpisode> GetEpisodeByKey(int key)
|
||||
//{
|
||||
// return await Db.PlexEpisode.FirstOrDefaultAsync(x => x.Key == key);
|
||||
//}
|
||||
//public async Task AddRange(IEnumerable<PlexEpisode> content)
|
||||
//{
|
||||
// Db.PlexEpisode.AddRange(content);
|
||||
// await Db.SaveChangesAsync();
|
||||
//}
|
||||
public async Task<EmbyEpisode> Add(EmbyEpisode content)
|
||||
{
|
||||
await Db.EmbyEpisode.AddAsync(content);
|
||||
await Db.SaveChangesAsync();
|
||||
return content;
|
||||
}
|
||||
public async Task<EmbyEpisode> GetEpisodeByEmbyId(string key)
|
||||
{
|
||||
return await Db.EmbyEpisode.FirstOrDefaultAsync(x => x.EmbyId == key);
|
||||
}
|
||||
|
||||
public async Task AddRange(IEnumerable<EmbyEpisode> content)
|
||||
{
|
||||
Db.EmbyEpisode.AddRange(content);
|
||||
await Db.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -15,5 +15,9 @@ namespace Ombi.Store.Repository
|
|||
Task<IEnumerable<EmbyContent>> GetAll();
|
||||
Task<EmbyContent> GetByEmbyId(string embyId);
|
||||
Task Update(EmbyContent existingContent);
|
||||
IQueryable<EmbyEpisode> GetAllEpisodes();
|
||||
Task<EmbyEpisode> Add(EmbyEpisode content);
|
||||
Task<EmbyEpisode> GetEpisodeByEmbyId(string key);
|
||||
Task AddRange(IEnumerable<EmbyEpisode> content);
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue