standardize knowledge of supported image extensions

4 files changed, 11 insertions, 6 deletions

diff --git a/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs b/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
index ce8e510b8c..27e6a8d95d 100644
--- a/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
@@ -36,9 +36,10 @@ namespace MediaBrowser.Controller.Dto
                 dto.NowPlayingItem = DtoBuilder.GetBaseItemInfo(session.NowPlayingItem);
             }
 
-            if (session.UserId.HasValue)
+            if (session.User != null)
             {
-                dto.UserId = session.UserId.Value.ToString("N");
+                dto.UserId = session.User.Id.ToString("N");
+                dto.UserName = session.User.Name;
             }
 
             return dto;
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index de272ca645..e4e3debe96 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -43,6 +43,11 @@ namespace MediaBrowser.Controller.Entities
         }
 
         /// <summary>
+        /// The supported image extensions
+        /// </summary>
+        public static readonly string[] SupportedImageExtensions = new[] { ".png", ".jpg", ".jpeg" };
+        
+        /// <summary>
         /// The trailer folder name
         /// </summary>
         public const string TrailerFolderName = "trailers";
diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
index 1bca867a98..1bd4ce0caa 100644
--- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
@@ -146,8 +146,7 @@ namespace MediaBrowser.Controller.Providers
         /// <returns>FileSystemInfo.</returns>
         protected virtual FileSystemInfo GetImage(BaseItem item, string filenameWithoutExtension)
         {
-            return item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.ResolveArgs.Path, filenameWithoutExtension + ".png")) 
-                ?? item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.ResolveArgs.Path, filenameWithoutExtension + ".jpg"));
+            return BaseItem.SupportedImageExtensions.Select(i => item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.ResolveArgs.Path, filenameWithoutExtension + i))).FirstOrDefault(i => i != null);
         }
 
         /// <summary>
@@ -159,7 +158,7 @@ namespace MediaBrowser.Controller.Providers
             // Primary Image
             var image = GetImage(item, "folder") ??
                 GetImage(item, "poster") ??
-                GetImage(item, "cover") ?? 
+                GetImage(item, "cover") ??
                 GetImage(item, "default");
 
             if (image != null)
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index c3651974b3..e49b526241 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.Controller.Session
         /// Gets or sets the user id.
         /// </summary>
         /// <value>The user id.</value>
-        public Guid? UserId { get; set; }
+        public User User { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the client.