* refactor: Fission ArchiveWriteRequest into prepare and execute classes

1 files changed, 10 insertions, 36 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 1d7042c..a93e58d 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -40,31 +40,22 @@ using Nini.Config;
 namespace OpenSim.Region.Environment.Modules.World.Archiver
 {
     /// <summary>
-    /// Method called when all the necessary assets for an archive request have been received.
+    /// Prepare to write out an archive.
     /// </summary>
-    public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets);
-
-    /// <summary>
-    /// Handles an individual archive write request
-    /// </summary>
-    public class ArchiveWriteRequest
+    public class ArchiveWriteRequestPreparation
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Scene m_scene;
-        private string m_savePath;
-
-        private string m_serializedEntities;
+        protected Scene m_scene;
+        protected string m_savePath;        
 
-        public ArchiveWriteRequest(Scene scene, string savePath)
+        public ArchiveWriteRequestPreparation(Scene scene, string savePath)
         {
             m_scene = scene;
             m_savePath = savePath;
-
-            ArchiveRegion();
         }
 
-        protected void ArchiveRegion()
+        public void ArchiveRegion()
         {
             Dictionary<LLUUID, int> assetUuids = new Dictionary<LLUUID, int>();
 
@@ -108,36 +99,19 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 }
             }
 
-            m_serializedEntities = SerializeObjects(entities);
+            string serializedEntities = SerializeObjects(entities);
 
-            if (m_serializedEntities != null && m_serializedEntities.Length > 0)
+            if (serializedEntities != null && serializedEntities.Length > 0)
             {
                 m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count);
                 m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} textures", assetUuids.Count);
 
                 // Asynchronously request all the assets required to perform this archive operation
-                new AssetsRequest(ReceivedAllAssets, m_scene.AssetCache, assetUuids.Keys);
+                ArchiveWriteRequestExecution awre = new ArchiveWriteRequestExecution(serializedEntities, m_savePath);                
+                new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute();
             }
         }
 
-        protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets)
-        {
-            m_log.DebugFormat("[ARCHIVER]: Received all {0} textures required", assets.Count);
-
-            // XXX: Shouldn't hijack the asset async callback thread like this - this is only temporary
-
-            TarArchiveWriter archive = new TarArchiveWriter();
-
-            archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
-            
-            AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
-            assetsArchiver.Archive(archive);
-
-            archive.WriteTar(m_savePath);
-
-            m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
-        }
-
         /// <summary>
         /// Get an xml representation of the given scene objects.
         /// </summary>