Update svn properties.

0.6.5-rc1
Jeff Ames 2009-05-01 05:16:05 +00:00
parent e7078520db
commit 5ede445bdf
1 changed files with 217 additions and 217 deletions

View File

@ -1,217 +1,217 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Xml; using System.Xml;
using System.Xml.Serialization; using System.Xml.Serialization;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using System.Net; using System.Net;
namespace OpenSim.Framework.Servers namespace OpenSim.Framework.Servers
{ {
public class CachedGetAssetStreamHandler : BaseStreamHandler public class CachedGetAssetStreamHandler : BaseStreamHandler
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private OpenAsset_Main m_assetManager; // private OpenAsset_Main m_assetManager;
private IAssetCache m_assetProvider; private IAssetCache m_assetProvider;
/// <summary> /// <summary>
/// Constructor. /// Constructor.
/// </summary> /// </summary>
/// <param name="assetManager"></param> /// <param name="assetManager"></param>
/// <param name="assetProvider"></param> /// <param name="assetProvider"></param>
public CachedGetAssetStreamHandler(IAssetCache assetProvider) public CachedGetAssetStreamHandler(IAssetCache assetProvider)
: base("GET", "/assets") : base("GET", "/assets")
{ {
m_log.Info("[REST]: In Get Request"); m_log.Info("[REST]: In Get Request");
// m_assetManager = assetManager; // m_assetManager = assetManager;
m_assetProvider = assetProvider; m_assetProvider = assetProvider;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
string param = GetParam(path); string param = GetParam(path);
byte[] result = new byte[] { }; byte[] result = new byte[] { };
string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries); string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries);
if (p.Length > 0) if (p.Length > 0)
{ {
UUID assetID = UUID.Zero; UUID assetID = UUID.Zero;
if (!UUID.TryParse(p[0], out assetID)) if (!UUID.TryParse(p[0], out assetID))
{ {
m_log.InfoFormat( m_log.InfoFormat(
"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
return result; return result;
} }
if (StatsManager.AssetStats != null) if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddRequest(); StatsManager.AssetStats.AddRequest();
AssetBase asset = m_assetProvider.GetAsset(assetID,true); // TODO IsTexture should be deduced from loaded asset. It is not used in this case. AssetBase asset = m_assetProvider.GetAsset(assetID,true); // TODO IsTexture should be deduced from loaded asset. It is not used in this case.
if (asset != null) if (asset != null)
{ {
// if (asset.ContainsReferences) // if (asset.ContainsReferences)
// { // {
// asset.Data = ProcessOutgoingAssetData(asset.Data); // asset.Data = ProcessOutgoingAssetData(asset.Data);
// } // }
if (p.Length > 1 && p[1] == "data") if (p.Length > 1 && p[1] == "data")
{ {
httpResponse.StatusCode = (int)HttpStatusCode.OK; httpResponse.StatusCode = (int)HttpStatusCode.OK;
httpResponse.ContentType = SLAssetTypeToContentType(asset.Type); httpResponse.ContentType = SLAssetTypeToContentType(asset.Type);
result = asset.Data; result = asset.Data;
} }
else else
{ {
XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented; xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset); xs.Serialize(xw, asset);
xw.Flush(); xw.Flush();
ms.Seek(0, SeekOrigin.Begin); ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms); //StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer(); result = ms.GetBuffer();
Array.Resize<byte>(ref result, (int)ms.Length); Array.Resize<byte>(ref result, (int)ms.Length);
} }
} }
else else
{ {
if (StatsManager.AssetStats != null) if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddNotFoundRequest(); StatsManager.AssetStats.AddNotFoundRequest();
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID); m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
} }
} }
return result; return result;
} }
// private byte[] ProcessOutgoingAssetData(byte[] assetData) // private byte[] ProcessOutgoingAssetData(byte[] assetData)
// { // {
// string data = Encoding.ASCII.GetString(assetData); // string data = Encoding.ASCII.GetString(assetData);
// data = ProcessAssetDataString(data); // data = ProcessAssetDataString(data);
// return Encoding.ASCII.GetBytes(data); // return Encoding.ASCII.GetBytes(data);
// } // }
public string ProcessAssetDataString(string data) public string ProcessAssetDataString(string data)
{ {
Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)"); Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)");
// IUserService userService = null; // IUserService userService = null;
data = regex.Replace(data, delegate(Match m) data = regex.Replace(data, delegate(Match m)
{ {
string result = String.Empty; string result = String.Empty;
// string key = m.Groups[1].Captures[0].Value; // string key = m.Groups[1].Captures[0].Value;
// //
// string value = m.Groups[2].Captures[0].Value; // string value = m.Groups[2].Captures[0].Value;
// //
// Guid userUri; // Guid userUri;
// //
// switch (key) // switch (key)
// { // {
// case "creator_id": // case "creator_id":
// userUri = new Guid(value); // userUri = new Guid(value);
// // result = "creator_url " + userService(userService, userUri); // // result = "creator_url " + userService(userService, userUri);
// break; // break;
// //
// case "owner_id": // case "owner_id":
// userUri = new Guid(value); // userUri = new Guid(value);
// // result = "owner_url " + ResolveUserUri(userService, userUri); // // result = "owner_url " + ResolveUserUri(userService, userUri);
// break; // break;
// } // }
return result; return result;
}); });
return data; return data;
} }
private string SLAssetTypeToContentType(int assetType) private string SLAssetTypeToContentType(int assetType)
{ {
switch (assetType) switch (assetType)
{ {
case 0: case 0:
return "image/jp2"; return "image/jp2";
case 1: case 1:
return "application/ogg"; return "application/ogg";
case 2: case 2:
return "application/x-metaverse-callingcard"; return "application/x-metaverse-callingcard";
case 3: case 3:
return "application/x-metaverse-landmark"; return "application/x-metaverse-landmark";
case 5: case 5:
return "application/x-metaverse-clothing"; return "application/x-metaverse-clothing";
case 6: case 6:
return "application/x-metaverse-primitive"; return "application/x-metaverse-primitive";
case 7: case 7:
return "application/x-metaverse-notecard"; return "application/x-metaverse-notecard";
case 8: case 8:
return "application/x-metaverse-folder"; return "application/x-metaverse-folder";
case 10: case 10:
return "application/x-metaverse-lsl"; return "application/x-metaverse-lsl";
case 11: case 11:
return "application/x-metaverse-lso"; return "application/x-metaverse-lso";
case 12: case 12:
return "image/tga"; return "image/tga";
case 13: case 13:
return "application/x-metaverse-bodypart"; return "application/x-metaverse-bodypart";
case 17: case 17:
return "audio/x-wav"; return "audio/x-wav";
case 19: case 19:
return "image/jpeg"; return "image/jpeg";
case 20: case 20:
return "application/x-metaverse-animation"; return "application/x-metaverse-animation";
case 21: case 21:
return "application/x-metaverse-gesture"; return "application/x-metaverse-gesture";
case 22: case 22:
return "application/x-metaverse-simstate"; return "application/x-metaverse-simstate";
default: default:
return "application/octet-stream"; return "application/octet-stream";
} }
} }
} }
} }