* Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStreamHandler

* Added some more tests

1 files changed, 3 insertions, 156 deletions

diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index ba0355c..a262e97 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -43,174 +43,21 @@ using System.Net;
 
 namespace OpenSim.Framework.Servers
 {
-    public class GetAssetStreamHandler : BaseStreamHandler
+    public class GetAssetStreamHandler : BaseGetAssetStreamHandler
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        // private OpenAsset_Main m_assetManager;
         private readonly IAssetDataPlugin m_assetProvider;
 
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="assetManager"></param>
-        /// <param name="assetProvider"></param>
         public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
             : base("GET", "/assets")
         {
-            // m_log.Info("[REST]: In Get Request");
-            // m_assetManager = assetManager;
             m_assetProvider = assetProvider;
         }
 
-        public override byte[] Handle(string path, Stream request,
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        protected override AssetBase GetAsset(UUID assetID)
         {
-            byte[] result = new byte[] { };
-
-            string[] p = SplitParams(path);
-
-            if (p.Length > 0)
-            {
-                UUID assetID = UUID.Zero;
-
-                if (!UUID.TryParse(p[0], out assetID))
-                {
-                    m_log.InfoFormat(
-                        "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
-                    return result;
-                }
-
-                if (StatsManager.AssetStats != null)
-                    StatsManager.AssetStats.AddRequest();
-
-                AssetBase asset = m_assetProvider.FetchAsset(assetID);
-                if (asset != null)
-                {
-//                    if (asset.ContainsReferences)
-//                    {                       
-//                        asset.Data = ProcessOutgoingAssetData(asset.Data);
-//                    }
-                    if (p.Length > 1 && p[1] == "data")
-                    {
-                        httpResponse.StatusCode = (int)HttpStatusCode.OK;
-                        httpResponse.ContentType = SLAssetTypeToContentType(asset.Type);
-                        result = asset.Data;
-                    }
-                    else
-                    {
-                        XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
-                        MemoryStream ms = new MemoryStream();
-                        XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
-                        xw.Formatting = Formatting.Indented;
-                        xs.Serialize(xw, asset);
-                        xw.Flush();
-
-                        ms.Seek(0, SeekOrigin.Begin);
-                        //StreamReader sr = new StreamReader(ms);
-
-                        result = ms.GetBuffer();
-
-                        Array.Resize<byte>(ref result, (int)ms.Length);
-                    }
-                }
-                else
-                {
-                    if (StatsManager.AssetStats != null)
-                        StatsManager.AssetStats.AddNotFoundRequest();
-
-                    m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
-                }
-            }
-
-            return result;
-        }
-
-        // private byte[] ProcessOutgoingAssetData(byte[] assetData)
-        // {
-        //     string data = Encoding.ASCII.GetString(assetData);
-
-        //     data = ProcessAssetDataString(data);
-
-        //     return Encoding.ASCII.GetBytes(data);
-        // }
-
-        public string ProcessAssetDataString(string data)
-        {
-            Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)");
-
-            // IUserService userService = null;
-
-            data = regex.Replace(data, delegate(Match m)
-            {
-                string result = String.Empty;
-
-//                string key = m.Groups[1].Captures[0].Value;
-//
-//                string value = m.Groups[2].Captures[0].Value;
-//
-//                Guid userUri;
-//
-//                switch (key)
-//                {
-//                    case "creator_id":
-//                        userUri = new Guid(value);
-//                        //         result = "creator_url " + userService(userService, userUri);
-//                        break;
-//
-//                    case "owner_id":
-//                        userUri = new Guid(value);
-//                        //       result = "owner_url " + ResolveUserUri(userService, userUri);
-//                        break;
-//                }
-
-                return result;
-            });
-
-            return data;
-        }
-
-        private string SLAssetTypeToContentType(int assetType)
-        {
-            switch (assetType)
-            {
-                case 0:
-                    return "image/jp2";
-                case 1:
-                    return "application/ogg";
-                case 2:
-                    return "application/x-metaverse-callingcard";
-                case 3:
-                    return "application/x-metaverse-landmark";
-                case 5:
-                    return "application/x-metaverse-clothing";
-                case 6:
-                    return "application/x-metaverse-primitive";
-                case 7:
-                    return "application/x-metaverse-notecard";
-                case 8:
-                    return "application/x-metaverse-folder";
-                case 10:
-                    return "application/x-metaverse-lsl";
-                case 11:
-                    return "application/x-metaverse-lso";
-                case 12:
-                    return "image/tga";
-                case 13:
-                    return "application/x-metaverse-bodypart";
-                case 17:
-                    return "audio/x-wav";
-                case 19:
-                    return "image/jpeg";
-                case 20:
-                    return "application/x-metaverse-animation";
-                case 21:
-                    return "application/x-metaverse-gesture";
-                case 22:
-                    return "application/x-metaverse-simstate";
-                default:
-                    return "application/octet-stream";
-            }
+            return m_assetProvider.FetchAsset(assetID);
         }
     }
 }