Merge pull request #16 from BeanVortex/bug_fix

BeanVortex · web-flow · commit 86c0033697d6 · 2024-05-07T01:58:01.000+03:30
Bug fix
diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml
@@ -4,7 +4,7 @@ on:
     branches:
       - main
 env:
-  VERSION: 1.4.5
+  VERSION: 1.4.6
   EXT_VERSION: 1.0
   NAME: BitKip
 jobs:
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'io.beanvortex'
-version '1.4.5'
+version '1.4.6'
 sourceCompatibility = '21'
 targetCompatibility = '21'
 mainClassName = 'io.beanvortex.bitkip.BitKip'
diff --git a/builders/linux-installer/application/BitKip.desktop b/builders/linux-installer/application/BitKip.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=BitKip
-Version=1.4.5
+Version=1.4.6
 Comment=Free download manager
 Keywords=download,java,app
 Exec=/usr/share/BitKip/bin/BitKip
diff --git a/extensions/chrome_based/manifest.json b/extensions/chrome_based/manifest.json
@@ -5,7 +5,7 @@
     "icon" : "./src/resources/icons/logo.png"
   },
   "manifest_version": 3,
-  "version": "1.0",
+  "version": "1.1",
   "description": "Download grabber that works with BitKip application",
   "host_permissions": ["*://*/*"],
   "permissions": [
diff --git a/extensions/chrome_based/src/scripts/connector.js b/extensions/chrome_based/src/scripts/connector.js
@@ -49,14 +49,16 @@ const postLinks = async (data, isBatch) => {
     fetch(URL_TO_POST, {
         method: 'POST',
         body: JSON.stringify(data),
-    }).catch(_ => {
+    }).catch(async _ => {
         chrome.notifications.create('', {
             title: 'BitKip Extension',
             message: "Can't send url to BitKip, Is application running on the same port?",
             iconUrl: '../resources/icons/logo.png',
             type: 'basic'
         });
-        chrome.downloads.download({url: data.url})
+        chrome.downloads.onDeterminingFilename.removeListener(triggerDownload)
+        await chrome.downloads.download({url: data.url})
+        chrome.downloads.onDeterminingFilename.addListener(triggerDownload)
     });
 }
 
diff --git a/extensions/firefox/manifest.json b/extensions/firefox/manifest.json
@@ -1,6 +1,6 @@
 {
   "manifest_version": 3,
-  "version": "1.0",
+  "version": "1.1",
   "name": "BitKip extension",
 
   "action": {
diff --git a/extensions/firefox/src/scripts/connector.js b/extensions/firefox/src/scripts/connector.js
@@ -50,14 +50,16 @@ const postLinks = async (data, isBatch) => {
         method: 'POST',
         mode: "cors",
         body: JSON.stringify(data),
-    }).catch(_ => {
+    }).catch(async _ => {
         browser.notifications.create('', {
             title: 'BitKip Extension',
             message: "Can't send url to BitKip, Is application running on the same port?",
             iconUrl: '../resources/icons/logo.png',
             type: 'basic'
         });
-        browser.downloads.download({url: data.url})
+        browser.downloads.onCreated.removeListener(triggerDownload)
+        await browser.downloads.download({url: data.url})
+        browser.downloads.onCreated.addListener(triggerDownload)
     });
 }
 
@@ -94,12 +96,12 @@ browser.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
 const triggerDownload = (downloadItem) => {
     // final url is used when url itself is a redirecting link
     updateEnable();
-    if (!enabled || (downloadItem.mime  && downloadItem.mime.includes("image")))
+    if (!enabled || (downloadItem.mime && downloadItem.mime.includes("image")))
         return;
     let url = downloadItem.finalUrl || downloadItem.url;
     if (isSupportedProtocol(url)) {
         let filename = downloadItem.filename;
-        if (filename.includes('/')){
+        if (filename.includes('/')) {
             const start = downloadItem.filename.lastIndexOf('/');
             filename = downloadItem.filename.substring(start === -1 ? 0 : start + 1);
         }
diff --git a/src/main/java/io/beanvortex/bitkip/config/AppConfigs.java b/src/main/java/io/beanvortex/bitkip/config/AppConfigs.java
@@ -17,7 +17,7 @@
 
 public class AppConfigs {
 
-    public static final String VERSION = "1.4.5";
+    public static final String VERSION = "1.4.6";
 
     public static final String dataPath = System.getProperty("user.home")
             + File.separator + "Documents"
@@ -61,6 +61,7 @@ public class AppConfigs {
     public static boolean addSameDownload  = defaultAddSameDownload;
     public static final boolean defaultLessCpuIntensive = false;
     public static boolean lessCpuIntensive = defaultLessCpuIntensive;
+    public static String lastSavedDir = null;
 
 
 
diff --git a/src/main/java/io/beanvortex/bitkip/controllers/BatchDownload.java b/src/main/java/io/beanvortex/bitkip/controllers/BatchDownload.java
@@ -1,5 +1,6 @@
 package io.beanvortex.bitkip.controllers;
 
+import io.beanvortex.bitkip.config.AppConfigs;
 import io.beanvortex.bitkip.utils.FxUtils;
 import io.beanvortex.bitkip.config.observers.QueueObserver;
 import io.beanvortex.bitkip.config.observers.QueueSubject;
@@ -12,10 +13,7 @@
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.stage.Stage;
 import org.kordamp.ikonli.javafx.FontIcon;
 
@@ -46,7 +44,8 @@ public class BatchDownload implements QueueObserver {
     private ComboBox<QueueModel> queueCombo;
     @FXML
     private TextField chunksField, urlField;
-
+    @FXML
+    private CheckBox lastLocationCheck;
 
     private LinkModel tempLink;
     private Stage stage;
@@ -79,6 +78,7 @@ public void initialize(URL location, ResourceBundle resources) {
         queueCombo.setValue(queues.get(0));
         errorLabel.setVisible(false);
         checkBtn.setDisable(true);
+        lastLocationCheck.setDisable(true);
         Validations.prepareLinkFromClipboard(urlField);
         Validations.validateChunksInput(chunksField);
         Validations.validateIntInputCheck(startField, 0L, 0, null);
@@ -109,7 +109,7 @@ public void initialize(URL location, ResourceBundle resources) {
     private void onOfflineFieldsChanged() {
         if (tempLink != null)
             handleError(() -> DownloadUtils.onOfflineFieldsChanged(locationField, tempLink.getName(),
-                    null, queueCombo, null, checkBtn, openLocation, null), errorLabel);
+                    null, queueCombo, null, checkBtn, openLocation, null, lastLocationCheck), errorLabel);
 
     }
 
@@ -128,7 +128,7 @@ private void autoFillLocation() {
             fileNameLocationFuture
                     .whenComplete((unused, throwable) ->
                             handleError(() -> DownloadUtils.checkIfFileIsOKToSave(locationField.getText(),
-                                    tempLink.getName(), null, checkBtn, null), errorLabel))
+                                    tempLink.getName(), null, checkBtn, null, lastLocationCheck), errorLabel))
                     .exceptionally(throwable -> {
                         var errorMsg = throwable.getCause().getLocalizedMessage();
                         Platform.runLater(() ->
@@ -231,7 +231,7 @@ private void onSelectLocation(ActionEvent e) {
             locationField.setText(path);
         if (tempLink != null)
             handleError(() -> DownloadUtils.checkIfFileIsOKToSave(locationField.getText(),
-                    tempLink.getName(), null, checkBtn, null), errorLabel);
+                    tempLink.getName(), null, checkBtn, null, lastLocationCheck), errorLabel);
     }
 
     @FXML
@@ -341,6 +341,13 @@ private void onQueueChanged() {
         onOfflineFieldsChanged();
     }
 
+    @FXML
+    private void onLastLocationCheck() {
+        if (lastLocationCheck.isSelected())
+            locationField.setText(AppConfigs.lastSavedDir);
+        else
+            setLocation(tempLink.getName());
+    }
 }
 
 
diff --git a/src/main/java/io/beanvortex/bitkip/controllers/SingleDownload.java b/src/main/java/io/beanvortex/bitkip/controllers/SingleDownload.java
@@ -10,10 +10,7 @@
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.stage.Stage;
 import org.kordamp.ikonli.javafx.FontIcon;
 
@@ -29,6 +26,8 @@
 
 public class SingleDownload implements QueueObserver {
 
+    @FXML
+    private CheckBox lastLocationCheck;
     @FXML
     private Label sizeLabel, resumableLabel, errorLabel;
     @FXML
@@ -78,6 +77,7 @@ public void initialize(URL location, ResourceBundle resources) {
         refreshBtn.setGraphic(new FontIcon());
         refreshBtn.setDisable(true);
         refreshBtn.setVisible(false);
+        lastLocationCheck.setDisable(true);
         refreshBtn.setOnAction(e -> {
             refreshBtn.setDisable(true);
             refreshBtn.setVisible(false);
@@ -162,14 +162,14 @@ private void autoFillLocationAndSizeAndName() {
             var connection = DownloadUtils.connect(url);
             var executor = Executors.newVirtualThreadPerTaskExecutor();
             var fileNameLocationFuture =
-                    DownloadUtils.prepareFileNameAndFieldsAsync(connection, url, nameField, executor)
+                    DownloadUtils.prepareFileNameAndFieldsAsync(connection, url, nameField, dm, executor)
                             .thenAccept(this::setLocation);
             var sizeFuture = DownloadUtils.prepareFileSizeAndFieldsAsync(connection,
                     urlField, sizeLabel, resumableLabel, speedField, chunksField, bytesField, dm, executor);
             CompletableFuture.allOf(fileNameLocationFuture, sizeFuture)
                     .whenComplete((unused, throwable) -> {
                         DownloadUtils.handleError(() -> DownloadUtils.checkIfFileIsOKToSave(locationField.getText(),
-                                nameField.getText(), downloadBtn, addBtn, refreshBtn), errorLabel);
+                                nameField.getText(), downloadBtn, addBtn, refreshBtn, lastLocationCheck), errorLabel);
                         executor.shutdown();
                     })
                     .exceptionally(throwable -> {
@@ -195,7 +195,15 @@ private void onSelectLocation(ActionEvent e) {
         if (path != null)
             locationField.setText(path);
         DownloadUtils.handleError(() -> DownloadUtils.checkIfFileIsOKToSave(locationField.getText(),
-                nameField.getText(), downloadBtn, addBtn, refreshBtn), errorLabel);
+                nameField.getText(), downloadBtn, addBtn, refreshBtn, lastLocationCheck), errorLabel);
+    }
+
+    @FXML
+    private void onLastLocationCheck() {
+        if (lastLocationCheck.isSelected())
+            locationField.setText(AppConfigs.lastSavedDir);
+        else
+            setLocation(dm.getName());
     }
 
     @FXML
@@ -314,7 +322,7 @@ private void onQueueChanged() {
 
     private void onOfflineFieldsChanged() {
         DownloadUtils.handleError(() -> DownloadUtils.onOfflineFieldsChanged(locationField, nameField.getText(), dm, queueCombo,
-                downloadBtn, addBtn, openLocation, refreshBtn), errorLabel);
+                downloadBtn, addBtn, openLocation, refreshBtn, lastLocationCheck), errorLabel);
     }
 
 
@@ -323,4 +331,5 @@ public void setUrlModel(SingleURLModel urlModel) {
         initAfterUrlModel();
     }
 
+
 }
diff --git a/src/main/java/io/beanvortex/bitkip/utils/DownloadUtils.java b/src/main/java/io/beanvortex/bitkip/utils/DownloadUtils.java
@@ -1,16 +1,12 @@
 package io.beanvortex.bitkip.utils;
 
-import io.beanvortex.bitkip.config.AppConfigs;
 import io.beanvortex.bitkip.exceptions.DeniedException;
 import io.beanvortex.bitkip.models.DownloadModel;
 import io.beanvortex.bitkip.models.QueueModel;
 import io.beanvortex.bitkip.repo.DownloadsRepo;
 import io.beanvortex.bitkip.repo.QueuesRepo;
 import javafx.application.Platform;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
 import org.controlsfx.control.Notifications;
@@ -35,7 +31,7 @@ public class DownloadUtils {
     public static HttpURLConnection connect(String uri) throws IOException {
         if (uri.isBlank())
             throw new IllegalArgumentException("URL is blank");
-        uri = fixURIChars(uri);
+        uri = Validations.fixURIChars(uri);
         var url = URI.create(uri).toURL();
         var conn = (HttpURLConnection) url.openConnection();
         conn.setConnectTimeout(connectionTimeout);
@@ -168,7 +164,7 @@ public static String extractFileName(String link, HttpURLConnection connection)
     }
 
     public static CompletableFuture<String> prepareFileNameAndFieldsAsync(HttpURLConnection connection, String link,
-                                                                          TextField nameField, Executor executor) {
+                                                                          TextField nameField, DownloadModel dm, Executor executor) {
         final HttpURLConnection[] finalConnection = {connection};
         return CompletableFuture.supplyAsync(() -> {
             if (finalConnection[0] == null) {
@@ -181,6 +177,7 @@ public static CompletableFuture<String> prepareFileNameAndFieldsAsync(HttpURLCon
             var fileName = extractFileName(link, finalConnection[0]);
             if (nameField != null)
                 Platform.runLater(() -> nameField.setText(fileName));
+            dm.setName(fileName);
             return fileName;
         }, executor);
     }
@@ -235,12 +232,16 @@ public static void initPopOvers(Button[] questionButtons, String[] contents) {
     public static String selectLocation(Stage stage) {
         var dirChooser = new DirectoryChooser();
         dirChooser.setTitle("Select download save location");
-        dirChooser.setInitialDirectory(new File(AppConfigs.downloadPath));
+        dirChooser.setInitialDirectory(new File(lastSavedDir));
         var selectedDir = dirChooser.showDialog(stage);
         if (selectedDir != null) {
             var path = selectedDir.getPath();
             if (!path.endsWith(File.separator))
                 path += File.separator;
+            if (!lastSavedDir.equals(path)) {
+                lastSavedDir = path;
+                IOUtils.saveConfigs();
+            }
             return path;
         }
         Notifications.create()
@@ -251,7 +252,7 @@ public static String selectLocation(Stage stage) {
     }
 
     public static void checkIfFileIsOKToSave(String location, String name, Button downloadBtn,
-                                             Button addBtn, Button refreshBtn) throws DeniedException {
+                                             Button addBtn, Button refreshBtn, CheckBox lastLocationCheck) throws DeniedException {
         var file = new File(location + name);
         var chunkFile = new File(location + name + "#0");
         if (file.exists() || chunkFile.exists()) {
@@ -271,6 +272,7 @@ public static void checkIfFileIsOKToSave(String location, String name, Button do
                 refreshBtn.setDisable(true);
                 refreshBtn.setVisible(false);
             }
+            lastLocationCheck.setDisable(false);
             addBtn.setDisable(false);
         }
     }
@@ -297,7 +299,7 @@ public interface ERunnable {
 
     public static void onOfflineFieldsChanged(TextField locationField, String filename, DownloadModel dm,
                                               ComboBox<QueueModel> queueCombo, Button downloadBtn, Button addBtn,
-                                              Button openLocation, Button refreshBtn) throws DeniedException {
+                                              Button openLocation, Button refreshBtn, CheckBox lastLocationCheck) throws DeniedException {
         // when saving outside BitKip folder
         var selectedQueue = queueCombo.getSelectionModel().getSelectedItem();
         if (!locationField.getText().contains("BitKip")
@@ -320,7 +322,7 @@ public static void onOfflineFieldsChanged(TextField locationField, String filena
             setLocationAndQueue(locationField, filename, dm);
             openLocation.setDisable(false);
         }
-        checkIfFileIsOKToSave(locationField.getText(), filename, downloadBtn, addBtn, refreshBtn);
+        checkIfFileIsOKToSave(locationField.getText(), filename, downloadBtn, addBtn, refreshBtn, lastLocationCheck);
     }
 
     public static void disableControlsAndShowError(String error, Label errorLbl,
diff --git a/src/main/java/io/beanvortex/bitkip/utils/IOUtils.java b/src/main/java/io/beanvortex/bitkip/utils/IOUtils.java
@@ -288,6 +288,7 @@ public static void saveConfigs() {
                     .append("immediate_download=").append(String.valueOf(downloadImmediately)).append("\n")
                     .append("add_same_download=").append(String.valueOf(addSameDownload)).append("\n")
                     .append("less_cpu_intensive=").append(String.valueOf(lessCpuIntensive)).append("\n")
+                    .append("last_saved_dir=").append(String.valueOf(lastSavedDir)).append("\n")
                     .append("user_agent_enabled=").append(String.valueOf(userAgentEnabled)).append("\n")
                     .append("user_agent=").append(userAgent);
             writer.flush();
@@ -310,7 +311,11 @@ public static void readConfig() {
                     var key = cfg.split("=")[0];
                     var value = cfg.split("=")[1];
                     switch (key) {
-                        case "save_location" -> downloadPath = value;
+                        case "save_location" -> {
+                            downloadPath = value;
+                            if (lastSavedDir == null || !lastSavedDir.equals(downloadPath))
+                                lastSavedDir = downloadPath;
+                        }
                         case "theme" -> theme = value;
                         case "startup" -> startup = value.equals("true");
                         case "server_enabled" -> serverEnabled = value.equals("true");
@@ -325,6 +330,7 @@ public static void readConfig() {
                         case "immediate_download" -> downloadImmediately = value.equals("true");
                         case "add_same_download" -> addSameDownload = value.equals("true");
                         case "less_cpu_intensive" -> lessCpuIntensive = value.equals("true");
+                        case "last_saved_dir" -> lastSavedDir = value;
                         case "user_agent" -> userAgent = value;
                         case "user_agent_enabled" -> userAgentEnabled = value.equals("true");
                     }
diff --git a/src/main/java/io/beanvortex/bitkip/utils/Validations.java b/src/main/java/io/beanvortex/bitkip/utils/Validations.java
diff --git a/src/main/resources/io/beanvortex/bitkip/fxml/batchDownload.fxml b/src/main/resources/io/beanvortex/bitkip/fxml/batchDownload.fxml
diff --git a/src/main/resources/io/beanvortex/bitkip/fxml/singleDownload.fxml b/src/main/resources/io/beanvortex/bitkip/fxml/singleDownload.fxml

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group 'io.beanvortex'`
`11`		`-version '1.4.5'`
	`11`	`+version '1.4.6'`
`12`	`12`	`sourceCompatibility = '21'`
`13`	`13`	`targetCompatibility = '21'`
`14`	`14`	`mainClassName = 'io.beanvortex.bitkip.BitKip'`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"manifest_version": 3,`
`3`		`- "version": "1.0",`
	`3`	`+ "version": "1.1",`
`4`	`4`	`"name": "BitKip extension",`
`5`	`5`
`6`	`6`	`"action": {`