From 0719c87b83d4c11e50066c9b47bcfb5de69bcc1c Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 26 May 2008 02:12:32 +0000
Subject: * Break out baby archiving code into separate class ready for async
asset requesting * No user functionality yet
---
.../Modules/World/Archiver/ArchiveRequest.cs | 116 +++++++++++++++++++++
.../Modules/World/Archiver/ArchiverModule.cs | 56 +---------
2 files changed, 118 insertions(+), 54 deletions(-)
create mode 100644 OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs
(limited to 'OpenSim/Region/Environment/Modules/World')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs
new file mode 100644
index 0000000..1ebf3e0
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Modules.World.Serialiser;
+using OpenSim.Region.Environment.Scenes;
+using System.Collections.Generic;
+using System.Reflection;
+using libsecondlife;
+using log4net;
+using Nini.Config;
+
+namespace OpenSim.Region.Environment
+{
+ ///
+ /// Handles an individual archive request
+ ///
+ public class ArchiveRequest
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private Scene m_scene;
+ private string m_savePath;
+
+ public ArchiveRequest(Scene scene, string savePath)
+ {
+ m_scene = scene;
+ m_savePath = savePath;
+
+ ArchiveRegion();
+ }
+
+ protected void ArchiveRegion()
+ {
+ m_log.Warn("[ARCHIVER]: Archive region not yet implemented");
+
+ Dictionary textureUuids = new Dictionary();
+
+ List entities = m_scene.GetEntities();
+
+ foreach (EntityBase entity in entities)
+ {
+ if (entity is SceneObjectGroup)
+ {
+ SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
+
+ foreach (SceneObjectPart part in sceneObject.GetParts())
+ {
+ LLUUID texture = new LLUUID(part.Shape.TextureEntry, 0);
+ textureUuids[texture] = 1;
+ }
+ }
+ }
+
+ string serEntities = SerializeObjects(entities);
+
+ if (serEntities != null && serEntities.Length > 0)
+ {
+ m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count);
+ m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} textures", textureUuids.Count);
+ }
+ }
+
+ ///
+ /// Get an xml representation of the given scene objects.
+ ///
+ ///
+ ///
+ protected static string SerializeObjects(List entities)
+ {
+ string serialization = "";
+
+ List serObjects = new List();
+
+ foreach (EntityBase ent in entities)
+ {
+ if (ent is SceneObjectGroup)
+ {
+ serObjects.Add(((SceneObjectGroup) ent).ToXmlString2());
+ }
+ }
+
+ foreach (string serObject in serObjects)
+ serialization += serObject;
+
+ serialization += "";
+
+ return serialization;
+ }
+ }
+}
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
index dc81f41..cff9235 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.Environment.Scenes;
@@ -71,65 +72,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
public void ArchiveRegion(string savePath)
{
- m_log.Warn("[ARCHIVER]: Archive region not yet implemented");
-
- Dictionary textureUuids = new Dictionary();
-
- List entities = m_scene.GetEntities();
-
- foreach (EntityBase entity in entities)
- {
- if (entity is SceneObjectGroup)
- {
- SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
-
- foreach (SceneObjectPart part in sceneObject.GetParts())
- {
- LLUUID texture = new LLUUID(part.Shape.TextureEntry, 0);
- textureUuids[texture] = 1;
- }
- }
- }
-
- string serEntities = SerializeObjects(entities);
-
- if (serEntities != null && serEntities.Length > 0)
- {
- m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count);
- m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} textures", textureUuids.Count);
- }
+ new ArchiveRequest(m_scene, savePath);
}
public void DearchiveRegion(string loadPath)
{
m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented");
}
-
- ///
- /// Get an xml representation of the given scene objects.
- ///
- ///
- ///
- private static string SerializeObjects(List entities)
- {
- string serialization = "";
-
- List serObjects = new List();
-
- foreach (EntityBase ent in entities)
- {
- if (ent is SceneObjectGroup)
- {
- serObjects.Add(((SceneObjectGroup) ent).ToXmlString2());
- }
- }
-
- foreach (string serObject in serObjects)
- serialization += serObject;
-
- serialization += "";
-
- return serialization;
- }
}
}
\ No newline at end of file
--
cgit v1.1