X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FFileParse.java;h=f2a797c6557a15403467846297e6e964e3266838;hb=9c19686c86fc6060c8734478ea6e73954684a597;hp=c0328d5f0774d4edebe31a095c333d59adc31667;hpb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;p=jalview.git

diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java
index c0328d5..f2a797c 100755
--- a/src/jalview/io/FileParse.java
+++ b/src/jalview/io/FileParse.java
@@ -20,13 +20,15 @@
  */
 package jalview.io;
 
-import jalview.api.AlignExportSettingI;
+import jalview.api.AlignExportSettingsI;
 import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureSettingsModelI;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;
@@ -45,6 +47,10 @@ import java.util.zip.GZIPInputStream;
  */
 public class FileParse
 {
+  protected static final String SPACE = " ";
+
+  protected static final String TAB = "\t";
+
   /**
    * text specifying source of data. usually filename or url.
    */
@@ -52,6 +58,12 @@ public class FileParse
 
   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
    * move to different object.
@@ -61,7 +73,7 @@ public class FileParse
   /**
    * 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
@@ -169,7 +181,7 @@ public class FileParse
       errormessage = "FILE CANNOT BE OPENED FOR READING";
       error = true;
     }
-    if (inFile.isDirectory())
+    if (!Platform.isJS() && inFile.isDirectory())
     {
       // this is really a 'complex' filetype - but we don't handle directory
       // reads yet.
@@ -299,22 +311,44 @@ public class FileParse
    * 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 MalformedURLException, 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)
@@ -335,6 +369,14 @@ public class FileParse
         }
       }
     }
+    else if (sourceType == DataSourceType.RELATIVE_URL)
+    {
+      // BH 2018 hack for no support for access-origin
+      bytes = Platform.getFileAsBytes(fileStr);
+      dataIn = new BufferedReader(new java.io.InputStreamReader(new ByteArrayInputStream(bytes)));      
+      dataName = fileStr;
+
+    }
     else if (sourceType == DataSourceType.URL)
     {
       try
@@ -411,7 +453,8 @@ public class FileParse
     {
       // pass up the reason why we have no source to read from
       throw new IOException(MessageManager.formatMessage(
-              "exception.failed_to_read_data_from_source", new String[]
+              "exception.failed_to_read_data_from_source",
+              new String[]
               { errormessage }));
     }
     error = false;
@@ -580,7 +623,7 @@ public class FileParse
   /**
    * @return the currently configured exportSettings for writing data.
    */
-  public AlignExportSettingI getExportSettings()
+  public AlignExportSettingsI getExportSettings()
   {
     return exportSettings;
   }
@@ -591,7 +634,7 @@ public class FileParse
    * @param exportSettings
    *          the exportSettings to set
    */
-  public void setExportSettings(AlignExportSettingI exportSettings)
+  public void setExportSettings(AlignExportSettingsI exportSettings)
   {
     this.exportSettings = exportSettings;
   }