X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fpymol%2FPymolManager.java;h=ddc8d84e859cc46bcff1613b3117df1cfed0b4b2;hb=ae3fad8019274ca3ab1258a480ba15dd9adac1e9;hp=f410b54c4648227af4771d7f34aed1a307a8dfac;hpb=6e0685c38078ddcf959db75d001f8c92b114c8ae;p=jalview.git
diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java
index f410b54..ddc8d84 100644
--- a/src/jalview/ext/pymol/PymolManager.java
+++ b/src/jalview/ext/pymol/PymolManager.java
@@ -1,3 +1,23 @@
+/*
+ * 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
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ext.pymol;
import java.io.BufferedReader;
@@ -12,11 +32,13 @@ import java.net.URL;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.gui.Preferences;
-import jalview.structure.StructureCommand;
import jalview.structure.StructureCommandI;
+import jalview.util.Platform;
public class PymolManager
{
@@ -43,20 +65,33 @@ public class PymolManager
*/
public static List getPymolPaths()
{
+ return getPymolPaths(System.getProperty("os.name"));
+ }
+
+ /**
+ * Returns a list of paths to try for the PyMOL executable. Any user
+ * preference is placed first, otherwise 'standard' paths depending on the
+ * operating system.
+ *
+ * @param os
+ * operating system as reported by environment variable
+ * {@code os.name}
+ * @return
+ */
+ protected static List getPymolPaths(String os)
+ {
List pathList = new ArrayList<>();
-
- String userPath = Cache
- .getDefault(Preferences.PYMOL_PATH, null);
+
+ String userPath = Cache.getDefault(Preferences.PYMOL_PATH, null);
if (userPath != null)
{
- pathList.add(0, userPath);
+ pathList.add(userPath);
}
-
+
/*
* add default installation paths
*/
String pymol = "PyMOL";
- String os = System.getProperty("os.name");
if (os.startsWith("Linux"))
{
pathList.add("/usr/local/pymol/bin/" + pymol);
@@ -66,7 +101,24 @@ public class PymolManager
}
else if (os.startsWith("Windows"))
{
- // todo Windows installation path(s)
+ for (String root : new String[] {
+ String.format("%s\\AppData\\Local",
+ System.getProperty("user.home")), // default user path
+ "\\ProgramData", "C:\\ProgramData", // this is the default install
+ // path "for everyone"
+ System.getProperty("user.home"), "\\Program Files",
+ "C:\\Program Files", "\\Program Files (x86)",
+ "C:\\Program Files (x86)" })
+ {
+ for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" })
+ {
+ for (String binary : new String[] { "PyMOLWinWithConsole.bat",
+ "Scripts\\pymol.exe", "PyMOLWin.exe" })
+ {
+ pathList.add(String.format("%s\\%s\\%s", root, path, binary));
+ }
+ }
+ }
}
else if (os.startsWith("Mac"))
{
@@ -94,17 +146,6 @@ public class PymolManager
return launched;
}
- public void exitPymol()
- {
- if (isPymolLaunched() && pymolProcess != null)
- {
- sendCommand(new StructureCommand("quit"), false);
- }
- pymolProcess = null;
- // currentModelsMap.clear();
- this.pymolXmlRpcPort = 0;
- }
-
/**
* Sends the command to Pymol; if requested, tries to get and return any
* replies, else returns null
@@ -117,7 +158,7 @@ public class PymolManager
boolean getReply)
{
String postBody = getPostRequest(command);
- // System.out.println(postBody);// debug
+ // jalview.bin.Console.outPrintln(postBody);// debug
String rpcUrl = "http://127.0.0.1:" + this.pymolXmlRpcPort;
PrintWriter out = null;
BufferedReader in = null;
@@ -137,7 +178,7 @@ public class PymolManager
int rc = conn.getResponseCode();
if (rc != HttpURLConnection.HTTP_OK)
{
- Cache.log.error(
+ Console.error(
String.format("Error status from %s: %d", rpcUrl, rc));
return result;
}
@@ -155,7 +196,7 @@ public class PymolManager
} catch (SocketException e)
{
// thrown when 'quit' command is sent to PyMol
- Cache.log.warn(String.format("Request to %s returned %s", rpcUrl,
+ Console.warn(String.format("Request to %s returned %s", rpcUrl,
e.toString()));
} catch (Exception e)
{
@@ -166,6 +207,14 @@ public class PymolManager
{
out.close();
}
+ if (Console.isTraceEnabled())
+ {
+ Console.trace("Sent: " + command.toString());
+ if (result != null)
+ {
+ Console.trace("Received: " + result);
+ }
+ }
}
return result;
}
@@ -197,13 +246,13 @@ public class PymolManager
return sb.toString();
}
- public boolean launchPymol()
+ public Process launchPymol()
{
// todo pull up much of this
// Do nothing if already launched
if (isPymolLaunched())
{
- return true;
+ return pymolProcess;
}
String error = "Error message: ";
@@ -223,27 +272,43 @@ public class PymolManager
}
List args = new ArrayList<>();
args.add(pymolPath);
+
+ // Windows PyMOLWin.exe needs an extra argument
+ if (Platform.isWin() && pymolPath.toLowerCase(Locale.ROOT)
+ .endsWith("\\pymolwin.exe"))
+ {
+ args.add("+2");
+ }
args.add("-R"); // https://pymolwiki.org/index.php/RPC
ProcessBuilder pb = new ProcessBuilder(args);
+ Console.debug("Running PyMOL as " + String.join(" ", pb.command()));
pymolProcess = pb.start();
error = "";
break;
} catch (Exception e)
{
- // pPymol could not be started using this path
+ // Pymol could not be started using this path
error += e.getMessage();
}
}
- if (error.length() == 0)
+
+ if (pymolProcess != null)
{
this.pymolXmlRpcPort = getPortNumber();
- System.out.println(
- "PyMOL XMLRPC started on port " + pymolXmlRpcPort);
- return (pymolXmlRpcPort > 0);
+ if (pymolXmlRpcPort > 0)
+ {
+ Console.info("PyMOL XMLRPC started on port " + pymolXmlRpcPort);
+ }
+ else
+ {
+ error += "Failed to read PyMOL XMLRPC port number";
+ Console.error(error);
+ pymolProcess.destroy();
+ pymolProcess = null;
+ }
}
- // logger.warn(error);
- return false;
+ return pymolProcess;
}
private int getPortNumber()
@@ -281,9 +346,8 @@ public class PymolManager
}
} catch (Exception e)
{
- System.err.println(
- "Failed to get REST port number from " + responses + ": "
- + e.getMessage());
+ Console.error("Failed to get REST port number from " + responses
+ + ": " + e.getMessage());
// logger.error("Failed to get REST port number from " + responses + ": "
// + e.getMessage());
} finally
@@ -297,10 +361,10 @@ public class PymolManager
}
if (port == 0)
{
- System.err.println("Failed to start PyMOL with XMLRPC, response was: "
+ Console.error("Failed to start PyMOL with XMLRPC, response was: "
+ responses);
}
- System.err.println("PyMOL started with XMLRPC on port " + port);
+ Console.info("PyMOL started with XMLRPC on port " + port);
return port;
}