Finish the implementation of GetUserInventory, even though it's still not used.

3 files changed, 97 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 4be3804..cf6d2f7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -297,14 +297,35 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_LocalGridInventoryService.CreateUserInventory(userID);
         }
 
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userID)
         {
-            return m_LocalGridInventoryService.GetInventorySkeleton(userId);
+            string invURL = GetInventoryServiceURL(userID);
+
+            if (invURL == null) // not there, forward to local inventory connector to resolve
+                return m_LocalGridInventoryService.GetInventorySkeleton(userID);
+
+            IInventoryService connector = GetConnector(invURL);
+
+            return connector.GetInventorySkeleton(userID);
         }
 
         public InventoryCollection GetUserInventory(UUID userID)
         {
-            return null;
+            string invURL = GetInventoryServiceURL(userID);
+            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetUserInventory for {0} {1}", userID, invURL);
+
+            if (invURL == null) // not there, forward to local inventory connector to resolve
+                return m_LocalGridInventoryService.GetUserInventory(userID);
+
+            InventoryCollection c = m_Cache.GetUserInventory(userID);
+            if (c != null)
+                return c;
+
+            IInventoryService connector = GetConnector(invURL);
+            c = connector.GetUserInventory(userID);
+
+            m_Cache.Cache(userID, c);
+            return c;
         }
 
         public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
@@ -362,8 +383,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (invURL == null) // not there, forward to local inventory connector to resolve
                 return m_LocalGridInventoryService.GetFolderContent(userID, folderID);
 
-            IInventoryService connector = GetConnector(invURL);
+            InventoryCollection c = m_Cache.GetFolderContent(userID, folderID);
+            if (c != null)
+            {
+                m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderContent found content in cache " + folderID);
+                return c;
+            }
 
+            IInventoryService connector = GetConnector(invURL);
             return connector.GetFolderContent(userID, folderID);
 
         }
@@ -377,8 +404,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (invURL == null) // not there, forward to local inventory connector to resolve
                 return m_LocalGridInventoryService.GetFolderItems(userID, folderID);
 
-            IInventoryService connector = GetConnector(invURL);
+            List<InventoryItemBase> items = m_Cache.GetFolderItems(userID, folderID);
+            if (items != null)
+            {
+                m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems found items in cache " + folderID);
+                return items;
+            }
 
+            IInventoryService connector = GetConnector(invURL);
             return connector.GetFolderItems(userID, folderID);
 
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 0fe778d..1e434b9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -12,6 +12,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private static ExpiringCache<UUID, InventoryFolderBase> m_RootFolders = new ExpiringCache<UUID, InventoryFolderBase>();
         private static ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>> m_FolderTypes = new ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>>();
+        private static ExpiringCache<UUID, InventoryCollection> m_Inventories = new ExpiringCache<UUID, InventoryCollection>();
 
         public void Cache(UUID userID, InventoryFolderBase root)
         {
@@ -55,5 +56,55 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
             return null;
         }
+
+        public void Cache(UUID userID, InventoryCollection inv)
+        {
+            lock (m_Inventories)
+                m_Inventories.AddOrUpdate(userID, inv, 120);
+        }
+
+        public InventoryCollection GetUserInventory(UUID userID)
+        {
+            InventoryCollection inv = null;
+            if (m_Inventories.TryGetValue(userID, out inv))
+                return inv;
+            return null;
+        }
+
+        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        {
+            InventoryCollection inv = null;
+            InventoryCollection c;
+            if (m_Inventories.TryGetValue(userID, out inv))
+            {
+                c = new InventoryCollection();
+                c.UserID = userID;
+
+                c.Folders = inv.Folders.FindAll(delegate(InventoryFolderBase f)
+                {
+                    return f.ParentID == folderID;
+                });
+                c.Items = inv.Items.FindAll(delegate(InventoryItemBase i)
+                {
+                    return i.Folder == folderID;
+                });
+                return c;
+            }
+            return null;
+        }
+
+        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        {
+            InventoryCollection inv = null;
+            if (m_Inventories.TryGetValue(userID, out inv))
+            {
+                List<InventoryItemBase> items = inv.Items.FindAll(delegate(InventoryItemBase i)
+                {
+                    return i.Folder == folderID;
+                });
+                return items;
+            }
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 77573c3..990dffb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public  InventoryCollection GetUserInventory(UUID userID)
         {
-            return null;
+            return m_RemoteConnector.GetUserInventory(userID);
         }
 
         public  void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
@@ -193,16 +193,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID);
 
-            if (UserManager != null)
+            if (invCol != null && UserManager != null)
             {
                 // Protect ourselves against the caller subsequently modifying the items list
                 List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
 
-                Util.FireAndForget(delegate
-                {
-                    foreach (InventoryItemBase item in items)
-                        UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                });
+                if (items != null && items.Count > 0)
+                    Util.FireAndForget(delegate
+                    {
+                        foreach (InventoryItemBase item in items)
+                            UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+                    });
             }
 
             return invCol;