X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=71f423769bb0d3031d7f126162c953f598f024f8;hb=2c11e91e2917eed2c65ff7c06ff2ab70a88c3914;hp=f80b3caff199e84e0403035b2466a618e4d9856d;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index f80b3ca..71f4237 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -1,46 +1,50 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
- *
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
* This file is part of Jalview.
- *
+ *
* Jalview 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 3 of the License, or (at your option) any later version.
- *
- * Jalview 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
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview 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 Jalview. If not, see .
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
-import java.io.*;
+import java.io.IOException;
/**
* DOCUMENT ME!
- *
+ *
* @author $author$
* @version $Revision$
*/
public class IdentifyFile
{
+ public static final String FeaturesFile = "GFF or Jalview features";
+
/**
* 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)
+ public String identify(String file, String protocol)
{
String emessage = "UNIDENTIFIED FILE PARSING ERROR";
FileParse parser = null;
@@ -49,7 +53,7 @@ public class IdentifyFile
parser = new FileParse(file, protocol);
if (parser.isValid())
{
- return Identify(parser);
+ return identify(parser);
}
} catch (Exception e)
{
@@ -58,29 +62,32 @@ public class IdentifyFile
emessage = e.getMessage();
}
if (parser != null)
+ {
return parser.errormessage;
+ }
return emessage;
}
- public String Identify(FileParse source)
+ public String identify(FileParse source)
{
- return Identify(source, true); // preserves original behaviour prior to
+ 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)
+ public String identify(FileParse source, boolean closeSource)
{
String reply = "PFAM";
String data;
- int length = 0;
+ int bytesRead = 0;
+ int trimmedLength = 0;
boolean lineswereskipped = false;
boolean isBinary = false; // true if length is non-zero and non-printable
// characters are encountered
@@ -92,7 +99,8 @@ public class IdentifyFile
}
while ((data = source.nextLine()) != null)
{
- length += data.length();
+ bytesRead += data.length();
+ trimmedLength += data.trim().length();
if (!lineswereskipped)
{
for (int i = 0; !isBinary && i < data.length(); i++)
@@ -126,50 +134,31 @@ public class IdentifyFile
}
data = data.toUpperCase();
- if ((data.indexOf("# STOCKHOLM") > -1))
+ if (data.startsWith("##GFF-VERSION"))
{
- reply = "STH";
-
+ // GFF - possibly embedded in a Jalview features file!
+ reply = FeaturesFile;
break;
}
-
- if ((data.indexOf("<") > -1))
+ if (looksLikeFeatureData(data))
{
- reply = "RNAML";
-
+ reply = FeaturesFile;
break;
}
-
- if ((data.length() < 1) || (data.indexOf("#") == 0))
+ if (data.indexOf("# STOCKHOLM") > -1)
{
- lineswereskipped = true;
- continue;
- }
-
- if (data.indexOf("PILEUP") > -1)
- {
- reply = "PileUp";
-
- break;
- }
-
- if ((data.indexOf("//") == 0)
- || ((data.indexOf("!!") > -1) && (data.indexOf("!!") < data
- .indexOf("_MULTIPLE_ALIGNMENT "))))
- {
- reply = "MSF";
-
+ reply = "STH";
break;
}
- else if (data.indexOf("CLUSTAL") > -1)
+ if (data.indexOf("_ENTRY.ID") > -1
+ || data.indexOf("_AUDIT_AUTHOR.NAME") > -1
+ || data.indexOf("_ATOM_SITE.") > -1)
{
- reply = "CLUSTAL";
-
+ reply = "mmCIF";
break;
}
-
-
- else if (data.indexOf(">") > -1)
+ // if (data.indexOf(">") > -1)
+ if (data.startsWith(">"))
{
// FASTA, PIR file or BLC file
boolean checkPIR = false, starterm = false;
@@ -197,13 +186,16 @@ public class IdentifyFile
starterm = (data1 != null && data1.indexOf("*") > -1)
|| (data2 != null && data2.indexOf("*") > -1);
}
- if (data2 != null && (c1=data.indexOf("*")) > -1)
+ if (data2 != null && (c1 = data.indexOf("*")) > -1)
{
- if (c1==0 && c1 == data2.indexOf("*"))
+ if (c1 == 0 && c1 == data2.indexOf("*"))
{
reply = "BLC";
- } else {
- reply = "FASTA"; // possibly a bad choice - may be recognised as PIR
+ }
+ else
+ {
+ reply = "FASTA"; // possibly a bad choice - may be recognised as
+ // PIR
}
// otherwise can still possibly be a PIR file
}
@@ -258,28 +250,89 @@ public class IdentifyFile
// read as a FASTA (probably)
break;
}
+ if ((data.indexOf("<") > -1)) // possible Markup Language data i.e HTML,
+ // RNAML, XML
+ {
+ // FIXME this is nuts - it consumes the rest of the file if no match
+ boolean identified = false;
+ do
+ {
+ if (data.matches("<(?i)html(\"[^\"]*\"|'[^']*'|[^'\">])*>"))
+ {
+ reply = HtmlFile.FILE_DESC;
+ identified = true;
+ break;
+ }
+
+ if (data.matches("<(?i)rnaml (\"[^\"]*\"|'[^']*'|[^'\">])*>"))
+ {
+ reply = "RNAML";
+ identified = true;
+ break;
+ }
+ } while ((data = source.nextLine()) != null);
+
+ if (identified)
+ {
+ break;
+ }
+ if (data == null)
+ {
+ break;
+ }
+ }
+
+ if (data.indexOf("{\"") > -1)
+ {
+ reply = JSONFile.FILE_DESC;
+ break;
+ }
+ if ((data.length() < 1) || (data.indexOf("#") == 0))
+ {
+ lineswereskipped = true;
+ 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("HEADER") == 0 || data.indexOf("ATOM") == 0)
{
reply = "PDB";
break;
}
- /*
- * // TODO comment out SimpleBLAST identification for Jalview 2.4.1 else
- * if (!lineswereskipped && data.indexOf("BLAST")<4) { reply =
- * "SimpleBLAST"; break;
- *
- * } // end comments for Jalview 2.4.1
- */
- else if (!lineswereskipped && data.charAt(0) != '*'
- && data.charAt(0) != ' '
- && data.indexOf(":") < data.indexOf(",")) // &&
- // data.indexOf(",") -1
+ && commaPos > -1 && colonPos < commaPos;
+ // && data.indexOf(",")