I think this works...

linus-berg · Sep 29, 2024 · 5ca8baa · 5ca8baa
1 parent b44ce31
commit 5ca8baa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/ACM.Kernel/FileSystem.cs b/ACM.Kernel/FileSystem.cs
@@ -92,7 +92,7 @@ public string GetArtifactPath(string module, string uri_str) {
   }
 
   public async Task<long> GetFileSize(string filepath) {
-    FileSpec spec = await storage_backend_.GetFileInfoAsync(filepath);
+    FileSpec spec = await storage_backend_.GetFileInfoAsync(filepath) ?? throw new InvalidOperationException();
     return spec.size;
   }
 

diff --git a/ACM.Kernel/Storage/Minio/MinioStorage.cs b/ACM.Kernel/Storage/Minio/MinioStorage.cs
@@ -184,13 +184,13 @@ public async Task<bool> SaveFileAsync(string path, Stream stream,
     }
 
     try {
+      /* Todo: fix this ugly hack */
       if (seekable_stream.Length == 0) {
         string filename = Path.GetTempFileName();
         await client.PutObjectAsync(
           new PutObjectArgs().WithBucket(bucket_).WithObject(normalized_path)
                              .WithFileName(filename), cancellation_token);
         File.Delete(filename);
-        return true;
       } else {
         await client.PutObjectAsync(
           new PutObjectArgs().WithBucket(bucket_).WithObject(normalized_path)
@@ -199,12 +199,13 @@ await client.PutObjectAsync(
                                seekable_stream.Length -
                                seekable_stream.Position),
           cancellation_token);
-        return true;
       }
+
+      return true;
     } catch (Exception ex) {
       logger_.LogError(ex, "Error saving {Path}: {Message}", normalized_path,
                        ex.Message);
-      return false;
+            throw;
     } finally {
       if (!stream.CanSeek) {
         seekable_stream.Dispose();

diff --git a/APC.Tester/Program.cs b/APC.Tester/Program.cs
@@ -84,18 +84,6 @@ await hc.GetAsync(
 connection.end_point = Configuration.GetApcVar(ApcVariable.ACM_S3_ENDPOINT);
 connection.bucket = Configuration.GetApcVar(ApcVariable.ACM_S3_BUCKET);
 
-
-MinioStorageOptions minio_options = new() {
-  auto_create_bucket = true,
-  connection_string = connection.ToString()
-};
-MinioStorage st = new(minio_options, NullLogger<MinioStorage>.Instance);
-HttpClient http_client = new();
-HttpResponseMessage response =
-  await http_client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
-await using Stream remote_stream =
-  await response.Content.ReadAsStreamAsync();
-
 //await st.SaveFileAsync("debug/empty-file", remote_stream);
 await file.Get("list");
 Console.WriteLine(Path.GetDirectoryName(path));