From e2242d6c14f7d6e35cc2733625f35cc9696ae7a2 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 15 May 2024 23:05:50 +0200
Subject: [PATCH] mcutout: adds short timestamp and filesize to tar.gz filename
---
.../servlet/src/main/java/cutout/DatasetsCli.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/data-access/servlet/src/main/java/cutout/DatasetsCli.java b/data-access/servlet/src/main/java/cutout/DatasetsCli.java
index f6a125b..c6d4ee6 100644
--- a/data-access/servlet/src/main/java/cutout/DatasetsCli.java
+++ b/data-access/servlet/src/main/java/cutout/DatasetsCli.java
@@ -30,6 +30,8 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import java.io.BufferedOutputStream;
+import java.util.Date;
+import java.text.SimpleDateFormat;
import vo.parameter.*;
@@ -122,7 +124,9 @@ class DatasetsCli implements Datasets
private MCutResult doCompressCutFiles(MCutResult.Cut[] cutArr)
throws IOException, InterruptedException
{
- final String tgzFileName = settings.fitsPaths.cutouts() + "/mcutout_TIMESTAMP.tar.gz";
+ String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+
+ final String tgzFileName = settings.fitsPaths.cutouts() + "/mcutout_" + timestamp + ".tar.gz";
/*
StringBuilder sb = new StringBuilder();
for(MCutResult.Cut cut : cutArr)
@@ -173,9 +177,9 @@ class DatasetsCli implements Datasets
MCutResult mCutResult = new MCutResult();
mCutResult.cutResArr = cutArr;
mCutResult.fileName = tgzFileName;
- mCutResult.fileSize = 0;
+ mCutResult.fileSize = Files.size(output);
- // FIXME add response.json to tar.gz, add timestamp, add filesize when successful
+ // FIXME add response.json to tar.gz, add nanosecs to timestamp
return mCutResult;
}
--
GitLab