X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=c21127ee201140c2b12bded740ab3278afd648c1;hb=bc93afe8b03eeafdba761dac61cd212434e3de7b;hp=ed1c29fe0b6f40f3f788022afeb2637bb14e6c77;hpb=2305d687bac5ed8a76ecb93c54c7b090a928e362;p=jalview.git

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index ed1c29f..c21127e 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -20,9 +20,11 @@
  */
 package jalview.io;
 
-import java.io.IOException;
 import java.util.Locale;
 
+import java.io.File;
+import java.io.IOException;
+
 /**
  * DOCUMENT ME!
  *
@@ -31,6 +33,42 @@ import java.util.Locale;
  */
 public class IdentifyFile
 {
+
+  public FileFormatI identify(Object file, DataSourceType protocol)
+          throws FileFormatException
+  {
+    // BH 2018
+    return (file instanceof File ? identify((File) file, protocol)
+            : identify((String) file, protocol));
+
+  }
+
+  public FileFormatI identify(File file, DataSourceType sourceType)
+          throws FileFormatException
+  {
+    // BH 2018
+    String emessage = "UNIDENTIFIED FILE PARSING ERROR";
+    FileParse parser = null;
+    try
+    {
+      parser = new FileParse(file, sourceType);
+      if (parser.isValid())
+      {
+        return identify(parser);
+      }
+    } catch (Exception e)
+    {
+      System.err.println("Error whilst identifying " + file);
+      e.printStackTrace(System.err);
+      emessage = e.getMessage();
+    }
+    if (parser != null)
+    {
+      throw new FileFormatException(parser.errormessage);
+    }
+    throw new FileFormatException(emessage);
+  }
+
   /**
    * Identify a datasource's file content.
    *
@@ -56,7 +94,7 @@ public class IdentifyFile
       }
     } catch (Exception e)
     {
-      System.err.println("Error whilst identifying");
+      System.err.println("Error whilst identifying " + file);
       e.printStackTrace(System.err);
       emessage = e.getMessage();
     }
@@ -131,16 +169,16 @@ public class IdentifyFile
           if (source.inFile != null)
           {
             String fileStr = source.inFile.getName();
-            // possibly a Jalview archive.
-            if (fileStr.lastIndexOf(".jar") > -1
-                    || fileStr.lastIndexOf(".zip") > -1)
+            if (fileStr.contains(".jar") || fileStr.contains(".zip")
+                    || fileStr.contains(".jvp"))
             {
+              // possibly a Jalview archive (but check further)
               reply = FileFormat.Jalview;
             }
           }
           if (!lineswereskipped && data.startsWith("PK"))
           {
-            reply = FileFormat.Jalview; // archive.
+            reply = FileFormat.Jalview; // archive
             break;
           }
         }
@@ -151,6 +189,19 @@ public class IdentifyFile
           reply = FileFormat.ScoreMatrix;
           break;
         }
+        if (data.startsWith("LOCUS"))
+        {
+          reply = FileFormat.GenBank;
+          break;
+        }
+        if (data.startsWith("ID "))
+        {
+          if (data.substring(2).trim().split(";").length == 7)
+          {
+            reply = FileFormat.Embl;
+            break;
+          }
+        }
         if (data.startsWith("H ") && !aaIndexHeaderRead)
         {
           aaIndexHeaderRead = true;
@@ -418,6 +469,11 @@ public class IdentifyFile
     return true;
   }
 
+  /**
+   * 
+   * @param args
+   * @j2sIgnore
+   */
   public static void main(String[] args)
   {
     for (int i = 0; args != null && i < args.length; i++)
@@ -440,4 +496,5 @@ public class IdentifyFile
       System.err.println("Usage: <Filename> [<Filename> ...]");
     }
   }
+
 }