From 4a5e1c754756f3fa004ea404ca8f4a8dde287c8d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 29 Sep 2008 14:55:26 +0000 Subject: * check in missing files that caused the previous build break --- .../Inventory/InventoryArchiveReadRequest.cs | 238 ++++++++++++++++++++ .../Inventory/InventoryArchiveWriteRequest.cs | 249 +++++++++++++++++++++ 2 files changed, 487 insertions(+) create mode 100644 OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveReadRequest.cs create mode 100644 OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveWriteRequest.cs diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveReadRequest.cs new file mode 100644 index 0000000..5dbaa19 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveReadRequest.cs @@ -0,0 +1,238 @@ +/* + * 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.IO.Compression; +using System.Reflection; +using System.Xml; +using OpenMetaverse; +using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Environment.Modules.World.Archiver; +using OpenSim.Framework; +using OpenSim.Framework.Communications; +using OpenSim.Framework.Communications.Cache; +using log4net; +using OpenSim.Region.Environment.Modules.World.Serialiser; + + +namespace OpenSim.Region.Environment.Modules.Avatar.Inventory +{ + public class InventoryArchiveReadRequest + { + protected Scene scene; + protected TarArchiveReader archive; + private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); + ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + CachedUserInfo userInfo; + UserProfileData userProfile; + CommunicationsManager commsManager; + string loadPath; + + public InventoryArchiveReadRequest(Scene currentScene, CommunicationsManager commsManager) + { + List serialisedObjects = new List(); + scene = currentScene; + this.commsManager = commsManager; + } + + protected InventoryItemBase loadInvItem(string path, string contents) + { + InventoryItemBase item = new InventoryItemBase(); + StringReader sr = new StringReader(contents); + XmlTextReader reader = new XmlTextReader(sr); + + if (contents.Equals("")) return null; + + reader.ReadStartElement("InventoryObject"); + reader.ReadStartElement("Name"); + item.Name = reader.ReadString(); + reader.ReadEndElement(); + reader.ReadStartElement("ID"); + item.ID = UUID.Parse(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("InvType"); + item.InvType = System.Convert.ToInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("CreatorUUID"); + item.Creator = UUID.Parse(reader.ReadString()); + item.Creator = userProfile.ID; + reader.ReadEndElement(); + reader.ReadStartElement("CreationDate"); + item.CreationDate = System.Convert.ToInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("Owner"); + item.Owner = UUID.Parse(reader.ReadString()); + item.Owner = userProfile.ID; + reader.ReadEndElement(); + //No description would kill it + if (reader.IsEmptyElement) + { + reader.ReadStartElement("Description"); + } + else + { + reader.ReadStartElement("Description"); + item.Description = reader.ReadString(); + reader.ReadEndElement(); + } + reader.ReadStartElement("AssetType"); + item.AssetType = System.Convert.ToInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("AssetID"); + item.AssetID = UUID.Parse(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("SaleType"); + item.SaleType = System.Convert.ToByte(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("SalePrice"); + item.SalePrice = System.Convert.ToInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("BasePermissions"); + item.BasePermissions = System.Convert.ToUInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("CurrentPermissions"); + item.CurrentPermissions = System.Convert.ToUInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("EveryOnePermssions"); + item.EveryOnePermissions = System.Convert.ToUInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("NextPermissions"); + item.NextPermissions = System.Convert.ToUInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("Flags"); + item.Flags = System.Convert.ToUInt32(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("GroupID"); + item.GroupID = UUID.Parse(reader.ReadString()); + reader.ReadEndElement(); + reader.ReadStartElement("GroupOwned"); + item.GroupOwned = System.Convert.ToBoolean(reader.ReadString()); + reader.ReadEndElement(); + //reader.ReadStartElement("ParentFolderID"); + //item.Folder = UUID.Parse(reader.ReadString()); + //reader.ReadEndElement(); + //reader.ReadEndElement(); + + return item; + } + + public void execute(string[] cmdparams) + { + string filePath = "ERROR"; + int successfulAssetRestores = 0; + int failedAssetRestores = 0; + + string firstName = cmdparams[0]; + string lastName = cmdparams[1]; + string invPath = cmdparams[2]; + loadPath = (cmdparams.Length > 3 ? cmdparams[3] : "inventory.tar.gz"); + + archive + = new TarArchiveReader(new GZipStream( + new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress)); + + + userProfile = commsManager.UserService.GetUserProfile(firstName, lastName); + userInfo = commsManager.UserProfileCacheService.GetUserDetails(userProfile.ID); + + byte[] data; + while ((data = archive.ReadEntry(out filePath)) != null) + { + if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) + { + if (LoadAsset(filePath, data)) + successfulAssetRestores++; + else + failedAssetRestores++; + } + else + { + //Load the item + InventoryItemBase item = loadInvItem(filePath, m_asciiEncoding.GetString(data)); + if (item != null) userInfo.AddItem(item); + } + } + + archive.Close(); + + m_log.InfoFormat("[ARCHIVER]: Restored {0} assets", successfulAssetRestores); + } + + /// + /// Load an asset + /// + /// + /// + /// true if asset was successfully loaded, false otherwise + private bool LoadAsset(string assetPath, byte[] data) + { + IRegionSerialiser serialiser = scene.RequestModuleInterface(); + // Right now we're nastily obtaining the UUID from the filename + string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); + int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR); + + if (i == -1) + { + m_log.ErrorFormat( + "[ARCHIVER]: Could not find extension information in asset path {0} since it's missing the separator {1}. Skipping", + assetPath, ArchiveConstants.ASSET_EXTENSION_SEPARATOR); + + return false; + } + + string extension = filename.Substring(i); + string uuid = filename.Remove(filename.Length - extension.Length); + + if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension)) + { + sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension]; + + m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); + + AssetBase asset = new AssetBase(new UUID(uuid), "RandomName"); + + asset.Type = assetType; + asset.Data = data; + + scene.AssetCache.AddAsset(asset); + + + return true; + } + else + { + m_log.ErrorFormat( + "[ARCHIVER]: Tried to dearchive data with path {0} with an unknown type extension {1}", + assetPath, extension); + + return false; + } + } + } +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveWriteRequest.cs new file mode 100644 index 0000000..45b2dd6 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryArchiveWriteRequest.cs @@ -0,0 +1,249 @@ +/* + * 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.IO.Compression; +using System.Reflection; +using System.Xml; +using OpenMetaverse; +using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Environment.Modules.World.Archiver; +using OpenSim.Framework; +using OpenSim.Framework.Communications; +using OpenSim.Framework.Communications.Cache; +using log4net; + + +namespace OpenSim.Region.Environment.Modules.Avatar.Inventory +{ + public class InventoryArchiveWriteRequest + { + protected Scene scene; + protected TarArchiveWriter archive; + protected CommunicationsManager commsManager; + Dictionary assetUuids; + string savePath; + + + public InventoryArchiveWriteRequest(Scene currentScene, CommunicationsManager commsManager) + { + scene = currentScene; + archive = new TarArchiveWriter(); + this.commsManager = commsManager; + assetUuids = new Dictionary(); + } + + protected void ReceivedAllAssets(IDictionary assetsFound, ICollection assetsNotFoundUuids) + { + AssetsArchiver assetsArchiver = new AssetsArchiver(assetsFound); + assetsArchiver.Archive(archive); + archive.WriteTar(new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress)); + } + + protected void saveInvItem(InventoryItemBase inventoryItem, string path) + { + string filename + = string.Format("{0}{1}_{2}.xml", + path, inventoryItem.Name, inventoryItem.ID); + StringWriter sw = new StringWriter(); + XmlTextWriter writer = new XmlTextWriter(sw); + writer.WriteStartElement("InventoryObject"); + writer.WriteStartElement("Name"); + writer.WriteString(inventoryItem.Name); + writer.WriteEndElement(); + writer.WriteStartElement("ID"); + writer.WriteString(inventoryItem.ID.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("InvType"); + writer.WriteString(inventoryItem.InvType.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("CreatorUUID"); + writer.WriteString(inventoryItem.Creator.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("CreationDate"); + writer.WriteString(inventoryItem.CreationDate.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("Owner"); + writer.WriteString(inventoryItem.Owner.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("Description"); + if (inventoryItem.Description.Length > 0) + writer.WriteString(inventoryItem.Description); + else writer.WriteString("No Description"); + writer.WriteEndElement(); + writer.WriteStartElement("AssetType"); + writer.WriteString(inventoryItem.AssetType.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("AssetID"); + writer.WriteString(inventoryItem.AssetID.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("SaleType"); + writer.WriteString(inventoryItem.SaleType.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("SalePrice"); + writer.WriteString(inventoryItem.SalePrice.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("BasePermissions"); + writer.WriteString(inventoryItem.BasePermissions.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("CurrentPermissions"); + writer.WriteString(inventoryItem.CurrentPermissions.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("EveryOnePermssions"); + writer.WriteString(inventoryItem.EveryOnePermissions.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("NextPermissions"); + writer.WriteString(inventoryItem.NextPermissions.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("Flags"); + writer.WriteString(inventoryItem.Flags.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("GroupID"); + writer.WriteString(inventoryItem.GroupID.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("GroupOwned"); + writer.WriteString(inventoryItem.GroupOwned.ToString()); + writer.WriteEndElement(); + writer.WriteStartElement("ParentFolderID"); + writer.WriteString(inventoryItem.Folder.ToString()); + writer.WriteEndElement(); + writer.WriteEndElement(); + + archive.AddFile(filename, sw.ToString()); + + assetUuids[inventoryItem.AssetID] = 1; + } + + protected void saveInvDir(InventoryFolderImpl inventoryFolder, string path) + { + List inventories = inventoryFolder.RequestListOfFolderImpls(); + List items = inventoryFolder.RequestListOfItems(); + string newPath = path + inventoryFolder.Name + InventoryFolderImpl.PATH_DELIMITER; + archive.AddDir(newPath); + foreach (InventoryFolderImpl folder in inventories) + { + saveInvDir(folder, newPath); + } + foreach (InventoryItemBase item in items) + { + saveInvItem(item, newPath); + } + } + + public void execute(string[] cmdparams) + { + ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + string firstName = cmdparams[0]; + string lastName = cmdparams[1]; + string invPath = cmdparams[2]; + savePath = (cmdparams.Length > 3 ? cmdparams[3] : "inventory.tar.gz"); + + UserProfileData userProfile = commsManager.UserService.GetUserProfile(firstName, lastName); + if (null == userProfile) + { + m_log.ErrorFormat("[CONSOLE]: Failed to find user {0} {1}", firstName, lastName); + return; + } + + CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userProfile.ID); + if (null == userInfo) + { + m_log.ErrorFormat("[CONSOLE]: Failed to find user info for {0} {1} {2}", firstName, lastName, userProfile.ID); + return; + } + + InventoryFolderImpl inventoryFolder = null; + InventoryItemBase inventoryItem = null; + + if (userInfo.HasReceivedInventory) + { + // Eliminate double slashes and any leading / on the path. This might be better done within InventoryFolderImpl + // itself (possibly at a small loss in efficiency). + string[] components + = invPath.Split(new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries); + invPath = String.Empty; + foreach (string c in components) + { + invPath += c + InventoryFolderImpl.PATH_DELIMITER; + } + + // Annoyingly Split actually returns the original string if the input string consists only of delimiters + // Therefore if we still start with a / after the split, then we need the root folder + if (invPath.Length == 0) + { + inventoryFolder = userInfo.RootFolder; + } + else + { + invPath = invPath.Remove(invPath.LastIndexOf(InventoryFolderImpl.PATH_DELIMITER)); + inventoryFolder = userInfo.RootFolder.FindFolderByPath(invPath); + } + + // The path may point to an item instead + if (inventoryFolder == null) + { + inventoryItem = userInfo.RootFolder.FindItemByPath(invPath); + } + } + else + { + m_log.ErrorFormat("[CONSOLE]: Have not yet received inventory info for user {0} {1} {2}", firstName, lastName, userProfile.ID); + return; + } + + if (null == inventoryFolder) + { + if (null == inventoryItem) + { + m_log.ErrorFormat("[CONSOLE]: Could not find inventory entry at path {0}", invPath); + return; + } + else + { + m_log.InfoFormat("[CONSOLE]: Found item {0} {1} at {2}", inventoryItem.Name, inventoryItem.ID, + invPath); + //get and export item info + saveInvItem(inventoryItem, invPath); + } + } + else + { + m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, + invPath); + //recurse through all dirs getting dirs and files + saveInvDir(inventoryFolder, ""); + } + + new AssetsRequest(assetUuids.Keys, scene.AssetCache, ReceivedAllAssets).Execute(); + + } + + } +} \ No newline at end of file -- cgit v1.1