*/
package jalview.io;
-import jalview.api.AlignExportSettingI;
-import jalview.api.AlignViewportI;
-import jalview.api.AlignmentViewPanel;
-import jalview.api.FeatureSettingsModelI;
-import jalview.util.MessageManager;
-
import java.io.BufferedInputStream;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
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;
/**
* implements a random access wrapper around a particular datasource, for
public File inFile = null;
+ private byte[] bytes; // from JavaScript
+
+ public byte[] getBytes()
+ {
+ return bytes;
+ }
/**
* a viewport associated with the current file operation. May be null. May
/**
* specific settings for exporting data from the current context
*/
- private AlignExportSettingI exportSettings;
+ private AlignExportSettingsI exportSettings;
/**
* sequence counter for FileParse object created from same data source
}
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
+ * @param bytes
+ * - at least two bytes
+ * @return
+ * @throws IOException
*/
- private static boolean isGzipStream(byte[] bytes) {
- int head = ((int) bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
- return (GZIPInputStream.GZIP_MAGIC == head);
+ 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);
}
/**
* @param input
* @return
*/
- private BufferedReader checkForGzipStream(InputStream input) throws Exception {
-
- // NB: stackoverflow https://stackoverflow.com/questions/4818468/how-to-check-if-inputstream-is-gzipped
+ 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
-
- BufferedInputStream bufinput;
- if (!input.markSupported()) {
- bufinput= new BufferedInputStream(input,16);
- input = bufinput;
+ if (!input.markSupported())
+ {
+ input = new BufferedInputStream(input, 16);
}
- input.mark(4);
- byte[] bytes=input.readNBytes(2);
- input.reset();
- if (bytes.length==2 && isGzipStream(bytes)) {
+ if (isGzipStream(input))
+ {
return getGzipReader(input);
}
// return a buffered reader for the stream.
- InputStreamReader isReader= new InputStreamReader(input);
- BufferedReader toReadFrom=new BufferedReader(isReader);
+ 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
throw new IOException(
"Response status from " + urlStr + " was " + rc);
}
- } else {
- try {
- dataIn = checkForGzipStream(_conn.getInputStream());
- dataName=urlStr;
+ }
+ else
+ {
+ try
+ {
+ dataIn = checkForGzipStream(_conn.getInputStream());
+ dataName = urlStr;
} catch (IOException ex)
{
- throw new IOException("Failed to handle non-HTTP URI stream",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);
+ throw new IOException(
+ "Failed to determine type of input stream for given URI",
+ ex);
}
return;
}
* Create a datasource for input to Jalview. See AppletFormatAdapter for the
* types of sources that are handled.
*
- * @param fileStr
- * - datasource locator/content
+ * @param file
+ * - datasource locator/content as File or String
* @param sourceType
* - protocol of source
* @throws MalformedURLException
* @throws IOException
*/
- public FileParse(String fileStr, DataSourceType sourceType)
+ public FileParse(Object file, DataSourceType sourceType)
throws MalformedURLException, IOException
{
- this.dataSourceType = sourceType;
+ if (file instanceof File)
+ {
+ parse((File) file, ((File) file).getPath(), sourceType, true);
+ }
+ else
+ {
+ parse(null, file.toString(), sourceType, false);
+ }
+ }
+
+ private void parse(File file, String fileStr, DataSourceType sourceType,
+ boolean isFileObject) throws IOException
+ {
+ bytes = Platform.getFileBytes(file);
+ dataSourceType = sourceType;
error = false;
if (sourceType == DataSourceType.FILE)
{
- if (checkFileSource(fileStr))
+
+ if (bytes != null)
+ {
+ // this will be from JavaScript
+ inFile = file;
+ dataIn = new BufferedReader(
+ new InputStreamReader(new ByteArrayInputStream(bytes)));
+ dataName = fileStr;
+ }
+ else if (checkFileSource(fileStr))
{
String suffixLess = extractSuffix(fileStr);
if (suffixLess != null)
}
}
}
+ else if (sourceType == DataSourceType.RELATIVE_URL)
+ {
+ // BH 2018 hack for no support for access-origin
+ bytes = Platform.getFileAsBytes(fileStr);
+ dataIn = new BufferedReader(
+ new InputStreamReader(new ByteArrayInputStream(bytes)));
+ dataName = fileStr;
+
+ }
else if (sourceType == DataSourceType.URL)
{
try
else if (sourceType == DataSourceType.CLASSLOADER)
{
errormessage = "RESOURCE CANNOT BE LOCATED";
- java.io.InputStream is = getClass()
- .getResourceAsStream("/" + fileStr);
+ InputStream is = getClass().getResourceAsStream("/" + fileStr);
if (is == null)
{
String suffixLess = extractSuffix(fileStr);
}
if (is != null)
{
- dataIn = new BufferedReader(new java.io.InputStreamReader(is));
+ dataIn = new BufferedReader(new InputStreamReader(is));
dataName = fileStr;
}
else
/**
* @return the currently configured exportSettings for writing data.
*/
- public AlignExportSettingI getExportSettings()
+ public AlignExportSettingsI getExportSettings()
{
return exportSettings;
}
* @param exportSettings
* the exportSettings to set
*/
- public void setExportSettings(AlignExportSettingI exportSettings)
+ public void setExportSettings(AlignExportSettingsI exportSettings)
{
this.exportSettings = exportSettings;
}
{
return dataSourceType;
}
+
+ /**
+ * Returns a buffered reader for the input object. Returns null, or throws
+ * IOException, on failure.
+ *
+ * @param file
+ * a File, or a String which is a name of a file
+ * @param sourceType
+ * @return
+ * @throws IOException
+ */
+ public BufferedReader getBufferedReader(Object file,
+ DataSourceType sourceType) throws IOException
+ {
+ BufferedReader in = null;
+ byte[] bytes;
+
+ switch (sourceType)
+ {
+ case FILE:
+ if (file instanceof String)
+ {
+ return new BufferedReader(new FileReader((String) file));
+ }
+ bytes = Platform.getFileBytes((File) file);
+ if (bytes != null)
+ {
+ return new BufferedReader(
+ new InputStreamReader(new ByteArrayInputStream(bytes)));
+ }
+ return new BufferedReader(new FileReader((File) file));
+ case URL:
+ URL url = new URL(file.toString());
+ in = new BufferedReader(new InputStreamReader(url.openStream()));
+ break;
+ case RELATIVE_URL: // JalviewJS only
+ bytes = Platform.getFileAsBytes(file.toString());
+ if (bytes != null)
+ {
+ in = new BufferedReader(
+ new InputStreamReader(new ByteArrayInputStream(bytes)));
+ }
+ break;
+ case PASTE:
+ in = new BufferedReader(new StringReader(file.toString()));
+ break;
+ case CLASSLOADER:
+ InputStream is = getClass().getResourceAsStream("/" + file);
+ if (is != null)
+ {
+ in = new BufferedReader(new InputStreamReader(is));
+ }
+ break;
+ }
+
+ return in;
+ }
}
git://source.jalview.org / jalview.git / blobdiff