X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=2dec5592664b9889095ed0d9f4618696cc1524d1;hb=5a352aa2f3330ae269d9b70c4a7374c2518bfb2e;hp=3c3e95124f858a29e67f7bd9ec188ba2478314e5;hpb=5e6d487896b10a77ee0240b764c82c42aeeaf6aa;p=jalview.git

diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java
index 3c3e951..2dec559 100755
--- a/src/jalview/io/FileParse.java
+++ b/src/jalview/io/FileParse.java
@@ -20,6 +20,7 @@
  */
 package jalview.io;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -33,12 +34,14 @@ import java.io.StringReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.zip.GZIPInputStream;
 
 import jalview.api.AlignExportSettingsI;
 import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureSettingsModelI;
+import jalview.bin.Console;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 
@@ -192,29 +195,83 @@ public class FileParse
     }
     if (!error)
     {
-      if (fileStr.toLowerCase().endsWith(".gz"))
+      try
       {
-        try
-        {
-          dataIn = getGzipReader(new FileInputStream(fileStr));
-          dataName = fileStr;
-          return error;
-        } catch (Exception x)
-        {
-          warningMessage = "Failed  to resolve as a GZ stream ("
-                  + x.getMessage() + ")";
-          // x.printStackTrace();
-        }
-        ;
+        dataIn = checkForGzipStream(new FileInputStream(fileStr));
+        dataName = fileStr;
+      } catch (Exception x)
+      {
+        warningMessage = "Failed to resolve " + fileStr
+                + " as a data source. (" + x.getMessage() + ")";
+        // x.printStackTrace();
+        error = true;
       }
-
-      dataIn = new BufferedReader(new FileReader(fileStr));
-      dataName = fileStr;
+      ;
     }
     return error;
   }
 
   /**
+   * Recognise the 2-byte magic header for gzip streams
+   * 
+   * https://recalll.co/ask/v/topic/java-How-to-check-if-InputStream-is-Gzipped/555aadd62bd27354438b90f6
+   * 
+   * @param bytes
+   *          - at least two bytes
+   * @return
+   * @throws IOException
+   */
+  public static boolean isGzipStream(InputStream input) throws IOException
+  {
+    if (!input.markSupported())
+    {
+      Console.error(
+              "FileParse.izGzipStream: input stream must support mark/reset");
+      return false;
+    }
+    input.mark(4);
+
+    // get first 2 bytes or return false
+    byte[] bytes = new byte[2];
+    int read = input.read(bytes);
+    input.reset();
+    if (read != bytes.length)
+    {
+      return false;
+    }
+
+    int header = (bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+    return (GZIPInputStream.GZIP_MAGIC == header);
+  }
+
+  /**
+   * Returns a Reader for the given input after wrapping it in a buffered input
+   * stream, and then checking if it needs to be wrapped by a GZipInputStream
+   * 
+   * @param input
+   * @return
+   */
+  private BufferedReader checkForGzipStream(InputStream input)
+          throws Exception
+  {
+    // NB: stackoverflow
+    // https://stackoverflow.com/questions/4818468/how-to-check-if-inputstream-is-gzipped
+    // could use a PushBackInputStream rather than a BufferedInputStream
+    if (!input.markSupported())
+    {
+      input = new BufferedInputStream(input, 16);
+    }
+    if (isGzipStream(input))
+    {
+      return getGzipReader(input);
+    }
+    // return a buffered reader for the stream.
+    InputStreamReader isReader = new InputStreamReader(input);
+    BufferedReader toReadFrom = new BufferedReader(isReader);
+    return toReadFrom;
+  }
+
+  /**
    * Returns a {@code BufferedReader} which wraps the input stream with a
    * GZIPInputStream. Throws a {@code ZipException} if a GZIP format error
    * occurs or the compression method used is unsupported.
@@ -256,19 +313,40 @@ public class FileParse
   {
     errormessage = "URL NOT FOUND";
     URL url = new URL(urlStr);
-    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-    int rc = conn.getResponseCode();
-    if (rc != HttpURLConnection.HTTP_OK)
+    URLConnection _conn = url.openConnection();
+    if (_conn instanceof HttpURLConnection)
     {
-      throw new IOException(
-              "Response status from " + urlStr + " was " + rc);
+      HttpURLConnection conn = (HttpURLConnection) _conn;
+      int rc = conn.getResponseCode();
+      if (rc != HttpURLConnection.HTTP_OK)
+      {
+        throw new IOException(
+                "Response status from " + urlStr + " was " + rc);
+      }
+    }
+    else
+    {
+      try
+      {
+        dataIn = checkForGzipStream(_conn.getInputStream());
+        dataName = urlStr;
+      } catch (IOException ex)
+      {
+        throw new IOException("Failed to handle non-HTTP URI stream", ex);
+      } catch (Exception ex)
+      {
+        throw new IOException(
+                "Failed to determine type of input stream for given URI",
+                ex);
+      }
+      return;
     }
-    String encoding = conn.getContentEncoding();
-    String contentType = conn.getContentType();
+    String encoding = _conn.getContentEncoding();
+    String contentType = _conn.getContentType();
     boolean isgzipped = "application/x-gzip".equalsIgnoreCase(contentType)
             || "gzip".equals(encoding);
     Exception e = null;
-    InputStream inputStream = conn.getInputStream();
+    InputStream inputStream = _conn.getInputStream();
     if (isgzipped)
     {
       try