Jpylyzer plugin finished

Author: BezrukovM

jpylyzer-plugin/src/main/java/org/verapdf/JpylyzerConfig.java

@@ -17,16 +17,19 @@
 @XmlRootElement(namespace = "http://www.verapdf.org/JpylyzerConfig", name = "jpylyzerConfig")
 final class JpylyzerConfig {
 
+	@XmlElement
+	private final String cliPath;
 	@XmlElement
 	private final String outFolder;
 	@XmlElement
 	private final boolean isVerbose;
 
 	private JpylyzerConfig() {
-		this("", false);
+		this("", "", false);
 	}
 
-	private JpylyzerConfig(String outFolder, boolean isVerbose) {
+	private JpylyzerConfig(String outFolder, String cliPath, boolean isVerbose) {
+		this.cliPath = cliPath;
 		this.outFolder = outFolder;
 		this.isVerbose = isVerbose;
 	}
@@ -39,31 +42,37 @@ public boolean isVerbose() {
 		return isVerbose;
 	}
 
+	public String getCliPath() {
+		return cliPath;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 
-		JpylyzerConfig that = (JpylyzerConfig) o;
+		JpylyzerConfig config = (JpylyzerConfig) o;
 
-		if (isVerbose != that.isVerbose) return false;
-		return outFolder != null ? outFolder.equals(that.outFolder) : that.outFolder == null;
+		if (isVerbose != config.isVerbose) return false;
+		if (cliPath != null ? !cliPath.equals(config.cliPath) : config.cliPath != null) return false;
+		return outFolder != null ? outFolder.equals(config.outFolder) : config.outFolder == null;
 
 	}
 
 	@Override
 	public int hashCode() {
-		int result = outFolder != null ? outFolder.hashCode() : 0;
+		int result = cliPath != null ? cliPath.hashCode() : 0;
+		result = 31 * result + (outFolder != null ? outFolder.hashCode() : 0);
 		result = 31 * result + (isVerbose ? 1 : 0);
 		return result;
 	}
 
 	static JpylyzerConfig defaultInstance() {
-		return new JpylyzerConfig(null, false);
+		return new JpylyzerConfig(null, null, false);
 	}
 
-	static JpylyzerConfig fromValues(final String outFolder, final boolean isVerbose) {
-		return new JpylyzerConfig(outFolder, isVerbose);
+	static JpylyzerConfig fromValues(final String cliPath, final String outFolder, final boolean isVerbose) {
+		return new JpylyzerConfig(cliPath, outFolder, isVerbose);
 	}
 
 	static String toXml(final JpylyzerConfig toConvert, Boolean prettyXml)

jpylyzer-plugin/src/main/java/org/verapdf/JpylyzerExtractor.java

@@ -17,8 +17,7 @@
 import java.io.*;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -66,8 +65,14 @@ private File generateTempFile(byte[] stream, String name) throws IOException {
 		return temp;
 	}
 
-	private static void exec(List<FeatureTreeNode> nodes, JpylyzerConfig config, File temp) throws InterruptedException, FeatureParsingException, IOException, URISyntaxException {
-		String scriptPath = getSystemIndependentPath("/jpylyzer-master/jpylyzer/jpylyzer.py");
+	private void exec(List<FeatureTreeNode> nodes, JpylyzerConfig config, File temp) throws InterruptedException, FeatureParsingException, IOException, URISyntaxException {
+		String scriptPath = getScriptPath(config);
+		if (scriptPath == null) {
+			FeatureTreeNode error = FeatureTreeNode.createRootNode("error");
+			error.setValue("Can not obtain jpylyzer script or binary");
+			nodes.add(error);
+			return;
+		}
 		String[] args;
 		if (config.isVerbose()) {
 			args = new String[3];
@@ -85,8 +90,7 @@ private static void exec(List<FeatureTreeNode> nodes, JpylyzerConfig config, Fil
 		FileOutputStream outStream = new FileOutputStream(out);
 		byte[] buffer = new byte[1024];
 		int bytesRead;
-		while ((bytesRead = pr.getInputStream().read(buffer)) != -1)
-		{
+		while ((bytesRead = pr.getInputStream().read(buffer)) != -1) {
 			outStream.write(buffer, 0, bytesRead);
 		}
 		pr.waitFor();
@@ -102,7 +106,7 @@ private static void exec(List<FeatureTreeNode> nodes, JpylyzerConfig config, Fil
 			nodes.add(validationNode);
 		} catch (ParserConfigurationException | SAXException | XPathExpressionException e) {
 			FeatureTreeNode error = FeatureTreeNode.createRootNode("error");
-			node.setValue("Error in obtaining validation result. Error message: " + e.getMessage());
+			error.setValue("Error in obtaining validation result. Error message: " + e.getMessage());
 			nodes.add(error);
 		}
 	}
@@ -139,11 +143,13 @@ private static File getTempFolder() {
 		if (!tempFolder.exists()) {
 			tempFolder.mkdir();
 		}
+		tempFolder.deleteOnExit();
 		return tempFolder;
 	}
 
 	private static File getOutFileInFolder(File folder) throws IOException {
 		File out = File.createTempFile("veraPDF_Jpylyzer_Plugin_out", ".xml", folder);
+		out.deleteOnExit();
 		return out;
 	}
 
@@ -176,9 +182,18 @@ public String getDescription() {
 		return "Extracts features of the Image using Jpylyzer";
 	}
 
-	private static String getSystemIndependentPath(String path) throws URISyntaxException {
-		URL resourceUrl = ClassLoader.class.getResource(path);
-		Path resourcePath = Paths.get(resourceUrl.toURI());
-		return resourcePath.toString();
+	private String getScriptPath(JpylyzerConfig config) {
+		String cliPath = config.getCliPath();
+		if (cliPath == null) {
+			cliPath = getFolderPath().toString() + "/jpylyzer-master/jpylyzer/jpylyzer.py";
+		}
+
+		File cli = new File(cliPath);
+		if (!(cli.exists() && cli.isFile())) {
+			return null;
+		}
+		return cliPath;
 	}
 }
+
+