From f2ff6d5186420ed4bbf7379ad6dc92f46b7907a9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 5 Jan 2012 20:31:46 +0000
Subject: Move asset commands from AssetService to AssetServerConnector so that
we can harmonise the same commands on the simulator side.
No functional change.
---
OpenSim/Services/AssetService/AssetService.cs | 124 +-------------------------
1 file changed, 3 insertions(+), 121 deletions(-)
(limited to 'OpenSim/Services')
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index b3af8e3..4f4cbf6 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -32,7 +32,6 @@ using System.Reflection;
using Nini.Config;
using log4net;
using OpenSim.Framework;
-using OpenSim.Framework.Console;
using OpenSim.Data;
using OpenSim.Services.Interfaces;
using OpenMetaverse;
@@ -53,23 +52,6 @@ namespace OpenSim.Services.AssetService
{
m_RootInstance = this;
- MainConsole.Instance.Commands.AddCommand("kfs", false,
- "show digest",
- "show digest <ID>",
- "Show asset digest", HandleShowDigest);
-
- MainConsole.Instance.Commands.AddCommand("kfs", false,
- "delete asset",
- "delete asset <ID>",
- "Delete asset from database", HandleDeleteAsset);
-
- MainConsole.Instance.Commands.AddCommand("kfs", false,
- "dump asset",
- "dump asset <ID>",
- "Dump asset to a file",
- "The filename is the same as the ID given.",
- HandleDumpAsset);
-
if (m_AssetLoader != null)
{
IConfig assetConfig = config.Configs["AssetService"];
@@ -218,111 +200,11 @@ namespace OpenSim.Services.AssetService
return m_Database.Delete(id);
}
else
- m_log.DebugFormat("[ASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id);
-
- return false;
- }
-
- void HandleDumpAsset(string module, string[] args)
- {
- if (args.Length < 3)
- {
- MainConsole.Instance.Output("Usage is dump asset <ID>");
- return;
- }
-
- string rawAssetId = args[2];
- UUID assetId;
-
- if (!UUID.TryParse(rawAssetId, out assetId))
- {
- MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
- return;
- }
-
- AssetBase asset = m_Database.GetAsset(assetId);
- if (asset == null)
- {
- MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
- return;
- }
-
- string fileName = rawAssetId;
-
- using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
- {
- using (BinaryWriter bw = new BinaryWriter(fs))
- {
- bw.Write(asset.Data);
- }
- }
-
- MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName);
- }
-
- void HandleShowDigest(string module, string[] args)
- {
- if (args.Length < 3)
- {
- MainConsole.Instance.Output("Syntax: show digest <ID>");
- return;
- }
-
- AssetBase asset = Get(args[2]);
-
- if (asset == null || asset.Data.Length == 0)
- {
- MainConsole.Instance.Output("Asset not found");
- return;
- }
-
- int i;
-
- MainConsole.Instance.OutputFormat("Name: {0}", asset.Name);
- MainConsole.Instance.OutputFormat("Description: {0}", asset.Description);
- MainConsole.Instance.OutputFormat("Type: {0} (type number = {1})", (AssetType)asset.Type, asset.Type);
- MainConsole.Instance.OutputFormat("Content-type: {0}", asset.Metadata.ContentType);
- MainConsole.Instance.OutputFormat("Flags: {0}", asset.Metadata.Flags);
-
- for (i = 0 ; i < 5 ; i++)
{
- int off = i * 16;
- if (asset.Data.Length <= off)
- break;
- int len = 16;
- if (asset.Data.Length < off + len)
- len = asset.Data.Length - off;
-
- byte[] line = new byte[len];
- Array.Copy(asset.Data, off, line, 0, len);
-
- string text = BitConverter.ToString(line);
- MainConsole.Instance.Output(String.Format("{0:x4}: {1}", off, text));
- }
- }
-
- void HandleDeleteAsset(string module, string[] args)
- {
- if (args.Length < 3)
- {
- MainConsole.Instance.Output("Syntax: delete asset <ID>");
- return;
- }
-
- AssetBase asset = Get(args[2]);
-
- if (asset == null || asset.Data.Length == 0)
- {
- MainConsole.Instance.Output("Asset not found");
- return;
+ m_log.DebugFormat("[ASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id);
}
- Delete(args[2]);
-
- //MainConsole.Instance.Output("Asset deleted");
- // TODO: Implement this
-
- MainConsole.Instance.Output("Asset deletion not supported by database");
+ return false;
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From 7319ba62dd1791a3dade5b5453e369d955de48a2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 5 Jan 2012 20:51:49 +0000
Subject: Move simulator asset info commands to an optional module from the
connector. Make them conform with service side commands.
This stops them appearing twice when Hypergrid is enabled.
---
.../Connectors/Asset/AssetServiceConnector.cs | 45 +---------------------
1 file changed, 2 insertions(+), 43 deletions(-)
(limited to 'OpenSim/Services')
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index d7b2ff8..e4c3eaf 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -86,11 +86,8 @@ namespace OpenSim.Services.Connectors
m_log.Error("[ASSET CONNECTOR]: No Server URI named in section AssetService");
throw new Exception("Asset connector init error");
}
- m_ServerURI = serviceURI;
- MainConsole.Instance.Commands.AddCommand("asset", false, "dump asset",
- "dump asset <id> <file>",
- "dump one cached asset", HandleDumpAsset);
+ m_ServerURI = serviceURI;
}
protected void SetCache(IImprovedAssetCache cache)
@@ -328,43 +325,5 @@ namespace OpenSim.Services.Connectors
}
return false;
}
-
- private void HandleDumpAsset(string module, string[] args)
- {
- if (args.Length != 4)
- {
- MainConsole.Instance.Output("Syntax: dump asset <id> <file>");
- return;
- }
-
- UUID assetID;
-
- if (!UUID.TryParse(args[2], out assetID))
- {
- MainConsole.Instance.Output("Invalid asset ID");
- return;
- }
-
- if (m_Cache == null)
- {
- MainConsole.Instance.Output("Instance uses no cache");
- return;
- }
-
- AssetBase asset = m_Cache.Get(assetID.ToString());
-
- if (asset == null)
- {
- MainConsole.Instance.Output("Asset not found in cache");
- return;
- }
-
- string fileName = args[3];
-
- FileStream fs = File.Create(fileName);
- fs.Write(asset.Data, 0, asset.Data.Length);
-
- fs.Close();
- }
}
-}
+}
\ No newline at end of file
--
cgit v1.1