Filename redundant property

LeedsExperiment/Dashboard/Views/Browse/Binary.cshtml

@@ -14,8 +14,8 @@
 
     <table class="table">
         <tr>
-            <th scope="row">File name</th>
-            <td>@Model.FileName</td>
+            <th scope="row">Name</th>
+            <td>@Model.Name</td>
         </tr>
         <tr>
             <th scope="row">Content type</th>

LeedsExperiment/Dashboard/Views/Shared/_ContainerTable.cshtml

@@ -11,7 +11,6 @@
             <th scope="col">Type</th>
             <th scope="col">Created</th>
             <th scope="col">LastModified</th>
-            <th scope="col">Filename</th>
             <th scope="col">Content type</th>
             <th scope="col">Size</th>
         </tr>
@@ -28,7 +27,6 @@
                 <td>@StringUtils.GetLocalDate(container.LastModified)</td>
                 <td></td>
                 <td></td>
-                <td></td>
             </tr>
         }
 
@@ -41,7 +39,6 @@
                 <td>@binary.Type</td>
                 <td>@StringUtils.GetLocalDate(binary.Created)</td>
                 <td>@StringUtils.GetLocalDate(binary.LastModified)</td>
-                <td>@binary.FileName</td>
                 <td>@binary.ContentType</td>
                 <td>@StringUtils.FormatFileSize(binary.Size, true)</td>
             </tr>

LeedsExperiment/Fedora/Abstractions/Binary.cs

@@ -20,8 +20,13 @@ public Binary(FedoraJsonLdResponse jsonLdResponse) : base(jsonLdResponse)
         }
     }
 
-    [JsonPropertyName("filename")]
-    [JsonPropertyOrder(21)]
+    /// <summary>
+    /// The ebucore:filename triple in Fedora.
+    /// This is here for visibility, but we will not use it in the Storage API - use Name to hold original file name.
+    /// 
+    /// We could validate that it's always the same as Name
+    /// </summary>
+    [JsonIgnore]
     public string? FileName { get; set; }
 
     [JsonPropertyName("contentType")]

LeedsExperiment/Fedora/Abstractions/Resource.cs

@@ -21,9 +21,14 @@ protected Resource()
 
     [JsonPropertyName("@id")]
     [JsonPropertyOrder(1)]
-    // The URI for this API
+    // The URI for this Storage API (accessible to API consumers)
     public Uri? PreservationApiUri { get; set; }
 
+    [JsonPropertyName("id")]
+    [JsonPropertyOrder(12)]
+    // The URI in Fedora (not accessible to API consumers)
+    public Uri? Location { get; set; }
+
     [JsonPropertyName("type")]
     [JsonPropertyOrder(1)]
     public string? Type { get; set; }
@@ -39,10 +44,6 @@ protected Resource()
     // Use dc:title on the fedora resource
     public string? Name { get; set; }
 
-    [JsonPropertyName("id")]
-    [JsonPropertyOrder(12)]
-    // The Fedora identifier
-    public Uri? Location { get; set; }
 
     [JsonPropertyName("objectPath")]
     [JsonPropertyOrder(12)]

LeedsExperiment/Fedora/Abstractions/Transfer/BinaryFile.cs

@@ -22,10 +22,12 @@ public class BinaryFile : ResourceWithParentUri
     /// <summary>
     /// The Original / actual name of the file, rather than the path-safe, reduced character set slug.
     /// Goes into Fedora as Content-Disposition
+    /// 
+    /// Going to remove this from the class that represents a file for transfer, because we only want to think about Name
     /// </summary>
-    [JsonPropertyName("fileName")]
-    [JsonPropertyOrder(13)]
-    public required string FileName { get; set; }
+    //[JsonPropertyName("fileName")]
+    //[JsonPropertyOrder(13)]
+    //public required string FileName { get; set; }
 
     // NB ^^^ for a filename like readme.txt, Slug, Name and FileName will all be the same.
     // And in practice, Name and FileName are going ot be the same

LeedsExperiment/Fedora/ApiModel/BinaryMetadataResponse.cs

@@ -4,6 +4,10 @@ namespace Fedora.ApiModel
 {
     public class BinaryMetadataResponse : FedoraJsonLdResponse
     {
+        /// <summary>
+        /// This property is present at ebucore:filename in Fedora RDF.
+        /// It is present if you gave the binary a content disposition header to set the file name
+        /// </summary>
         [JsonPropertyName("filename")]
         [JsonPropertyOrder(201)]
         public string? FileName { get; set; }

LeedsExperiment/Preservation.API/Controllers/ImportController.cs

@@ -196,7 +196,7 @@ private static void TraverseContainers(
                 ContentType = binary.ContentType ?? string.Empty,
                 StorageType = StorageTypes.S3, // shouldn't have to hard code that here, but Binary doesn't have that prop
                 Digest = binary.Digest,
-                FileName = binary.FileName!,
+                // FileName = binary.FileName!,
                 ExternalLocation = binary.Origin ?? string.Empty // we won't use this because it's the destination                
             });
         }
@@ -437,7 +437,7 @@ private async Task<ImportSource> GetImportSource(string source, Uri intendedPare
             importSource.Files.Add(new BinaryFile
             {
                 Name = nameAndParentPath.Name,
-                FileName = nameAndParentPath.Name,
+                // FileName = nameAndParentPath.Name,
                 Parent = intendedParent,
                 Path = sourcePath,
                 StorageType = StorageTypes.S3,

LeedsExperiment/Preservation/FedoraWrapper.cs

@@ -350,7 +350,7 @@ private async Task<HttpRequestMessage> MakeBinaryPutOrPost(HttpMethod httpMethod
             case StorageTypes.S3:
                 // This should instead reference the file in S3, for Fedora to fetch
                 // https://fedora-project.slack.com/archives/C8B5TSR4J/p1710164226000799
-                // ^ not possible rn
+                // ^ not possible rn - but can use a signed HTTP url to fetch! (TODO)
                 var s3Uri = new AmazonS3Uri(binaryFile.ExternalLocation);
                 var s3Req = new GetObjectRequest() { BucketName = s3Uri.Bucket, Key = s3Uri.Key };
                 var ms = new MemoryStream();
@@ -362,7 +362,9 @@ private async Task<HttpRequestMessage> MakeBinaryPutOrPost(HttpMethod httpMethod
             default:
                 throw new InvalidOperationException("Unkown storage type " + binaryFile.StorageType);
         }
-        req.Content.WithContentDisposition(binaryFile.FileName);
+        // req.Content.WithContentDisposition(binaryFile.FileName); // no longer use this property...
+        // ...but still set the content disposition to give the file within Fedora an ebucore:filename triple:
+        req.Content.WithContentDisposition(binaryFile.Name);
         return req;
     }
 

LeedsExperiment/SamplesWorker/Worker.cs

@@ -103,7 +103,7 @@ private BinaryFile MakeBinaryFileFromFileSystem(string localRootPath, Uri fedora
                 ExternalLocation = localFileInfo.FullName,
                 Path = pathWithinArchivalGroup,
                 ContentType = contentType,
-                FileName = localFileInfo.Name,
+                // FileName = localFileInfo.Name,
                 Name = localFileInfo.Name,
                 StorageType = StorageTypes.FileSystem,
                 Digest = sha256