Merge pull request #25 from BeanVortex/1.6.1

1.6.1

Author: BeanVortex

.github/workflows/ci_cd.yaml

@@ -4,7 +4,7 @@ on:
     branches:
       - main
 env:
-  VERSION: 1.6.0
+  VERSION: 1.6.1
   EXT_VERSION: 1.3
   NAME: BitKip
 jobs:

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'io.beanvortex'
-version '1.6.0'
+version '1.6.1'
 //sourceCompatibility = '25'
 //targetCompatibility = '25'
 //mainClassName = 'io.beanvortex.bitkip.BitKip'

builders/linux-installer/application/BitKip.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=BitKip
-Version=1.6.0
+Version=1.6.1
 Comment=Free download manager
 Keywords=download,java,app
 Exec=/usr/share/BitKip/bin/BitKip

src/main/java/io/beanvortex/bitkip/BitKip.java

@@ -1,6 +1,7 @@
 package io.beanvortex.bitkip;
 
 import io.beanvortex.bitkip.api.BatchService;
+import io.beanvortex.bitkip.api.NewInstanceService;
 import io.beanvortex.bitkip.api.SingleService;
 import io.beanvortex.bitkip.api.SyncService;
 import io.beanvortex.bitkip.exceptions.GlobalExceptionHandler;
@@ -41,9 +42,10 @@
 public class BitKip extends Application {
 
     private static WebServer server;
-
+    private static Stage stage;
     @Override
     public void start(Stage stage) {
+        BitKip.stage = stage;
         IOUtils.readConfig();
         AppConfigs.initPaths();
         IOUtils.createSaveLocations();
@@ -75,15 +77,19 @@ private static void trustAllConnections() {
                             public X509Certificate[] getAcceptedIssuers() {
                                 return new X509Certificate[0];
                             }
-                            public void checkClientTrusted(X509Certificate[] certs, String authType) {}
-                            public void checkServerTrusted(X509Certificate[] certs, String authType) {}
+
+                            public void checkClientTrusted(X509Certificate[] certs, String authType) {
+                            }
+
+                            public void checkServerTrusted(X509Certificate[] certs, String authType) {
+                            }
                         }
                 };
                 SSLContext sc = SSLContext.getInstance("TLS");
                 sc.init(null, trustAllCerts, new SecureRandom());
                 HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
 
-                HttpsURLConnection.setDefaultHostnameVerifier((hostname, session) -> true);
+                HttpsURLConnection.setDefaultHostnameVerifier((_, _) -> true);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -110,13 +116,16 @@ private void initTray(Stage stage) {
             var popup = new PopupMenu();
             var openItem = new MenuItem("Open App");
             var exitItem = new MenuItem("Exit App");
-            ActionListener openListener = e -> Platform.runLater(() -> {
+            ActionListener openListener = _ -> Platform.runLater(() -> {
                 if (stage.isShowing())
                     stage.toFront();
                 else stage.show();
             });
+            if (hideOnStart)
+                stage.close();
+
             openItem.addActionListener(openListener);
-            exitItem.addActionListener(e -> stop());
+            exitItem.addActionListener(_ -> stop());
             popup.add(openItem);
             popup.add(exitItem);
             var trayIcon = new TrayIcon(image, "BitKip", popup);
@@ -136,7 +145,8 @@ private void initTray(Stage stage) {
     @Override
     public void stop() {
         var notObservedDms = new ArrayList<>(currentDownloadings);
-        notObservedDms.forEach(dm -> dm.getDownloadTask().pause(()->{}));
+        notObservedDms.forEach(dm -> dm.getDownloadTask().pause(() -> {
+        }));
         startedQueues.clear();
         currentSchedules.values().forEach(sm -> {
             var startScheduler = sm.getStartScheduler();
@@ -174,6 +184,7 @@ private static void startServer() {
                     .register("/single", cors, new SingleService())
                     .register("/batch", cors, new BatchService())
                     .register("/sync", cors, new SyncService())
+                    .register("/new_instance", cors, new NewInstanceService())
                     .build();
             var jacksonSupport = JacksonSupport.create();
             server = WebServer.builder()
@@ -182,7 +193,12 @@ private static void startServer() {
                     .addRouting(routing)
                     .addMediaSupport(jacksonSupport)
                     .build();
+
             server.start().exceptionally(throwable -> {
+                if (InstanceManager.notifyCurrentInstance()){
+                    Platform.exit();
+                    return null;
+                }
                 var header = "Failed to start server. Is there another instance running?\nIf not you may need to change application server port and restart";
                 log.error(header);
                 Platform.runLater(() -> {
@@ -198,4 +214,8 @@ private static void startServer() {
     public static URL getResource(String path) {
         return BitKip.class.getResource(path);
     }
+
+    public static void show(){
+        stage.show();
+    }
 }

src/main/java/io/beanvortex/bitkip/InstanceManager.java

@@ -0,0 +1,30 @@
+package io.beanvortex.bitkip;
+
+import io.beanvortex.bitkip.config.AppConfigs;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+
+public class InstanceManager {
+    public static boolean notifyCurrentInstance() {
+        try (var client = HttpClient.newBuilder()
+                        .connectTimeout(Duration.ofSeconds(5))
+                        .build()) {
+
+            var request = HttpRequest.newBuilder()
+                    .uri(URI.create("http://127.0.0.1:" + AppConfigs.serverPort + "/new_instance"))
+                    .GET()
+                    .timeout(Duration.ofSeconds(5))
+                    .build();
+
+            var response = client.send(request, HttpResponse.BodyHandlers.ofString());
+            return response.statusCode() == 200;
+        } catch (Exception e) {
+
+            return false;
+        }
+    }
+}

src/main/java/io/beanvortex/bitkip/api/NewInstanceService.java

@@ -0,0 +1,21 @@
+package io.beanvortex.bitkip.api;
+
+import io.beanvortex.bitkip.BitKip;
+import io.helidon.webserver.Routing;
+import io.helidon.webserver.ServerRequest;
+import io.helidon.webserver.ServerResponse;
+import io.helidon.webserver.Service;
+import javafx.application.Platform;
+
+public class NewInstanceService implements Service {
+    @Override
+    public void update(Routing.Rules rules) {
+        rules.get("/", this::doGet);
+    }
+
+    private void doGet(ServerRequest req, ServerResponse res) {
+        Platform.runLater(BitKip::show);
+        res.status(200);
+        res.send("OK");
+    }
+}

src/main/java/io/beanvortex/bitkip/config/AppConfigs.java

@@ -17,7 +17,7 @@
 
 public class AppConfigs {
 
-    public static final String VERSION = "1.6.0";
+    public static final String VERSION = "1.6.1";
 
     public static final String dataPath = System.getProperty("user.home")
             + File.separator + "Documents"
@@ -68,6 +68,8 @@ public class AppConfigs {
     public static boolean startFastQueue = defaultStartFastQueue;
     public static final boolean defaultTrustAllServers = false;
     public static boolean trustAllServers = defaultTrustAllServers;
+    public static final boolean defaultHideOnStart = false;
+    public static boolean hideOnStart = defaultHideOnStart;
 
 
 

src/main/java/io/beanvortex/bitkip/controllers/SettingsController.java

@@ -40,7 +40,7 @@
 public class SettingsController implements FXMLController {
 
     @FXML
-    private CheckBox immediateCheck, startupCheck, triggerOffCheck, agentCheck, addDownCheck,
+    private CheckBox immediateCheck, startupCheck, hideStartCheck, triggerOffCheck, agentCheck, addDownCheck,
             continueCheck, completeDialogCheck, errorNotificationCheck, startFastQueueCheck, trustAllServersCheck, serverCheck, lessCpuCheck;
     @FXML
     private VBox root, actionArea, queueContainer;
@@ -62,13 +62,13 @@ public void initAfterStage() {
         initQueues();
         stage.setTitle("Settings");
         stage.setResizable(true);
-        stage.setOnCloseRequest(e -> {
+        stage.setOnCloseRequest(_ -> {
             ThemeSubject.getThemeSubject().removeObserver(this);
             QueueSubject.getQueueSubject().removeObserver(queueController);
         });
         var defaultWidth = stage.getMinWidth() + 50;
         var defaultHeight = stage.getMinHeight() + 50;
-        tabPane.getSelectionModel().selectedIndexProperty().addListener((ob, o, n) -> {
+        tabPane.getSelectionModel().selectedIndexProperty().addListener((_, _, n) -> {
             // if queue tab is selected
             if (n.intValue() == 2) {
                 root.getChildren().remove(actionArea);
@@ -104,6 +104,7 @@ private void initElements() {
         lblLocation.setText(AppConfigs.downloadPath);
         serverCheck.setSelected(AppConfigs.serverEnabled);
         startupCheck.setSelected(AppConfigs.startup);
+        hideStartCheck.setSelected(AppConfigs.hideOnStart);
         triggerOffCheck.setSelected(AppConfigs.triggerTurnOffOnEmptyQueue);
         immediateCheck.setSelected(AppConfigs.downloadImmediately);
         addDownCheck.setSelected(AppConfigs.addSameDownload);
@@ -314,6 +315,12 @@ private void onStartupCheck() {
         initStartup();
     }
 
+    @FXML
+    private void onHideStartCheck() {
+        AppConfigs.hideOnStart = hideStartCheck.isSelected();
+        IOUtils.saveConfigs();
+    }
+
     private void initStartup() {
         try {
             if (AppConfigs.startup && !existsOnStartup())

src/main/java/io/beanvortex/bitkip/utils/IOUtils.java

@@ -285,6 +285,7 @@ public static void saveConfigs() {
             writer.append("save_location=").append(downloadPath).append("\n")
                     .append("theme=").append(theme).append("\n")
                     .append("startup=").append(String.valueOf(startup)).append("\n")
+                    .append("hide_on_start=").append(String.valueOf(hideOnStart)).append("\n")
                     .append("server_enabled=").append(String.valueOf(serverEnabled)).append("\n")
                     .append("port=").append(String.valueOf(serverPort)).append("\n")
                     .append("trigger_turn_off_on_empty_queue=").append(String.valueOf(triggerTurnOffOnEmptyQueue)).append("\n")
@@ -326,6 +327,7 @@ public static void readConfig() {
                         case "save_location" -> downloadPath = value;
                         case "theme" -> theme = value;
                         case "startup" -> startup = value.equals("true");
+                        case "hide_on_start" -> hideOnStart = value.equals("true");
                         case "server_enabled" -> serverEnabled = value.equals("true");
                         case "port" -> serverPort = Integer.parseInt(value);
                         case "trigger_turn_off_on_empty_queue" -> triggerTurnOffOnEmptyQueue = value.equals("true");

src/main/java/module-info.java

@@ -29,6 +29,7 @@
     requires java.prefs;
     requires com.zaxxer.hikari;
     requires context.propagation;
+    requires java.net.http;
 
     opens io.beanvortex.bitkip to javafx.fxml, javafx.controls;
     opens io.beanvortex.bitkip.controllers to javafx.fxml, javafx.base;