Firefly-1701: Merge PR #1741 from FIREFLY-1701-mpv-more-support

Firefly-1701: DataProductViewer: add pdf, yaml, json html, and text files

Author: robyww

src/firefly/java/edu/caltech/ipac/firefly/core/FileAnalysis.java

@@ -68,7 +68,7 @@ public static FileAnalysisReport analyze(FileInfo fileInfo,
         if (responseCode>=400) {
             return analyzeError(infile, responseCode, contentType);
         }
-        if (contentType!=null && contentType.toLowerCase().equals("text/html")) {
+        if (contentType!=null && contentType.equalsIgnoreCase("text/html")) {
             return analyzeLoadInBrowser(infile, contentType);
         }
         switch (format) {

src/firefly/java/edu/caltech/ipac/firefly/data/ServerParams.java

@@ -179,7 +179,9 @@ public class ServerParams {
 
     public static final String INIT_APP = "CmdInitApp";
     public static final String JSON_PROPERTY= "CmdJsonProperty";
+    public static final String TEXT_FILE= "CmdTextFile";
     public static final String LOGOUT = "CmdLogout";
+    public static final String MAX_FILE_SIZE = "maxFileSize";
     public static final String TILE_SIZE = "tileSize";
     public static final String DATA_COMPRESS = "dataCompress";
     public static final String POINT_SIZE= "pointSize";

src/firefly/java/edu/caltech/ipac/firefly/server/AppServerCommands.java

@@ -13,7 +13,10 @@
 import edu.caltech.ipac.firefly.server.events.ServerEventManager;
 import edu.caltech.ipac.firefly.server.security.SsoAdapter;
 import edu.caltech.ipac.firefly.server.util.Logger;
+import edu.caltech.ipac.firefly.server.visualize.imageretrieve.URLFileRetriever;
 import edu.caltech.ipac.util.AppProperties;
+import edu.caltech.ipac.util.FileUtil;
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -56,6 +59,38 @@ public String doCommand(SrvParam params) throws Exception {
         }
     }
 
+    public static class TextFile extends ServCommand {
+        
+        public String doCommand(SrvParam sp) throws Exception {
+            long maxSize= sp.getOptionalLong(ServerParams.MAX_FILE_SIZE, FileUtil.MEG);
+            JSONObject obj= new JSONObject();
+            JSONArray retAry= new JSONArray();
+            retAry.add(obj);
+            var fileInfo= new URLFileRetriever().getFile(sp.getRequired(ServerParams.URL));
+            if (fileInfo.getResponseCode() != 200) {
+                obj.put("success", false);
+                obj.put("error", "Error retrieving file, status: "+fileInfo.getResponseCode());
+                obj.put("cause", "Error retrieving file, status: "+fileInfo.getResponseCode());
+            }
+            if (fileInfo.getFile().length() > maxSize) {
+                var sizeStr= FileUtil.getSizeAsString(fileInfo.getFile().length());
+                obj.put("success", false);
+                obj.put("error", "File too large, size: "+sizeStr);
+                obj.put("cause", "File too large, size: "+sizeStr);
+            }
+            else {
+                String data= FileUtil.readFile(fileInfo.getFile());
+                obj.put("success", true);
+                obj.put("data", data);
+            }
+            return retAry.toString();
+        }
+    }
+
+
+
+
+
     public static class JsonProperty extends ServCommand {
         static final String INVENTORY_PROP = "inventory.serverURLAry";
         static final String FIREFLY_OPTIONS = "FIREFLY_OPTIONS";

src/firefly/java/edu/caltech/ipac/firefly/server/ServerCommandAccess.java

@@ -103,6 +103,7 @@ private static void initCommand() {
         _cmdMap.put(ServerParams.LOGOUT,                 new AppServerCommands.Logout());
         _cmdMap.put(ServerParams.GET_USER_INFO,          new AppServerCommands.GetUserInfo());
         _cmdMap.put(ServerParams.GET_ALERTS,             new AppServerCommands.GetAlerts());
+        _cmdMap.put(ServerParams.TEXT_FILE,              new AppServerCommands.TextFile());
 
     }
 

src/firefly/java/edu/caltech/ipac/firefly/server/SrvParam.java

@@ -216,6 +216,20 @@ public float getOptionalFloat(String key, float defValue) {
         }
     }
 
+    public long getOptionalLong(String key, long defValue) {
+        String[] ary = paramMap.get(key);
+        if (ary != null && ary.length>0) {
+            try {
+                return Long.parseLong(ary[0]);
+            } catch (NumberFormatException e) {
+                return defValue;
+            }
+        }
+        else {
+            return defValue;
+        }
+    }
+
     public int getOptionalInt(String key, int defValue) {
         String[] ary = paramMap.get(key);
         if (ary != null && ary.length>0) {

src/firefly/java/edu/caltech/ipac/firefly/server/servlets/AnyFileDownload.java

@@ -159,7 +159,7 @@ private void handleExternalURLRequest(HttpServletRequest req, HttpServletRespons
         File dFile= File.createTempFile("tmp-","-"+fileName ,ServerContext.getUploadDir());
         FileInfo fi;
         try {
-            fi = URLDownload.getDataToFile(url, dFile);
+            fi = URLDownload.getDataToFile(url, dFile, null, null, URLDownload.Options.defWithRedirect());
         } catch (FailedRequestException e) {
             res.sendError(404, e.toString());
             return;

src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/URLFileRetriever.java

@@ -46,6 +46,12 @@ public FileInfo getFile(WebPlotRequest request) throws FailedRequestException, G
        return getFile(request,true);
     }
 
+    public FileInfo getFile(String urlStr) throws FailedRequestException, GeomException, SecurityException {
+        WebPlotRequest request = WebPlotRequest.makeURLPlotRequest(urlStr);
+        request.setUrlCheckForNewer(true);
+        return getFile(request,true);
+    }
+
     public FileInfo getFile(WebPlotRequest request, boolean handleAllErrors) throws FailedRequestException, GeomException, SecurityException {
         FileInfo fitsFileInfo;
         String urlStr = request.getURL();

src/firefly/java/edu/caltech/ipac/visualize/net/AnyUrlParams.java

@@ -18,7 +18,7 @@ public class AnyUrlParams extends BaseNetParams {
     public static List<String> DEF_EXT_LIST=
             Arrays.asList(
                     "ul", FileUtil.FITS, FileUtil.GZ, FileUtil.TAR, FileUtil.PDF, FileUtil.GZ, FileUtil.REG,
-                    "votable", FileUtil.VOT, FileUtil.XML, FileUtil.TBL, FileUtil.CSV, FileUtil.TSV,
+                    "votable", FileUtil.VOT, FileUtil.XML, FileUtil.TBL, FileUtil.CSV, FileUtil.TSV, FileUtil.TXT,
                     FileUtil.jpeg, FileUtil.jpg, FileUtil.png, FileUtil.bmp, FileUtil.gif, FileUtil.tiff, FileUtil.tif);
 
     private final static int MAX_LENGTH = 30;

src/firefly/js/core/JsonUtils.js

@@ -37,7 +37,7 @@ export function jsonFetch(url, params, doPost, useBigInt) {
                     if (toBoolean(result[0].success)) {
                         resolve(result[0].data ? result[0].data : result[0]);
                     } else if (has(result, '0.error')) {
-                        reject(new Error(result[0].error, { cause: result[0].cause1}));
+                        reject(new Error(result[0].error, { cause: result[0].cause1 ?? result[0].cause}));
                     } else {
                         reject(new Error(`Unrecognized result: ${result}`));
                     }

src/firefly/js/data/ServerParams.js

@@ -159,6 +159,7 @@ export const ServerParams = {
         LOG_OUT: 'CmdLogout',
         INIT_APP: 'CmdInitApp',
         JSON_PROPERTY: 'CmdJsonProperty',
+        TEXT_FILE: 'CmdTextFile',
         GET_IMAGE_MASTER_DATA: 'getImageMasterData',
         GET_FLOAT_DATA: 'getFloatData',
         GET_BYTE_DATA: 'getStretchedByteData',
@@ -167,6 +168,7 @@ export const ServerParams = {
         VIS_PUSH_ALIVE_CHECK: 'pushAliveCheck',
         VIS_PUSH_ALIVE_COUNT: 'pushAliveCount',
         VIS_PUSH_ACTION: 'pushAction',
+        MAX_FILE_SIZE: 'maxFileSize',
         TILE_SIZE: 'tileSize',
         DATA_COMPRESS: 'dataCompress',
         POINT_SIZE: 'pointSize',