1 files changed, 21 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/IItemByName.cs b/MediaBrowser.Controller/Entities/IItemByName.cs
index 7284bf101..1e83c7466 100644
--- a/MediaBrowser.Controller/Entities/IItemByName.cs
+++ b/MediaBrowser.Controller/Entities/IItemByName.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Model.Dto;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -9,26 +10,37 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public interface IItemByName
     {
-        Dictionary<Guid, ItemByNameCounts> UserItemCounts { get; set; }
+        List<ItemByNameCounts> UserItemCountList { get; set; }
     }
 
-    public static class IItemByNameExtensions
+    public interface IHasDualAccess : IItemByName
     {
-        public static ItemByNameCounts GetItemByNameCounts(this IItemByName item, User user)
+        bool IsAccessedByName { get; }
+    }
+
+    public static class ItemByNameExtensions
+    {
+        public static ItemByNameCounts GetItemByNameCounts(this IItemByName item, Guid userId)
         {
-            if (user == null)
+            if (userId == Guid.Empty)
             {
-                throw new ArgumentNullException("user");
+                throw new ArgumentNullException("userId");
             }
 
-            ItemByNameCounts counts;
+            return item.UserItemCountList.FirstOrDefault(i => i.UserId == userId);
+        }
+
+        public static void SetItemByNameCounts(this IItemByName item, Guid userId, ItemByNameCounts counts)
+        {
+            var current = item.UserItemCountList.FirstOrDefault(i => i.UserId == userId);
 
-            if (item.UserItemCounts.TryGetValue(user.Id, out counts))
+            if (current != null)
             {
-                return counts;
+                item.UserItemCountList.Remove(current);
             }
 
-            return null;
+            counts.UserId = userId;
+            item.UserItemCountList.Add(counts);
         }
     }
 }