2 files changed, 132 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
index 6c341c6..41f230c 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -123,23 +123,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
            TarArchiveWriter archive = new TarArchiveWriter();
            archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
+            
-            // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
+            AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
-            //archive.AddDir("assets");
+            assetsArchiver.Archive(archive);
-            foreach (LLUUID uuid in assets.Keys)
-            {
-                if (assets[uuid] != null)
-                {
-                    archive.AddFile(
-                        ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
-                        assets[uuid].Data);
-                }
-                else
-                {
-                    m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
-                }
-            }
            archive.WriteTar(m_savePath);
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
new file mode 100644
index 0000000..44757cc
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -0,0 +1,129 @@
+/*
+ * 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 System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using libsecondlife;
+using log4net;
+using OpenSim.Framework;
+namespace OpenSim.Region.Environment.Modules.World.Archiver
+{
+    /// <summary>
+    /// Archives assets
+    /// </summary>
+    public class AssetsArchiver
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
+        
+        /// <summary>
+        /// Archive assets
+        /// </summary>
+        protected IDictionary<LLUUID, AssetBase> m_assets;
+        
+        public AssetsArchiver(IDictionary<LLUUID, AssetBase> assets)
+        {
+            m_assets = assets;
+        }
+        
+        /// <summary>
+        /// Archive the assets given to this archiver to the given archive.
+        /// </summary>
+        /// <param name="archive"></param>
+        public void Archive(TarArchiveWriter archive)
+        {
+            // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
+            //archive.AddDir("assets");
+            
+            WriteMetadata(archive);
+            WriteData(archive);
+        }
+        /// <summary>
+        /// Write an assets metadata file to the given archive
+        /// </summary>
+        /// <param name="archive"></param>
+        protected void WriteMetadata(TarArchiveWriter archive)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter xtw = new XmlTextWriter(sw);
+            
+            xtw.Formatting = Formatting.Indented;
+            xtw.WriteStartDocument();
+            
+            xtw.WriteStartElement("assets");
+            
+            foreach (LLUUID uuid in m_assets.Keys)
+            {
+                if (m_assets[uuid] != null)
+                {
+                    xtw.WriteStartElement("asset");
+                    
+                    AssetBase asset = m_assets[uuid];
+                    
+                    xtw.WriteElementString("filename", uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION);
+                    xtw.WriteElementString("name", asset.Name);
+                    xtw.WriteElementString("description", asset.Description);
+                    xtw.WriteElementString("asset-type", asset.Type.ToString());
+                    xtw.WriteElementString("inventory-type", asset.InvType.ToString());
+                    
+                    xtw.WriteEndElement();
+                }                
+                
+            }
+            
+            xtw.WriteEndElement();
+            
+            xtw.WriteEndDocument();
+            
+            archive.AddFile("assets.xml", sw.ToString());            
+        }
+        
+        /// <summary>
+        /// Write asset data files to the given archive
+        /// </summary>
+        /// <param name="archive"></param>
+        protected void WriteData(TarArchiveWriter archive)
+        {
+            foreach (LLUUID uuid in m_assets.Keys)
+            {
+                if (m_assets[uuid] != null)
+                {
+                    archive.AddFile(
+                        ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
+                        m_assets[uuid].Data);
+                }
+                else
+                {
+                    m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
+                }
+            }            
+        }
+    }
+}

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs index 6c341c6..41f230c 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -123,23 +123,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
123	TarArchiveWriter archive = new TarArchiveWriter();	123	TarArchiveWriter archive = new TarArchiveWriter();
124		124
125	archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);	125	archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
126		126
127	// It appears that gtar, at least, doesn't need the intermediate directory entries in the tar	127	AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
128	//archive.AddDir("assets");	128	assetsArchiver.Archive(archive);
129
130	foreach (LLUUID uuid in assets.Keys)
131	{
132	if (assets[uuid] != null)
133	{
134	archive.AddFile(
135	ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
136	assets[uuid].Data);
137	}
138	else
139	{
140	m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
141	}
142	}
143		129
144	archive.WriteTar(m_savePath);	130	archive.WriteTar(m_savePath);
145		131


diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs new file mode 100644 index 0000000..44757cc --- /dev/null +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -0,0 +1,129 @@
		1	/*
		2	* Copyright (c) Contributors, http://opensimulator.org/
		3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
		4	*
		5	* Redistribution and use in source and binary forms, with or without
		6	* modification, are permitted provided that the following conditions are met:
		7	* * Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* * Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	* * Neither the name of the OpenSim Project nor the
		13	* names of its contributors may be used to endorse or promote products
		14	* derived from this software without specific prior written permission.
		15	*
		16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
		17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
		18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
		19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
		20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
		21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
		25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		26	*/
		27
		28	using System.Collections.Generic;
		29	using System.IO;
		30	using System.Reflection;
		31	using System.Xml;
		32	using libsecondlife;
		33	using log4net;
		34	using OpenSim.Framework;
		35
		36	namespace OpenSim.Region.Environment.Modules.World.Archiver
		37	{
		38	/// <summary>
		39	/// Archives assets
		40	/// </summary>
		41	public class AssetsArchiver
		42	{
		43	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
		44
		45	/// <summary>
		46	/// Archive assets
		47	/// </summary>
		48	protected IDictionary<LLUUID, AssetBase> m_assets;
		49
		50	public AssetsArchiver(IDictionary<LLUUID, AssetBase> assets)
		51	{
		52	m_assets = assets;
		53	}
		54
		55	/// <summary>
		56	/// Archive the assets given to this archiver to the given archive.
		57	/// </summary>
		58	/// <param name="archive"></param>
		59	public void Archive(TarArchiveWriter archive)
		60	{
		61	// It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
		62	//archive.AddDir("assets");
		63
		64	WriteMetadata(archive);
		65	WriteData(archive);
		66	}
		67
		68	/// <summary>
		69	/// Write an assets metadata file to the given archive
		70	/// </summary>
		71	/// <param name="archive"></param>
		72	protected void WriteMetadata(TarArchiveWriter archive)
		73	{
		74	StringWriter sw = new StringWriter();
		75	XmlTextWriter xtw = new XmlTextWriter(sw);
		76
		77	xtw.Formatting = Formatting.Indented;
		78	xtw.WriteStartDocument();
		79
		80	xtw.WriteStartElement("assets");
		81
		82	foreach (LLUUID uuid in m_assets.Keys)
		83	{
		84	if (m_assets[uuid] != null)
		85	{
		86	xtw.WriteStartElement("asset");
		87
		88	AssetBase asset = m_assets[uuid];
		89
		90	xtw.WriteElementString("filename", uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION);
		91	xtw.WriteElementString("name", asset.Name);
		92	xtw.WriteElementString("description", asset.Description);
		93	xtw.WriteElementString("asset-type", asset.Type.ToString());
		94	xtw.WriteElementString("inventory-type", asset.InvType.ToString());
		95
		96	xtw.WriteEndElement();
		97	}
		98
		99	}
		100
		101	xtw.WriteEndElement();
		102
		103	xtw.WriteEndDocument();
		104
		105	archive.AddFile("assets.xml", sw.ToString());
		106	}
		107
		108	/// <summary>
		109	/// Write asset data files to the given archive
		110	/// </summary>
		111	/// <param name="archive"></param>
		112	protected void WriteData(TarArchiveWriter archive)
		113	{
		114	foreach (LLUUID uuid in m_assets.Keys)
		115	{
		116	if (m_assets[uuid] != null)
		117	{
		118	archive.AddFile(
		119	ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
		120	m_assets[uuid].Data);
		121	}
		122	else
		123	{
		124	m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
		125	}
		126	}
		127	}
		128	}
		129	}