ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

make AssetServicesConnector do HG work (HGAssetServicesConnector should no not be in used now); change HGAssetBroker to be a extended derivative of it. WARNING TESTgit push origin master possible still very broken

Browse Source
This commit is contained in:
UbitUmarov
2020-10-23 19:43:31 +01:00
parent 56d3e1cdc9
commit b3893b9dc5
8 changed files with 616 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
OpenSim/Framework/Util.cs
View File

@@ -1485,30 +1485,41 @@ namespace OpenSim.Framework
/// <param name="url">The URL: http://grid.example.com:8002</param>
/// <param name="assetID">The asset ID: 00000000-0000-0000-0000-000000000000. Returned even if 'id' isn't foreign.</param>
/// <returns>True: this is a foreign asset ID; False: it isn't</returns>
public static bool ParseForeignAssetID(string id, out string url, out string assetID)
public static int ParseForeignAssetID(string id, out string url, out string assetID)
{
url = String.Empty;
assetID = String.Empty;
url = string.Empty;
assetID = string.Empty;
if (UUID.TryParse(id, out UUID uuid))
if (id.Length == 0)
return -1;
if(id[0] != 'h' && id[0] != 'H')
{
assetID = uuid.ToString();
return false;
if (UUID.TryParse(id, out UUID luuid))
{
assetID = id;
return 0;
}
return -1;
}
if ((id.Length == 0) || (id[0] != 'h' && id[0] != 'H'))
return false;
if (!Uri.TryCreate(id, UriKind.Absolute, out Uri assetUri) || assetUri.Scheme != Uri.UriSchemeHttp)
return false;
url = "http://" + assetUri.Authority;
assetID = assetUri.LocalPath.Trim(new char[] { '/' });
if (!UUID.TryParse(assetID, out uuid))
return false;
return true;
OSHTTPURI uri = new OSHTTPURI(id, true);
if(uri.IsResolvedHost)
{
url = uri.URL;
string tmp = uri.Path;
if(tmp.Length < 36)
return -3;
if(tmp[0] =='/')
tmp = tmp.Substring(1);
if (UUID.TryParse(tmp, out UUID uuid))
{
assetID = tmp;
return 1;
}
return -1;
}
return -2;
}
/// <summary>