From a9901d765d660ef13e0659132b5fc0e01ab9c1ca Mon Sep 17 00:00:00 2001 From: Alex | Kronox Date: Sun, 2 Feb 2025 11:30:55 +0100 Subject: [PATCH 1/2] check whether report viewer exists --- cli/src/main/java/de/jplag/cli/JPlagRunner.java | 4 ++++ cli/src/main/java/de/jplag/cli/server/ReportViewer.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cli/src/main/java/de/jplag/cli/JPlagRunner.java b/cli/src/main/java/de/jplag/cli/JPlagRunner.java index 3346eec62..2c8c90be4 100644 --- a/cli/src/main/java/de/jplag/cli/JPlagRunner.java +++ b/cli/src/main/java/de/jplag/cli/JPlagRunner.java @@ -40,6 +40,10 @@ public static JPlagResult runJPlag(JPlagOptions options) throws ExitException { * @throws IOException If the internal server throws an exception */ public static void runInternalServer(File zipFile, int port) throws IOException { + if (!ReportViewer.hasCompiledViewer()) { + logger.info("The report viewer is not available. Check whether you compiled JPlag with the report viewer."); + return; + } ReportViewer reportViewer = new ReportViewer(zipFile, port); int actualPort = reportViewer.start(); logger.info("ReportViewer started on port http://localhost:{}", actualPort); diff --git a/cli/src/main/java/de/jplag/cli/server/ReportViewer.java b/cli/src/main/java/de/jplag/cli/server/ReportViewer.java index 2f5b83cbd..7f4e5c471 100644 --- a/cli/src/main/java/de/jplag/cli/server/ReportViewer.java +++ b/cli/src/main/java/de/jplag/cli/server/ReportViewer.java @@ -138,4 +138,8 @@ public void handle(HttpExchange exchange) throws IOException { RoutingTree getRoutingTree() { return routingTree; } + + public static boolean hasCompiledViewer() { + return ResponseData.fromResourceUrl("/" + REPORT_VIEWER_RESOURCE_PREFIX + "/index.html") != null; + } } From dd08bb8afa8e4d63c23bc993b9ca888c1315621e Mon Sep 17 00:00:00 2001 From: Alex | Kronox Date: Wed, 5 Feb 2025 13:02:04 +0100 Subject: [PATCH 2/2] change log level to warn --- cli/src/main/java/de/jplag/cli/JPlagRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/main/java/de/jplag/cli/JPlagRunner.java b/cli/src/main/java/de/jplag/cli/JPlagRunner.java index 2c8c90be4..3dc3b8484 100644 --- a/cli/src/main/java/de/jplag/cli/JPlagRunner.java +++ b/cli/src/main/java/de/jplag/cli/JPlagRunner.java @@ -41,7 +41,7 @@ public static JPlagResult runJPlag(JPlagOptions options) throws ExitException { */ public static void runInternalServer(File zipFile, int port) throws IOException { if (!ReportViewer.hasCompiledViewer()) { - logger.info("The report viewer is not available. Check whether you compiled JPlag with the report viewer."); + logger.warn("The report viewer is not available. Check whether you compiled JPlag with the report viewer."); return; } ReportViewer reportViewer = new ReportViewer(zipFile, port);