From 5752c1f5c2ee069e2ff5ffc0ff2f186d7454c5c4 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 28 May 2008 03:44:49 +0000
Subject: Formatting cleanup.
---
.../Modules/World/Archiver/ArchiveRequest.cs | 68 +++++++++---------
.../Modules/World/Archiver/TarArchive.cs | 82 +++++++++++-----------
.../Modules/World/Terrain/FileLoaders/LLRAW.cs | 2 +-
3 files changed, 76 insertions(+), 76 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/World')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs
index 1579485..ea74941 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs
@@ -37,37 +37,37 @@ using log4net;
using Nini.Config;
namespace OpenSim.Region.Environment
-{
+{
///
/// Method called when all the necessary assets for an archive request have been received.
///
public delegate void AssetsRequestCallback(IDictionary assets);
-
+
///
/// Handles an individual archive request
///
public class ArchiveRequest
- {
+ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+
private Scene m_scene;
private string m_savePath;
-
+
private string m_serializedEntities;
-
+
public ArchiveRequest(Scene scene, string savePath)
{
m_scene = scene;
m_savePath = savePath;
-
+
ArchiveRegion();
}
-
+
protected void ArchiveRegion()
{
m_log.Warn("[ARCHIVER]: Archive region not yet implemented");
- Dictionary textureUuids = new Dictionary();
+ Dictionary textureUuids = new Dictionary();
List entities = m_scene.GetEntities();
@@ -76,14 +76,14 @@ namespace OpenSim.Region.Environment
if (entity is SceneObjectGroup)
{
SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
-
+
foreach (SceneObjectPart part in sceneObject.GetParts())
{
LLUUID texture = new LLUUID(part.Shape.TextureEntry, 0);
textureUuids[texture] = 1;
}
- }
- }
+ }
+ }
m_serializedEntities = SerializeObjects(entities);
@@ -91,30 +91,30 @@ namespace OpenSim.Region.Environment
{
m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count);
m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} textures", textureUuids.Count);
-
+
// Asynchronously request all the assets required to perform this archive operation
new AssetsRequest(ReceivedAllAssets, m_scene.AssetCache, textureUuids.Keys);
}
}
-
+
protected internal void ReceivedAllAssets(IDictionary 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
-
+
TarArchive archive = new TarArchive();
-
+
archive.AddFile("prims.xml", m_serializedEntities);
-
+
foreach (LLUUID uuid in assets.Keys)
{
archive.AddFile(uuid.ToString() + ".jp2", assets[uuid].Data);
}
-
+
archive.WriteTar(m_savePath);
}
-
+
///
/// Get an xml representation of the given scene objects.
///
@@ -152,38 +152,38 @@ namespace OpenSim.Region.Environment
/// Callback used when all the assets requested have been received.
///
protected AssetsRequestCallback m_assetsRequestCallback;
-
+
///
/// Assets retrieved in this request
///
protected Dictionary m_assets = new Dictionary();
-
+
///
/// Record the number of asset replies required so we know when we've finished
///
private int m_repliesRequired;
-
+
///
/// Asset cache used to request the assets
///
- protected AssetCache m_assetCache;
-
- protected internal AssetsRequest(AssetsRequestCallback assetsRequestCallback, AssetCache assetCache, ICollection uuids)
- {
- m_assetsRequestCallback = assetsRequestCallback;
+ protected AssetCache m_assetCache;
+
+ protected internal AssetsRequest(AssetsRequestCallback assetsRequestCallback, AssetCache assetCache, ICollection uuids)
+ {
+ m_assetsRequestCallback = assetsRequestCallback;
m_assetCache = assetCache;
m_repliesRequired = uuids.Count;
-
+
// We can stop here if there are no assets to fetch
if (m_repliesRequired == 0)
- m_assetsRequestCallback(m_assets);
-
+ m_assetsRequestCallback(m_assets);
+
foreach (LLUUID uuid in uuids)
{
- m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
+ m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
}
}
-
+
///
/// Called back by the asset cache when it has the asset
///
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment
public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
{
m_assets[assetID] = asset;
-
+
if (m_assets.Count == m_repliesRequired)
{
m_assetsRequestCallback(m_assets);
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchive.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchive.cs
index 5e5be34..3a7518c 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchive.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchive.cs
@@ -34,16 +34,16 @@ using System.Reflection;
using log4net;
namespace OpenSim.Region.Environment
-{
+{
///
/// Temporary code to produce a tar archive in tar v7 format
- ///
+ ///
public class TarArchive
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+
protected Dictionary m_files = new Dictionary();
-
+
protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
///
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Environment
{
AddFile(filePath, m_asciiEncoding.GetBytes(data));
}
-
+
///
/// Add a file to the tar archive
///
@@ -65,117 +65,117 @@ namespace OpenSim.Region.Environment
{
m_files[filePath] = data;
}
-
+
///
/// Write the raw tar archive data to a file
///
///
public void WriteTar(string archivePath)
{
- BinaryWriter bw = new BinaryWriter(new FileStream(archivePath, FileMode.Create));
+ BinaryWriter bw = new BinaryWriter(new FileStream(archivePath, FileMode.Create));
foreach (string filePath in m_files.Keys)
{
byte[] header = new byte[512];
byte[] data = m_files[filePath];
-
- //string filePath = "test.txt";
- //byte[] data = m_asciiEncoding.GetBytes("hello\n");
-
+
+ //string filePath = "test.txt";
+ //byte[] data = m_asciiEncoding.GetBytes("hello\n");
+
// file path field (100)
byte[] nameBytes = m_asciiEncoding.GetBytes(filePath);
int nameSize = (nameBytes.Length >= 100) ? 100 : nameBytes.Length;
- Array.Copy(nameBytes, header, nameSize);
-
+ Array.Copy(nameBytes, header, nameSize);
+
// file mode (8)
byte[] modeBytes = m_asciiEncoding.GetBytes("0000644");
Array.Copy(modeBytes, 0, header, 100, 7);
-
+
// owner user id (8)
byte[] ownerIdBytes = m_asciiEncoding.GetBytes("0000764");
Array.Copy(ownerIdBytes, 0, header, 108, 7);
-
+
// group user id (8)
byte[] groupIdBytes = m_asciiEncoding.GetBytes("0000764");
Array.Copy(groupIdBytes, 0, header, 116, 7);
-
+
// file size in bytes (12)
int fileSize = data.Length;
m_log.DebugFormat("[TAR ARCHIVE]: File size of {0} is {1}", filePath, fileSize);
byte[] fileSizeBytes = ConvertDecimalToPaddedOctalBytes(fileSize, 11);
-
+
Array.Copy(fileSizeBytes, 0, header, 124, 11);
-
+
// last modification time (12)
byte[] lastModTimeBytes = m_asciiEncoding.GetBytes("11017037332");
- Array.Copy(lastModTimeBytes, 0, header, 136, 11);
-
+ Array.Copy(lastModTimeBytes, 0, header, 136, 11);
+
// link indicator (1)
//header[156] = m_asciiEncoding.GetBytes("0")[0];
header[156] = 0;
-
+
Array.Copy(m_asciiEncoding.GetBytes("0000000"), 0, header, 329, 7);
Array.Copy(m_asciiEncoding.GetBytes("0000000"), 0, header, 337, 7);
-
+
// check sum for header block (8) [calculated last]
Array.Copy(m_asciiEncoding.GetBytes(" "), 0, header, 148, 8);
-
+
int checksum = 0;
foreach (byte b in header)
{
checksum += b;
}
-
+
m_log.DebugFormat("[TAR ARCHIVE]: Decimal header checksum is {0}", checksum);
-
+
byte[] checkSumBytes = ConvertDecimalToPaddedOctalBytes(checksum, 6);
//byte[] checkSumBytes = m_asciiEncoding.GetBytes("007520");
-
+
Array.Copy(checkSumBytes, 0, header, 148, 6);
-
+
header[154] = 0;
-
- // Write out header
+
+ // Write out header
bw.Write(header);
-
+
// Write out data
bw.Write(data);
-
+
int paddingRequired = 512 - (data.Length % 512);
if (paddingRequired > 0)
{
m_log.DebugFormat("Padding data with {0} bytes", paddingRequired);
-
+
byte[] padding = new byte[paddingRequired];
bw.Write(padding);
}
}
-
+
// Write two consecutive 0 blocks to end the archive
byte[] finalZeroPadding = new byte[1024];
bw.Write(finalZeroPadding);
-
+
bw.Close();
}
-
+
public static byte[] ConvertDecimalToPaddedOctalBytes(int d, int padding)
{
- string oString = "";
-
+ string oString = "";
+
while (d > 0)
{
oString = Convert.ToString((byte)'0' + d & 7) + oString;
d >>= 3;
}
-
+
while (oString.Length < padding)
{
oString = "0" + oString;
- }
-
+ }
+
byte[] oBytes = m_asciiEncoding.GetBytes(oString);
-
+
return oBytes;
}
}
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
index 505fae3..2e8fa9e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
double t = map[x, y];
int index = 0;
- // The lookup table is pre-sorted, so we either find an exact match or
+ // The lookup table is pre-sorted, so we either find an exact match or
// the next closest (smaller) match with a binary search
index = Array.BinarySearch(LookupHeightTable, new HeightmapLookupValue(0, t));
if (index < 0)
--
cgit v1.1