Commit e2242d6c authored by Robert Butora's avatar Robert Butora
Browse files

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

parent cc26a9cb
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -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;
   }