Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modernize testclient uploadscript

Browse Source
This commit is contained in:
nopjmp
2019-10-30 20:54:41 -05:00
parent 6e846008e2
commit f6cf0ac588
2 changed files with 53 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Programs/examples/TestClient/Commands/Inventory/UploadScriptCommand.cs
View File

@@ -25,68 +25,54 @@ namespace OpenMetaverse.TestClient
/// The default override for TestClient commands
/// </summary>
/// <param name="args"></param>
/// <param name="fromAgentID"></param>
/// <param name="fromAgentId"></param>
/// <returns></returns>
public override string Execute(string[] args, UUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentId)
{
if (args.Length < 1)
return "Usage: uploadscript filename.lsl";
string file = args.Aggregate(string.Empty, (current, t) => $"{current}{t} ");
var file = args.Aggregate(string.Empty, (current, t) => $"{current}{t} ");
file = file.TrimEnd();
if (!File.Exists(file))
{
return $"Filename '{file}' does not exist";
}
string ret = $"Filename: {file}";
var ret = $"Filename: {file}";
try
{
using (StreamReader reader = new StreamReader(file))
using (var reader = new StreamReader(file))
{
string body = reader.ReadToEnd();
string desc = $"{file} created by LibreMetaverse TestClient {DateTime.Now}";
var body = reader.ReadToEnd();
var desc = $"{file} created by OpenMetaverse TestClient {DateTime.Now}";
// create the asset
Client.Inventory.RequestCreateItem(Client.Inventory.FindFolderForType(AssetType.LSLText),
file, desc, AssetType.LSLText, UUID.Random(), InventoryType.LSL, PermissionMask.All,
delegate(bool success, InventoryItem item)
{
if (success)
// upload the asset
Client.Inventory.RequestUpdateScriptAgentInventory(EncodeScript(body), item.UUID, true,
delegate(bool uploadSuccess, string uploadStatus, bool compileSuccess, List<string> compileMessages, UUID itemid, UUID assetid)
{
if (uploadSuccess)
ret += $" Script successfully uploaded, ItemID {itemid} AssetID {assetid}";
if (compileSuccess)
ret += " compilation successful";
});
});
Client.Inventory.RequestCreateItem(Client.Inventory.FindFolderForType(AssetType.LSLText),
file, desc, AssetType.LSLText, UUID.Random(),
InventoryType.LSL, PermissionMask.All, (success, item) =>
{
if (success)
// upload the asset
Client.Inventory.RequestUpdateScriptAgentInventory(
System.Text.Encoding.UTF8.GetBytes(body), item.UUID, true,
(uploadSuccess, uploadStatus, compileSuccess, compileMessages, itemId, assetId) =>
{
if (uploadSuccess)
ret += $" Script successfully uploaded, ItemID {itemId} AssetID {assetId}";
if (compileSuccess)
ret += " compilation successful";
});
});
}
return ret;
}
catch (System.Exception e)
catch (Exception e)
{
Logger.Log(e.ToString(), Helpers.LogLevel.Error, Client);
return $"Error creating script for {ret}";
}
}
/// <summary>
/// Encodes the script text for uploading
/// </summary>
/// <param name="body"></param>
public static byte[] EncodeScript(string body)
{
// Assume this is a string, add 1 for the null terminator ?
byte[] stringBytes = System.Text.Encoding.UTF8.GetBytes(body);
byte[] assetData = new byte[stringBytes.Length]; //+ 1];
Array.Copy(stringBytes, 0, assetData, 0, stringBytes.Length);
return assetData;
}
}
}