Merge pull request #3265 from MediaBrowser/dev

update boxset queries

Author: LukePulverenti

Emby.Server.Implementations/ApplicationHost.cs

@@ -2178,9 +2178,9 @@ private async Task<bool> IsIpAddressValidAsync(IpAddressInfo address, Cancellati
                 Logger.Debug("Ping test result to {0}. Success: {1}", apiUrl, "Cancelled");
                 throw;
             }
-            catch
+            catch (Exception ex)
             {
-                Logger.Debug("Ping test result to {0}. Success: {1}", apiUrl, false);
+                Logger.Debug("Ping test result to {0}. Success: {1} {2}", apiUrl, false, ex.Message);
 
                 _validAddressResults.AddOrUpdate(apiUrl, false, (k, v) => false);
                 return false;

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -3696,7 +3696,8 @@ private List<string> GetWhereClauses(InternalItemsQuery query, IStatement statem
 
             if (!string.IsNullOrWhiteSpace(query.Path))
             {
-                whereClauses.Add("(Path=@Path COLLATE NOCASE)");
+                //whereClauses.Add("(Path=@Path COLLATE NOCASE)");
+                whereClauses.Add("Path=@Path");
                 if (statement != null)
                 {
                     statement.TryBind("@Path", GetPathToSave(query.Path));

Emby.Server.Implementations/Dto/DtoService.cs

@@ -25,6 +25,7 @@
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Extensions;
+using MediaBrowser.Controller.Playlists;
 
 namespace Emby.Server.Implementations.Dto
 {
@@ -427,7 +428,7 @@ private void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, D
                 if (!dto.ChildCount.HasValue && item.SourceType == SourceType.Library)
                 {
                     // For these types we can try to optimize and assume these values will be equal
-                    if (item is MusicAlbum || item is Season)
+                    if (item is MusicAlbum || item is Season || item is Playlist)
                     {
                         dto.ChildCount = dto.RecursiveItemCount;
                     }

Emby.Server.Implementations/HttpServer/HttpListenerHost.cs

@@ -628,18 +628,16 @@ protected async Task RequestHandler(IHttpRequest httpReq, string urlString, stri
                     return;
                 }
 
-                if (string.Equals(localPath, "/emby/pin", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, "web/pin.html");
-                    return;
-                }
-
                 if (!string.IsNullOrEmpty(GlobalResponse))
                 {
-                    httpRes.StatusCode = 503;
-                    httpRes.ContentType = "text/html";
-                    Write(httpRes, GlobalResponse);
-                    return;
+                    // We don't want the address pings in ApplicationHost to fail
+                    if (localPath.IndexOf("system/ping", StringComparison.OrdinalIgnoreCase) == -1)
+                    {
+                        httpRes.StatusCode = 503;
+                        httpRes.ContentType = "text/html";
+                        Write(httpRes, GlobalResponse);
+                        return;
+                    }
                 }
 
                 var handler = GetServiceHandler(httpReq);

Emby.Server.Implementations/Library/UserManager.cs

@@ -45,7 +45,9 @@ public class UserManager : IUserManager
         /// Gets the users.
         /// </summary>
         /// <value>The users.</value>
-        public IEnumerable<User> Users { get; private set; }
+        public IEnumerable<User> Users { get { return _users; } }
+
+        private User[] _users;
 
         /// <summary>
         /// The _logger
@@ -94,7 +96,7 @@ public UserManager(ILogger logger, IServerConfigurationManager configurationMana
             _fileSystem = fileSystem;
             _cryptographyProvider = cryptographyProvider;
             ConfigurationManager = configurationManager;
-            Users = new List<User>();
+            _users = Array.Empty<User>();
 
             DeletePinFile();
         }
@@ -192,7 +194,7 @@ public User GetUserByName(string name)
 
         public void Initialize()
         {
-            Users = LoadUsers();
+            _users = LoadUsers();
 
             var users = Users.ToList();
 
@@ -526,7 +528,7 @@ private bool IsPasswordEmpty(User user, string passwordHash)
         /// Loads the users from the repository
         /// </summary>
         /// <returns>IEnumerable{User}.</returns>
-        private List<User> LoadUsers()
+        private User[] LoadUsers()
         {
             var users = UserRepository.RetrieveAllUsers();
 
@@ -554,7 +556,7 @@ private List<User> LoadUsers()
                 UpdateUserPolicy(user, user.Policy, false);
             }
 
-            return users;
+            return users.ToArray();
         }
 
         public UserDto GetUserDto(User user, string remoteEndPoint = null)
@@ -745,7 +747,7 @@ public async Task<User> CreateUser(string name)
 
                 var list = Users.ToList();
                 list.Add(user);
-                Users = list;
+                _users = list.ToArray();
 
                 user.DateLastSaved = DateTime.UtcNow;
 
@@ -816,7 +818,7 @@ public async Task DeleteUser(User user)
 
                 DeleteUserPolicy(user);
 
-                Users = allUsers.Where(i => i.Id != user.Id).ToList();
+                _users = allUsers.Where(i => i.Id != user.Id).ToArray();
 
                 OnUserDeleted(user);
             }

Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -1463,8 +1463,6 @@ private async Task RecordStream(TimerInfo timer, DateTime recordingEndDate, Acti
                     directStreamProvider = liveStreamResponse.Item2;
                 }
 
-                liveStreamId = mediaStreamInfo.Id;
-
                 var recorder = GetRecorder(mediaStreamInfo);
 
                 recordPath = recorder.GetOutputPath(mediaStreamInfo, recordPath);

MediaBrowser.Providers/Manager/MetadataService.cs

@@ -305,9 +305,12 @@ protected virtual ItemUpdateType BeforeSaveInternal(TItemType item, bool isFullR
         {
             if (EnableUpdateMetadataFromChildren(item, isFullRefresh, updateType))
             {
-                var children = GetChildrenForMetadataUpdates(item);
+                if (isFullRefresh || updateType > ItemUpdateType.None)
+                {
+                    var children = GetChildrenForMetadataUpdates(item);
 
-                updateType = UpdateMetadataFromChildren(item, children, isFullRefresh, updateType);
+                    updateType = UpdateMetadataFromChildren(item, children, isFullRefresh, updateType);
+                }
             }
 
             var presentationUniqueKey = item.CreatePresentationUniqueKey();