* Start writing out assets metadata file for archiver

* Ignoring it on reload as of yet

OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

@@ -718,6 +718,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         m_secureSessionId = sessionInfo.LoginInfo.SecureSession;
                     }
+                    
                     // This sets up all the timers
                     InitNewClient();
 
@@ -726,7 +727,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             catch (Exception e)
             {
-                // ThreadAbortExceptions need to go through unmolested.
                 if (e is ThreadAbortException)
                     throw e;
                 

OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs

@@ -124,22 +124,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
             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);
 

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);
+                }
+            }            
+        }
+    }
+}