X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=7f3db40720fda78e4b677235514f8715ed01c61e;hb=e8b5b1e551794bf54de00c610363ffd140c62e55;hp=f1dfffece42b9ac20a24bc866aafe963d1a9e1ed;hpb=9dee46fd31f98c240f7cc20c5451502286dc71f6;p=jalview.git

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index f1dfffe..7f3db40 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -1,170 +1,182 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-package jalview.io;
-
-import java.io.*;
-import java.net.*;
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
- */
-public class IdentifyFile
-{
-  /**
-   * DOCUMENT ME!
-   *
-   * @param file DOCUMENT ME!
-   * @param protocol DOCUMENT ME!
-   *
-   * @return DOCUMENT ME!
-   */
-  public String Identify(String file, String protocol)
-  {
-    String reply = "PFAM";
-    String error = "FILE NOT FOUND";
-    try
-    {
-      BufferedReader reader = null;
-
-      if (protocol.equals(AppletFormatAdapter.FILE))
-      {
-        reader = new BufferedReader(new FileReader(file));
-      }
-      else if (protocol.equals(AppletFormatAdapter.URL))
-      {
-        error = "URL NOT FOUND";
-        URL url = new URL(file);
-        reader = new BufferedReader(new InputStreamReader(
-            url.openStream()));
-
-      }
-      else if (protocol.equals(AppletFormatAdapter.PASTE))
-      {
-        reader = new BufferedReader(new StringReader(file));
-      }
-      else if (protocol.equals(AppletFormatAdapter.CLASSLOADER))
-      {
-        java.io.InputStream is = getClass().getResourceAsStream("/" +
-            file);
-        reader = new BufferedReader(new java.io.InputStreamReader(is));
-      }
-
-      String data;
-
-      while ( (data = reader.readLine()) != null)
-      {
-        data = data.toUpperCase();
-
-        if ( (data.indexOf("# STOCKHOLM") > -1))
-        {
-          reply = "STH";
-
-          break;
-        }
-
-        if ( (data.indexOf("#") == 0) || (data.length() < 1))
-        {
-          continue;
-        }
-
-        if (data.indexOf("PILEUP") > -1)
-        {
-          reply = "PileUp";
-
-          break;
-        }
-
-        if ( (data.indexOf("//") == 0) ||
-            ( (data.indexOf("!!") > -1) &&
-             (data.indexOf("!!") < data.indexOf(
-                 "_MULTIPLE_ALIGNMENT "))))
-        {
-          reply = "MSF";
-
-          break;
-        }
-        else if (data.indexOf("CLUSTAL") > -1)
-        {
-          reply = "CLUSTAL";
-
-          break;
-        }
-        else if ( (data.indexOf(">P1;") > -1) ||
-                 (data.indexOf(">DL;") > -1))
-        {
-          reply = "PIR";
-
-          break;
-        }
-        else if (data.indexOf(">") > -1)
-        {
-          // could be BLC file, read next line to confirm
-          data = reader.readLine();
-
-          if (data.indexOf(">") > -1)
-          {
-            reply = "BLC";
-          }
-          else
-          {
-            //Is this a single line BLC file?
-            reader.readLine();
-            String data2 = reader.readLine();
-            if (data2 != null
-                && data.indexOf("*") > -1
-                && data.indexOf("*") == data2.indexOf("*"))
-            {
-              reply = "BLC";
-            }
-            else
-            {
-              reply = "FASTA";
-            }
-          }
-
-          break;
-        }
-        else if (data.indexOf("HEADER") == 0 ||
-                 data.indexOf("ATOM") == 0)
-        {
-          reply = "PDB";
-          break;
-        }
-        else if (data.indexOf(":") < data.indexOf(",")) //  && data.indexOf(",")<data.indexOf(",", data.indexOf(",")))
-        {
-          // file looks like a concise JNet file
-          reply = "JnetFile";
-          break;
-        }
-      }
-
-      reader.close();
-    }
-    catch (Exception ex)
-    {
-      System.err.println("File Identification failed!\n" + ex);
-      return error;
-    }
-
-    return reply;
-  }
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.io;
+
+import java.io.*;
+import java.net.*;
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class IdentifyFile
+{
+  /**
+   * Identify a datasource's file content. 
+   * @note Do not use this method
+   * for stream sources - create a FileParse object instead. 
+   *
+   * @param file DOCUMENT ME!
+   * @param protocol DOCUMENT ME! 
+   * @return ID String
+   */
+  public String Identify(String file, String protocol)
+  {
+    FileParse parser = null;
+    try {
+      parser = new FileParse(file, protocol);
+      if (parser.isValid()) {
+        return Identify(parser);
+      }
+    } catch (Exception e) {
+      System.err.println("Error whilst identifying");
+      e.printStackTrace(System.err);
+    }
+    if (parser!=null)
+      return parser.errormessage;
+    return "UNIDENTIFIED FILE PARSING ERROR";
+  }
+  public String Identify(FileParse source) {
+    return Identify(source, true); // preserves original behaviour prior to version 2.3
+  }
+  /**
+   * Identify contents of source, closing it or resetting source to start afterwards.
+   * @param source
+   * @param closeSource
+   * @return filetype string
+   */
+  public String Identify(FileParse source, boolean closeSource) {
+    String reply = "PFAM";
+    String data;
+    try {
+      while ( (data = source.nextLine()) != null)
+      {
+        data = data.toUpperCase();
+
+        if ( (data.indexOf("# STOCKHOLM") > -1))
+        {
+          reply = "STH";
+
+          break;
+        }
+
+        if ( (data.indexOf("#") == 0) || (data.length() < 1))
+        {
+          continue;
+        }
+
+        if (data.indexOf("PILEUP") > -1)
+        {
+          reply = "PileUp";
+
+          break;
+        }
+
+        if ( (data.indexOf("//") == 0) ||
+            ( (data.indexOf("!!") > -1) &&
+             (data.indexOf("!!") < data.indexOf(
+                 "_MULTIPLE_ALIGNMENT "))))
+        {
+          reply = "MSF";
+
+          break;
+        }
+        else if (data.indexOf("CLUSTAL") > -1)
+        {
+          reply = "CLUSTAL";
+
+          break;
+        }
+        else if ( (data.indexOf(">P1;") > -1) ||
+                 (data.indexOf(">DL;") > -1))
+        {
+          reply = "PIR";
+
+          break;
+        }
+        else if (data.indexOf(">") > -1)
+        {
+          // could be BLC file, read next line to confirm
+          data = source.nextLine();
+
+          if (data.indexOf(">") > -1)
+          {
+            reply = "BLC";
+          }
+          else
+          {
+            //Is this a single line BLC file?
+            source.nextLine();
+            String data2 = source.nextLine();
+            if (data2 != null
+                && data.indexOf("*") > -1
+                && data.indexOf("*") == data2.indexOf("*"))
+            {
+              reply = "BLC";
+            }
+            else
+            {
+              reply = "FASTA";
+            }
+          }
+
+          break;
+        }
+        else if (data.indexOf("HEADER") == 0 ||
+                 data.indexOf("ATOM") == 0)
+        {
+          reply = "PDB";
+          break;
+        }
+        else if (data.indexOf(":") < data.indexOf(",")) //  && data.indexOf(",")<data.indexOf(",", data.indexOf(",")))
+        {
+          // file looks like a concise JNet file
+          reply = "JnetFile";
+          break;
+        }
+        else  if (source.inFile!=null) 
+        {
+            String fileStr=source.inFile.getName();
+            // possibly a Jalview archive. 
+            if (fileStr.lastIndexOf(".jar")>-1 || fileStr.lastIndexOf(".zip")>-1) 
+            {
+              reply = "Jalview";
+            }
+        } else if (data.startsWith("PK")) {
+          reply="Jalview"; // archive.
+          break;
+        }
+      }
+      if (closeSource) {
+        source.close();
+      } else {
+        source.reset(); // so the file can be parsed from the beginning again.
+      }
+    }
+    catch (Exception ex)
+    {
+      System.err.println("File Identification failed!\n" + ex);
+      return source.errormessage;
+    }
+
+    return reply;
+  }
+}