Skip to content
Snippets Groups Projects
Commit e2242d6c authored by Robert Butora's avatar Robert Butora
Browse files

mcutout: adds short timestamp and filesize to tar.gz filename

parent cc26a9cb
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,8 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; ...@@ -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.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.util.Date;
import java.text.SimpleDateFormat;
import vo.parameter.*; import vo.parameter.*;
...@@ -122,7 +124,9 @@ class DatasetsCli implements Datasets ...@@ -122,7 +124,9 @@ class DatasetsCli implements Datasets
private MCutResult doCompressCutFiles(MCutResult.Cut[] cutArr) private MCutResult doCompressCutFiles(MCutResult.Cut[] cutArr)
throws IOException, InterruptedException 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(); StringBuilder sb = new StringBuilder();
for(MCutResult.Cut cut : cutArr) for(MCutResult.Cut cut : cutArr)
...@@ -173,9 +177,9 @@ class DatasetsCli implements Datasets ...@@ -173,9 +177,9 @@ class DatasetsCli implements Datasets
MCutResult mCutResult = new MCutResult(); MCutResult mCutResult = new MCutResult();
mCutResult.cutResArr = cutArr; mCutResult.cutResArr = cutArr;
mCutResult.fileName = tgzFileName; 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; return mCutResult;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment