X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=bd8bc534e718429ac4a2b840343120a1ee0f5e43;hb=10eedfb43dacd4cf32d4b5fe27d8d5987c70eaf8;hp=becc43426c258048fd5f9adbb080568e7547d78e;hpb=fee1b781ca14aadea5d112fc554fe14879c787c5;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index becc434..bd8bc53 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -24,6 +24,7 @@ import jalview.api.ComplexAlignFile; import jalview.api.FeatureSettingsModelI; import jalview.api.FeaturesDisplayedI; import jalview.api.FeaturesSourceI; +import jalview.bin.Cache; import jalview.bin.Jalview; import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; @@ -38,7 +39,10 @@ import jalview.json.binding.biojson.v1.ColourSchemeMapper; import jalview.schemes.ColourSchemeI; import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; +import jalview.ws.utils.UrlDownloadClient; +import java.io.File; +import java.io.IOException; import java.util.StringTokenizer; import java.util.Vector; @@ -48,11 +52,12 @@ public class FileLoader implements Runnable { String file; - String protocol; + DataSourceType protocol; - String format; + FileFormatI format; - FileParse source = null; // alternative specification of where data comes + AlignmentFileReaderI source = null; // alternative specification of where data + // comes // from @@ -86,13 +91,14 @@ public class FileLoader implements Runnable } public void LoadFile(AlignViewport viewport, String file, - String protocol, String format) + DataSourceType protocol, FileFormatI format) { this.viewport = viewport; LoadFile(file, protocol, format); } - public void LoadFile(String file, String protocol, String format) + public void LoadFile(String file, DataSourceType protocol, + FileFormatI format) { this.file = file; this.protocol = protocol; @@ -116,7 +122,7 @@ public class FileLoader implements Runnable * @param file * @param protocol */ - public void LoadFile(String file, String protocol) + public void LoadFile(String file, DataSourceType protocol) { LoadFile(file, protocol, null); } @@ -125,27 +131,28 @@ public class FileLoader implements Runnable * Load alignment from (file, protocol) and wait till loaded * * @param file - * @param protocol + * @param sourceType * @return alignFrame constructed from file contents */ - public AlignFrame LoadFileWaitTillLoaded(String file, String protocol) + public AlignFrame LoadFileWaitTillLoaded(String file, + DataSourceType sourceType) { - return LoadFileWaitTillLoaded(file, protocol, null); + return LoadFileWaitTillLoaded(file, sourceType, null); } /** * Load alignment from (file, protocol) of type format and wait till loaded * * @param file - * @param protocol + * @param sourceType * @param format * @return alignFrame constructed from file contents */ - public AlignFrame LoadFileWaitTillLoaded(String file, String protocol, - String format) + public AlignFrame LoadFileWaitTillLoaded(String file, + DataSourceType sourceType, FileFormatI format) { this.file = file; - this.protocol = protocol; + this.protocol = sourceType; this.format = format; return _LoadFileWaitTillLoaded(); } @@ -157,12 +164,13 @@ public class FileLoader implements Runnable * @param format * @return alignFrame constructed from file contents */ - public AlignFrame LoadFileWaitTillLoaded(FileParse source, String format) + public AlignFrame LoadFileWaitTillLoaded(AlignmentFileReaderI source, + FileFormatI format) { this.source = source; file = source.getInFile(); - protocol = source.type; + protocol = source.getDataSourceType(); this.format = format; return _LoadFileWaitTillLoaded(); } @@ -194,13 +202,19 @@ public class FileLoader implements Runnable public void updateRecentlyOpened() { Vector recent = new Vector(); - if (protocol.equals(FormatAdapter.PASTE)) + if (protocol == DataSourceType.PASTE) { // do nothing if the file was pasted in as text... there is no filename to // refer to it as. return; } - String type = protocol.equals(FormatAdapter.FILE) ? "RECENT_FILE" + if (file != null + && file.indexOf(System.getProperty("java.io.tmpdir")) > -1) + { + // ignore files loaded from the system's temporary directory + return; + } + String type = protocol == DataSourceType.FILE ? "RECENT_FILE" : "RECENT_URL"; String historyItems = jalview.bin.Cache.getProperty(type); @@ -229,18 +243,18 @@ public class FileLoader implements Runnable newHistory.append(recent.elementAt(i)); } - jalview.bin.Cache.setProperty(type, newHistory.toString()); + Cache.setProperty(type, newHistory.toString()); - if (protocol.equals(FormatAdapter.FILE)) + if (protocol == DataSourceType.FILE) { - jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format); + Cache.setProperty("DEFAULT_FILE_FORMAT", format.getName()); } } @Override public void run() { - String title = protocol.equals(AppletFormatAdapter.PASTE) ? "Copied From Clipboard" + String title = protocol == DataSourceType.PASTE ? "Copied From Clipboard" : file; Runtime rt = Runtime.getRuntime(); try @@ -254,10 +268,8 @@ public class FileLoader implements Runnable // just in case the caller didn't identify the file for us if (source != null) { - format = new IdentifyFile().identify(source, false); // identify - // stream and - // rewind rather - // than close + format = new IdentifyFile().identify(source, false); + // identify stream and rewind rather than close } else { @@ -266,7 +278,7 @@ public class FileLoader implements Runnable } - if (format == null || format.equalsIgnoreCase("EMPTY DATA FILE")) + if (format == null) { Desktop.instance.stopLoading(); System.err.println("The input file \"" + file @@ -277,7 +289,7 @@ public class FileLoader implements Runnable Desktop.desktop, MessageManager.getString("label.couldnt_read_data") + " in " + file + "\n" - + AppletFormatAdapter.SUPPORTED_FORMATS, + + AppletFormatAdapter.getSupportedFormats(), MessageManager.getString("label.couldnt_read_data"), JvOptionPane.WARNING_MESSAGE); } @@ -296,7 +308,7 @@ public class FileLoader implements Runnable loadtime = -System.currentTimeMillis(); AlignmentI al = null; - if (format.equalsIgnoreCase("Jalview")) + if (FileFormat.Jalview.equals(format)) { if (source != null) { @@ -309,37 +321,40 @@ public class FileLoader implements Runnable } else { - String error = AppletFormatAdapter.SUPPORTED_FORMATS; - if (FormatAdapter.isValidFormat(format)) + String error = AppletFormatAdapter.getSupportedFormats(); + try { - try + if (source != null) + { + // read from the provided source + al = new FormatAdapter().readFromFile(source, format); + } + else { - if (source != null) - { - // read from the provided source - al = new FormatAdapter().readFromFile(source, format); - } - else - { - // open a new source and read from it - FormatAdapter fa = new FormatAdapter(); - al = fa.readFile(file, protocol, format); - source = fa.getAlignFile(); // keep reference for later if - // necessary. + // open a new source and read from it + FormatAdapter fa = new FormatAdapter(); + boolean downloadStructureFile = format.isStructureFile() + && protocol.equals(DataSourceType.URL); + if (downloadStructureFile) + { + String structExt = format.getExtensions().split(",")[0]; + String urlLeafName = file.substring(file.lastIndexOf(System + .getProperty("file.separator")), file + .lastIndexOf(".")); + String tempStructureFileStr = createNamedJvTempFile( + urlLeafName, structExt); + UrlDownloadClient.download(file, tempStructureFileStr); + file = tempStructureFileStr; + protocol = DataSourceType.FILE; } - } catch (java.io.IOException ex) - { - error = ex.getMessage(); + al = fa.readFile(file, protocol, format); + source = fa.getAlignFile(); // keep reference for later if + // necessary. } - } - else + } catch (java.io.IOException ex) { - if (format != null && format.length() > 7) - { - // ad hoc message in format. - error = format + "\n" + error; - } + error = ex.getMessage(); } if ((al != null) && (al.getHeight() > 0) && al.hasValidSequence()) @@ -410,7 +425,7 @@ public class FileLoader implements Runnable } } // add metadata and update ui - if (!protocol.equals(AppletFormatAdapter.PASTE)) + if (!(protocol == DataSourceType.PASTE)) { alignFrame.setFileName(file, format); } @@ -564,6 +579,29 @@ public class FileLoader implements Runnable } + /** + * This method creates the file - + * {tmpdir}/jalview/{current_timestamp}/fileName.exetnsion using the supplied + * file name and extension + * + * @param fileName + * the name of the temp file to be created + * @param extension + * the extension of the temp file to be created + * @return + */ + private static String createNamedJvTempFile(String fileName, + String extension) throws IOException + { + String seprator = System.getProperty("file.separator"); + String jvTempDir = System.getProperty("java.io.tmpdir") + "jalview" + + seprator + System.currentTimeMillis(); + File tempStructFile = new File(jvTempDir + seprator + fileName + "." + + extension); + tempStructFile.mkdirs(); + return tempStructFile.toString(); + } + /* * (non-Javadoc) *