Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • coscine/backend/apis/treeapi
1 result
Select Git revision
Loading items
Show changes
Commits on Source (5)
...@@ -22,6 +22,7 @@ using VDS.RDF.Parsing; ...@@ -22,6 +22,7 @@ using VDS.RDF.Parsing;
using VDS.RDF.Writing; using VDS.RDF.Writing;
using Coscine.ResourceLoader; using Coscine.ResourceLoader;
using Coscine.Configuration; using Coscine.Configuration;
using Coscine.ResourceTypeBase;
namespace Coscine.Api.Tree.Controllers namespace Coscine.Api.Tree.Controllers
{ {
...@@ -84,6 +85,7 @@ namespace Coscine.Api.Tree.Controllers ...@@ -84,6 +85,7 @@ namespace Coscine.Api.Tree.Controllers
[HttpGet("[controller]/{resourceId}/{*path}")] [HttpGet("[controller]/{resourceId}/{*path}")]
public async Task<IActionResult> GetMetadata(string resourceId, string path) public async Task<IActionResult> GetMetadata(string resourceId, string path)
{ {
var rawPath = path;
path = $"/{path}"; path = $"/{path}";
if (path.Contains("%2F") || path.Contains("%2f")) if (path.Contains("%2F") || path.Contains("%2f"))
{ {
...@@ -144,6 +146,8 @@ namespace Coscine.Api.Tree.Controllers ...@@ -144,6 +146,8 @@ namespace Coscine.Api.Tree.Controllers
Kind = x.Key[(x.Key.LastIndexOf(".") + 1)..], Kind = x.Key[(x.Key.LastIndexOf(".") + 1)..],
Provider = resource.Type.DisplayName Provider = resource.Type.DisplayName
}; };
var resourceTypeOptions = _resourceModel.GetResourceTypeOptions(resource.Id);
var resourceTypeDefinition = ResourceTypeFactory.CreateResourceTypeObject(resource.Type.DisplayName, _configuration);
var objectMetaInfoReturnObject = new ObjectMetaInfoReturnObject(objectMetaInfo, _blobApiLink, resource.Id.ToString()); var objectMetaInfoReturnObject = new ObjectMetaInfoReturnObject(objectMetaInfo, _blobApiLink, resource.Id.ToString());
var result = new JObject var result = new JObject
{ {
...@@ -164,12 +168,12 @@ namespace Coscine.Api.Tree.Controllers ...@@ -164,12 +168,12 @@ namespace Coscine.Api.Tree.Controllers
["Download"] = new JObject ["Download"] = new JObject
{ {
["Method"] = "GET", ["Method"] = "GET",
["Url"] = objectMetaInfoReturnObject.DownloadLink ["Url"] = resourceTypeDefinition?.GetEntryDownloadUrl(rawPath, null, resourceTypeOptions).Result.ToString()
}, },
["Upload"] = new JObject ["Upload"] = new JObject
{ {
["Method"] = "PUT", ["Method"] = "PUT",
["Url"] = objectMetaInfoReturnObject.UploadLink ["Url"] = resourceTypeDefinition?.GetEntryStoreUrl(rawPath, null, resourceTypeOptions).Result.ToString()
} }
} }
}; };
...@@ -320,6 +324,7 @@ namespace Coscine.Api.Tree.Controllers ...@@ -320,6 +324,7 @@ namespace Coscine.Api.Tree.Controllers
return NoContent(); return NoContent();
} }
/// <summary> /// <summary>
/// Checks the resource Id and the path /// Checks the resource Id and the path
/// </summary> /// </summary>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<AssemblyName>Coscine.Api.Tree</AssemblyName> <AssemblyName>Coscine.Api.Tree</AssemblyName>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Version>2.1.1</Version> <Version>2.2.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Authors>RWTH Aachen University</Authors> <Authors>RWTH Aachen University</Authors>
......