OpenSimulator GForge > Projects > Cable Beach Asset Server > SVN

Diff of /trunk/AssetServer/Extensions/OpenSimInventoryFrontend.cs

-revision 65, Fri Jan  9 02:24:28 2009 UTC
+revision 66, Fri Jan  9 23:05:23 2009 UTC
 Line 41
  {
      public class OpenSimInventoryFrontend : IExtension<AssetServer>
      {
-         const string URI_UUID_MAP = "uri_uuid_map.txt";
          AssetServer server;
          Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer();
          Utils.InventoryFolderSerializer folderSerializer = new Utils.InventoryFolderSerializer();
-Line 56
+Line 54
          {
              this.server = server;
-             // Load Utils.OwnerMap from disk
-             try
-             {
-                 OSDMap osd = OSDParser.DeserializeJson(new FileStream(URI_UUID_MAP, FileMode.Open, FileAccess.Read)) as OSDMap;
-                 Utils.OwnerMap.FromOSD(osd);
-             }
-             catch (Exception) { }
-             Logger.Log.InfoFormat("Loaded {0} entries for the legacy URI to UUID mapping", Utils.OwnerMap.Count);
              server.HttpServer.AddHandler("post", null, @"^/GetInventory/", GetInventoryHandler);
              server.HttpServer.AddHandler("post", null, @"^/CreateInventory/", CreateInventoryHandler);
              server.HttpServer.AddHandler("post", null, @"^/NewFolder/", NewFolderHandler);
-Line 80
+Line 68
          public void Stop()
          {
-             // Write Utils.OwnerMap to disk
-             LitJson.JsonData json = OSDParser.SerializeJson(Utils.OwnerMap.ToOSD());
-             try
-             {
-                 StreamWriter streamWriter = new StreamWriter(URI_UUID_MAP);
-                 LitJson.JsonWriter writer = new LitJson.JsonWriter(streamWriter);
-                 writer.PrettyPrint = true;
-                 json.ToJson(writer);
-                 streamWriter.Close();
-                 Logger.Log.Info("Saved legacy URI to UUID mapping to " + URI_UUID_MAP);
-             }
-             catch (Exception ex)
-             {
-                 Logger.Log.ErrorFormat("Failed to write {0} to disk: {1}", URI_UUID_MAP, ex.Message);
-             }
          }
          bool GetInventoryHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
-Line 108
+Line 79
              {
                  Logger.Log.Warn("GetInventory is not scalable on some inventory backends, avoid calling it wherever possible");
-                 // Lookup the owner Uri for this ownerID
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
-                 Uri owner;
-                 if (Utils.OwnerMap.TryGetUri(ownerID, out owner))
-                 {
                      InventoryCollection inventory;
                      StorageResponse storageResponse = server.InventoryProvider.TryFetchInventory(owner, sessionID, out inventory);
-Line 143
+Line 111
                  }
                  else
                  {
-                     response.Status = HttpStatusCode.NotFound;
-                 }
-             }
-             else
-             {
                  response.Status = HttpStatusCode.BadRequest;
              }
-Line 164
+Line 127
                  // Huge gaping security hole
                  UUID sessionID = UUID.Zero;
-                 // HACK: Since OpenSim doesn't pass us identification for this request, build a URL
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
-                 // identifier for the owner of this inventory
-                 Uri owner = new Uri("http://opensim/" + ownerID.ToString());
-                 Utils.OwnerMap.Add(ownerID, owner);
                  Logger.Log.DebugFormat("Created URI {0} for inventory creation", owner);
                  InventoryFolder rootFolder = new InventoryFolder("My Inventory", ownerID, UUID.Zero, (short)AssetType.Folder);
-                 StorageResponse storageResponse = server.InventoryProvider.TryCreateInventory(rootFolder, sessionID);
+                 StorageResponse storageResponse = server.InventoryProvider.TryCreateInventory(owner, rootFolder, sessionID);
                  if (storageResponse == StorageResponse.Success)
                  {
                      CreateFolder("Animations", ownerID, rootFolder.ID, AssetType.Animation, sessionID);
-Line 206
+Line 166
          {
              UUID agentID, sessionID;
              InventoryFolder folder = DeserializeFolder(request.Body, out agentID, out sessionID);
-             Uri owner;
-             if (folder != null && Utils.OwnerMap.TryGetUri(folder.Owner, out owner))
+             if (folder != null)
              {
+                 Uri owner = Utils.GetOpenSimUri(folder.Owner);
                  // Some calls that are moving or updating a folder instead of creating a new one
                  // will pass in an InventoryFolder without the name set. If this is the case we
                  // need to look up the name first
-Line 220
+Line 181
                          folder.Name = oldFolder.Name;
                  }
-                 StorageResponse storageResponse = server.InventoryProvider.TryCreateFolder(folder, sessionID);
+                 StorageResponse storageResponse = server.InventoryProvider.TryCreateFolder(owner, folder, sessionID);
                  if (storageResponse == StorageResponse.Success)
                  {
-Line 251
+Line 212
          {
              UUID agentID, sessionID;
              InventoryFolder folder = DeserializeFolder(request.Body, out agentID, out sessionID);
-             Uri owner;
-             if (folder != null && Utils.OwnerMap.TryGetUri(folder.Owner, out owner))
+             if (folder != null)
              {
+                 Uri owner = Utils.GetOpenSimUri(folder.Owner);
                  StorageResponse storageResponse = server.InventoryProvider.TryPurgeFolder(owner, folder.ID, sessionID);
                  if (storageResponse == StorageResponse.Success)
-Line 279
+Line 240
              if (item != null)
              {
-                 StorageResponse storageResponse = server.InventoryProvider.TryCreateItem(item, sessionID);
+                 Uri owner = Utils.GetOpenSimUri(agentID);
+                 StorageResponse storageResponse = server.InventoryProvider.TryCreateItem(owner, item, sessionID);
                  if (storageResponse == StorageResponse.Success)
                  {
-Line 300
+Line 262
          {
              UUID agentID, sessionID;
              InventoryItem item = DeserializeItem(request.Body, out agentID, out sessionID);
-             Uri owner;
-             if (item != null && Utils.OwnerMap.TryGetUri(item.Owner, out owner))
+             if (item != null)
              {
+                 Uri owner = Utils.GetOpenSimUri(item.Owner);
                  StorageResponse storageResponse = server.InventoryProvider.TryDeleteItem(owner, item.ID, sessionID);
                  if (storageResponse == StorageResponse.Success)
-Line 331
+Line 293
                  // Huge gaping security hole
                  UUID sessionID = UUID.Zero;
-                 Uri owner;
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
-                 if (Utils.OwnerMap.TryGetUri(ownerID, out owner))
-                 {
                      List<InventoryFolder> skeleton;
                      StorageResponse storageResponse = server.InventoryProvider.TryFetchFolderList(owner, sessionID, out skeleton);
-Line 361
+Line 321
                  }
                  else
                  {
-                     response.Status = HttpStatusCode.NotFound;
-                 }
-             }
-             else
-             {
                  response.Status = HttpStatusCode.BadRequest;
              }
-Line 382
+Line 337
                  // Huge gaping security hole
                  UUID sessionID = UUID.Zero;
-                 Uri owner;
+                 Uri owner = Utils.GetOpenSimUri(ownerID);
-                 if (Utils.OwnerMap.TryGetUri(ownerID, out owner))
-                 {
                      List<InventoryItem> gestures;
                      StorageResponse storageResponse = server.InventoryProvider.TryFetchActiveGestures(owner, sessionID, out gestures);
-Line 412
+Line 365
                  }
                  else
                  {
-                     response.Status = HttpStatusCode.NotFound;
-                 }
-             }
-             else
-             {
                  response.Status = HttpStatusCode.BadRequest;
              }
-Line 426
+Line 374
          StorageResponse CreateFolder(string name, UUID ownerID, UUID parentID, AssetType assetType, UUID sessionID)
          {
              InventoryFolder folder = new InventoryFolder(name, ownerID, parentID, (short)assetType);
-             return server.InventoryProvider.TryCreateFolder(folder, sessionID);
+             Uri owner = Utils.GetOpenSimUri(ownerID);
+             return server.InventoryProvider.TryCreateFolder(owner, folder, sessionID);
          }
          UUID DeserializeUUID(Stream stream)

 Legend:



Removed from v.65
 


changed lines


 
Added in v.66
 Legend:



Removed from v.65
 


changed lines


 
Added in v.66
-Removed from v.65
+Added in v.66

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Cable Beach Asset Server

Diff of /trunk/AssetServer/Extensions/OpenSimInventoryFrontend.cs