Merge branch 'DotNetCore' of https://github.com/tidusjar/PlexRequests.Net into DotNetCore

src/Ombi.Core/Engine/MovieSearchEngine.cs

@@ -13,13 +13,15 @@ using Ombi.Core.Requests.Models;
 using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Store.Entities;
+using Ombi.Store.Repository;
 
 namespace Ombi.Core.Engine
 {
     public class MovieSearchEngine : BaseMediaEngine, IMovieEngine
     {
 
-        public MovieSearchEngine(IPrincipal identity, IRequestServiceMain service, IMovieDbApi movApi, IMapper mapper, ISettingsService<PlexSettings> plexSettings, ISettingsService<EmbySettings> embySettings,
+        public MovieSearchEngine(IPrincipal identity, IRequestServiceMain service, IMovieDbApi movApi, IMapper mapper, ISettingsService<PlexSettings> plexSettings,
+            ISettingsService<EmbySettings> embySettings, IPlexContentRepository repo,
             ILogger<MovieSearchEngine> logger)
             : base(identity, service)
         {
@@ -28,6 +30,7 @@ namespace Ombi.Core.Engine
             PlexSettings = plexSettings;
             EmbySettings = embySettings;
             Logger = logger;
+            PlexContentRepo = repo;
         }
 
         private IMovieDbApi MovieApi { get; }
@@ -35,6 +38,7 @@ namespace Ombi.Core.Engine
         private ISettingsService<PlexSettings> PlexSettings { get; }
         private ISettingsService<EmbySettings> EmbySettings { get; }
         private ILogger<MovieSearchEngine> Logger { get; }
+        private IPlexContentRepository PlexContentRepo { get; }
 
         public async Task<IEnumerable<SearchMovieViewModel>> LookupImdbInformation(IEnumerable<SearchMovieViewModel> movies)
         {
@@ -136,8 +140,17 @@ namespace Ombi.Core.Engine
         private async Task<SearchMovieViewModel> ProcessSingleMovie(SearchMovieViewModel viewMovie,
             Dictionary<int, MovieRequestModel> existingRequests, PlexSettings plexSettings, EmbySettings embySettings)
         {
+            var showInfo = await MovieApi.GetMovieInformation(viewMovie.Id);
             if (plexSettings.Enable)
             {
+
+                var item = await PlexContentRepo.Get(showInfo.ImdbId.ToString());
+                if(item != null)
+                {
+                    viewMovie.Available = true;
+                    viewMovie.PlexUrl = item.Url;
+                }
+
                 //        var content = PlexContentRepository.GetAll();
                 //        var plexMovies = PlexChecker.GetPlexMovies(content);
 

src/Ombi.Core/Engine/TvSearchEngine.cs

@@ -14,6 +14,7 @@ using Ombi.Core.Requests.Models;
 using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Store.Entities;
+using Ombi.Store.Repository;
 
 namespace Ombi.Core.Engine
 {
@@ -21,13 +22,14 @@ namespace Ombi.Core.Engine
     {
 
         public TvSearchEngine(IPrincipal identity, IRequestServiceMain service, ITvMazeApi tvMaze, IMapper mapper, ISettingsService<PlexSettings> plexSettings,
-            ISettingsService<EmbySettings> embySettings)
+            ISettingsService<EmbySettings> embySettings, IPlexContentRepository repo)
             : base(identity, service)
         {
             TvMazeApi = tvMaze;
             Mapper = mapper;
             PlexSettings = plexSettings;
             EmbySettings = embySettings;
+            PlexContentRepo = repo;
             //TraktApi = trakt;
         }
 
@@ -35,6 +37,7 @@ namespace Ombi.Core.Engine
         private IMapper Mapper { get; }
         private ISettingsService<PlexSettings> PlexSettings { get; }
         private ISettingsService<EmbySettings> EmbySettings { get; }
+        private IPlexContentRepository PlexContentRepo { get; }
         //private ITraktApi TraktApi { get; }
 
 
@@ -91,7 +94,7 @@ namespace Ombi.Core.Engine
             var existingRequests = await GetTvRequests();
             var plexSettings = await PlexSettings.GetSettingsAsync();
             var embySettings = await EmbySettings.GetSettingsAsync();
-            return ProcessResult(mapped, existingRequests, plexSettings, embySettings);
+            return await ProcessResult(mapped, existingRequests, plexSettings, embySettings);
         }
 
         //public async Task<IEnumerable<SearchTvShowViewModel>> Popular()
@@ -127,12 +130,12 @@ namespace Ombi.Core.Engine
             foreach (var tvMazeSearch in items)
             {
                 var viewT = Mapper.Map<SearchTvShowViewModel>(tvMazeSearch);
-                retVal.Add(ProcessResult(viewT, existingRequests, plexSettings, embySettings));
+                retVal.Add(await ProcessResult(viewT, existingRequests, plexSettings, embySettings));
             }
             return retVal;
         }
 
-        private SearchTvShowViewModel ProcessResult(SearchTvShowViewModel item, Dictionary<int, TvRequestModel> existingRequests, PlexSettings plexSettings, EmbySettings embySettings)
+        private async Task<SearchTvShowViewModel> ProcessResult(SearchTvShowViewModel item, Dictionary<int, TvRequestModel> existingRequests, PlexSettings plexSettings, EmbySettings embySettings)
         {
             if (embySettings.Enable)
             {
@@ -144,6 +147,13 @@ namespace Ombi.Core.Engine
             }
             if (plexSettings.Enable)
             {
+                var content = await PlexContentRepo.Get(item.Id.ToString());
+
+                if (content != null)
+                {
+                    item.Available = true;
+                    item.PlexUrl = content.Url;
+                }
                 //var plexShow = PlexChecker.GetTvShow(plexTvShows.ToArray(), t.show.name, t.show.premiered?.Substring(0, 4),
                 //    providerId);
                 //if (plexShow != null)
@@ -155,6 +165,8 @@ namespace Ombi.Core.Engine
 
             if (item.Id > 0 && item.Available)
             {
+
+                // TODO need to check if the episodes are available
                 var tvdbid = item.Id;
                 if (existingRequests.ContainsKey(tvdbid))
                 {
@@ -168,7 +180,7 @@ namespace Ombi.Core.Engine
                     {
                         foreach (var existingRequestChildRequest in existingRequest.ChildRequests)
                         {
-                            
+
                             // Find the existing request season
                             var existingSeason =
                                 existingRequestChildRequest.SeasonRequests.FirstOrDefault(x => x.SeasonNumber == season.SeasonNumber);

src/Ombi.Schedule/JobSetup.cs

@@ -14,7 +14,7 @@ namespace Ombi.Schedule
         private IPlexContentCacher Cacher { get; }
         public void Setup()
         {
-            RecurringJob.AddOrUpdate(() => Cacher.CacheContent(), Cron.Minutely);
+            RecurringJob.AddOrUpdate(() => Cacher.CacheContent(), Cron.Hourly);
         }
     }
 }

src/Ombi.Schedule/Jobs/PlexContentCacher.cs

@@ -126,17 +126,16 @@ namespace Ombi.Schedule.Jobs
                 var allContent = GetAllContent(servers);
 
                 // Let's now process this.
-
                 var contentToAdd = new List<PlexContent>();
                 foreach (var content in allContent)
                 {
                     if (content.viewGroup.Equals(PlexMediaType.Show.ToString(), StringComparison.CurrentCultureIgnoreCase))
                     {
                         // Process Shows
-                        foreach (var metadata in content.Metadata)
+                        foreach (var show in content.Metadata)
                         {
                             var seasonList = await PlexApi.GetSeasons(servers.PlexAuthToken, servers.FullUri,
-                                metadata.ratingKey);
+                                show.ratingKey);
                             var seasonsContent = new List<SeasonsContent>();
                             foreach (var season in seasonList.MediaContainer.Metadata)
                             {
@@ -149,46 +148,83 @@ namespace Ombi.Schedule.Jobs
                             }
 
                             // Do we already have this item?
-                            var existingContent = await Repo.GetByKey(metadata.key);
+                            var existingContent = await Repo.GetByKey(show.ratingKey);
                             if (existingContent != null)
                             {
                                 // Ok so we have it, let's check if there are any new seasons
-                                var seasonDifference = seasonsContent.Except(existingContent.Seasons).ToList();
-                                if (seasonDifference.Any())
+                                var itemAdded = false;
+                                foreach (var season in seasonsContent)
                                 {
-                                    // We have new seasons on Plex, let's add them back into the entity
-                                    existingContent.Seasons.AddRange(seasonDifference);
-                                    await Repo.Update(existingContent);
-                                    continue;
+                                    var seasonExists = existingContent.Seasons.Where(x => x.SeasonKey == season.SeasonKey);
+
+                                    if (seasonExists != null)
+                                    {
+                                        // We already have this season
+                                        continue;
+                                    }
+                                    else
+                                    {
+                                        existingContent.Seasons.Add(season);
+                                        itemAdded = true;
+                                    }
                                 }
-                                else
+
+                                if (itemAdded) await Repo.Update(existingContent);
+                            }
+                            else
+                            {
+
+                                // Get the show metadata... This sucks since the `metadata` var contains all information about the show
+                                // But it does not contain the `guid` property that we need to pull out thetvdb id...
+                                var showMetadata = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri,
+                                    show.ratingKey);
+                                var item = new PlexContent
                                 {
-                                    // No changes, no need to do anything
-                                    continue;
-                                }
+                                    AddedAt = DateTime.Now,
+                                    Key = show.ratingKey,
+                                    ProviderId = PlexHelper.GetProviderIdFromPlexGuid(showMetadata.MediaContainer.Metadata
+                                        .FirstOrDefault()
+                                        .guid),
+                                    ReleaseYear = show.year.ToString(),
+                                    Type = PlexMediaTypeEntity.Show,
+                                    Title = show.title,
+                                    Url = PlexHelper.GetPlexMediaUrl(servers.MachineIdentifier, show.ratingKey),
+                                    Seasons = new List<SeasonsContent>()
+                                };
+
+                                item.Seasons.ToList().AddRange(seasonsContent);
+
+                                contentToAdd.Add(item);
+                            }
+                        }
+                    }
+                    if (content.viewGroup.Equals(PlexMediaType.Movie.ToString(), StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        foreach (var movie in content.Metadata)
+                        {
+                            // Let's check if we have this movie
+                            var existing = await Repo.GetByKey(movie.ratingKey);
+                            if(existing != null)
+                            {
+                                continue;
                             }
 
-                            // Get the show metadata... This sucks since the `metadata` var contains all information about the show
-                            // But it does not contain the `guid` property that we need to pull out thetvdb id...
-                            var showMetadata = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri,
-                                metadata.ratingKey);
+                            var metaData = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri,
+                                movie.ratingKey);
                             var item = new PlexContent
                             {
                                 AddedAt = DateTime.Now,
-                                Key = metadata.ratingKey,
-                                ProviderId = PlexHelper.GetProviderIdFromPlexGuid(showMetadata.MediaContainer.Metadata
-                                    .FirstOrDefault()
-                                    .guid),
-                                ReleaseYear = metadata.year.ToString(),
-                                Type = PlexMediaTypeEntity.Show,
-                                Title = metadata.title,
-                                Url = PlexHelper.GetPlexMediaUrl(servers.MachineIdentifier, metadata.ratingKey),
+                                Key = movie.ratingKey,
+                                ProviderId = PlexHelper.GetProviderIdFromPlexGuid(metaData.MediaContainer.Metadata
+                                .FirstOrDefault()
+                                .guid),
+                                ReleaseYear = movie.year.ToString(),
+                                Type = PlexMediaTypeEntity.Movie,
+                                Title = movie.title,
+                                Url = PlexHelper.GetPlexMediaUrl(servers.MachineIdentifier, movie.ratingKey),
                                 Seasons = new List<SeasonsContent>()
                             };
 
-
-                            item.Seasons.AddRange(seasonsContent);
-
                             contentToAdd.Add(item);
                         }
                     }
@@ -196,7 +232,8 @@ namespace Ombi.Schedule.Jobs
 
                 if (contentToAdd.Any())
                 {
-                    await Repo.AddRange(contentToAdd);
+                    
+                    contentToAdd.ForEach(async x => await Repo.Add(x));
                 }
 
             }

src/Ombi.Store/Context/IOmbiContext.cs

@@ -15,8 +15,7 @@ namespace Ombi.Store.Context
         DbSet<GlobalSettings> Settings { get; set; }
         DbSet<PlexContent> PlexContent { get; set; }
         DbSet<User> Users { get; set; }
-        EntityEntry<GlobalSettings> Entry(GlobalSettings settings);
-        EntityEntry<User> Entry(User settings);
+        EntityEntry<T> Entry<T>(T entry) where T : class;
         EntityEntry<TEntity> Attach<TEntity>(TEntity entity) where TEntity : class;
     }
 }

src/Ombi.Store/Context/OmbiContext.cs

@@ -37,14 +37,9 @@ namespace Ombi.Store.Context
         public DbSet<PlexContent> PlexContent { get; set; }
 
 
-        public EntityEntry<GlobalSettings> Entry(GlobalSettings settings)
+        public EntityEntry<T> Entry<T>(T entry) where T : class
         {
-            return base.Entry(settings);
-        }
-
-        public EntityEntry<User> Entry(User settings)
-        {
-            return base.Entry(settings);
+            return base.Entry(entry);
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)

src/Ombi.Store/Entities/PlexContent.cs

@@ -44,7 +44,7 @@ namespace Ombi.Store.Entities
         /// <summary>
         /// Only used for TV Shows
         /// </summary>
-        public List<SeasonsContent> Seasons { get; set; }
+        public virtual ICollection<SeasonsContent> Seasons { get; set; }
 
         /// <summary>
         /// Plex's internal ID for this item
@@ -55,6 +55,7 @@ namespace Ombi.Store.Entities
 
     public class SeasonsContent : Entity
     {
+        public int PlexContentId { get; set; }
         public int SeasonNumber { get; set; }
         public int SeasonKey { get; set; }
         public int ParentKey { get; set; }

src/Ombi.Store/Repository/PlexContentRepository.cs

@@ -50,7 +50,7 @@ namespace Ombi.Store.Repository
 
         public async Task AddRange(IEnumerable<PlexContent> content)
         {
-            await Db.PlexContent.AddRangeAsync(content);
+            Db.PlexContent.AddRange(content);
             await Db.SaveChangesAsync();
         }
 
@@ -73,7 +73,7 @@ namespace Ombi.Store.Repository
 
         public async Task<PlexContent> GetByKey(string key)
         {
-            return await Db.PlexContent.FirstOrDefaultAsync(x => x.Key == key);
+            return await Db.PlexContent.Include(x => x.Seasons).FirstOrDefaultAsync(x => x.Key == key);
         }
 
         public async Task Update(PlexContent existingContent)

src/Ombi/Controllers/External/PlexController.cs

@@ -36,27 +36,37 @@ namespace Ombi.Controllers.External
             if (!string.IsNullOrEmpty(result.user?.authentication_token))
             {
                 var server = await PlexApi.GetServer(result.user.authentication_token);
-                var servers = server.Server;
+                var servers = server.Server.FirstOrDefault();
 
-                settings.Servers = new List<PlexServers>();
-                var serverNumber = 0;
-                foreach (var s in servers)
-                {
-                    if (string.IsNullOrEmpty(s.LocalAddresses) || string.IsNullOrEmpty(s.Port))
-                    {
-                        continue;
-                    }
-                    settings.Servers.Add(new PlexServers
-                    {
-                        PlexAuthToken = result.user.authentication_token,
+                settings.Enable = true;
+                settings.Servers = new List<PlexServers> { new PlexServers{
+PlexAuthToken = result.user.authentication_token,
                         Id = new Random().Next(),
-                        Ip = s.LocalAddresses.Split(new []{','}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(),
-                        MachineIdentifier = s.MachineIdentifier,
-                        Port = int.Parse(s.Port),
-                        Ssl = s.Scheme != "http",
-                        Name = $"Server{serverNumber++}"
-                    });
+                        Ip = servers.LocalAddresses.Split(new []{','}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(),
+                        MachineIdentifier = servers.MachineIdentifier,
+                        Port = int.Parse(servers.Port),
+                        Ssl = servers.Scheme != "http",
+                        Name = $"Server 1",
                 }
+                };
+                //var serverNumber = 0;
+                //foreach (var s in servers)
+                //{
+                //    if (string.IsNullOrEmpty(s.LocalAddresses) || string.IsNullOrEmpty(s.Port))
+                //    {
+                //        continue;
+                //    }
+                //    settings.Servers.Add(new PlexServers
+                //    {
+                //        PlexAuthToken = result.user.authentication_token,
+                //        Id = new Random().Next(),
+                //        Ip = s.LocalAddresses.Split(new []{','}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(),
+                //        MachineIdentifier = s.MachineIdentifier,
+                //        Port = int.Parse(s.Port),
+                //        Ssl = s.Scheme != "http",
+                //        Name = $"Server{serverNumber++}"
+                //    });
+                //}
 
                 await PlexSettings.SaveSettingsAsync(settings);
             }
@@ -72,6 +82,6 @@ namespace Ombi.Controllers.External
             return libs;
         }
 
-        
+
     }
 }

src/Ombi/wwwroot/app/search/moviesearch.component.html

@@ -85,6 +85,7 @@
 
                         </div>
                     </div>
+                    <div *ngIf="!result.available">
                     <div *ngIf="result.requested; then requestedBtn else notRequestedBtn"></div>
                     <template #requestedBtn>
                         <button style="text-align: right" class="btn btn-primary-outline disabled" [disabled]><i class="fa fa-check"></i> Requested</button>
@@ -92,7 +93,7 @@
                     <template #notRequestedBtn>
                         <button id="{{result.id}}" style="text-align: right" class="btn btn-primary-outline" (click)="request(result)"><i class="fa fa-plus"></i> Request</button>
                     </template>
-
+                        </div>
                     <!--{{#if_eq type "tv"}}
                     {{#if_eq tvFullyAvailable true}}
                     @*//TODO Not used yet*@

src/Ombi/wwwroot/app/services/applications/plex.service.ts

@@ -6,8 +6,8 @@ import { Observable } from 'rxjs/Rx';
 
 import { ServiceAuthHelpers } from '../service.helpers';
 
-import { IPlexAuthentication, IPlexLibraries} from '../../interfaces/IPlex';
-import { IPlexSettings } from '../../interfaces/ISettings';
+import { IPlexAuthentication, IPlexLibraries } from '../../interfaces/IPlex';
+import { IPlexServer } from '../../interfaces/ISettings';
 
 
 @Injectable()
@@ -20,7 +20,7 @@ export class PlexService extends ServiceAuthHelpers {
         return this.regularHttp.post(`${this.url}`, JSON.stringify({ login: login, password:password}), { headers: this.headers }).map(this.extractData);
     }
 
-    getLibraries(plexSettings: IPlexSettings): Observable<IPlexLibraries> {
+    getLibraries(plexSettings: IPlexServer): Observable<IPlexLibraries> {
         return this.http.post(`${this.url}Libraries`, JSON.stringify(plexSettings), { headers: this.headers }).map(this.extractData);
     }
     

src/Ombi/wwwroot/app/settings/plex/plex.component.html

@@ -44,7 +44,7 @@
                         <div class="form-group">
                             <label for="portNumber" class="control-label">Port</label>
                             <div>
-                                <input type="text" [(ngModel)]="settings.port" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="{{server.port}}">
+                                <input type="text" [(ngModel)]="server.port" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="{{server.port}}">
                             </div>
                         </div>
 
@@ -103,7 +103,7 @@
                         <label>Please select the libraries you want Ombi to look in for content</label>
                         <div class="form-group">
                             <div>
-                                <button (click)="loadLibraries()" class="btn btn-primary-outline">Load Libraries <i class="fa fa-film"></i></button>
+                                <button (click)="loadLibraries(server)" class="btn btn-primary-outline">Load Libraries <i class="fa fa-film"></i></button>
                             </div>
                         </div>
                         <div *ngIf="server.plexSelectedLibraries">

src/Ombi/wwwroot/app/settings/plex/plex.component.ts

@@ -51,7 +51,7 @@ export class PlexComponent implements OnInit {
     }
 
     loadLibraries(server:IPlexServer) {
-        this.plexService.getLibraries(this.settings).subscribe(x => {
+        this.plexService.getLibraries(server).subscribe(x => {
 
             server.plexSelectedLibraries = [];
             x.mediaContainer.directory.forEach((item, index) => {