Merge pull request #1302 from tidusjar/dev

Small changes before releasing....

Ombi.Services/Jobs/PlexUserChecker.cs

@@ -31,6 +31,7 @@ using System;
 using System.Linq;
 using NLog;
 using Ombi.Api.Interfaces;
+using Ombi.Api.Models.Plex;
 using Ombi.Core;
 using Ombi.Core.SettingModels;
 using Ombi.Core.Users;
@@ -89,7 +90,7 @@ namespace Ombi.Services.Jobs
                 var localUsers = LocalUserRepository.GetAll().ToList();
 
                 // Regular users
-                foreach (var user in plexUsers.User)
+                foreach (var user in plexUsers?.User ?? new UserFriends[]{})
                 {
                     var dbUser = dbUsers.FirstOrDefault(x => x.PlexUserId == user.Id);
                     if (dbUser != null)

Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs

@@ -159,9 +159,11 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
                         var i = Api.GetInformation(relatedSeries.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
                             embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
 
+                        Thread.Sleep(200);
                         var episodeInfo = Api.GetInformation(embyEpisodes.EmbyId,
                             Ombi.Api.Models.Emby.EmbyMediaType.Episode,
                             embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
+                        
                         // Check if we already have this series
                         var existingSeries = recentlyAddedModel.FirstOrDefault(x =>
                             x.EmbyInformation.SeriesInformation.Id.Equals(i.SeriesInformation.Id,
@@ -197,35 +199,11 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
                 {
                     var i = Api.GetInformation(t.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
                         embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
-                    var ep = filteredEp.Where(x => x.ParentId == t.EmbyId).ToList();
                     var item = new EmbyRecentlyAddedModel
                     {
                         EmbyContent = t,
                         EmbyInformation = i,
                     };
-                    if (ep.Any() && embySettings.EnableEpisodeSearching)
-                    {
-                        try
-                        {
-                            var episodeList = new List<EmbyEpisodeInformation>();
-                            foreach (var embyEpisodese in ep)
-                            {
-                                var epInfo = Api.GetInformation(embyEpisodese.EmbyId,
-                                    Ombi.Api.Models.Emby.EmbyMediaType.Episode,
-                                    embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
-                                episodeList.Add(epInfo.EpisodeInformation);
-                                Thread.Sleep(600); // Let's not try and overload the server
-                            }
-                            item.EpisodeInformation = episodeList;
-                        }
-                        catch (JsonReaderException)
-                        {
-                            Log.Error(
-                                "Failed getting episode information, we may have overloaded Emby's api... Waiting and we will skip this one and go to the next");
-                            Thread.Sleep(1000);
-                        }
-                    }
-
                     info.Add(item);
                 }
             }

appveyor.yml

@@ -1,11 +1,11 @@
-version: 2.1.{build}
+version: 2.2.{build}
 configuration: Release
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
-  assembly_version: '2.1.0'
+  assembly_version: '2.2.0'
   assembly_file_version: '{version}'
-  assembly_informational_version: '2.1.0'
+  assembly_informational_version: '2.2.0'
 before_build:
 - cmd: appveyor-retry nuget restore
 build: