- publisher name in windows image

- fixed a bug in determining save location
BeanVortex · Apr 26, 2023 · d8218de · d8218de
1 parent b86cb51
commit d8218de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -68,7 +68,9 @@ jlink {
         if (OperatingSystem.current().windows) {
             appVersion = version
             installerName = 'BitKip'
-            installerOptions = ['--win-menu', '--win-shortcut', '--icon', 'src/main/resources/ir/darkdeveloper/bitkip/icons/logo.ico']
+            installerOptions = ['--win-menu', '--win-shortcut',
+                                '--icon', 'src/main/resources/ir/darkdeveloper/bitkip/icons/logo.ico',
+                                '--vendor', 'DarkDeveloper']
             imageOptions = ['--icon', 'src/main/resources/ir/darkdeveloper/bitkip/icons/logo.ico']
         }
     }

diff --git a/src/main/java/ir/darkdeveloper/bitkip/controllers/SingleDownload.java b/src/main/java/ir/darkdeveloper/bitkip/controllers/SingleDownload.java
@@ -127,8 +127,7 @@ private void autoFillLocationAndSizeAndName() {
             var url = urlField.getText();
             var connection = NewDownloadUtils.connect(url, 3000, 3000);
             var executor = Executors.newFixedThreadPool(2);
-            CompletableFuture<Void> fileNameLocationFuture = CompletableFuture.completedFuture(null);
-            fileNameLocationFuture = NewDownloadUtils.prepareFileNameAndFieldsAsync(connection, url, nameField, executor)
+            var fileNameLocationFuture = NewDownloadUtils.prepareFileNameAndFieldsAsync(connection, url, nameField, executor)
                     .thenAccept(this::setLocation);
             var sizeFuture = NewDownloadUtils.prepareFileSizeAndFieldsAsync(connection, urlField, sizeLabel, chunksField, bytesField, dm, executor);
             CompletableFuture.allOf(fileNameLocationFuture, sizeFuture)

diff --git a/src/main/java/ir/darkdeveloper/bitkip/utils/NewDownloadUtils.java b/src/main/java/ir/darkdeveloper/bitkip/utils/NewDownloadUtils.java
@@ -126,13 +126,6 @@ public static void determineLocationAndQueue(TextField locationField, String fil
             if (fileName == null || fileName.isBlank())
                 return;
             for (var entry : extensions.entrySet()) {
-                // empty is set for others
-                if (entry.getValue().isEmpty()) {
-                    if (!locationField.getText().equals(othersPath))
-                        locationField.setText(othersPath);
-                    determineQueue(dm, entry.getKey());
-                    return;
-                }
                 var matched = entry.getValue().stream().anyMatch(fileName::endsWith);
                 if (matched) {
                     var path = defaultDownloadPaths.stream().filter(p -> p.contains(entry.getKey()))
@@ -142,6 +135,13 @@ public static void determineLocationAndQueue(TextField locationField, String fil
                     determineQueue(dm, entry.getKey());
                     return;
                 }
+                // empty is set for others
+                if (entry.getValue().isEmpty()) {
+                    if (!locationField.getText().equals(othersPath))
+                        locationField.setText(othersPath);
+                    determineQueue(dm, entry.getKey());
+                    return;
+                }
             }
         });
     }