From 180be7de07014aa33bc6066f12a0819b731c1c9d Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Tue, 10 Feb 2009 13:10:57 +0000 Subject: this is step 2 of 2 of the OpenSim.Region.Environment refactor. NOTHING has been deleted or moved off to forge at this point. what has happened is that OpenSim.Region.Environment.Modules has been split in two: - OpenSim.Region.CoreModules: all those modules that are either directly or indirectly referenced from other OpenSim packages, or that provide functionality that the OpenSim developer community considers core functionality: CoreModules/Agent/AssetTransaction CoreModules/Agent/Capabilities CoreModules/Agent/TextureDownload CoreModules/Agent/TextureSender CoreModules/Agent/TextureSender/Tests CoreModules/Agent/Xfer CoreModules/Avatar/AvatarFactory CoreModules/Avatar/Chat/ChatModule CoreModules/Avatar/Combat CoreModules/Avatar/Currency/SampleMoney CoreModules/Avatar/Dialog CoreModules/Avatar/Friends CoreModules/Avatar/Gestures CoreModules/Avatar/Groups CoreModules/Avatar/InstantMessage CoreModules/Avatar/Inventory CoreModules/Avatar/Inventory/Archiver CoreModules/Avatar/Inventory/Transfer CoreModules/Avatar/Lure CoreModules/Avatar/ObjectCaps CoreModules/Avatar/Profiles CoreModules/Communications/Local CoreModules/Communications/REST CoreModules/Framework/EventQueue CoreModules/Framework/InterfaceCommander CoreModules/Hypergrid CoreModules/InterGrid CoreModules/Scripting/DynamicTexture CoreModules/Scripting/EMailModules CoreModules/Scripting/HttpRequest CoreModules/Scripting/LoadImageURL CoreModules/Scripting/VectorRender CoreModules/Scripting/WorldComm CoreModules/Scripting/XMLRPC CoreModules/World/Archiver CoreModules/World/Archiver/Tests CoreModules/World/Estate CoreModules/World/Land CoreModules/World/Permissions CoreModules/World/Serialiser CoreModules/World/Sound CoreModules/World/Sun CoreModules/World/Terrain CoreModules/World/Terrain/DefaultEffects CoreModules/World/Terrain/DefaultEffects/bin CoreModules/World/Terrain/DefaultEffects/bin/Debug CoreModules/World/Terrain/Effects CoreModules/World/Terrain/FileLoaders CoreModules/World/Terrain/FloodBrushes CoreModules/World/Terrain/PaintBrushes CoreModules/World/Terrain/Tests CoreModules/World/Vegetation CoreModules/World/Wind CoreModules/World/WorldMap - OpenSim.Region.OptionalModules: all those modules that are not core modules: OptionalModules/Avatar/Chat/IRC-stuff OptionalModules/Avatar/Concierge OptionalModules/Avatar/Voice/AsterixVoice OptionalModules/Avatar/Voice/SIPVoice OptionalModules/ContentManagementSystem OptionalModules/Grid/Interregion OptionalModules/Python OptionalModules/SvnSerialiser OptionalModules/World/NPC OptionalModules/World/TreePopulator --- .../Modules/World/Archiver/AssetsDearchiver.cs | 184 --------------------- 1 file changed, 184 deletions(-) delete mode 100644 OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs deleted file mode 100644 index 95ff468..0000000 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs +++ /dev/null @@ -1,184 +0,0 @@ -/* - * 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; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Xml; -using OpenMetaverse; -using log4net; -using OpenSim.Framework; -using OpenSim.Framework.Communications.Cache; - -namespace OpenSim.Region.Environment.Modules.World.Archiver -{ - /// - /// Dearchives assets - /// - public class AssetsDearchiver - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); - - /// - /// Store for asset data we received before we get the metadata - /// - protected Dictionary m_assetDataAwaitingMetadata = new Dictionary(); - - /// - /// Asset metadata. Is null if asset metadata isn't yet available. - /// - protected Dictionary m_metadata; - - /// - /// Cache to which dearchived assets will be added - /// - protected IAssetCache m_cache; - - public AssetsDearchiver(IAssetCache cache) - { - m_cache = cache; - } - - /// - /// Add asset data to the dearchiver - /// - /// - /// - public void AddAssetData(string assetFilename, byte[] data) - { - if (null == m_metadata) - { - m_assetDataAwaitingMetadata[assetFilename] = data; - } - else - { - ResolveAssetData(assetFilename, data); - } - } - - /// - /// Add asset metadata xml - /// - /// - public void AddAssetMetadata(string xml) - { - m_metadata = new Dictionary(); - - StringReader sr = new StringReader(xml); - XmlTextReader reader = new XmlTextReader(sr); - - reader.ReadStartElement("assets"); - reader.Read(); - - while (reader.Name.Equals("asset")) - { - reader.Read(); - - AssetMetadata metadata = new AssetMetadata(); - - string filename = reader.ReadElementString("filename"); - m_log.DebugFormat("[DEARCHIVER]: Reading node {0}", filename); - - metadata.Name = reader.ReadElementString("name"); - metadata.Description = reader.ReadElementString("description"); - metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type")); - - m_metadata[filename] = metadata; - - // Read asset end tag - reader.ReadEndElement(); - - reader.Read(); - } - - m_log.DebugFormat("[DEARCHIVER]: Resolved {0} items of asset metadata", m_metadata.Count); - - ResolvePendingAssetData(); - } - - /// - /// Resolve asset data that we collected before receiving the metadata - /// - protected void ResolvePendingAssetData() - { - foreach (string filename in m_assetDataAwaitingMetadata.Keys) - { - ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]); - } - } - - /// - /// Resolve a new piece of asset data against stored metadata - /// - /// - /// - protected void ResolveAssetData(string assetPath, byte[] data) - { - // Right now we're nastily obtaining the UUID from the filename - string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); - - if (m_metadata.ContainsKey(filename)) - { - AssetMetadata metadata = m_metadata[filename]; - - if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(metadata.AssetType)) - { - string extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[metadata.AssetType]; - filename = filename.Remove(filename.Length - extension.Length); - } - - m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); - - AssetBase asset = new AssetBase(new UUID(filename), metadata.Name); - asset.Metadata.Description = metadata.Description; - asset.Metadata.Type = metadata.AssetType; - asset.Data = data; - - m_cache.AddAsset(asset); - } - else - { - m_log.ErrorFormat( - "[DEARCHIVER]: Tried to dearchive data with filename {0} without any corresponding metadata", - assetPath); - } - } - - /// - /// Metadata for an asset - /// - protected struct AssetMetadata - { - public string Name; - public string Description; - public sbyte AssetType; - } - } -} -- cgit v1.1