From b9c1406a4078a3bb035180ec27401df2a868f768 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Fri, 5 Jul 2024 18:04:56 +0530
Subject: [PATCH 01/36] feat: Added ability to perform in-place update of
 drifty

---
 .idea/inspectionProfiles/Project_Default.xml  |   3 +
 CLI/src/main/java/cli/support/Constants.java  |   4 +
 .../java/cli/updater/CLIUpdateExecutor.java   |  46 ++++++
 .../main/java/cli/utils/MessageBroker.java    |   4 +
 CLI/src/main/java/main/Drifty_CLI.java        |  97 ++++++++++--
 Core/src/main/java/init/Environment.java      |   3 +
 Core/src/main/java/module-info.java           |   1 +
 Core/src/main/java/preferences/Clear.java     |  20 +++
 Core/src/main/java/preferences/Get.java       |  20 +++
 Core/src/main/java/preferences/Labels.java    |   6 +
 Core/src/main/java/preferences/Set.java       |  25 +++
 .../main/java/properties/MessageCategory.java |   2 +-
 Core/src/main/java/support/Constants.java     |  20 ++-
 Core/src/main/java/updater/UpdateChecker.java | 145 ++++++++++++++++++
 .../src/main/java/updater/UpdateExecutor.java |  41 +++++
 Core/src/main/java/utils/MessageBroker.java   |   8 +
 Core/src/main/java/utils/Utility.java         |  36 ++++-
 .../java/gui/updater/GUIUpdateExecutor.java   |  68 ++++++++
 .../main/java/gui/utils/MessageBroker.java    |   6 +
 .../java/gui/utils/UIComponentBuilder.java    |   2 +
 GUI/src/main/java/main/Drifty_GUI.java        |   6 +-
 GUI/src/main/java/module-info.java            |   1 +
 GUI/src/main/java/ui/ConfirmationDialog.java  |  40 +++--
 GUI/src/main/java/ui/Settings.java            |  28 +++-
 GUI/src/main/java/ui/Splash.java              |   2 +-
 GUI/src/main/java/ui/UIController.java        |  57 ++++++-
 .../META-INF/native-image/reflect-config.json |   4 -
 .../native-image/resource-config.json         |   6 +-
 28 files changed, 652 insertions(+), 49 deletions(-)
 create mode 100644 CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
 create mode 100644 Core/src/main/java/updater/UpdateChecker.java
 create mode 100644 Core/src/main/java/updater/UpdateExecutor.java
 create mode 100644 GUI/src/main/java/gui/updater/GUIUpdateExecutor.java

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 7e62176b7..178bd8e2f 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.util.concurrent.Executors,newSingleThreadScheduledExecutor" />
+    </inspection_tool>
     <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <Languages>
         <language minSize="57" name="Java" />
diff --git a/CLI/src/main/java/cli/support/Constants.java b/CLI/src/main/java/cli/support/Constants.java
index bedd84087..cef32bd13 100644
--- a/CLI/src/main/java/cli/support/Constants.java
+++ b/CLI/src/main/java/cli/support/Constants.java
@@ -13,11 +13,15 @@ public class Constants extends support.Constants {
     public static final String HELP_FLAG = "--help";
     public static final String NAME_FLAG = "--name";
     public static final String VERSION_FLAG = "--version";
+    public static final String UPDATE_FLAG = "--update";
+    public static final String EARLY_ACCESS_FLAG = "--early-access";
     public static final String LOCATION_FLAG = "--location";
     public static final String BATCH_FLAG = "--batch";
     public static final String HELP_FLAG_SHORT = "-h";
     public static final String NAME_FLAG_SHORT = "-n";
     public static final String VERSION_FLAG_SHORT = "-v";
+    public static final String UPDATE_FLAG_SHORT = "-u";
+    public static final String EARLY_ACCESS_FLAG_SHORT = "-ea";
     public static final String LOCATION_FLAG_SHORT = "-l";
     public static final String BATCH_FLAG_SHORT = "-b";
     public static final String REMOVE_ALL_URL_CONFIRMATION = "Are you sure you wish to delete ALL links? (Y/N): ";
diff --git a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
new file mode 100644
index 000000000..9191a263b
--- /dev/null
+++ b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
@@ -0,0 +1,46 @@
+package cli.updater;
+
+import properties.OS;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+public class CLIUpdateExecutor extends updater.UpdateExecutor {
+    public CLIUpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
+        super(currentExecutableFile, latestExecutableFile);
+    }
+
+    @Override
+    public boolean execute() {
+        M.msgLogInfo("Setting executable permission for the latest version of Drifty...");
+        if (setExecutablePermissions()) {
+            M.msgLogInfo("Executing update...");
+        } else {
+            return false;
+        }
+        String currentExecutablePath = currentExecutableFile.toPath().toString();
+        boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
+        if (!isCurrentExecutableRenamed) {
+            M.msgUpdateError("Failed to rename the current executable!");
+            return false;
+        }
+        try {
+            Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePath), StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            M.msgUpdateError("Failed to replace the current executable with the latest version!");
+            return false;
+        }
+        if (!OS.isWindows()) {
+            try {
+                Files.deleteIfExists(Paths.get(currentExecutablePath + ".old"));
+            } catch (IOException e) {
+                M.msgUpdateError("Failed to delete the old version of Drifty!");
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/CLI/src/main/java/cli/utils/MessageBroker.java b/CLI/src/main/java/cli/utils/MessageBroker.java
index 1ee235869..117f73509 100644
--- a/CLI/src/main/java/cli/utils/MessageBroker.java
+++ b/CLI/src/main/java/cli/utils/MessageBroker.java
@@ -30,4 +30,8 @@ public void msgHistoryWarning(String message, boolean endWithNewLine) {
         this.endWithNewLine = endWithNewLine;
         sendMessage(message, MessageType.WARN, MessageCategory.HISTORY);
     }
+
+    public void msgUpdateInfo(String message) {
+        sendMessage(message, MessageType.INFO, MessageCategory.UPDATE);
+    }
 }
diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 9e7071d91..358ba9e9f 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -2,6 +2,7 @@
 
 import backend.FileDownloader;
 import cli.init.Environment;
+import cli.updater.CLIUpdateExecutor;
 import cli.utils.MessageBroker;
 import cli.utils.ScannerFactory;
 import cli.utils.Utility;
@@ -16,6 +17,7 @@
 import properties.Program;
 import support.Job;
 import support.JobHistory;
+import updater.UpdateChecker;
 import utils.Logger;
 
 import java.io.*;
@@ -51,10 +53,11 @@ public static void main(String[] args) {
         LOGGER.log(MessageType.INFO, CLI_APPLICATION_STARTED);
         messageBroker = new MessageBroker(System.out);
         Environment.setCLIMessageBroker(messageBroker);
+        utility = new Utility();
+        checkAndUpdateDrifty(true);
         messageBroker.msgInitInfo("Initializing environment...");
         Environment.initializeEnvironment();
         messageBroker.msgInitInfo("Environment initialized successfully!");
-        utility = new Utility();
         jobHistory = AppSettings.GET.jobHistory();
         printBanner();
         if (args.length > 0) {
@@ -89,6 +92,12 @@ public static void main(String[] args) {
                         printVersion();
                         Environment.terminate(0);
                     }
+                    case UPDATE_FLAG, UPDATE_FLAG_SHORT -> checkAndUpdateDrifty(false);
+                    case EARLY_ACCESS_FLAG, EARLY_ACCESS_FLAG_SHORT -> {
+                        AppSettings.SET.earlyAccess(!AppSettings.GET.earlyAccess());
+                        messageBroker.msgInitInfo("Early access mode " + (AppSettings.GET.earlyAccess() ? "enabled!" : "disabled!"));
+                        Environment.terminate(0);
+                    }
                     case ADD_FLAG -> {
                         setYamlFilePath();
                         if (i + 1 < args.length) {
@@ -294,6 +303,68 @@ public static void main(String[] args) {
         Environment.terminate(0);
     }
 
+    private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
+        messageBroker.msgInitInfo("Checking for updates...");
+        if (!isDriftyUpdateChecked()) {
+            if (UpdateChecker.isUpdateAvailable()) {
+                messageBroker.msgUpdateInfo("Update available!");
+                messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + "(" + AppSettings.GET.newDriftyVersionName() + ")");
+                boolean choice = true;
+                if (askForInstallingUpdate) {
+                    messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
+                    String choiceString = SC.nextLine().toLowerCase();
+                    choice = utility.yesNoValidation(choiceString, "Do you want to download the update? (Enter Y for yes and N for no) : ");
+                }
+                if (!choice) {
+                    messageBroker.msgUpdateInfo("Drifty update cancelled!");
+                } else {
+                    messageBroker.msgUpdateInfo("Downloading update...");
+                    if (!downloadUpdate()) {
+                        messageBroker.msgUpdateError("Failed to update Drifty!");
+                    } else {
+                        messageBroker.msgUpdateInfo("Update successful!");
+                        messageBroker.msgUpdateInfo("Please restart Drifty to see the changes!");
+                        System.exit(0);
+                    }
+                }
+            }
+        }
+    }
+
+    private static boolean isDriftyUpdateChecked() {
+        long timeSinceLastUpdate = System.currentTimeMillis() - AppSettings.GET.lastDriftyUpdateTime();
+        return timeSinceLastUpdate <= ONE_DAY;
+    }
+
+    private static boolean downloadUpdate() {
+        try {
+            // "Current executable" means the executable currently running i.e., the one that is outdated.
+            File currentExecutableFile = new File(Drifty_CLI.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+            // "Latest executable" means the executable that is to be downloaded and installed i.e., the latest version.
+            // "tmpFolder" is the temporary folder where the latest executable will be downloaded to.
+            File tmpFolder = Files.createTempDirectory("Drifty").toFile();
+            tmpFolder.deleteOnExit();
+            File latestExecutableFile = Paths.get(tmpFolder.getPath()).resolve(currentExecutableFile.getName()).toFile();
+            FileDownloader downloader = new FileDownloader(updateURL.toString(), currentExecutableFile.getName(), tmpFolder.toString(), false);
+            downloader.run();
+            if (latestExecutableFile.exists() && latestExecutableFile.isFile() && latestExecutableFile.length() > 0) {
+                // If the latest executable was successfully downloaded, set the executable permission and execute the update.
+                CLIUpdateExecutor updateExecutor = new CLIUpdateExecutor(currentExecutableFile, latestExecutableFile);
+                return updateExecutor.execute();
+            } else {
+                messageBroker.msgUpdateError("Failed to download update!");
+                return false;
+            }
+        } catch (IOException e) {
+            messageBroker.msgUpdateError("Failed to create temporary folder for downloading update! " + e.getMessage());
+        } catch (URISyntaxException e) {
+            messageBroker.msgUpdateError("Failed to get the location of the current executable! " + e.getMessage());
+        } catch (Exception e) {
+            messageBroker.msgUpdateError("Failed to update Drifty! " + e.getMessage());
+        }
+        return false;
+    }
+
     private static void printVersion() {
         System.out.println("\033[1m" + APPLICATION_NAME + " " + VERSION_NUMBER + ANSI_RESET);
         if (AppSettings.GET.ytDlpVersion().isEmpty()) {
@@ -505,20 +576,22 @@ private static String getProperDownloadsFolder(String downloadsFolder) {
     }
 
     public static void help() {
-        System.out.println(ANSI_RESET + "\n\033[38;31;48;40;1m-----------------------==| DRIFTY CLI HELP |==----------------------" + ANSI_RESET);
+        System.out.println(ANSI_RESET + "\n\033[38;31;48;40;1m------------------------==| DRIFTY CLI HELP |==------------------------" + ANSI_RESET);
         System.out.println("\033[38;31;48;40;0m\t\t\t\t\t\t\t\t" + VERSION_NUMBER + ANSI_RESET);
         System.out.println("\033[31;1mRequired parameter: File URL" + ANSI_RESET);
         System.out.println("\033[33;1mOptional parameters:");
-        System.out.println("\033[97;1mName        ShortForm     Default                  Description" + ANSI_RESET);
-        System.out.println("--batch      -b            N/A                      The path to the yaml/yml file containing the links and other arguments");
-        System.out.println("--location   -l            Downloads                The location on your computer where file downloaded using Drifty are placed");
-        System.out.println("--name       -n            Source                   Filename of the downloaded file");
-        System.out.println("--help       -h            N/A                      Prints this help menu");
-        System.out.println("--version    -v            Current Version          Displays version number of Drifty");
-        System.out.println("--add        N/A           N/A                      Add URL(s) to the links queue");
-        System.out.println("--remove     N/A           N/A                      Remove URL(s) from the links queue");
-        System.out.println("--list       N/A           N/A                      List all the URLs in the links queue");
-        System.out.println("--get        N/A           N/A                      Download all the URLs in the links queue");
+        System.out.println("\033[97;1mName           ShortForm     Default                  Description" + ANSI_RESET);
+        System.out.println("--batch         -b            N/A                      The path to the YAML file containing the links and other arguments");
+        System.out.println("--location      -l            Downloads folder         The folder where the downloaded file(s) will be saved");
+        System.out.println("--name          -n            Source                   Filename of the downloaded file");
+        System.out.println("--help          -h            N/A                      Prints this help menu");
+        System.out.println("--version       -v            Current Version          Displays version number of Drifty");
+        System.out.println("--update        -u            N/A                      Updates Drifty CLI to the latest version");
+        System.out.println("--early-access  -ea           Disabled by default      Toggle early access mode");
+        System.out.println("--add           N/A           N/A                      Add URL(s) to the links queue");
+        System.out.println("--remove        N/A           N/A                      Remove URL(s) from the links queue");
+        System.out.println("--list          N/A           N/A                      List all the URLs in the links queue");
+        System.out.println("--get           N/A           N/A                      Download all the URLs in the links queue");
         System.out.println("\033[97;1mSee full documentation at https://github.com/SaptarshiSarkar12/Drifty#readme" + ANSI_RESET);
         System.out.println("For more information visit: ");
         System.out.println("\tProject Link - https://github.com/SaptarshiSarkar12/Drifty/");
diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index b224e39ec..2a70ca82c 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -3,6 +3,7 @@
 import preferences.AppSettings;
 import properties.OS;
 import properties.Program;
+import updater.UpdateChecker;
 import utils.CopyExecutables;
 import utils.MessageBroker;
 import utils.Utility;
@@ -27,6 +28,8 @@ public class Environment {
     */
     public static void initializeEnvironment() {
         msgBroker.msgLogInfo("OS : " + OS.getOSName());
+        Utility.initializeUtility(); // Lazy initialization of the MessageBroker in Utility class
+        new Thread(() -> AppSettings.SET.driftyUpdateAvailable(UpdateChecker.isUpdateAvailable())).start();
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         executor.scheduleAtFixedRate(Utility.setSpotifyAccessToken(), 0, 3480, java.util.concurrent.TimeUnit.SECONDS); // Thread to refresh Spotify access token every 58 minutes
         String ffmpegExecName = "";
diff --git a/Core/src/main/java/module-info.java b/Core/src/main/java/module-info.java
index 2b78ba99b..565320af2 100644
--- a/Core/src/main/java/module-info.java
+++ b/Core/src/main/java/module-info.java
@@ -10,6 +10,7 @@
     exports preferences;
     exports properties;
     exports support;
+    exports updater;
     exports utils;
     opens support to com.google.gson;
 }
\ No newline at end of file
diff --git a/Core/src/main/java/preferences/Clear.java b/Core/src/main/java/preferences/Clear.java
index 8ed2250b0..51d107df2 100644
--- a/Core/src/main/java/preferences/Clear.java
+++ b/Core/src/main/java/preferences/Clear.java
@@ -38,4 +38,24 @@ public void ytDlpUpdating() {
     public void isFfmpegWorking() {
         preferences.remove(IS_FFMPEG_WORKING);
     }
+
+    public void earlyAccess() {
+        preferences.remove(EARLY_ACCESS);
+    }
+
+    public void newDriftyVersionName() {
+        preferences.remove(NEW_DRIFTY_VERSION_NAME);
+    }
+
+    public void lastDriftyUpdateTime() {
+        preferences.remove(LAST_DRIFTY_UPDATE_TIME);
+    }
+
+    public void latestDriftyVersionTag() {
+        preferences.remove(LATEST_DRIFTY_VERSION_TAG);
+    }
+
+    public void driftyUpdateAvailable() {
+        preferences.remove(DRIFTY_UPDATE_AVAILABLE);
+    }
 }
diff --git a/Core/src/main/java/preferences/Get.java b/Core/src/main/java/preferences/Get.java
index 567209e7d..77c2f5b04 100644
--- a/Core/src/main/java/preferences/Get.java
+++ b/Core/src/main/java/preferences/Get.java
@@ -101,4 +101,24 @@ public boolean ytDlpUpdating() {
     public boolean isFfmpegWorking() {
         return preferences.getBoolean(IS_FFMPEG_WORKING, false);
     }
+
+    public boolean earlyAccess() {
+        return preferences.getBoolean(EARLY_ACCESS, false);
+    }
+
+    public String newDriftyVersionName() {
+        return preferences.get(NEW_DRIFTY_VERSION_NAME, "");
+    }
+
+    public long lastDriftyUpdateTime() {
+        return preferences.getLong(LAST_DRIFTY_UPDATE_TIME, 1000L);
+    }
+
+    public String latestDriftyVersionTag() {
+        return preferences.get(LATEST_DRIFTY_VERSION_TAG, "");
+    }
+
+    public boolean driftyUpdateAvailable() {
+        return preferences.getBoolean(DRIFTY_UPDATE_AVAILABLE, false);
+    }
 }
diff --git a/Core/src/main/java/preferences/Labels.java b/Core/src/main/java/preferences/Labels.java
index 9c5733e38..4ce46d078 100644
--- a/Core/src/main/java/preferences/Labels.java
+++ b/Core/src/main/java/preferences/Labels.java
@@ -11,4 +11,10 @@ public interface Labels {
     String SPOTIFY_ACCESS_TOKEN = "SPOTIFY_ACCESS_TOKEN";
     String IS_FFMPEG_WORKING = "IS_FFMPEG_WORKING";
     String FFMPEG_VERSION = "FFMPEG_VERSION";
+    String DRIFTY_UPDATE_CHANNEL = "DRIFTY_UPDATE_CHANNEL";
+    String NEW_DRIFTY_VERSION_NAME = "NEW_DRIFTY_VERSION_NAME";
+    String LATEST_DRIFTY_VERSION_TAG = "LATEST_DRIFTY_VERSION_TAG";
+    String LAST_DRIFTY_UPDATE_TIME = "LAST_DRIFTY_UPDATE_TIME";
+    String EARLY_ACCESS = "EARLY_ACCESS";
+    String DRIFTY_UPDATE_AVAILABLE = "DRIFTY_UPDATE_AVAILABLE";
 }
diff --git a/Core/src/main/java/preferences/Set.java b/Core/src/main/java/preferences/Set.java
index 42feb7b30..b37e9dc41 100644
--- a/Core/src/main/java/preferences/Set.java
+++ b/Core/src/main/java/preferences/Set.java
@@ -99,4 +99,29 @@ public void isFfmpegWorking(boolean isWorking) {
         AppSettings.CLEAR.isFfmpegWorking();
         preferences.putBoolean(IS_FFMPEG_WORKING, isWorking);
     }
+
+    public void earlyAccess(boolean isEarlyAccess) {
+        AppSettings.CLEAR.earlyAccess();
+        preferences.putBoolean(EARLY_ACCESS, isEarlyAccess);
+    }
+
+    public void newDriftyVersionName(String versionName) {
+        AppSettings.CLEAR.newDriftyVersionName();
+        preferences.put(NEW_DRIFTY_VERSION_NAME, versionName);
+    }
+
+    public void lastDriftyUpdateTime(long value) {
+        AppSettings.CLEAR.lastDriftyUpdateTime();
+        preferences.putLong(LAST_DRIFTY_UPDATE_TIME, value);
+    }
+
+    public void latestDriftyVersionTag(String tag) {
+        AppSettings.CLEAR.latestDriftyVersionTag();
+        preferences.put(LATEST_DRIFTY_VERSION_TAG, tag);
+    }
+
+    public void driftyUpdateAvailable(boolean isUpdateAvailable) {
+        AppSettings.CLEAR.driftyUpdateAvailable();
+        preferences.putBoolean(DRIFTY_UPDATE_AVAILABLE, isUpdateAvailable);
+    }
 }
diff --git a/Core/src/main/java/properties/MessageCategory.java b/Core/src/main/java/properties/MessageCategory.java
index deabb5351..5a40e4ba4 100644
--- a/Core/src/main/java/properties/MessageCategory.java
+++ b/Core/src/main/java/properties/MessageCategory.java
@@ -1,5 +1,5 @@
 package properties;
 
 public enum MessageCategory {
-    LINK, DIRECTORY, DOWNLOAD, FILENAME, LOG, INITIALIZATION, BATCH, INPUT, STYLE, HISTORY
+    LINK, DIRECTORY, DOWNLOAD, FILENAME, LOG, INITIALIZATION, BATCH, INPUT, STYLE, HISTORY, UPDATE
 }
diff --git a/Core/src/main/java/support/Constants.java b/Core/src/main/java/support/Constants.java
index 5d7cb4445..6c34b42ad 100644
--- a/Core/src/main/java/support/Constants.java
+++ b/Core/src/main/java/support/Constants.java
@@ -1,8 +1,15 @@
 package support;
 
+import init.Environment;
+import utils.Utility;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
 public class Constants {
     public static final String APPLICATION_NAME = "Drifty";
-    public static final String VERSION_NUMBER = "v2.1.0-beta.1";
+    public static final String VERSION_NUMBER = "v1.1.0";
     public static final String DRIFTY_WEBSITE_URL = "https://saptarshisarkar12.github.io/Drifty/";
     public static final String INVALID_LINK = "Link is invalid! Please check the link and try again.";
     public static final String FILENAME_DETECTION_ERROR = "Failed to detect the filename! A default name will be used instead.";
@@ -17,6 +24,17 @@ public class Constants {
     public static final String PERMISSION_DENIED = "You do not have access to download the video, permission is denied.";
     public static final String DRIFTY_COMPONENT_NOT_EXECUTABLE = "A Drifty component (yt-dlp) is not marked as executable.";
     public static final String USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0";
+    public static final long ONE_DAY = 86400000; // Value of one day (24 Hours) in milliseconds
+    public static URL updateURL;
+
+    static {
+        try {
+            updateURL = Utility.getUpdateURL();
+        } catch (MalformedURLException | URISyntaxException e) {
+            Environment.getMessageBroker().msgUpdateError("Drifty update URL is invalid! " + e.getMessage());
+            updateURL = null;
+        }
+    }
 
     /*
     Denoting a Constant with _F indicates that it needs to be used with String.format(), where %s is replaced with the
diff --git a/Core/src/main/java/updater/UpdateChecker.java b/Core/src/main/java/updater/UpdateChecker.java
new file mode 100644
index 000000000..1bbe8ec43
--- /dev/null
+++ b/Core/src/main/java/updater/UpdateChecker.java
@@ -0,0 +1,145 @@
+package updater;
+
+import init.Environment;
+import preferences.AppSettings;
+import support.Constants;
+import utils.MessageBroker;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+public class UpdateChecker {
+    private static final String CURRENT_VERSION = Constants.VERSION_NUMBER.replace("v", "");
+    private static final MessageBroker M = Environment.getMessageBroker();
+
+    public static boolean isUpdateAvailable() {
+        String latestVersion;
+        if (AppSettings.GET.earlyAccess()) {
+            latestVersion = getLatestPreReleaseVersion();
+        } else {
+            latestVersion = getLatestStableVersion();
+        }
+        M.msgLogInfo("Latest version : " + latestVersion);
+        M.msgLogInfo("Current version : " + CURRENT_VERSION);
+        if (latestVersion.isEmpty()) {
+            return false;
+        }
+        AppSettings.SET.lastDriftyUpdateTime(System.currentTimeMillis());
+        return compareVersions(CURRENT_VERSION, latestVersion);
+    }
+
+    private static String getLatestStableVersion() {
+        try {
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.github.com/repos/SaptarshiSarkar12/Drifty/releases/latest"))
+                    .header("Accept", "application/vnd.github.v3+json")
+                    .build();
+            return getReleaseTag(request);
+        } catch (URISyntaxException e) {
+            M.msgUpdateError("Failed to fetch stable release data from GitHub api! " + e.getMessage());
+            return "";
+        }
+    }
+
+    private static String getLatestPreReleaseVersion() {
+        try {
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.github.com/repos/SaptarshiSarkar12/Drifty/releases"))
+                    .header("Accept", "application/vnd.github.v3+json")
+                    .build();
+            return getReleaseTag(request);
+        } catch (URISyntaxException e) {
+            M.msgUpdateError("Failed to fetch pre-release data from GitHub api! " + e.getMessage());
+            return "";
+        }
+    }
+
+    private static String getReleaseTag(HttpRequest request) {
+        try (HttpClient client = HttpClient.newHttpClient()) {
+            String responseBody = client.send(request, HttpResponse.BodyHandlers.ofString()).body();
+            String tag = responseBody.split("\"tag_name\":\"")[1].split("\"")[0];
+            AppSettings.SET.newDriftyVersionName(responseBody.split("\"name\":\"")[1].split("\"")[0]);
+            AppSettings.SET.latestDriftyVersionTag(tag);
+            return tag.replace("v", "");
+        } catch (IOException e) {
+            if (e.getMessage() == null) {
+                M.msgLogError("Failed to check for updates! You may be offline.");
+            } else {
+                if (e.getMessage().contains("403")) {
+                    M.msgUpdateError("Failed to check for updates! GitHub API rate limit exceeded. " + e.getMessage());
+                } else {
+                    M.msgUpdateError("Failed to check for updates! " + e.getMessage());
+                }
+            }
+            return "";
+        } catch (InterruptedException e) {
+            M.msgUpdateError("User interrupted the update check! " + e.getMessage());
+            return "";
+        }
+    }
+
+    public static boolean compareVersions(String currentVersion, String latestVersion) {
+        String[] currentVersionParts = getTagParts(currentVersion);
+        String[] latestVersionParts = getTagParts(latestVersion);
+
+        // Check major, minor, and patch versions
+        for (int i = 0; i < 3; i++) {
+            int cvPart = Integer.parseInt(currentVersionParts[i]);
+            int lvPart = Integer.parseInt(latestVersionParts[i]);
+
+            if (cvPart < lvPart) {
+                return true;
+            } else if (cvPart > lvPart) {
+                return false;
+            }
+        }
+
+        if (currentVersionParts.length == 3 && latestVersionParts.length == 5) {
+            // Example: currentVersion = v2.1.0 and latestVersion = v2.1.0-beta.1
+            // currentVersion is a stable release version, and the latestVersion is a pre-release version
+            // So, the currentVersion is greater than latestVersion as currentVersion is a stable version
+            return false;
+        } else if (currentVersionParts.length == 5 && latestVersionParts.length == 3) {
+            // Example: currentVersion = v2.1.0-beta.1 and latestVersion = v2.1.0
+            // currentVersion is a pre-release version, and the latestVersion is a release version
+            // So, the currentVersion is less than latestVersion as latestVersion is a stable version
+            return true;
+        } else if (currentVersionParts.length == 5 && latestVersionParts.length == 5) {
+            if (AppSettings.GET.earlyAccess()) { // If the user has enabled early access, then pre-release versions are considered
+                // Both versions are pre-release versions
+                int comparePreReleaseType = currentVersionParts[3].compareTo(latestVersionParts[3]); // alpha < beta < rc (compared lexicographically)
+                // Example: currentVersion = v2.1.0-beta.1 and latestVersion = v2.1.0-alpha.1
+                // beta > alpha, so the currentVersion is greater than the latestVersion. Return false
+                // Example: currentVersion = v2.1.0-beta.1, and latestVersion = v2.1.0-rc.1
+                // beta < rc, so the currentVersion is less than the latestVersion. Return true
+                if (comparePreReleaseType < 0) {
+                    return true;
+                } else if (comparePreReleaseType > 0) {
+                    return false;
+                } else {
+                    // Both versions have the same pre-release type (alpha, beta, rc)
+                    // Higher Revision number means a newer version
+                    int cvRevisionNumber = Integer.parseInt(currentVersionParts[4]);
+                    int lvRevisionNumber = Integer.parseInt(latestVersionParts[4]);
+                    return cvRevisionNumber < lvRevisionNumber;
+                }
+            }
+        }
+        return false; // Both versions are equal
+    }
+
+    private static String[] getTagParts(String tag) {
+        if (tag.contains("-")) {
+            String[] versionAndReleaseCode = tag.replace("v", "").split("-"); // Example: v2.1.0-beta.1 => [2.1.0, beta.1]
+            String[] releaseTypeAndNumber = versionAndReleaseCode[1].split("\\."); // Example: beta.1 => [beta, 1]
+            String[] versionParts = versionAndReleaseCode[0].split("\\."); // Example: 2.1.0 => [2, 1, 0]
+            return new String[]{versionParts[0], versionParts[1], versionParts[2], releaseTypeAndNumber[0], releaseTypeAndNumber[1]};
+        } else {
+            return tag.replace("v", "").split("\\."); // Example: v2.1.0 => [2, 1, 0]
+        }
+    }
+}
diff --git a/Core/src/main/java/updater/UpdateExecutor.java b/Core/src/main/java/updater/UpdateExecutor.java
new file mode 100644
index 000000000..3128cfa1f
--- /dev/null
+++ b/Core/src/main/java/updater/UpdateExecutor.java
@@ -0,0 +1,41 @@
+package updater;
+
+import init.Environment;
+import utils.MessageBroker;
+
+import java.io.File;
+
+public abstract class UpdateExecutor {
+    protected static final MessageBroker M = Environment.getMessageBroker();
+    protected File currentExecutableFile;
+    protected File latestExecutableFile;
+
+    protected UpdateExecutor() {
+    }
+
+    public UpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
+        this.currentExecutableFile = currentExecutableFile;
+        this.latestExecutableFile = latestExecutableFile;
+    }
+
+    public boolean setExecutablePermissions() {
+        boolean isExecutablePermissionGranted = latestExecutableFile.setExecutable(true);
+        if (!isExecutablePermissionGranted) {
+            M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
+            return false;
+        }
+        boolean isWritePermissionGranted = latestExecutableFile.setWritable(true);
+        if (!isWritePermissionGranted) {
+            M.msgUpdateError("Failed to set write permission for the latest version of Drifty!");
+            return false;
+        }
+        boolean isReadPermissionGranted = latestExecutableFile.setReadable(true);
+        if (!isReadPermissionGranted) {
+            M.msgUpdateError("Failed to set read permission for the latest version of Drifty!");
+            return false;
+        }
+        return true;
+    }
+
+    public abstract boolean execute();
+}
diff --git a/Core/src/main/java/utils/MessageBroker.java b/Core/src/main/java/utils/MessageBroker.java
index 20ca55296..e98ffae8c 100644
--- a/Core/src/main/java/utils/MessageBroker.java
+++ b/Core/src/main/java/utils/MessageBroker.java
@@ -76,6 +76,14 @@ public void msgBatchError(String message) {
         sendMessage(message, MessageType.ERROR, MessageCategory.BATCH);
     }
 
+    public void msgUpdateError(String message) {
+        sendMessage(message, MessageType.ERROR, MessageCategory.UPDATE);
+    }
+
+    public void msgUpdateInfo(String message) {
+        sendMessage(message, MessageType.INFO, MessageCategory.UPDATE);
+    }
+
     protected void sendMessage(String message, MessageType messageType, MessageCategory messageCategory) {
         logger.log(messageType, message);
         message = switch (messageType) {
diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index b92647f5c..7ab833b37 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -7,6 +7,7 @@
 import org.apache.commons.text.StringEscapeUtils;
 import org.hildan.fxgson.FxGson;
 import preferences.AppSettings;
+import properties.Mode;
 import properties.OS;
 import properties.Program;
 
@@ -22,6 +23,8 @@
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -32,9 +35,14 @@
 
 public class Utility {
     private static final Random RANDOM_GENERATOR = new Random(System.currentTimeMillis());
-    protected static final MessageBroker M = Environment.getMessageBroker();
+    protected static MessageBroker M;
     private static boolean interrupted;
 
+    public static void initializeUtility() {
+        // Lazy initialization of the MessageBroker as it might be null when the Environment MessageBroker is not set
+        M = Environment.getMessageBroker();
+    }
+
     public static boolean isYoutube(String url) {
         String pattern = "^(http(s)?://)?((w){3}.)?youtu(be|.be)?(\\.com)?/.+";
         return url.matches(pattern);
@@ -89,6 +97,30 @@ public static boolean isLinkValid(String link) {
         return false;
     }
 
+    public static URL getUpdateURL() throws MalformedURLException, URISyntaxException {
+        URL updateURL;
+        String[] executableNames;
+        if (Mode.isGUI()) {
+            executableNames = new String[]{"Drifty-GUI.pkg", "Drifty-GUI.exe", "Drifty-GUI_linux"};
+        } else {
+            executableNames = new String[]{"Drifty-CLI_macos", "Drifty-CLI.exe", "Drifty-CLI_linux"};
+        } // https://github.com/SaptarshiSarkar12/Drifty/releases/download/v2.1.0-beta/Drifty-CLI_linux
+        String updateURLMiddle;
+        if (AppSettings.GET.earlyAccess()) {
+            updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
+        } else {
+            updateURLMiddle = "latest/download/";
+        }
+        if (OS.isMac()) {
+            updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[0]).toURL();
+        } else if (OS.isWindows()) {
+            updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[1]).toURL();
+        } else {
+            updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[2]).toURL();
+        }
+        return updateURL;
+    }
+
     public static LinkedList<String> getYtDlpMetadata(String link) {
         try {
             LinkedList<String> list = new LinkedList<>();
@@ -728,6 +760,8 @@ public static Runnable setSpotifyAccessToken() {
                 AppSettings.SET.spotifyAccessToken(jsonObject.get("access_token").getAsString());
             } catch (UnknownHostException e) {
                 M.msgInitError("You are not connected to the Internet!");
+                ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+                executor.schedule(setSpotifyAccessToken(), 5, TimeUnit.SECONDS); // retry after 5 seconds
             } catch (IOException e) {
                 M.msgInitError("Failed to get Spotify access token! Failed to read response from Spotify API! " + e.getMessage());
             } catch (URISyntaxException e) {
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
new file mode 100644
index 000000000..8759af0e5
--- /dev/null
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -0,0 +1,68 @@
+package gui.updater;
+
+import org.buildobjects.process.ProcBuilder;
+import org.buildobjects.process.ProcResult;
+import properties.OS;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+public class GUIUpdateExecutor extends updater.UpdateExecutor {
+
+    public GUIUpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
+        super(currentExecutableFile, latestExecutableFile);
+    }
+
+    @Override
+    public boolean execute() {
+        M.msgLogInfo("Download successful! Setting executable permission...");
+        if (setExecutablePermissions()) {
+            M.msgLogInfo("Executable permission set! Executing update...");
+        } else {
+            M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
+            return false;
+        }
+        if (OS.isMac()) {
+            ProcResult executionResult = new ProcBuilder("open").withArgs(latestExecutableFile.getAbsolutePath()).withNoTimeout().ignoreExitStatus().run();
+            if (executionResult.getExitValue() != 0) {
+                M.msgUpdateError("Failed to open the installer for the latest version of Drifty!");
+            } else {
+                System.exit(0);
+            }
+        } else {
+            String currentExecutablePathString = currentExecutableFile.toPath().toString();
+            ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
+            boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
+            if (!isCurrentExecutableRenamed) {
+                M.msgUpdateError("Failed to rename the current version of Drifty!");
+                return false;
+            }
+            try {
+                Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
+                M.msgUpdateInfo("Update successful!");
+            } catch (IOException e) {
+                M.msgUpdateError("Failed to replace the current version of Drifty!");
+                return false;
+            }
+            try {
+                runCurrentExecutable.start();
+            } catch (IOException e) {
+                M.msgUpdateError("Failed to start the latest version of Drifty!");
+            }
+            if (OS.isWindows()) {
+                System.exit(0);
+            } else {
+                try {
+                    Files.deleteIfExists(Paths.get(currentExecutablePathString + ".old"));
+                    System.exit(0);
+                } catch (IOException e) {
+                    M.msgUpdateError("Failed to delete the old version of Drifty!");
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/GUI/src/main/java/gui/utils/MessageBroker.java b/GUI/src/main/java/gui/utils/MessageBroker.java
index 1ac6bb414..b00fbec5c 100644
--- a/GUI/src/main/java/gui/utils/MessageBroker.java
+++ b/GUI/src/main/java/gui/utils/MessageBroker.java
@@ -3,6 +3,7 @@
 import javafx.scene.paint.Color;
 import properties.MessageCategory;
 import properties.MessageType;
+import ui.ConfirmationDialog;
 import ui.UIController;
 
 import java.util.Objects;
@@ -35,6 +36,11 @@ protected void sendMessage(String message, MessageType messageType, MessageCateg
             case FILENAME -> Objects.requireNonNull(ui).setFilenameOutput(color, message);
             case DIRECTORY -> Objects.requireNonNull(ui).setDirOutput(color, message);
             case DOWNLOAD -> Objects.requireNonNull(ui).setDownloadOutput(color, message);
+            case UPDATE -> {
+                if (MessageType.ERROR.equals(messageType)) {
+                    new ConfirmationDialog("Update Failed", message, true, true).getResponse();
+                }
+            }
             default -> {
                 if (!message.isEmpty()) {
                     logger.log(messageType, message);
diff --git a/GUI/src/main/java/gui/utils/UIComponentBuilder.java b/GUI/src/main/java/gui/utils/UIComponentBuilder.java
index 66be5f215..bf9d2d8bb 100644
--- a/GUI/src/main/java/gui/utils/UIComponentBuilder.java
+++ b/GUI/src/main/java/gui/utils/UIComponentBuilder.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.Border;
 import javafx.scene.layout.HBox;
 import javafx.scene.paint.LinearGradient;
 import javafx.scene.paint.Paint;
@@ -65,6 +66,7 @@ public TextField buildTextField() {
     public Hyperlink buildHyperlink(String text, Font font, LinearGradient fill, String url) {
         Hyperlink link = new Hyperlink(text);
         link.setFont(font);
+        link.setBorder(Border.EMPTY);
         link.setTextFill(fill);
         link.setOnAction(e -> Drifty_GUI.INSTANCE.openWebsite(url));
         return link;
diff --git a/GUI/src/main/java/main/Drifty_GUI.java b/GUI/src/main/java/main/Drifty_GUI.java
index aab8ec7a4..68485e0d1 100644
--- a/GUI/src/main/java/main/Drifty_GUI.java
+++ b/GUI/src/main/java/main/Drifty_GUI.java
@@ -43,17 +43,17 @@ public void init() {
         msgBroker = new MessageBroker();
         Environment.setGUIMessageBroker(msgBroker);
         msgBroker.msgLogInfo("Drifty GUI (Graphical User Interface) Application Started !");
+        Environment.initializeEnvironment();
+        notifyPreloader(new Preloader.StateChangeNotification(Preloader.StateChangeNotification.Type.BEFORE_START));
     }
 
     @Override
     public void start(Stage primaryStage) {
-        Environment.initializeEnvironment();
         this.primaryStage = Constants.getStage("Drifty GUI", true);
         this.primaryStage.setMinWidth(Constants.SCREEN_WIDTH * .46);
         this.primaryStage.setMinHeight(Constants.SCREEN_HEIGHT * .8125);
         createScene();
         this.primaryStage.setScene(scene);
-        notifyPreloader(new Preloader.StateChangeNotification(Preloader.StateChangeNotification.Type.BEFORE_LOAD));
         this.primaryStage.show();
     }
 
@@ -158,7 +158,7 @@ private Menu getEditMenu() {
         MenuItem wipeHistory = new MenuItem("Clear Download History");
         MenuItem settings = new MenuItem("Settings");
         wipeHistory.setOnAction(e -> {
-            ConfirmationDialog ask = new ConfirmationDialog("Clear Download History", "Are you sure you wish to wipe out all of your download history?\n(This will NOT delete any downloaded files)", false);
+            ConfirmationDialog ask = new ConfirmationDialog("Clear Download History", "Are you sure you wish to wipe out all of your download history?\n(This will NOT delete any downloaded files)", false, false);
             if (ask.getResponse().isYes()) {
                 UIController.clearJobHistory();
             }
diff --git a/GUI/src/main/java/module-info.java b/GUI/src/main/java/module-info.java
index 876373541..64bf61f55 100644
--- a/GUI/src/main/java/module-info.java
+++ b/GUI/src/main/java/module-info.java
@@ -7,6 +7,7 @@
     requires com.google.gson;
     requires org.hildan.fxgson;
     requires java.prefs;
+    requires jproc;
 
     exports gui.support;
     exports gui.utils;
diff --git a/GUI/src/main/java/ui/ConfirmationDialog.java b/GUI/src/main/java/ui/ConfirmationDialog.java
index 966096a2e..badbc20e0 100644
--- a/GUI/src/main/java/ui/ConfirmationDialog.java
+++ b/GUI/src/main/java/ui/ConfirmationDialog.java
@@ -1,7 +1,6 @@
 package ui;
 
 import gui.init.Environment;
-
 import gui.preferences.AppSettings;
 import gui.support.Constants;
 import javafx.application.Platform;
@@ -11,10 +10,16 @@
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
-import javafx.scene.control.Label;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Stop;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 import javafx.stage.Stage;
@@ -33,17 +38,23 @@ enum State {
     private static Button btnYes;
     private double width = 200;
     private double height = 150;
-    private Stage stage;
-    private VBox vbox;
     private final String windowTitle;
     private final String msg;
-    private String filename = "";
+    private boolean isUpdateError;
     private final GetConfirmationDialogResponse answer = new GetConfirmationDialogResponse();
+    private Stage stage;
+    private VBox vbox;
+    private String filename = "";
 
-    public ConfirmationDialog(String windowTitle, String message, boolean okOnly) {
+    public ConfirmationDialog(String windowTitle, String message, boolean okOnly, boolean isUpdateError) {
         this.windowTitle = windowTitle;
-        this.msg = message;
         this.state = okOnly ? State.OK : State.YES_NO;
+        this.isUpdateError = isUpdateError;
+        if (isUpdateError) {
+            this.msg = message + "\n\nPlease try again later or download the latest version from the below link :";
+        } else {
+            this.msg = message;
+        }
         finish();
     }
 
@@ -98,13 +109,7 @@ private void createControls() {
         text.setFont(Constants.getMonaco(16));
         text.setTextAlignment(TextAlignment.LEFT);
         text.setWrappingWidth(width * .85);
-        Label message = new Label("Are you sure?");
-        message.setFont(Constants.getMonaco(17));
-        if (!msg.isEmpty()) {
-            message.setText(msg);
-            message.setWrapText(true);
-            message.setTextAlignment(TextAlignment.CENTER);
-        }
+        Hyperlink downloadLink = Constants.UI_COMPONENT_BUILDER_INSTANCE.buildHyperlink("Download the Latest Version", Font.font("Verdana", FontWeight.BOLD, 16), new LinearGradient(0, 0, 1, 0, true, CycleMethod.NO_CYCLE, new Stop(0.25, Color.valueOf("#4158D0")), new Stop(1, Color.valueOf("#C850C0"))), "https://saptarshisarkar12.github.io/Drifty/download");
         btnYes = newButton("Yes", e -> {
             answer.setAnswer(true);
             stage.close();
@@ -129,7 +134,12 @@ private void createControls() {
             vbox.getChildren().add(tfFilename);
         }
         switch (state) {
-            case OK -> hbox.getChildren().add(btnOk);
+            case OK -> {
+                if (isUpdateError) {
+                    vbox.getChildren().add(downloadLink);
+                }
+                hbox.getChildren().add(btnOk);
+            }
             case YES_NO, FILENAME -> hbox.getChildren().addAll(btnYes, btnNo);
             default -> Environment.getMessageBroker().msgLogError("Unknown state in ConfirmationDialog : " + state);
         }
diff --git a/GUI/src/main/java/ui/Settings.java b/GUI/src/main/java/ui/Settings.java
index 8111f48cb..d753575ee 100644
--- a/GUI/src/main/java/ui/Settings.java
+++ b/GUI/src/main/java/ui/Settings.java
@@ -28,10 +28,12 @@ public class Settings {
     private static Scene settingsScene;
     private static TextField tfCurrentDirectory;
     private CheckBox autoPasteCheckbox;
+    private CheckBox earlyAccessCheckbox;
     private Label lblDefaultDownloadDir;
     private Label lblTheme;
     private Label lblSettingsHeading;
     private Label lblAutoPaste;
+    private Label lblEarlyAccess;
     private ChoiceBox<String> themeChoiceBox;
     private Stage stage;
     private GridPane root;
@@ -46,6 +48,7 @@ private void initializeUIComponents() {
         createTfDirectory();
         createLabels();
         createAutoPasteCheck();
+        createEarlyAccessCheck();
         createDirectoryButton();
     }
 
@@ -73,7 +76,7 @@ private void configureLayout() {
         root.setPadding(new Insets(10, 20, 20, 20));
         addComponents();
         setHAlignments();
-        setHGrowsAlways(lblSettingsHeading, lblAutoPaste, autoPasteCheckbox, lblTheme, themeChoiceBox, lblDefaultDownloadDir, tfCurrentDirectory, selectDirectoryButton);
+        setHGrowsAlways(lblSettingsHeading, lblAutoPaste, autoPasteCheckbox, lblEarlyAccess, earlyAccessCheckbox, lblTheme, themeChoiceBox, lblDefaultDownloadDir, tfCurrentDirectory, selectDirectoryButton);
     }
 
     public void show() {
@@ -89,6 +92,7 @@ public void show() {
     private void setHAlignments() {
         GridPane.setHalignment(lblSettingsHeading, HPos.CENTER);
         GridPane.setHalignment(lblAutoPaste, HPos.RIGHT);
+        GridPane.setHalignment(lblEarlyAccess, HPos.RIGHT);
         GridPane.setHalignment(lblTheme, HPos.RIGHT);
         GridPane.setHalignment(lblDefaultDownloadDir, HPos.RIGHT);
         GridPane.setHalignment(selectDirectoryButton, HPos.CENTER);
@@ -104,17 +108,19 @@ private void addComponents() {
         root.add(lblSettingsHeading, 0, 0, 2, 1);
         root.add(lblAutoPaste, 0, 1);
         root.add(autoPasteCheckbox, 1, 1);
-        root.add(lblTheme, 0, 2);
-        root.add(themeChoiceBox, 1, 2);
-        root.add(lblDefaultDownloadDir, 0, 3);
-        root.add(tfCurrentDirectory, 1, 3);
-        root.add(selectDirectoryButton, 1, 4, 2, 1);
+        root.add(lblEarlyAccess, 0, 2);
+        root.add(earlyAccessCheckbox, 1, 2);
+        root.add(lblTheme, 0, 3);
+        root.add(themeChoiceBox, 1, 3);
+        root.add(lblDefaultDownloadDir, 0, 4);
+        root.add(tfCurrentDirectory, 1, 4);
+        root.add(selectDirectoryButton, 1, 5);
     }
 
     private void setInitialTheme(String theme) {
         boolean isDark = "Dark".equals(theme);
         Constants.addCSS(settingsScene, isDark ? Constants.DARK_THEME_CSS : Constants.LIGHT_THEME_CSS);
-        applyStyleToLabels(isDark, lblTheme, lblAutoPaste, lblDefaultDownloadDir, lblSettingsHeading);
+        applyStyleToLabels(isDark, lblTheme, lblAutoPaste, lblEarlyAccess, lblDefaultDownloadDir, lblSettingsHeading);
         tfCurrentDirectory.setStyle("-fx-text-fill: " + (isDark ? "white" : "black") + " ; -fx-font-weight: Bold");
     }
 
@@ -140,10 +146,18 @@ private void createAutoPasteCheck() {
         autoPasteCheckbox.selectedProperty().addListener(((observable, oldValue, newValue) -> AppSettings.SET.mainAutoPaste(newValue)));
     }
 
+    private void createEarlyAccessCheck() {
+        earlyAccessCheckbox = new CheckBox();
+        earlyAccessCheckbox.setSelected(AppSettings.GET.earlyAccess());
+        earlyAccessCheckbox.setMaxWidth(5.0);
+        earlyAccessCheckbox.selectedProperty().addListener(((observable, oldValue, newValue) -> AppSettings.SET.earlyAccess(newValue)));
+    }
+
     private void createLabels() {
         Paint textFill = LinearGradient.valueOf("linear-gradient(to right, #0f0c29, #302b63, #24243e)");
         lblSettingsHeading = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Settings", Font.font("monospace", FontWeight.EXTRA_BOLD, 100), textFill);
         lblAutoPaste = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Auto-Paste", Font.font("Arial", FontWeight.EXTRA_BOLD, 20), textFill);
+        lblEarlyAccess = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Get Early Access Updates", Font.font("Arial", FontWeight.EXTRA_BOLD, 20), textFill);
         lblTheme = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Theme", Font.font("Arial", FontWeight.EXTRA_BOLD, 20), textFill);
         lblDefaultDownloadDir = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Default Download Directory", Font.font("Arial", FontWeight.BOLD, 20), textFill);
     }
diff --git a/GUI/src/main/java/ui/Splash.java b/GUI/src/main/java/ui/Splash.java
index dc5c01587..7e974dd9d 100644
--- a/GUI/src/main/java/ui/Splash.java
+++ b/GUI/src/main/java/ui/Splash.java
@@ -47,7 +47,7 @@ public void start(Stage primaryStage) {
     @Override
     public void handleStateChangeNotification(StateChangeNotification info) {
         StateChangeNotification.Type type = info.getType();
-        if (Objects.requireNonNull(type) == StateChangeNotification.Type.BEFORE_LOAD) {
+        if (Objects.requireNonNull(type) == StateChangeNotification.Type.BEFORE_START) {
             double time;
             if (AppSettings.GET.ytDlpUpdating()) {
                 time = 2.0;
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index 0141a8145..6235627a9 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -8,6 +8,7 @@
 import gui.support.Constants;
 import gui.support.Folders;
 import gui.support.Jobs;
+import gui.updater.GUIUpdateExecutor;
 import gui.utils.CheckFile;
 import gui.utils.MessageBroker;
 import javafx.application.Platform;
@@ -32,11 +33,16 @@
 import javafx.scene.text.TextFlow;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
+import main.Drifty_GUI;
+import properties.OS;
 import support.Job;
 import support.JobHistory;
 import utils.Utility;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedDeque;
@@ -84,6 +90,15 @@ private UIController() {
     Methods for initializing the various controls that are on the form - MainGridPane
      */
     private void start(MainGridPane pane) {
+        new Thread(() -> {
+            if (AppSettings.GET.driftyUpdateAvailable()) {
+                M.msgLogInfo("A new version of Drifty is available!");
+                ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + "Do you want to download it now?", false, false);
+                if (ask.getResponse().isYes()) {
+                    downloadUpdate();
+                }
+            }
+        }).start();
         form = pane;
         setControlProperties();
         setControlActions();
@@ -91,6 +106,44 @@ private void start(MainGridPane pane) {
         commitJobListToListView();
     }
 
+    private void downloadUpdate() {
+        String previouslySelectedDir = getDir(); // Save the download folder selected before the update was initiated.
+        try {
+            // "Current executable" means the executable currently running i.e., the one that is outdated.
+            File currentExecutableFile = new File(Drifty_GUI.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+            // "Latest executable" means the executable that is to be downloaded and installed i.e., the latest version.
+            // "tmpFolder" is the temporary folder where the latest executable will be downloaded to.
+            File tmpFolder = Files.createTempDirectory("Drifty").toFile();
+            tmpFolder.deleteOnExit();
+            // For Mac, the latest executable is a ".pkg" file as it is the only working way to update the application, i.e., by installing a new version.
+            // For other OS, the latest executable name along with the extension is the same as that of the current executable.
+            String latestExecutableName = OS.isMac() ? "Drifty_GUI.pkg" : currentExecutableFile.getName();
+            File latestExecutableFile = Paths.get(tmpFolder.getPath()).resolve(latestExecutableName).toFile();
+            // Download the latest executable
+            Job updateJob = new Job(Constants.updateURL.toString(), latestExecutableFile.getParent(), latestExecutableFile.getName(), false);
+            addJob(updateJob);
+            Thread downloadUpdate = new Thread(batchDownloader());
+            downloadUpdate.start();
+            while (!downloadUpdate.getState().equals(Thread.State.TERMINATED)) {
+                sleep(500);
+            }
+            setDir(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
+            if (latestExecutableFile.exists() && latestExecutableFile.isFile() && latestExecutableFile.length() > 0) {
+                // If the latest executable was successfully downloaded, set the executable permission and execute the update.
+                GUIUpdateExecutor updateExecutor = new GUIUpdateExecutor(currentExecutableFile, latestExecutableFile);
+                updateExecutor.execute();
+            } else {
+                M.msgUpdateError("Failed to download update!");
+            }
+        } catch (IOException e) {
+            M.msgUpdateError("Failed to create temporary folder for downloading update! " + e.getMessage());
+        } catch (URISyntaxException e) {
+            M.msgUpdateError("Failed to get the location of the current executable! " + e.getMessage());
+        } catch (Exception e) {
+            M.msgUpdateError("Failed to update! An unknown error occurred! " + e.getMessage());
+        }
+    }
+
     private void setControlProperties() {
         setDir(folders.getDownloadFolder());
         DIRECTORY_EXISTS.setValue(new File(getDir()).exists());
@@ -517,10 +570,10 @@ private void checkHistoryAddJobs(Worker<ConcurrentLinkedDeque<Job>> worker) {
                             ask = new ConfirmationDialog("File Already Downloaded and Exists", message, renameFile(job.getFilename(), job.getDir()));
                         } else if (existsNoHistory) {
                             message = String.format(fileExistsString, job.getFilename());
-                            ask = new ConfirmationDialog("File Already Exists", message, false);
+                            ask = new ConfirmationDialog("File Already Exists", message, false, false);
                         } else if (fileHasHistory) {
                             message = String.format(pastJobNoFile, job.getFilename());
-                            ask = new ConfirmationDialog("File Already Downloaded", message, false);
+                            ask = new ConfirmationDialog("File Already Downloaded", message, false, false);
                         }
                         if (fileHasHistory || existsHasHistory || existsNoHistory) {
                             addJob = ask.getResponse().isYes();
diff --git a/GUI/src/main/resources/META-INF/native-image/reflect-config.json b/GUI/src/main/resources/META-INF/native-image/reflect-config.json
index c5bae7363..437dced57 100644
--- a/GUI/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/GUI/src/main/resources/META-INF/native-image/reflect-config.json
@@ -107,10 +107,6 @@
   "name":"com.sun.prism.shader.Mask_TextureSuper_Loader",
   "methods":[{"name":"loadShader","parameterTypes":["com.sun.prism.ps.ShaderFactory","java.io.InputStream"] }]
 },
-{
-  "name":"com.sun.prism.shader.Solid_Color_Loader",
-  "methods":[{"name":"loadShader","parameterTypes":["com.sun.prism.ps.ShaderFactory","java.io.InputStream"] }]
-},
 {
   "name":"com.sun.prism.shader.Solid_TextureFirstPassLCD_Loader",
   "methods":[{"name":"loadShader","parameterTypes":["com.sun.prism.ps.ShaderFactory","java.io.InputStream"] }]
diff --git a/GUI/src/main/resources/META-INF/native-image/resource-config.json b/GUI/src/main/resources/META-INF/native-image/resource-config.json
index 0f645362a..96b50edd7 100644
--- a/GUI/src/main/resources/META-INF/native-image/resource-config.json
+++ b/GUI/src/main/resources/META-INF/native-image/resource-config.json
@@ -86,6 +86,10 @@
     "pattern":"\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en.properties\\E"
   }, {
     "pattern":"\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en_US.properties\\E"
+  }, {
+    "pattern":"\\Qffmpeg\\E"
+  }, {
+    "pattern":"\\Qyt-dlp\\E"
   }, {
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/nfkc.nrm\\E"
   }, {
@@ -130,8 +134,6 @@
     "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillRoundRect_Color.frag\\E"
   }, {
     "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Mask_TextureSuper.frag\\E"
-  }, {
-    "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_Color.frag\\E"
   }, {
     "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureFirstPassLCD.frag\\E"
   }, {

From 394539b9beeeaa418b97d5bfe5f930cac3971c84 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Fri, 5 Jul 2024 18:40:29 +0530
Subject: [PATCH 02/36] fix: fixed Linter issue

---
 CLI/src/main/java/cli/utils/Utility.java |  24 ++--
 Core/src/main/java/utils/Utility.java    | 134 +++++++++++------------
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/CLI/src/main/java/cli/utils/Utility.java b/CLI/src/main/java/cli/utils/Utility.java
index 54c60d8d5..e04487783 100644
--- a/CLI/src/main/java/cli/utils/Utility.java
+++ b/CLI/src/main/java/cli/utils/Utility.java
@@ -27,23 +27,23 @@ public static String findFilenameInLink(String link) {
             // example.com/file.json -> file.json
             String file = link.substring(link.lastIndexOf("/") + 1);
             if (file.isEmpty()) {
-                M.msgFilenameError(FILENAME_DETECTION_ERROR);
+                msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                 return null;
             }
             int index = file.lastIndexOf(".");
             if (index < 0) {
-                M.msgFilenameError(FILENAME_DETECTION_ERROR);
+                msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                 return null;
             }
             String extension = file.substring(index);
             // edge case 1: "example.com/."
             if (extension.length() == 1) {
-                M.msgFilenameError(FILENAME_DETECTION_ERROR);
+                msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                 return null;
             }
             // file.png?width=200 -> file.png
             filename = file.split("([?])")[0];
-            M.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
+            msgBroker.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
         }
         return filename;
     }
@@ -51,7 +51,7 @@ public static String findFilenameInLink(String link) {
     public boolean yesNoValidation(String input, String printMessage) {
         while (input.isEmpty()) {
             Environment.getMessageBroker().msgInputError(ENTER_Y_OR_N, true);
-            M.msgLogError(ENTER_Y_OR_N);
+            msgBroker.msgLogError(ENTER_Y_OR_N);
             Environment.getMessageBroker().msgInputInfo(printMessage, false);
             input = SC.nextLine().toLowerCase();
         }
@@ -62,7 +62,7 @@ public boolean yesNoValidation(String input, String printMessage) {
             return false;
         } else {
             Environment.getMessageBroker().msgInputError("Invalid input!", true);
-            M.msgLogError("Invalid input!");
+            msgBroker.msgLogError("Invalid input!");
             Environment.getMessageBroker().msgInputInfo(printMessage, false);
             input = SC.nextLine().toLowerCase();
             return yesNoValidation(input, printMessage);
@@ -82,26 +82,26 @@ public static String getSpotifyDownloadLink(String spotifyMetadataJson) {
         ArrayList<HashMap<String, Object>> searchResults = getYoutubeSearchResults(query, true);
         boolean searchedWithFilters = true;
         if (searchResults == null) {
-            M.msgLogError("Failed to get search results for the song with filters! Trying without filters ...");
+            msgBroker.msgLogError("Failed to get search results for the song with filters! Trying without filters ...");
             searchResults = getYoutubeSearchResults(query, false);
             searchedWithFilters = false;
             if (searchResults == null) {
-                M.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
+                msgBroker.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
                 return null;
             }
         }
         String matchedId = getMatchingVideoID(Objects.requireNonNull(searchResults), duration, artistNames);
         if (matchedId.isEmpty()) {
             if (searchedWithFilters) {
-                M.msgLogError("Failed to get a matching video ID for the song with filters! Trying without filters ...");
+                msgBroker.msgLogError("Failed to get a matching video ID for the song with filters! Trying without filters ...");
                 searchResults = getYoutubeSearchResults(query, false);
                 matchedId = getMatchingVideoID(Objects.requireNonNull(searchResults), duration, artistNames);
                 if (matchedId.isEmpty()) {
-                    M.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
+                    msgBroker.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
                     return null;
                 }
             } else {
-                M.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
+                msgBroker.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
                 return null;
             }
         }
@@ -114,7 +114,7 @@ public static Yaml getYamlParser() {
         loaderOptions.setAllowRecursiveKeys(false);
         loaderOptions.setProcessComments(false);
         Yaml yamlParser = new Yaml(new SafeConstructor(loaderOptions));
-        M.msgLogInfo("YAML parser initialized successfully");
+        msgBroker.msgLogInfo("YAML parser initialized successfully");
         return yamlParser;
     }
 }
diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 7ab833b37..959e2ca57 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -35,12 +35,12 @@
 
 public class Utility {
     private static final Random RANDOM_GENERATOR = new Random(System.currentTimeMillis());
-    protected static MessageBroker M;
+    protected static MessageBroker msgBroker;
     private static boolean interrupted;
 
     public static void initializeUtility() {
         // Lazy initialization of the MessageBroker as it might be null when the Environment MessageBroker is not set
-        M = Environment.getMessageBroker();
+        msgBroker = Environment.getMessageBroker();
     }
 
     public static boolean isYoutube(String url) {
@@ -68,31 +68,31 @@ public static boolean isLinkValid(String link) {
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("HEAD"); // Faster validation and hence improves performance
             connection.connect();
-            M.msgLinkInfo("Link is valid!");
+            msgBroker.msgLinkInfo("Link is valid!");
             return true;
         } catch (ConnectException e) {
-            M.msgLinkError("Connection to the link timed out! Please check your internet connection. " + e.getMessage());
+            msgBroker.msgLinkError("Connection to the link timed out! Please check your internet connection. " + e.getMessage());
         } catch (UnknownHostException unknownHost) {
             try {
                 URL projectWebsite = URI.create(DRIFTY_WEBSITE_URL).toURL();
                 HttpURLConnection connectProjectWebsite = (HttpURLConnection) projectWebsite.openConnection();
                 connectProjectWebsite.connect();
-                M.msgLinkError(INVALID_LINK); // If our project website can be connected to, then the one entered by user is not valid! [NOTE: UnknownHostException is thrown if either internet is not connected or the website address is incorrect]
+                msgBroker.msgLinkError(INVALID_LINK); // If our project website can be connected to, then the one entered by user is not valid! [NOTE: UnknownHostException is thrown if either internet is not connected or the website address is incorrect]
             } catch (UnknownHostException e) {
-                M.msgLinkError("You are not connected to the Internet!");
+                msgBroker.msgLinkError("You are not connected to the Internet!");
             } catch (MalformedURLException e) {
-                M.msgLinkError("The link is not correctly formatted! " + e.getMessage());
+                msgBroker.msgLinkError("The link is not correctly formatted! " + e.getMessage());
             } catch (IOException e) {
-                M.msgLinkError("Failed to connect to the project website! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to connect to the project website! " + e.getMessage());
             }
         } catch (ProtocolException e) {
-            M.msgLinkError("An error occurred with the protocol! " + e.getMessage());
+            msgBroker.msgLinkError("An error occurred with the protocol! " + e.getMessage());
         } catch (MalformedURLException e) {
-            M.msgLinkError("The link is not correctly formatted! " + e.getMessage());
+            msgBroker.msgLinkError("The link is not correctly formatted! " + e.getMessage());
         } catch (IOException e) {
-            M.msgLinkError("Failed to connect to " + link + " ! " + e.getMessage());
+            msgBroker.msgLinkError("Failed to connect to " + link + " ! " + e.getMessage());
         } catch (IllegalArgumentException e) {
-            M.msgLinkError(link + " is not a URL; error: " + e.getMessage());
+            msgBroker.msgLinkError(link + " is not a URL; error: " + e.getMessage());
         }
         return false;
     }
@@ -129,14 +129,14 @@ public static LinkedList<String> getYtDlpMetadata(String link) {
                 FileUtils.forceDelete(driftyJsonFolder); // Deletes the previously generated temporary directory for Drifty
             }
             if (!driftyJsonFolder.mkdir()) {
-                M.msgLinkError("Failed to create temporary directory for Drifty to get link metadata!");
+                msgBroker.msgLinkError("Failed to create temporary directory for Drifty to get link metadata!");
                 return null;
             }
             Thread linkThread = new Thread(ytDLPJsonData(driftyJsonFolder.getAbsolutePath(), link));
             try {
                 linkThread.start();
             } catch (Exception e) {
-                M.msgLinkError("Failed to start thread to get link metadata! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to start thread to get link metadata! " + e.getMessage());
                 return null;
             }
             while (!linkThread.getState().equals(Thread.State.TERMINATED) && !linkThread.isInterrupted()) {
@@ -159,14 +159,14 @@ public static LinkedList<String> getYtDlpMetadata(String link) {
             }
             return list;
         } catch (IOException e) {
-            M.msgLinkError("Failed to perform I/O operations on link metadata! " + e.getMessage());
+            msgBroker.msgLinkError("Failed to perform I/O operations on link metadata! " + e.getMessage());
             return null;
         }
     }
 
     public static String getHomeDownloadFolder() {
         String downloadsFolder;
-        M.msgDirInfo(TRYING_TO_AUTO_DETECT_DOWNLOADS_FOLDER);
+        msgBroker.msgDirInfo(TRYING_TO_AUTO_DETECT_DOWNLOADS_FOLDER);
         if (!OS.isWindows()) {
             String home = System.getProperty("user.home");
             downloadsFolder = home + FileSystems.getDefault().getSeparator() + "Downloads" + FileSystems.getDefault().getSeparator();
@@ -175,9 +175,9 @@ public static String getHomeDownloadFolder() {
         }
         if (downloadsFolder.equals(FileSystems.getDefault().getSeparator())) {
             downloadsFolder = System.getProperty("user.home");
-            M.msgDirError(FAILED_TO_RETRIEVE_DEFAULT_DOWNLOAD_FOLDER);
+            msgBroker.msgDirError(FAILED_TO_RETRIEVE_DEFAULT_DOWNLOAD_FOLDER);
         } else {
-            M.msgDirInfo(FOLDER_DETECTED + downloadsFolder);
+            msgBroker.msgDirInfo(FOLDER_DETECTED + downloadsFolder);
         }
         return downloadsFolder;
     }
@@ -215,10 +215,10 @@ public static String getFilenameFromJson(String jsonString) {
         Matcher m = p.matcher(json);
         if (m.find()) {
             filename = cleanFilename(m.group(2)) + ".mp4";
-            M.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
+            msgBroker.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
         } else {
             filename = cleanFilename("Unknown_Filename_") + randomString(15) + ".mp4";
-            M.msgFilenameError(FILENAME_DETECTION_ERROR);
+            msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
         }
         return filename;
     }
@@ -230,7 +230,7 @@ public static HashMap<String, Object> getSpotifySongMetadata(String songUrl) {
         if (trackMatcher.find()) {
             trackId = trackMatcher.group(1);
         } else {
-            M.msgLinkError("Failed to extract track ID from Spotify link!");
+            msgBroker.msgLinkError("Failed to extract track ID from Spotify link!");
             return null;
         }
         try {
@@ -263,14 +263,14 @@ public static HashMap<String, Object> getSpotifySongMetadata(String songUrl) {
             String json = gson.toJson(songMetadataMap);
             File jsonFile = Program.getJsonDataPath().resolve("spotify-metadata.json").toFile();
             FileUtils.writeStringToFile(jsonFile, json, Charset.defaultCharset());
-            M.msgLogInfo("Spotify metadata retrieved successfully!");
+            msgBroker.msgLogInfo("Spotify metadata retrieved successfully!");
             return songMetadataMap;
         } catch (URISyntaxException e) {
-            M.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
+            msgBroker.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
         } catch (IOException e) {
-            M.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
+            msgBroker.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
         } catch (InterruptedException e) {
-            M.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
+            msgBroker.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
         }
         return null;
     }
@@ -289,17 +289,17 @@ private static String fetchSpotifyPlaylistData(String spotifyPlaylistAPIUrl) {
                 songMetadataResponse = client.send(getPlaylistMetadata, HttpResponse.BodyHandlers.ofByteArray());
                 return extractContent(songMetadataResponse);
             } catch (UnknownHostException e) {
-                M.msgLinkError("You are not connected to the Internet!");
+                msgBroker.msgLinkError("You are not connected to the Internet!");
                 return null;
             } catch (IOException e) {
-                M.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
                 return null;
             } catch (InterruptedException e) {
-                M.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
+                msgBroker.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
                 return null;
             }
         } catch (URISyntaxException e) {
-            M.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
+            msgBroker.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
             return null;
         }
     }
@@ -311,7 +311,7 @@ public static ArrayList<HashMap<String, Object>> getSpotifyPlaylistMetadata(Stri
         if (playlistMatcher.find()) {
             playlistId = playlistMatcher.group(1);
         } else {
-            M.msgLinkError("Failed to extract playlist ID from Spotify link!");
+            msgBroker.msgLinkError("Failed to extract playlist ID from Spotify link!");
             return null;
         }
         int offset = 0;
@@ -328,10 +328,10 @@ public static ArrayList<HashMap<String, Object>> getSpotifyPlaylistMetadata(Stri
             if (offset == 0) {
                 totalNumberOfTracks = playlistMetadata.get("total").getAsInt();
                 if (totalNumberOfTracks == 0) {
-                    M.msgLinkError("The playlist is empty!");
+                    msgBroker.msgLinkError("The playlist is empty!");
                     return null;
                 }
-                M.msgLinkInfo("Total number of tracks in the playlist: " + totalNumberOfTracks);
+                msgBroker.msgLinkInfo("Total number of tracks in the playlist: " + totalNumberOfTracks);
             }
             JsonElement nextUrl = playlistMetadata.get("next");
             if (!nextUrl.isJsonNull()) {
@@ -363,7 +363,7 @@ public static ArrayList<HashMap<String, Object>> getSpotifyPlaylistMetadata(Stri
                 playlistData.add(songMetadataMap);
             }
         }
-        M.msgLogInfo("Spotify playlist metadata retrieved successfully!");
+        msgBroker.msgLogInfo("Spotify playlist metadata retrieved successfully!");
         return playlistData;
     }
 
@@ -377,7 +377,7 @@ private static String extractContent(HttpResponse<byte[]> response) {
                 content.append(line);
             }
         } catch (IOException e) {
-            M.msgLinkError("Failed to extract content from Spotify API response! " + e.getMessage());
+            msgBroker.msgLinkError("Failed to extract content from Spotify API response! " + e.getMessage());
         }
         return content.toString();
     }
@@ -403,31 +403,31 @@ private static Runnable ytDLPJsonData(String folderPath, String link) {
                     while ((line = reader.readLine()) != null) {
                         if (line.contains("ERROR") || line.contains("WARNING")) {
                             if (line.contains("unable to extract username")) {
-                                M.msgLinkError("The Instagram post/reel is private!");
+                                msgBroker.msgLinkError("The Instagram post/reel is private!");
                                 break;
                             } else if (line.contains("The playlist does not exist")) {
-                                M.msgLinkError("The YouTube playlist does not exist or is private!");
+                                msgBroker.msgLinkError("The YouTube playlist does not exist or is private!");
                                 break;
                             } else if (line.contains("Video unavailable")) {
-                                M.msgLinkError("The YouTube video is unavailable!");
+                                msgBroker.msgLinkError("The YouTube video is unavailable!");
                                 break;
                             } else if (line.contains("Skipping player responses from android clients")) {
-                                M.msgLogWarning(line);
+                                msgBroker.msgLogWarning(line);
                             } else if (line.contains("Unable to download webpage") && line.contains("Temporary failure in name resolution")) {
-                                M.msgLinkError("You are not connected to the Internet!");
+                                msgBroker.msgLinkError("You are not connected to the Internet!");
                                 break;
                             } else {
                                 if (line.contains("ERROR")) {
-                                    M.msgLogError(line);
+                                    msgBroker.msgLogError(line);
                                 } else {
-                                    M.msgLogWarning(line);
+                                    msgBroker.msgLogWarning(line);
                                 }
                             }
                         }
                     }
                 }
             } catch (Exception e) {
-                M.msgLinkError("Failed to get link metadata! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to get link metadata! " + e.getMessage());
             }
         };
     }
@@ -443,7 +443,7 @@ public static void sleep(long time) {
         try {
             TimeUnit.MILLISECONDS.sleep(time);
         } catch (InterruptedException e) {
-            M.msgLinkError("The calling method failed to sleep for " + time + " milliseconds. It got interrupted. " + e.getMessage());
+            msgBroker.msgLinkError("The calling method failed to sleep for " + time + " milliseconds. It got interrupted. " + e.getMessage());
         }
     }
 
@@ -516,7 +516,7 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
         query = query.replace(" ", "-"); // make the query URL-friendly
         String googleVisitorId = getGoogleVisitorId();
         if (googleVisitorId == null) {
-            M.msgDownloadError("Failed to get Google Visitor ID!");
+            msgBroker.msgDownloadError("Failed to get Google Visitor ID!");
             return null;
         }
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -538,14 +538,14 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
             try (HttpClient client = HttpClient.newHttpClient()) {
                 response = client.send(req, HttpResponse.BodyHandlers.ofByteArray());
             } catch (UnknownHostException e) {
-                M.msgDownloadError("You are not connected to the Internet!");
+                msgBroker.msgDownloadError("You are not connected to the Internet!");
                 return null;
             } catch (IOException e) {
-                M.msgDownloadError("Failed to get search results! " + e.getMessage());
+                msgBroker.msgDownloadError("Failed to get search results! " + e.getMessage());
                 return null;
             }
             if (response.statusCode() != 200) {
-                M.msgDownloadError("Failed to get search results! " + response.statusCode() + " " + response.uri());
+                msgBroker.msgDownloadError("Failed to get search results! " + response.statusCode() + " " + response.uri());
             } else {
                 String responseContent = extractContent(response);
                 JsonObject jsonObject = JsonParser.parseString(responseContent).getAsJsonObject();
@@ -575,10 +575,10 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
                                     String duration = in.readLine();
                                     searchResult.put("duration", duration);
                                 } catch (IOException e) {
-                                    M.msgDownloadError("Failed to get video duration! " + e.getMessage());
+                                    msgBroker.msgDownloadError("Failed to get video duration! " + e.getMessage());
                                 }
                             } catch (IOException e) {
-                                M.msgDownloadError("Failed to get video duration! " + e.getMessage());
+                                msgBroker.msgDownloadError("Failed to get video duration! " + e.getMessage());
                             }
                         }
                         searchResults.add(searchResult);
@@ -617,7 +617,7 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
                 return searchResults;
             }
         } catch (URISyntaxException | InterruptedException e) {
-            M.msgDownloadError("Failed to get search results! " + e.getMessage());
+            msgBroker.msgDownloadError("Failed to get search results! " + e.getMessage());
         }
         return null;
     }
@@ -677,9 +677,9 @@ private static String getGoogleVisitorId() {
                 return matcher2.group(1); // return the visitor ID (aka "X-Goog-Visitor-Id")
             }
         } catch (UnknownHostException e) {
-            M.msgDownloadError("You are not connected to the Internet!");
+            msgBroker.msgDownloadError("You are not connected to the Internet!");
         } catch (URISyntaxException | IOException | InterruptedException e) {
-            M.msgDownloadError("Failed to get Google Visitor ID! " + e.getMessage());
+            msgBroker.msgDownloadError("Failed to get Google Visitor ID! " + e.getMessage());
         }
         return null;
     }
@@ -687,10 +687,10 @@ private static String getGoogleVisitorId() {
     public static void setFfmpegVersion() {
         Path ffmpegPath = Paths.get(Program.get(Program.FFMPEG));
         if (!Files.exists(ffmpegPath)) {
-            M.msgLogError("FFMPEG not found at " + ffmpegPath);
+            msgBroker.msgLogError("FFMPEG not found at " + ffmpegPath);
             AppSettings.SET.isFfmpegWorking(false);
         } else {
-            M.msgLogInfo("FFMPEG found at " + ffmpegPath);
+            msgBroker.msgLogInfo("FFMPEG found at " + ffmpegPath);
             ProcessBuilder getFfmpegVersion = new ProcessBuilder(ffmpegPath.toString(), "-version");
             try {
                 Process process = getFfmpegVersion.start();
@@ -699,15 +699,15 @@ public static void setFfmpegVersion() {
                     while ((line = reader.readLine()) != null) {
                         if (line.contains("ffmpeg version")) {
                             String version = line.split(" ")[2];
-                            M.msgLogInfo("FFMPEG version: " + version);
-                            M.msgLogInfo(line);
+                            msgBroker.msgLogInfo("FFMPEG version: " + version);
+                            msgBroker.msgLogInfo(line);
                             AppSettings.SET.isFfmpegWorking(true);
                             AppSettings.SET.ffmpegVersion(version);
                         }
                     }
                 }
             } catch (IOException e) {
-                M.msgLogError("Failed to get FFMPEG version : " + e.getMessage());
+                msgBroker.msgLogError("Failed to get FFMPEG version : " + e.getMessage());
                 AppSettings.SET.isFfmpegWorking(false);
             }
         }
@@ -721,7 +721,7 @@ public static Runnable setYtDlpVersion() {
             try {
                 ytDlpVersionTask = getYtDlpVersion.start();
             } catch (IOException e) {
-                M.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
                 return;
             }
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(ytDlpVersionTask).getInputStream()))) {
@@ -730,7 +730,7 @@ public static Runnable setYtDlpVersion() {
                     AppSettings.SET.ytDlpVersion(line);
                 }
             } catch (IOException e) {
-                M.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
             }
         };
     }
@@ -759,13 +759,13 @@ public static Runnable setSpotifyAccessToken() {
                 JsonObject jsonObject = JsonParser.parseString(responseContent.toString()).getAsJsonObject();
                 AppSettings.SET.spotifyAccessToken(jsonObject.get("access_token").getAsString());
             } catch (UnknownHostException e) {
-                M.msgInitError("You are not connected to the Internet!");
+                msgBroker.msgInitError("You are not connected to the Internet!");
                 ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
                 executor.schedule(setSpotifyAccessToken(), 5, TimeUnit.SECONDS); // retry after 5 seconds
             } catch (IOException e) {
-                M.msgInitError("Failed to get Spotify access token! Failed to read response from Spotify API! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get Spotify access token! Failed to read response from Spotify API! " + e.getMessage());
             } catch (URISyntaxException e) {
-                M.msgInitError("Failed to get Spotify access token! Spotify API URI is incorrect! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get Spotify access token! Spotify API URI is incorrect! " + e.getMessage());
             }
         };
     }
@@ -796,21 +796,21 @@ public static String convertToMp3(Path inputFilePath) {
                     renamedFile = renamedFile.getParentFile().toPath().resolve(newFilename).toFile();
                 }
                 if (outputFilePath.toFile().renameTo(renamedFile)) {
-                    M.msgLogInfo("Converted to mp3 successfully!");
+                    msgBroker.msgLogInfo("Converted to mp3 successfully!");
                     return "Converted to mp3 successfully!";
                 } else {
-                    M.msgLogError("Failed to rename the converted file!");
+                    msgBroker.msgLogError("Failed to rename the converted file!");
                     return "Failed to rename the converted file!";
                 }
             } else {
-                M.msgLogError("Failed to convert to mp3!");
+                msgBroker.msgLogError("Failed to convert to mp3!");
                 return "Failed to convert to mp3!";
             }
         } catch (IOException e) {
-            M.msgLogError("Failed to convert to mp3! IOException: " + e.getMessage());
+            msgBroker.msgLogError("Failed to convert to mp3! IOException: " + e.getMessage());
             return "Failed to convert to mp3! IOException: " + e.getMessage();
         } catch (InterruptedException e) {
-            M.msgLogError("Failed to convert to mp3! User interrupted the process. " + e.getMessage());
+            msgBroker.msgLogError("Failed to convert to mp3! User interrupted the process. " + e.getMessage());
             return "Failed to convert to mp3! User interrupted the process. " + e.getMessage();
         }
     }

From 7e1ae44d52208b90c11393ec76613ee963f14f6b Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Sat, 6 Jul 2024 10:49:31 +0530
Subject: [PATCH 03/36] fix: fixed Drifty GUI downloading wrong update file and
 also fixed some minor CLI issues

---
 .../main/java/cli/utils/MessageBroker.java    |  4 ---
 CLI/src/main/java/cli/utils/Utility.java      |  4 +++
 CLI/src/main/java/main/Drifty_CLI.java        | 19 +++++++-----
 .../resources/META-INF/native-image/.lock     |  1 -
 .../META-INF/native-image/reflect-config.json | 31 +++++++++++++++++++
 .../native-image/resource-config.json         |  4 ++-
 .../src/main/java/updater/UpdateExecutor.java |  3 --
 Core/src/main/java/utils/Utility.java         |  2 +-
 GUI/src/main/java/main/Drifty_GUI.java        |  2 +-
 GUI/src/main/java/ui/UIController.java        |  3 +-
 10 files changed, 54 insertions(+), 19 deletions(-)
 delete mode 100644 CLI/src/main/resources/META-INF/native-image/.lock

diff --git a/CLI/src/main/java/cli/utils/MessageBroker.java b/CLI/src/main/java/cli/utils/MessageBroker.java
index 117f73509..1ee235869 100644
--- a/CLI/src/main/java/cli/utils/MessageBroker.java
+++ b/CLI/src/main/java/cli/utils/MessageBroker.java
@@ -30,8 +30,4 @@ public void msgHistoryWarning(String message, boolean endWithNewLine) {
         this.endWithNewLine = endWithNewLine;
         sendMessage(message, MessageType.WARN, MessageCategory.HISTORY);
     }
-
-    public void msgUpdateInfo(String message) {
-        sendMessage(message, MessageType.INFO, MessageCategory.UPDATE);
-    }
 }
diff --git a/CLI/src/main/java/cli/utils/Utility.java b/CLI/src/main/java/cli/utils/Utility.java
index e04487783..ca212953a 100644
--- a/CLI/src/main/java/cli/utils/Utility.java
+++ b/CLI/src/main/java/cli/utils/Utility.java
@@ -22,6 +22,10 @@ public static String findFilenameInLink(String link) {
             for (String json : Objects.requireNonNull(linkMetadataList)) {
                 filename = Utility.getFilenameFromJson(json);
             }
+            if (filename.isEmpty()) {
+                msgBroker.msgFilenameError("Filename detection failed!");
+                return null;
+            }
         } else {
             // Example: "example.com/file.txt" prints "Filename detected: file.txt"
             // example.com/file.json -> file.json
diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 358ba9e9f..5a573a33b 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -209,10 +209,14 @@ public static void main(String[] args) {
                             } else {
                                 fileName = findFilenameInLink(link);
                             }
-                            if (!Objects.requireNonNull(fileName).isEmpty()) {
+                            if (fileName != null && !fileName.isEmpty()) {
                                 verifyJobAndDownload(false);
                             }
                         }
+                    } else {
+                        fileName = name;
+                        messageBroker.msgFilenameInfo("Filename provided : " + fileName);
+                        verifyJobAndDownload(false);
                     }
                 }
             }
@@ -275,7 +279,7 @@ public static void main(String[] args) {
                         } else {
                             messageBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                         }
-                        if (!Objects.requireNonNull(fileName).isEmpty()) {
+                        if (fileName != null && !fileName.isEmpty()) {
                             verifyJobAndDownload(true);
                         }
                     }
@@ -285,7 +289,7 @@ public static void main(String[] args) {
                     }
                     messageBroker.msgFilenameInfo("Retrieving filename from link...");
                     fileName = findFilenameInLink(link);
-                    if (!Objects.requireNonNull(fileName).isEmpty()) {
+                    if (fileName != null && !fileName.isEmpty()) {
                         verifyJobAndDownload(true);
                     } else {
                         messageBroker.msgFilenameError("Failed to retrieve filename from link!");
@@ -305,10 +309,10 @@ public static void main(String[] args) {
 
     private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
         messageBroker.msgInitInfo("Checking for updates...");
-        if (!isDriftyUpdateChecked()) {
+        if (!isDriftyUpdateChecked() || !askForInstallingUpdate) { // Check for updates only once a day and only if the user wants to install the update (if available)
             if (UpdateChecker.isUpdateAvailable()) {
                 messageBroker.msgUpdateInfo("Update available!");
-                messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + "(" + AppSettings.GET.newDriftyVersionName() + ")");
+                messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + " (" + AppSettings.GET.newDriftyVersionName() + ")");
                 boolean choice = true;
                 if (askForInstallingUpdate) {
                     messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
@@ -321,10 +325,11 @@ private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
                     messageBroker.msgUpdateInfo("Downloading update...");
                     if (!downloadUpdate()) {
                         messageBroker.msgUpdateError("Failed to update Drifty!");
+                        Environment.terminate(1);
                     } else {
                         messageBroker.msgUpdateInfo("Update successful!");
                         messageBroker.msgUpdateInfo("Please restart Drifty to see the changes!");
-                        System.exit(0);
+                        Environment.terminate(0);
                     }
                 }
             }
@@ -508,7 +513,7 @@ private static void batchDownloader() {
                 }
                 if (isSpotifyLink && link.contains("playlist")) {
                     handleSpotifyPlaylist();
-                } else if (!Objects.requireNonNull(fileName).isEmpty()) {
+                } else if (fileName != null && !fileName.isEmpty()) {
                     verifyJobAndDownload(false);
                 }
             }
diff --git a/CLI/src/main/resources/META-INF/native-image/.lock b/CLI/src/main/resources/META-INF/native-image/.lock
deleted file mode 100644
index 4291bf955..000000000
--- a/CLI/src/main/resources/META-INF/native-image/.lock
+++ /dev/null
@@ -1 +0,0 @@
-46564
\ No newline at end of file
diff --git a/CLI/src/main/resources/META-INF/native-image/reflect-config.json b/CLI/src/main/resources/META-INF/native-image/reflect-config.json
index c8b544ef9..bf8c352b0 100644
--- a/CLI/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/CLI/src/main/resources/META-INF/native-image/reflect-config.json
@@ -44,6 +44,10 @@
   "name":"com.sun.crypto.provider.GaloisCounterMode$AESGCM",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"com.sun.crypto.provider.HmacCore$HmacSHA256",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"com.sun.crypto.provider.HmacCore$HmacSHA384",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -99,22 +103,49 @@
 {
   "name":"java.sql.Date"
 },
+{
+  "name":"java.util.ArrayList",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"java.util.Date"
 },
+{
+  "name":"java.util.HashMap",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"java.util.concurrent.ConcurrentLinkedDeque",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"java.util.concurrent.ForkJoinTask",
+  "fields":[{"name":"aux"}, {"name":"status"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicBoolean",
+  "fields":[{"name":"value"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicReference",
+  "fields":[{"name":"value"}]
+},
 {
   "name":"java.util.concurrent.atomic.Striped64",
   "fields":[{"name":"base"}, {"name":"cellsBusy"}]
 },
+{
+  "name":"java.util.concurrent.atomic.Striped64$Cell",
+  "fields":[{"name":"value"}]
+},
 {
   "name":"javax.security.auth.x500.X500Principal",
   "fields":[{"name":"thisX500Name"}],
   "methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
 },
+{
+  "name":"jdk.internal.misc.Unsafe"
+},
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
diff --git a/CLI/src/main/resources/META-INF/native-image/resource-config.json b/CLI/src/main/resources/META-INF/native-image/resource-config.json
index 0b0f8748c..c60492f05 100644
--- a/CLI/src/main/resources/META-INF/native-image/resource-config.json
+++ b/CLI/src/main/resources/META-INF/native-image/resource-config.json
@@ -6,6 +6,8 @@
     "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.nio.charset.spi.CharsetProvider\\E"
   }, {
@@ -31,6 +33,6 @@
   }]},
   "bundles":[{
     "name":"com.sun.org.apache.xml.internal.serializer.XMLEntities",
-    "locales":[""]
+    "locales":["", "und"]
   }]
 }
diff --git a/Core/src/main/java/updater/UpdateExecutor.java b/Core/src/main/java/updater/UpdateExecutor.java
index 3128cfa1f..fd1aec0cb 100644
--- a/Core/src/main/java/updater/UpdateExecutor.java
+++ b/Core/src/main/java/updater/UpdateExecutor.java
@@ -10,9 +10,6 @@ public abstract class UpdateExecutor {
     protected File currentExecutableFile;
     protected File latestExecutableFile;
 
-    protected UpdateExecutor() {
-    }
-
     public UpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
         this.currentExecutableFile = currentExecutableFile;
         this.latestExecutableFile = latestExecutableFile;
diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 959e2ca57..781ebcf79 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -104,7 +104,7 @@ public static URL getUpdateURL() throws MalformedURLException, URISyntaxExceptio
             executableNames = new String[]{"Drifty-GUI.pkg", "Drifty-GUI.exe", "Drifty-GUI_linux"};
         } else {
             executableNames = new String[]{"Drifty-CLI_macos", "Drifty-CLI.exe", "Drifty-CLI_linux"};
-        } // https://github.com/SaptarshiSarkar12/Drifty/releases/download/v2.1.0-beta/Drifty-CLI_linux
+        }
         String updateURLMiddle;
         if (AppSettings.GET.earlyAccess()) {
             updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
diff --git a/GUI/src/main/java/main/Drifty_GUI.java b/GUI/src/main/java/main/Drifty_GUI.java
index 68485e0d1..18bc7d923 100644
--- a/GUI/src/main/java/main/Drifty_GUI.java
+++ b/GUI/src/main/java/main/Drifty_GUI.java
@@ -32,6 +32,7 @@ public class Drifty_GUI extends Application {
     private Stage primaryStage;
 
     public static void main(String[] args) {
+        Mode.setGUIMode();
         System.setProperty("javafx.preloader", Splash.class.getCanonicalName());
         launch(args);
     }
@@ -39,7 +40,6 @@ public static void main(String[] args) {
     @Override
     public void init() {
         System.setProperty("apple.laf.useScreenMenuBar", "true");
-        Mode.setGUIMode();
         msgBroker = new MessageBroker();
         Environment.setGUIMessageBroker(msgBroker);
         msgBroker.msgLogInfo("Drifty GUI (Graphical User Interface) Application Started !");
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index 6235627a9..00bbd3034 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -93,7 +93,7 @@ private void start(MainGridPane pane) {
         new Thread(() -> {
             if (AppSettings.GET.driftyUpdateAvailable()) {
                 M.msgLogInfo("A new version of Drifty is available!");
-                ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + "Do you want to download it now?", false, false);
+                ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Do you want to download and install the update?", false, false);
                 if (ask.getResponse().isYes()) {
                     downloadUpdate();
                 }
@@ -127,6 +127,7 @@ private void downloadUpdate() {
             while (!downloadUpdate.getState().equals(Thread.State.TERMINATED)) {
                 sleep(500);
             }
+            AppSettings.SET.lastFolder(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
             setDir(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
             if (latestExecutableFile.exists() && latestExecutableFile.isFile() && latestExecutableFile.length() > 0) {
                 // If the latest executable was successfully downloaded, set the executable permission and execute the update.

From 150655bc7df5744086504f2117cda008df2eaaed Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Sat, 6 Jul 2024 11:15:09 +0530
Subject: [PATCH 04/36] fix: fixed CWE-248 - NumberFormatException raised by
 CodeQL

---
 Core/src/main/java/updater/UpdateChecker.java | 10 ++++++----
 Core/src/main/java/utils/MessageBroker.java   |  4 ++++
 Core/src/main/java/utils/Utility.java         |  6 ++++--
 GUI/src/main/java/backend/FileDownloader.java |  7 ++++---
 GUI/src/main/java/ui/GetFilename.java         |  3 ++-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Core/src/main/java/updater/UpdateChecker.java b/Core/src/main/java/updater/UpdateChecker.java
index 1bbe8ec43..1b78e4e11 100644
--- a/Core/src/main/java/updater/UpdateChecker.java
+++ b/Core/src/main/java/updater/UpdateChecker.java
@@ -2,8 +2,10 @@
 
 import init.Environment;
 import preferences.AppSettings;
+import properties.MessageCategory;
 import support.Constants;
 import utils.MessageBroker;
+import utils.Utility;
 
 import java.io.IOException;
 import java.net.URI;
@@ -88,8 +90,8 @@ public static boolean compareVersions(String currentVersion, String latestVersio
 
         // Check major, minor, and patch versions
         for (int i = 0; i < 3; i++) {
-            int cvPart = Integer.parseInt(currentVersionParts[i]);
-            int lvPart = Integer.parseInt(latestVersionParts[i]);
+            int cvPart = Utility.parseStringToInt(currentVersionParts[i], "Failed to parse current version part " + i, MessageCategory.UPDATE);
+            int lvPart = Utility.parseStringToInt(latestVersionParts[i], "Failed to parse latest version part " + i, MessageCategory.UPDATE);
 
             if (cvPart < lvPart) {
                 return true;
@@ -123,8 +125,8 @@ public static boolean compareVersions(String currentVersion, String latestVersio
                 } else {
                     // Both versions have the same pre-release type (alpha, beta, rc)
                     // Higher Revision number means a newer version
-                    int cvRevisionNumber = Integer.parseInt(currentVersionParts[4]);
-                    int lvRevisionNumber = Integer.parseInt(latestVersionParts[4]);
+                    int cvRevisionNumber = Utility.parseStringToInt(currentVersionParts[4], "Failed to parse current version's revision number", MessageCategory.UPDATE);
+                    int lvRevisionNumber = Utility.parseStringToInt(latestVersionParts[4], "Failed to parse latest version's revision number", MessageCategory.UPDATE);
                     return cvRevisionNumber < lvRevisionNumber;
                 }
             }
diff --git a/Core/src/main/java/utils/MessageBroker.java b/Core/src/main/java/utils/MessageBroker.java
index e98ffae8c..3ce89a96c 100644
--- a/Core/src/main/java/utils/MessageBroker.java
+++ b/Core/src/main/java/utils/MessageBroker.java
@@ -76,6 +76,10 @@ public void msgBatchError(String message) {
         sendMessage(message, MessageType.ERROR, MessageCategory.BATCH);
     }
 
+    public void msgError(String message, MessageCategory messageCategory) {
+        sendMessage(message, MessageType.ERROR, messageCategory);
+    }
+
     public void msgUpdateError(String message) {
         sendMessage(message, MessageType.ERROR, MessageCategory.UPDATE);
     }
diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 781ebcf79..93d83e173 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -7,6 +7,7 @@
 import org.apache.commons.text.StringEscapeUtils;
 import org.hildan.fxgson.FxGson;
 import preferences.AppSettings;
+import properties.MessageCategory;
 import properties.Mode;
 import properties.OS;
 import properties.Program;
@@ -477,7 +478,7 @@ public static String getMatchingVideoID(ArrayList<HashMap<String, Object>> searc
                 continue;
             }
             String[] durationInMinutes = searchResult.get("duration").toString().split(":");
-            int videoDurationInMs = parseStringToInt(durationInMinutes[0]) * 60000 + parseStringToInt(durationInMinutes[1]) * 1000;
+            int videoDurationInMs = parseStringToInt(durationInMinutes[0], "Failed to parse video duration for Spotify song!", MessageCategory.DOWNLOAD) * 60000 + parseStringToInt(durationInMinutes[1], "Failed to parse video duration for Spotify song!", MessageCategory.DOWNLOAD) * 1000;
             if ("Top result".equalsIgnoreCase(searchResult.get("category").toString())) {
                 if (isDurationMatched(videoDurationInMs, spotifySongDuration, false)) {
                     matchedVideoId = (String) searchResult.get("videoId");
@@ -815,10 +816,11 @@ public static String convertToMp3(Path inputFilePath) {
         }
     }
 
-    public static int parseStringToInt(String string) {
+    public static int parseStringToInt(String string, String errorMessage, MessageCategory messageCategory) {
         try {
             return Integer.parseInt(string);
         } catch (NumberFormatException e) {
+            msgBroker.msgError(errorMessage + " " + e.getMessage(), messageCategory);
             return 0;
         }
     }
diff --git a/GUI/src/main/java/backend/FileDownloader.java b/GUI/src/main/java/backend/FileDownloader.java
index 4df33e7ad..b503ad11e 100644
--- a/GUI/src/main/java/backend/FileDownloader.java
+++ b/GUI/src/main/java/backend/FileDownloader.java
@@ -13,6 +13,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 import properties.LinkType;
+import properties.MessageCategory;
 import properties.Program;
 import support.DownloadMetrics;
 import support.Job;
@@ -410,9 +411,9 @@ So I put a check in the second regex match (m2.find()) because if
                     String speed = String.format("%06.2f", averageSpeed);
                     String units = m2.group(2);
                     String[] parts = m2.group(3).split(":");
-                    int hours = parts.length > 0 ? Utility.parseStringToInt(parts[0]) : 0;
-                    int minutes = parts.length > 1 ? Utility.parseStringToInt(parts[1]) : 0;
-                    int seconds = parts.length > 2 ? Utility.parseStringToInt(parts[2]) : 0;
+                    int hours = parts.length > 0 ? Utility.parseStringToInt(parts[0], "Failed to parse hours in ETA", MessageCategory.DOWNLOAD) : 0;
+                    int minutes = parts.length > 1 ? Utility.parseStringToInt(parts[1], "Failed to parse minutes in ETA", MessageCategory.DOWNLOAD) : 0;
+                    int seconds = parts.length > 2 ? Utility.parseStringToInt(parts[2], "Failed to parse seconds in ETA", MessageCategory.DOWNLOAD) : 0;
                     String time = String.format("%02d:%02d:%02d", hours, minutes, seconds);
                     updateMessage(speed + " " + units + " ETA " + time);
                     if (progress > 99) {
diff --git a/GUI/src/main/java/ui/GetFilename.java b/GUI/src/main/java/ui/GetFilename.java
index 1791414a1..feb9ea221 100644
--- a/GUI/src/main/java/ui/GetFilename.java
+++ b/GUI/src/main/java/ui/GetFilename.java
@@ -6,6 +6,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 import org.apache.commons.io.FileUtils;
+import properties.MessageCategory;
 import properties.Program;
 import support.Job;
 import utils.Utility;
@@ -162,7 +163,7 @@ private Runnable getFileCount() {
                     for (String line : list) {
                         Matcher m = pattern.matcher(line);
                         if (m.find()) {
-                            fileCount = Utility.parseStringToInt(m.group(2));
+                            fileCount = Utility.parseStringToInt(m.group(2), "Failed to get file count", MessageCategory.FILENAME);
                             break;
                         }
                     }

From 22bab34834492962569def64ea176709936f8c78 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Sun, 18 Aug 2024 10:37:50 +0530
Subject: [PATCH 05/36] feat: Added support for updating Drifty GUI and CLI
 based on architecture (`amd64`/`x86_64` or `aarch64`) for macOS

---
 Core/src/main/java/utils/Utility.java | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 0bb0d139f..7ac661337 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -9,7 +9,6 @@
 import preferences.AppSettings;
 import properties.MessageCategory;
 import properties.Mode;
-import properties.Mode;
 import properties.OS;
 import properties.Program;
 
@@ -102,17 +101,24 @@ public static boolean isLinkValid(String link) {
     public static URL getUpdateURL() throws MalformedURLException, URISyntaxException {
         URL updateURL;
         String[] executableNames;
+        String arch = System.getProperty("os.arch");
+        if (arch.equals("amd64") || arch.equals("x86_64")) {
+            arch = "x86_64";
+        } else if (arch.equals("aarch64")) {
+            arch = "aarch64";
+        }
         if (Mode.isGUI()) {
-            executableNames = new String[]{"Drifty-GUI.pkg", "Drifty-GUI.exe", "Drifty-GUI_linux"};
+            executableNames = new String[]{"Drifty-GUI_" + arch + ".pkg", "Drifty-GUI.exe", "Drifty-GUI_linux"};
         } else {
-            executableNames = new String[]{"Drifty-CLI_macos", "Drifty-CLI.exe", "Drifty-CLI_linux"};
+            executableNames = new String[]{"Drifty-CLI_macos_" + arch, "Drifty-CLI.exe", "Drifty-CLI_linux"};
         }
         String updateURLMiddle;
-        if (AppSettings.GET.earlyAccess()) {
-            updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
-        } else {
-            updateURLMiddle = "latest/download/";
-        }
+//        if (AppSettings.GET.earlyAccess()) {
+//            updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
+//        } else {
+//            updateURLMiddle = "latest/download/";
+//        }
+        updateURLMiddle = "download/v1.0.0/";
         if (OS.isMac()) {
             updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[0]).toURL();
         } else if (OS.isWindows()) {
@@ -256,7 +262,7 @@ public static HashMap<String, Object> getSpotifySongMetadata(String songUrl) {
                     if (Mode.isCLI()) {
                         // Get the time (from `retry-after` header) to wait before sending another request
                         String retryAfter = songMetadataResponse.headers().firstValue("retry-after").orElse("5");
-                        long timeToWait = (long) parseStringToInt(retryAfter,
+                        long timeToWait = (long) parseStringToInt(retryAfter, "Failed to parse time to wait before retrying!", MessageCategory.DOWNLOAD) * 1000;
                         for (long i = timeToWait; i >= 0; i -= 1000) {
                             System.out.print("\r" + "Retrying in " + i / 1000 + " seconds...");
                             sleep(1000);

From c73c17c8e8be0728659430405a97e39ff60633de Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 05:09:12 +0000
Subject: [PATCH 06/36] style: format codebase

---
 Core/src/main/java/utils/Utility.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 7ac661337..e942e1771 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -102,9 +102,9 @@ public static URL getUpdateURL() throws MalformedURLException, URISyntaxExceptio
         URL updateURL;
         String[] executableNames;
         String arch = System.getProperty("os.arch");
-        if (arch.equals("amd64") || arch.equals("x86_64")) {
+        if ("amd64".equals(arch) || "x86_64".equals(arch)) {
             arch = "x86_64";
-        } else if (arch.equals("aarch64")) {
+        } else if ("aarch64".equals(arch)) {
             arch = "aarch64";
         }
         if (Mode.isGUI()) {

From da19c3bde178fd762cd28f6b299c42021c919908 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Sun, 18 Aug 2024 11:04:27 +0530
Subject: [PATCH 07/36] fix(CI): Fixed linter issue

---
 Core/src/main/java/utils/Utility.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 7ac661337..ffe2f7475 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -113,11 +113,11 @@ public static URL getUpdateURL() throws MalformedURLException, URISyntaxExceptio
             executableNames = new String[]{"Drifty-CLI_macos_" + arch, "Drifty-CLI.exe", "Drifty-CLI_linux"};
         }
         String updateURLMiddle;
-//        if (AppSettings.GET.earlyAccess()) {
-//            updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
-//        } else {
-//            updateURLMiddle = "latest/download/";
-//        }
+        // if (AppSettings.GET.earlyAccess()) {
+        //     updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
+        // } else {
+        //     updateURLMiddle = "latest/download/";
+        // }
         updateURLMiddle = "download/v1.0.0/";
         if (OS.isMac()) {
             updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[0]).toURL();

From 6e5cec5da6e76098114698658b3bca6801374011 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Mon, 19 Aug 2024 17:37:04 +0530
Subject: [PATCH 08/36] debug: Added debug window to pop-up for windows msi if
 there's a lack in permission

---
 Core/src/main/java/utils/Utility.java             | 15 +++++++++------
 .../main/java/gui/updater/GUIUpdateExecutor.java  | 11 +++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 4916cbc2d..df09d8c00 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -113,12 +113,15 @@ public static URL getUpdateURL() throws MalformedURLException, URISyntaxExceptio
             executableNames = new String[]{"Drifty-CLI_macos_" + arch, "Drifty-CLI.exe", "Drifty-CLI_linux"};
         }
         String updateURLMiddle;
-        // if (AppSettings.GET.earlyAccess()) {
-        //     updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
-        // } else {
-        //     updateURLMiddle = "latest/download/";
-        // }
-        updateURLMiddle = "download/v1.0.0/";
+        if (OS.isMac()) {
+            updateURLMiddle = "download/v1.0.0/"; // For testing the update feature of Drifty for macOS, the latest executables have been uploaded to the v1.0.0 release
+        } else {
+            if (AppSettings.GET.earlyAccess()) {
+                updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
+            } else {
+                updateURLMiddle = "latest/download/";
+            }
+        }
         if (OS.isMac()) {
             updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[0]).toURL();
         } else if (OS.isWindows()) {
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 8759af0e5..238df1f04 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -3,6 +3,7 @@
 import org.buildobjects.process.ProcBuilder;
 import org.buildobjects.process.ProcResult;
 import properties.OS;
+import ui.ConfirmationDialog;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,6 +20,16 @@ public GUIUpdateExecutor(File currentExecutableFile, File latestExecutableFile)
     @Override
     public boolean execute() {
         M.msgLogInfo("Download successful! Setting executable permission...");
+        if (OS.isWindows()) { // Added logging for debugging purposes
+            // Check if we have administrative privileges in windows
+            ConfirmationDialog confirmationDialog = new ConfirmationDialog("Drifty Update", "canWrite: " + currentExecutableFile.canWrite() + "\n" + "canExecute: " + currentExecutableFile.canExecute() + "\n" + "canRead: " + currentExecutableFile.canRead() + "\n" + "Latest Executable - canWrite: " + latestExecutableFile.canWrite() + "\n" + "Latest Executable - canExecute: " + latestExecutableFile.canExecute() + "\n" + "Latest Executable - canRead: " + latestExecutableFile.canRead() + "\n" + "Do you want to continue?");
+            if (confirmationDialog.getResponse().isYes()) {
+                M.msgLogInfo("User confirmed to continue with the update...");
+            } else {
+                M.msgLogInfo("User cancelled the update...");
+                return false;
+            }
+        }
         if (setExecutablePermissions()) {
             M.msgLogInfo("Executable permission set! Executing update...");
         } else {

From 2bac14bd0a0fd0599ba6ea647df1755c34e27354 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Mon, 19 Aug 2024 18:45:53 +0530
Subject: [PATCH 09/36] debug: Added debug window to pop-up for windows msi if
 there's a lack in permission

---
 GUI/src/main/java/gui/updater/GUIUpdateExecutor.java | 2 +-
 GUI/src/main/java/ui/UIController.java               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 238df1f04..fb713606d 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -22,7 +22,7 @@ public boolean execute() {
         M.msgLogInfo("Download successful! Setting executable permission...");
         if (OS.isWindows()) { // Added logging for debugging purposes
             // Check if we have administrative privileges in windows
-            ConfirmationDialog confirmationDialog = new ConfirmationDialog("Drifty Update", "canWrite: " + currentExecutableFile.canWrite() + "\n" + "canExecute: " + currentExecutableFile.canExecute() + "\n" + "canRead: " + currentExecutableFile.canRead() + "\n" + "Latest Executable - canWrite: " + latestExecutableFile.canWrite() + "\n" + "Latest Executable - canExecute: " + latestExecutableFile.canExecute() + "\n" + "Latest Executable - canRead: " + latestExecutableFile.canRead() + "\n" + "Do you want to continue?");
+            ConfirmationDialog confirmationDialog = new ConfirmationDialog("Drifty Update", "\n" + "canWrite: " + currentExecutableFile.canWrite() + "\n" + "canExecute: " + currentExecutableFile.canExecute() + "\n" + "canRead: " + currentExecutableFile.canRead() + "\n" + "Latest Executable - canWrite: " + latestExecutableFile.canWrite() + "\n" + "Latest Executable - canExecute: " + latestExecutableFile.canExecute() + "\n" + "Latest Executable - canRead: " + latestExecutableFile.canRead() + "\n" + "Do you want to continue?");
             if (confirmationDialog.getResponse().isYes()) {
                 M.msgLogInfo("User confirmed to continue with the update...");
             } else {
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index 00bbd3034..d1bb704be 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -122,6 +122,7 @@ private void downloadUpdate() {
             // Download the latest executable
             Job updateJob = new Job(Constants.updateURL.toString(), latestExecutableFile.getParent(), latestExecutableFile.getName(), false);
             addJob(updateJob);
+
             Thread downloadUpdate = new Thread(batchDownloader());
             downloadUpdate.start();
             while (!downloadUpdate.getState().equals(Thread.State.TERMINATED)) {

From 297ece22f1e42bd986727f705d00f083be8c9c58 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Mon, 19 Aug 2024 23:07:12 +0530
Subject: [PATCH 10/36] fix: Fixed delay in updating Drifty GUI when the
 download queue is not empty

---
 GUI/src/main/java/ui/UIController.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index d1bb704be..3f66d9139 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -119,10 +119,14 @@ private void downloadUpdate() {
             // For other OS, the latest executable name along with the extension is the same as that of the current executable.
             String latestExecutableName = OS.isMac() ? "Drifty_GUI.pkg" : currentExecutableFile.getName();
             File latestExecutableFile = Paths.get(tmpFolder.getPath()).resolve(latestExecutableName).toFile();
+            // Get the download queue already present in the application before adding the latest executable to it. This is done to ensure that the latest executable is downloaded first and alone.
+            ConcurrentLinkedDeque<Job> currentDownloadQueue = getJobs().jobList();
+            // Clear the download queue to download only the latest executable to prevent any other downloads from interfering with the update process.
+            getJobs().clear();s
+
             // Download the latest executable
             Job updateJob = new Job(Constants.updateURL.toString(), latestExecutableFile.getParent(), latestExecutableFile.getName(), false);
             addJob(updateJob);
-
             Thread downloadUpdate = new Thread(batchDownloader());
             downloadUpdate.start();
             while (!downloadUpdate.getState().equals(Thread.State.TERMINATED)) {
@@ -130,6 +134,8 @@ private void downloadUpdate() {
             }
             AppSettings.SET.lastFolder(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
             setDir(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
+            // Reset the download queue to the previous state.
+            getJobs().setList(currentDownloadQueue);
             if (latestExecutableFile.exists() && latestExecutableFile.isFile() && latestExecutableFile.length() > 0) {
                 // If the latest executable was successfully downloaded, set the executable permission and execute the update.
                 GUIUpdateExecutor updateExecutor = new GUIUpdateExecutor(currentExecutableFile, latestExecutableFile);

From d163df3ae7c1f8ac933d224a08c0b92f92cf90b0 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Mon, 19 Aug 2024 23:07:40 +0530
Subject: [PATCH 11/36] fix: Fixed delay in updating Drifty GUI when the
 download queue is not empty

---
 GUI/src/main/java/ui/UIController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index 3f66d9139..dc779731b 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -122,7 +122,7 @@ private void downloadUpdate() {
             // Get the download queue already present in the application before adding the latest executable to it. This is done to ensure that the latest executable is downloaded first and alone.
             ConcurrentLinkedDeque<Job> currentDownloadQueue = getJobs().jobList();
             // Clear the download queue to download only the latest executable to prevent any other downloads from interfering with the update process.
-            getJobs().clear();s
+            getJobs().clear();
 
             // Download the latest executable
             Job updateJob = new Job(Constants.updateURL.toString(), latestExecutableFile.getParent(), latestExecutableFile.getName(), false);

From bc80b718624deec32bb0196be4df74a0d9dde74a Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Mon, 19 Aug 2024 23:42:30 +0530
Subject: [PATCH 12/36] debug: Added debug window to pop-up for windows msi if
 there's a lack in permission

---
 .../java/gui/updater/GUIUpdateExecutor.java   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index fb713606d..9df8408b8 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -22,12 +22,23 @@ public boolean execute() {
         M.msgLogInfo("Download successful! Setting executable permission...");
         if (OS.isWindows()) { // Added logging for debugging purposes
             // Check if we have administrative privileges in windows
-            ConfirmationDialog confirmationDialog = new ConfirmationDialog("Drifty Update", "\n" + "canWrite: " + currentExecutableFile.canWrite() + "\n" + "canExecute: " + currentExecutableFile.canExecute() + "\n" + "canRead: " + currentExecutableFile.canRead() + "\n" + "Latest Executable - canWrite: " + latestExecutableFile.canWrite() + "\n" + "Latest Executable - canExecute: " + latestExecutableFile.canExecute() + "\n" + "Latest Executable - canRead: " + latestExecutableFile.canRead() + "\n" + "Do you want to continue?");
-            if (confirmationDialog.getResponse().isYes()) {
-                M.msgLogInfo("User confirmed to continue with the update...");
+            if (currentExecutableFile.canWrite()) {
+                ConfirmationDialog confirmationDialog = new ConfirmationDialog("I can write", "I can write to the current executable file. Do you want to continue?");
+                if (confirmationDialog.getResponse().isYes()) {
+                    M.msgLogInfo("User confirmed to continue with the update...");
+                } else {
+                    M.msgLogInfo("User cancelled the update...");
+                    return false;
+                }
             } else {
-                M.msgLogInfo("User cancelled the update...");
-                return false;
+                M.msgLogInfo("I can't write to the current executable file. Trying to set the permission...");
+                ConfirmationDialog confirmationDialog = new ConfirmationDialog("I can't write", "I can't write to the current executable file. Do you want to continue?");
+                if (confirmationDialog.getResponse().isYes()) {
+                    M.msgLogInfo("User confirmed to continue with the update...");
+                } else {
+                    M.msgLogInfo("User cancelled the update...");
+                    return false;
+                }
             }
         }
         if (setExecutablePermissions()) {

From 9240fd411354beacf080f08cc528bdeb947da6ee Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 09:44:53 +0530
Subject: [PATCH 13/36] debug: Removed debug window as write permissions are
 apparently available

---
 .../java/gui/updater/GUIUpdateExecutor.java   | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 9df8408b8..8759af0e5 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -3,7 +3,6 @@
 import org.buildobjects.process.ProcBuilder;
 import org.buildobjects.process.ProcResult;
 import properties.OS;
-import ui.ConfirmationDialog;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,27 +19,6 @@ public GUIUpdateExecutor(File currentExecutableFile, File latestExecutableFile)
     @Override
     public boolean execute() {
         M.msgLogInfo("Download successful! Setting executable permission...");
-        if (OS.isWindows()) { // Added logging for debugging purposes
-            // Check if we have administrative privileges in windows
-            if (currentExecutableFile.canWrite()) {
-                ConfirmationDialog confirmationDialog = new ConfirmationDialog("I can write", "I can write to the current executable file. Do you want to continue?");
-                if (confirmationDialog.getResponse().isYes()) {
-                    M.msgLogInfo("User confirmed to continue with the update...");
-                } else {
-                    M.msgLogInfo("User cancelled the update...");
-                    return false;
-                }
-            } else {
-                M.msgLogInfo("I can't write to the current executable file. Trying to set the permission...");
-                ConfirmationDialog confirmationDialog = new ConfirmationDialog("I can't write", "I can't write to the current executable file. Do you want to continue?");
-                if (confirmationDialog.getResponse().isYes()) {
-                    M.msgLogInfo("User confirmed to continue with the update...");
-                } else {
-                    M.msgLogInfo("User cancelled the update...");
-                    return false;
-                }
-            }
-        }
         if (setExecutablePermissions()) {
             M.msgLogInfo("Executable permission set! Executing update...");
         } else {

From 9dff7c2490b40df6ff78e51249a50e2084780b72 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 10:13:45 +0530
Subject: [PATCH 14/36] fix: Fixed the usage of temporary drifty update
 directory for future downloads

---
 .../main/java/gui/updater/GUIUpdateExecutor.java   |  2 +-
 GUI/src/main/java/ui/UIController.java             |  2 +-
 .../META-INF/native-image/resource-config.json     | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 8759af0e5..558e08edf 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -44,7 +44,7 @@ public boolean execute() {
                 Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
                 M.msgUpdateInfo("Update successful!");
             } catch (IOException e) {
-                M.msgUpdateError("Failed to replace the current version of Drifty!");
+                M.msgUpdateError("Failed to replace the current version of Drifty!\n" + e.getMessage());
                 return false;
             }
             try {
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index dc779731b..d702381e0 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -132,8 +132,8 @@ private void downloadUpdate() {
             while (!downloadUpdate.getState().equals(Thread.State.TERMINATED)) {
                 sleep(500);
             }
-            AppSettings.SET.lastFolder(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
             setDir(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
+            AppSettings.SET.lastFolder(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
             // Reset the download queue to the previous state.
             getJobs().setList(currentDownloadQueue);
             if (latestExecutableFile.exists() && latestExecutableFile.isFile() && latestExecutableFile.length() > 0) {
diff --git a/GUI/src/main/resources/META-INF/native-image/resource-config.json b/GUI/src/main/resources/META-INF/native-image/resource-config.json
index 96b50edd7..4994ecb62 100644
--- a/GUI/src/main/resources/META-INF/native-image/resource-config.json
+++ b/GUI/src/main/resources/META-INF/native-image/resource-config.json
@@ -72,6 +72,8 @@
     "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.nio.charset.spi.CharsetProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.util.prefs.PreferencesFactory\\E"
   }, {
@@ -87,9 +89,11 @@
   }, {
     "pattern":"\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en_US.properties\\E"
   }, {
-    "pattern":"\\Qffmpeg\\E"
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/nfkc.nrm\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/ubidi.icu\\E"
   }, {
-    "pattern":"\\Qyt-dlp\\E"
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/uprops.icu\\E"
   }, {
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/nfkc.nrm\\E"
   }, {
@@ -167,13 +171,13 @@
   }]},
   "bundles":[{
     "name":"com.sun.javafx.tk.quantum.QuantumMessagesBundle",
-    "locales":["en-US"]
+    "locales":["", "en-US", "und"]
   }, {
     "name":"com.sun.org.apache.xml.internal.serializer.XMLEntities",
-    "locales":["en-US"]
+    "locales":["", "en-US", "und"]
   }, {
     "name":"com/sun/javafx/scene/control/skin/resources/controls",
-    "locales":["en-US"]
+    "locales":["", "en-US", "und"]
   }, {
     "name":"sun.text.resources.cldr.FormatData",
     "locales":["en", "en-US", "und"]

From 28ddd7c23588560cbad584066f9744648da2a69d Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 11:28:22 +0530
Subject: [PATCH 15/36] debug: Moved log file to a visible area for better
 monitoring of update of drifty in windows

---
 Core/src/main/java/utils/Logger.java         | 6 ++++--
 GUI/src/main/java/ui/ConfirmationDialog.java | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Core/src/main/java/utils/Logger.java b/Core/src/main/java/utils/Logger.java
index 750b68e1a..81ef2af94 100644
--- a/Core/src/main/java/utils/Logger.java
+++ b/Core/src/main/java/utils/Logger.java
@@ -2,14 +2,16 @@
 
 import properties.MessageType;
 import properties.Mode;
+import properties.Program;
 
 import java.io.*;
+import java.nio.file.Path;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import static support.Constants.FAILED_TO_CREATE_LOG;
 import static support.Constants.FAILED_TO_CLEAR_LOG;
+import static support.Constants.FAILED_TO_CREATE_LOG;
 
 public final class Logger {
     boolean isLogEmpty;
@@ -45,7 +47,7 @@ public static Logger getInstance() {
     }
 
     private void clearLog() {
-        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFilename, false))))) {
+        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(Path.of(Program.get(Program.DRIFTY_PATH)).resolveSibling(logFilename).toFile(), false))))) {
             isLogEmpty = true;
             logWriter.write("");
         } catch (IOException e) {
diff --git a/GUI/src/main/java/ui/ConfirmationDialog.java b/GUI/src/main/java/ui/ConfirmationDialog.java
index badbc20e0..6ea162c7a 100644
--- a/GUI/src/main/java/ui/ConfirmationDialog.java
+++ b/GUI/src/main/java/ui/ConfirmationDialog.java
@@ -177,7 +177,7 @@ private void showScene() {
             answer.setAnswer(false);
             stage.close();
         });
-        stage.setResizable(false);
+        stage.setResizable(true);
         stage.showAndWait();
     }
 

From 300de23b873d96f50346e2d4b82893e90249cb3f Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 12:30:25 +0530
Subject: [PATCH 16/36] debug: Moved log file to a visible area for better
 monitoring of update of drifty in windows

---
 Core/src/main/java/utils/Logger.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Core/src/main/java/utils/Logger.java b/Core/src/main/java/utils/Logger.java
index 81ef2af94..cc5210725 100644
--- a/Core/src/main/java/utils/Logger.java
+++ b/Core/src/main/java/utils/Logger.java
@@ -2,10 +2,8 @@
 
 import properties.MessageType;
 import properties.Mode;
-import properties.Program;
 
 import java.io.*;
-import java.nio.file.Path;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -20,6 +18,7 @@ public final class Logger {
     private final DateFormat dateFormat;
     private final Calendar calendarObject = Calendar.getInstance();
     private final String logFilename;
+    private final File logFile;
 
     private Logger() {
         if (Mode.isCLI()) {
@@ -28,6 +27,11 @@ private Logger() {
             logFilename = "Drifty GUI.log";
         }
         dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            logFile = File.createTempFile(logFilename.replace(".log", ""), ".log");
+        } catch (IOException e) {
+            throw new RuntimeException(FAILED_TO_CREATE_LOG + logFilename);
+        }
     }
 
     public static Logger getInstance() {
@@ -47,7 +51,7 @@ public static Logger getInstance() {
     }
 
     private void clearLog() {
-        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(Path.of(Program.get(Program.DRIFTY_PATH)).resolveSibling(logFilename).toFile(), false))))) {
+        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFile, false))))) {
             isLogEmpty = true;
             logWriter.write("");
         } catch (IOException e) {
@@ -60,7 +64,7 @@ public void log(MessageType messageType, String logMessage) {
         if (!isLogEmpty) {
             clearLog();
         }
-        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFilename, true))))) {
+        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFile, true))))) {
             isLogEmpty = true;
             logWriter.println(dateAndTime + " " + messageType.toString() + " - " + logMessage);
         } catch (IOException e) {

From b04674b883ca6170588d54bf4d70b79909174411 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 13:40:26 +0530
Subject: [PATCH 17/36] debug: Narrow down the update failure to the code for
 replacing executables

---
 .../main/java/gui/updater/GUIUpdateExecutor.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 558e08edf..b37d62cbe 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -3,6 +3,7 @@
 import org.buildobjects.process.ProcBuilder;
 import org.buildobjects.process.ProcResult;
 import properties.OS;
+import ui.ConfirmationDialog;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,6 +41,21 @@ public boolean execute() {
                 M.msgUpdateError("Failed to rename the current version of Drifty!");
                 return false;
             }
+            // Check if the application runner user has adequate permissions to replace the current executable
+            if (Paths.get(currentExecutablePathString).getParent().toFile().canWrite()) {
+                M.msgLogInfo("User has write permissions to the current executable directory!");
+                ConfirmationDialog confirmationDialog = new ConfirmationDialog("User Permissions", "User has write permissions to the current executable directory!\n\nDo you want to replace the current version of Drifty with the latest version?", true, false);
+                if (confirmationDialog.getResponse().isYes()) {
+                    M.msgLogInfo("User has confirmed to replace the current version of Drifty with the latest version!");
+                } else {
+                    M.msgLogInfo("User has denied to replace the current version of Drifty with the latest version!");
+                    return false;
+                }
+            } else {
+                M.msgUpdateError("User does not have write permissions to the current executable directory!");
+                ConfirmationDialog confirmationDialog = new ConfirmationDialog("User Permissions", "User does not have write permissions to the current executable directory!\n\nDo you want to run the latest version of Drifty without replacing the current version?", true, false);
+                confirmationDialog.getResponse().isYes();
+            }
             try {
                 Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
                 M.msgUpdateInfo("Update successful!");

From f6d5d59dee6b5f252cd3323cfe580e87ab6dc3c0 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 14:04:53 +0530
Subject: [PATCH 18/36] debug: Narrow down the update failure to the code for
 replacing executables

---
 GUI/src/main/java/gui/updater/GUIUpdateExecutor.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index b37d62cbe..fb1da4602 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -36,11 +36,6 @@ public boolean execute() {
         } else {
             String currentExecutablePathString = currentExecutableFile.toPath().toString();
             ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
-            boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
-            if (!isCurrentExecutableRenamed) {
-                M.msgUpdateError("Failed to rename the current version of Drifty!");
-                return false;
-            }
             // Check if the application runner user has adequate permissions to replace the current executable
             if (Paths.get(currentExecutablePathString).getParent().toFile().canWrite()) {
                 M.msgLogInfo("User has write permissions to the current executable directory!");
@@ -56,6 +51,11 @@ public boolean execute() {
                 ConfirmationDialog confirmationDialog = new ConfirmationDialog("User Permissions", "User does not have write permissions to the current executable directory!\n\nDo you want to run the latest version of Drifty without replacing the current version?", true, false);
                 confirmationDialog.getResponse().isYes();
             }
+            boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
+            if (!isCurrentExecutableRenamed) {
+                M.msgUpdateError("Failed to rename the current version of Drifty!");
+                return false;
+            }
             try {
                 Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
                 M.msgUpdateInfo("Update successful!");

From ada0206c43919eda780325156784d038ec2cf846 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 15:21:21 +0530
Subject: [PATCH 19/36] debug: Added log instructions to get an idea of the
 permissions available

---
 GUI/src/main/java/gui/updater/GUIUpdateExecutor.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index fb1da4602..b46eeb923 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -36,6 +36,16 @@ public boolean execute() {
         } else {
             String currentExecutablePathString = currentExecutableFile.toPath().toString();
             ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
+            M.msgLogInfo("Current executable path: " + currentExecutablePathString);
+            M.msgLogInfo("Latest executable path: " + latestExecutableFile.getAbsolutePath());
+            M.msgLogInfo("For Current executable,");
+            M.msgLogInfo("canWrite: " + currentExecutableFile.canWrite());
+            M.msgLogInfo("canExecute: " + currentExecutableFile.canExecute());
+            M.msgLogInfo("canModify: " + currentExecutableFile.setWritable(true));
+            M.msgLogInfo("For Latest executable,");
+            M.msgLogInfo("canWrite: " + latestExecutableFile.canWrite());
+            M.msgLogInfo("canExecute: " + latestExecutableFile.canExecute());
+            M.msgLogInfo("canModify: " + latestExecutableFile.setWritable(true));
             // Check if the application runner user has adequate permissions to replace the current executable
             if (Paths.get(currentExecutablePathString).getParent().toFile().canWrite()) {
                 M.msgLogInfo("User has write permissions to the current executable directory!");

From ea97819f422a7932125e4d602a77e1b84883cd1b Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 17:07:20 +0530
Subject: [PATCH 20/36] fix: Fixed permission detection for windows msi

---
 .../java/gui/updater/GUIUpdateExecutor.java   | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index b46eeb923..d1b8c097b 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -3,11 +3,11 @@
 import org.buildobjects.process.ProcBuilder;
 import org.buildobjects.process.ProcResult;
 import properties.OS;
-import ui.ConfirmationDialog;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 
@@ -36,30 +36,16 @@ public boolean execute() {
         } else {
             String currentExecutablePathString = currentExecutableFile.toPath().toString();
             ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
-            M.msgLogInfo("Current executable path: " + currentExecutablePathString);
-            M.msgLogInfo("Latest executable path: " + latestExecutableFile.getAbsolutePath());
-            M.msgLogInfo("For Current executable,");
-            M.msgLogInfo("canWrite: " + currentExecutableFile.canWrite());
-            M.msgLogInfo("canExecute: " + currentExecutableFile.canExecute());
-            M.msgLogInfo("canModify: " + currentExecutableFile.setWritable(true));
-            M.msgLogInfo("For Latest executable,");
-            M.msgLogInfo("canWrite: " + latestExecutableFile.canWrite());
-            M.msgLogInfo("canExecute: " + latestExecutableFile.canExecute());
-            M.msgLogInfo("canModify: " + latestExecutableFile.setWritable(true));
             // Check if the application runner user has adequate permissions to replace the current executable
-            if (Paths.get(currentExecutablePathString).getParent().toFile().canWrite()) {
-                M.msgLogInfo("User has write permissions to the current executable directory!");
-                ConfirmationDialog confirmationDialog = new ConfirmationDialog("User Permissions", "User has write permissions to the current executable directory!\n\nDo you want to replace the current version of Drifty with the latest version?", true, false);
-                if (confirmationDialog.getResponse().isYes()) {
-                    M.msgLogInfo("User has confirmed to replace the current version of Drifty with the latest version!");
-                } else {
-                    M.msgLogInfo("User has denied to replace the current version of Drifty with the latest version!");
-                    return false;
-                }
-            } else {
-                M.msgUpdateError("User does not have write permissions to the current executable directory!");
-                ConfirmationDialog confirmationDialog = new ConfirmationDialog("User Permissions", "User does not have write permissions to the current executable directory!\n\nDo you want to run the latest version of Drifty without replacing the current version?", true, false);
-                confirmationDialog.getResponse().isYes();
+            try {
+                String windowsDriveLetter = currentExecutablePathString.substring(0, 2);
+                M.msgLogInfo("Drive letter: " + windowsDriveLetter);
+                Path testFilePath = Files.createFile(Paths.get(windowsDriveLetter).resolve("Windows").resolve("System32").resolve("test.txt"));
+                Files.deleteIfExists(testFilePath);
+            } catch (IOException e) {
+                M.msgUpdateError("Insufficient permissions to replace the current version of Drifty!");
+                M.msgLogInfo("Please run Drifty as an administrator to update the application." + e.getMessage());
+                return false;
             }
             boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
             if (!isCurrentExecutableRenamed) {

From 7f94067bc707f217f70c3a91b22978496d05e79d Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 20:22:08 +0530
Subject: [PATCH 21/36] fix: Fixed permission detection for windows, linux and
 mac (for mac, only in case of CLI) to prevent failure in in-place update of
 Drifty

---
 .../main/java/cli/utils/MessageBroker.java    |  4 ++
 CLI/src/main/java/main/Drifty_CLI.java        | 41 ++++++++++++-------
 Core/src/main/java/init/Environment.java      | 27 ++++++++++++
 Core/src/main/java/utils/Logger.java          | 17 ++++++--
 .../java/gui/updater/GUIUpdateExecutor.java   | 12 ------
 GUI/src/main/java/ui/UIController.java        | 11 +++--
 6 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/CLI/src/main/java/cli/utils/MessageBroker.java b/CLI/src/main/java/cli/utils/MessageBroker.java
index 1ee235869..bb97fc6f6 100644
--- a/CLI/src/main/java/cli/utils/MessageBroker.java
+++ b/CLI/src/main/java/cli/utils/MessageBroker.java
@@ -30,4 +30,8 @@ public void msgHistoryWarning(String message, boolean endWithNewLine) {
         this.endWithNewLine = endWithNewLine;
         sendMessage(message, MessageType.WARN, MessageCategory.HISTORY);
     }
+
+    public void msgUpdateWarning(String message) {
+        sendMessage(message, MessageType.WARN, MessageCategory.UPDATE);
+    }
 }
diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 86fa01e40..14385b6c0 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -313,23 +313,34 @@ private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
             if (UpdateChecker.isUpdateAvailable()) {
                 messageBroker.msgUpdateInfo("Update available!");
                 messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + " (" + AppSettings.GET.newDriftyVersionName() + ")");
-                boolean choice = true;
-                if (askForInstallingUpdate) {
-                    messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
-                    String choiceString = SC.nextLine().toLowerCase();
-                    choice = utility.yesNoValidation(choiceString, "Do you want to download the update? (Enter Y for yes and N for no) : ");
-                }
-                if (!choice) {
-                    messageBroker.msgUpdateInfo("Drifty update cancelled!");
+                if (Environment.isAdministrator()) {
+                    boolean choice = true;
+                    if (askForInstallingUpdate) {
+                        messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
+                        String choiceString = SC.nextLine().toLowerCase();
+                        choice = utility.yesNoValidation(choiceString, "Do you want to download the update? (Enter Y for yes and N for no) : ");
+                    }
+                    if (!choice) {
+                        messageBroker.msgUpdateInfo("Drifty update cancelled!");
+                    } else {
+                        messageBroker.msgUpdateInfo("Downloading update...");
+                        if (!downloadUpdate()) {
+                            messageBroker.msgUpdateError("Failed to update Drifty!");
+                            Environment.terminate(1);
+                        } else {
+                            messageBroker.msgUpdateInfo("Update successful!");
+                            messageBroker.msgUpdateInfo("Please restart Drifty to see the changes!");
+                            Environment.terminate(0);
+                        }
+                    }
                 } else {
-                    messageBroker.msgUpdateInfo("Downloading update...");
-                    if (!downloadUpdate()) {
-                        messageBroker.msgUpdateError("Failed to update Drifty!");
-                        Environment.terminate(1);
+                    if (askForInstallingUpdate) {
+                        messageBroker.msgUpdateWarning("Drifty update requires administrator privileges!");
+                        messageBroker.msgUpdateWarning("Please run Drifty with administrator privileges to update!");
                     } else {
-                        messageBroker.msgUpdateInfo("Update successful!");
-                        messageBroker.msgUpdateInfo("Please restart Drifty to see the changes!");
-                        Environment.terminate(0);
+                        messageBroker.msgUpdateError("Drifty update requires administrator privileges!");
+                        messageBroker.msgUpdateError("Please run Drifty with administrator privileges to update!");
+                        Environment.terminate(1);
                     }
                 }
             }
diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index 2a70ca82c..7b51ff0eb 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -10,7 +10,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.AccessDeniedException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -19,6 +22,7 @@
 
 public class Environment {
     private static MessageBroker msgBroker = Environment.getMessageBroker();
+    private static final boolean isAdministrator = checkForAdminPrivileges();
 
     /*
     This method is called by both CLI.Main and GUI.Forms.Main classes.
@@ -105,6 +109,29 @@ public static boolean isYtDLPUpdated() {
         return timeSinceLastUpdate <= oneDay;
     }
 
+    private static boolean checkForAdminPrivileges() {
+        try {
+            Path currentExecutableFolderPath = Paths.get(Utility.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent();
+            Path adminTestFilePath = currentExecutableFolderPath.resolve("adminTestFile.txt");
+            Files.createFile(adminTestFilePath);
+            Files.deleteIfExists(adminTestFilePath);
+            return true;
+        } catch (URISyntaxException e) {
+            msgBroker.msgInitError("Failed to get the current executable folder! " + e.getMessage());
+            return false;
+        } catch (AccessDeniedException e) {
+            msgBroker.msgInitError("You are not running Drifty as an administrator! " + e.getMessage());
+            return false;
+        } catch (IOException e) {
+            msgBroker.msgInitError("Failed to create a file in the current executable folder! " + e.getMessage());
+            return false;
+        }
+    }
+
+    public static boolean isAdministrator() {
+        return isAdministrator;
+    }
+
     public static MessageBroker getMessageBroker() {
         return msgBroker;
     }
diff --git a/Core/src/main/java/utils/Logger.java b/Core/src/main/java/utils/Logger.java
index cc5210725..cba944236 100644
--- a/Core/src/main/java/utils/Logger.java
+++ b/Core/src/main/java/utils/Logger.java
@@ -1,9 +1,11 @@
 package utils;
 
+import init.Environment;
 import properties.MessageType;
 import properties.Mode;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -27,11 +29,18 @@ private Logger() {
             logFilename = "Drifty GUI.log";
         }
         dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            logFile = File.createTempFile(logFilename.replace(".log", ""), ".log");
-        } catch (IOException e) {
-            throw new RuntimeException(FAILED_TO_CREATE_LOG + logFilename);
+        logFile = determineLogFile();
+    }
+
+    private File determineLogFile() {
+        if (!Environment.isAdministrator()) {
+            try {
+                return Files.createTempFile(logFilename.split("\\.")[0], ".log").toFile();
+            } catch (IOException e) {
+                System.err.println(FAILED_TO_CREATE_LOG + logFilename);
+            }
         }
+        return new File(logFilename);
     }
 
     public static Logger getInstance() {
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index d1b8c097b..558e08edf 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -7,7 +7,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 
@@ -36,17 +35,6 @@ public boolean execute() {
         } else {
             String currentExecutablePathString = currentExecutableFile.toPath().toString();
             ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
-            // Check if the application runner user has adequate permissions to replace the current executable
-            try {
-                String windowsDriveLetter = currentExecutablePathString.substring(0, 2);
-                M.msgLogInfo("Drive letter: " + windowsDriveLetter);
-                Path testFilePath = Files.createFile(Paths.get(windowsDriveLetter).resolve("Windows").resolve("System32").resolve("test.txt"));
-                Files.deleteIfExists(testFilePath);
-            } catch (IOException e) {
-                M.msgUpdateError("Insufficient permissions to replace the current version of Drifty!");
-                M.msgLogInfo("Please run Drifty as an administrator to update the application." + e.getMessage());
-                return false;
-            }
             boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
             if (!isCurrentExecutableRenamed) {
                 M.msgUpdateError("Failed to rename the current version of Drifty!");
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index d702381e0..4b9e97a96 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -93,9 +93,14 @@ private void start(MainGridPane pane) {
         new Thread(() -> {
             if (AppSettings.GET.driftyUpdateAvailable()) {
                 M.msgLogInfo("A new version of Drifty is available!");
-                ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Do you want to download and install the update?", false, false);
-                if (ask.getResponse().isYes()) {
-                    downloadUpdate();
+                if (OS.isMac() || Environment.isAdministrator()) { // If the user is running as an administrator, they can update the application. Otherwise, they will be prompted to run as an administrator. For Mac, the user will always be prompted to update the application as a `.pkg` file will just be opened to install the update (the user has to manually install the update).
+                    ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Do you want to download and install the update?", false, false);
+                    if (ask.getResponse().isYes()) {
+                        downloadUpdate();
+                    }
+                } else {
+                    ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Unfortunately, you do not have the necessary permissions to update the application." + nl.repeat(2) + "Please run Drifty as an administrator to update the application.", true, false);
+                    ask.getResponse().isYes();
                 }
             }
         }).start();

From cafd6d841335e006fe80fcb5b3b34a04d27ec8e3 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 20:28:48 +0530
Subject: [PATCH 22/36] fix(CI): Fixed linter issue

---
 Core/src/main/java/init/Environment.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index 7b51ff0eb..b79ee3638 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -22,7 +22,7 @@
 
 public class Environment {
     private static MessageBroker msgBroker = Environment.getMessageBroker();
-    private static final boolean isAdministrator = checkForAdminPrivileges();
+    private static final boolean IS_ADMINISTRATOR = HasAdminPrivileges();
 
     /*
     This method is called by both CLI.Main and GUI.Forms.Main classes.
@@ -109,7 +109,7 @@ public static boolean isYtDLPUpdated() {
         return timeSinceLastUpdate <= oneDay;
     }
 
-    private static boolean checkForAdminPrivileges() {
+    private static boolean HasAdminPrivileges() {
         try {
             Path currentExecutableFolderPath = Paths.get(Utility.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent();
             Path adminTestFilePath = currentExecutableFolderPath.resolve("adminTestFile.txt");
@@ -129,7 +129,7 @@ private static boolean checkForAdminPrivileges() {
     }
 
     public static boolean isAdministrator() {
-        return isAdministrator;
+        return IS_ADMINISTRATOR;
     }
 
     public static MessageBroker getMessageBroker() {

From bf01672a338d2316017d6651279a35b9b375355a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 15:02:24 +0000
Subject: [PATCH 23/36] style: format codebase

---
 Core/src/main/java/init/Environment.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index b79ee3638..d685b2714 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -22,7 +22,7 @@
 
 public class Environment {
     private static MessageBroker msgBroker = Environment.getMessageBroker();
-    private static final boolean IS_ADMINISTRATOR = HasAdminPrivileges();
+    private static final boolean IS_ADMINISTRATOR = hasAdminPrivileges();
 
     /*
     This method is called by both CLI.Main and GUI.Forms.Main classes.
@@ -109,7 +109,7 @@ public static boolean isYtDLPUpdated() {
         return timeSinceLastUpdate <= oneDay;
     }
 
-    private static boolean HasAdminPrivileges() {
+    private static boolean hasAdminPrivileges() {
         try {
             Path currentExecutableFolderPath = Paths.get(Utility.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent();
             Path adminTestFilePath = currentExecutableFolderPath.resolve("adminTestFile.txt");

From b33becf23f815604928b9d23d4a062ef2955b5e2 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 20:59:02 +0530
Subject: [PATCH 24/36] fix: Fixed NullPointerException while creating log
 during initialization

---
 CLI/src/main/java/main/Drifty_CLI.java           | 16 +++++++---------
 .../META-INF/native-image/jni-config.json        |  4 ++++
 .../META-INF/native-image/reflect-config.json    | 12 ++++++++++++
 Core/src/main/java/init/Environment.java         |  5 +++--
 Core/src/main/java/preferences/Labels.java       |  1 -
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 14385b6c0..b7fc00042 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -308,8 +308,8 @@ public static void main(String[] args) {
     }
 
     private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
-        messageBroker.msgInitInfo("Checking for updates...");
         if (!isDriftyUpdateChecked() || !askForInstallingUpdate) { // Check for updates only once a day and only if the user wants to install the update (if available)
+            messageBroker.msgInitInfo("Checking for updates...");
             if (UpdateChecker.isUpdateAvailable()) {
                 messageBroker.msgUpdateInfo("Update available!");
                 messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + " (" + AppSettings.GET.newDriftyVersionName() + ")");
@@ -387,16 +387,14 @@ private static void printVersion() {
             Utility.setYtDlpVersion().run();
         }
         System.out.println("yt-dlp version : " + AppSettings.GET.ytDlpVersion());
-        if (AppSettings.GET.isFfmpegWorking()) {
-            if (AppSettings.GET.ffmpegVersion().isEmpty()) {
-                Thread ffmpegVersion = new Thread(utils.Utility::setFfmpegVersion);
-                ffmpegVersion.start();
-                while (ffmpegVersion.isAlive()) {
-                    sleep(100);
-                }
+        if (AppSettings.GET.ffmpegVersion().isEmpty()) {
+            Thread ffmpegVersion = new Thread(utils.Utility::setFfmpegVersion);
+            ffmpegVersion.start();
+            while (ffmpegVersion.isAlive()) {
+                sleep(100);
             }
-            System.out.println("FFMPEG version : " + AppSettings.GET.ffmpegVersion());
         }
+        System.out.println("FFMPEG version : " + AppSettings.GET.ffmpegVersion());
     }
 
     private static void handleSpotifyPlaylist() {
diff --git a/CLI/src/main/resources/META-INF/native-image/jni-config.json b/CLI/src/main/resources/META-INF/native-image/jni-config.json
index 9e2ecec55..369030359 100644
--- a/CLI/src/main/resources/META-INF/native-image/jni-config.json
+++ b/CLI/src/main/resources/META-INF/native-image/jni-config.json
@@ -7,6 +7,10 @@
   "name":"java.lang.InternalError",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"main.Drifty_CLI",
+  "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
+},
 {
   "name":"sun.instrument.InstrumentationImpl",
   "methods":[{"name":"<init>","parameterTypes":["long","boolean","boolean","boolean"] }, {"name":"loadClassAndCallAgentmain","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"loadClassAndCallPremain","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"transform","parameterTypes":["java.lang.Module","java.lang.ClassLoader","java.lang.String","java.lang.Class","java.security.ProtectionDomain","byte[]","boolean"] }]
diff --git a/CLI/src/main/resources/META-INF/native-image/reflect-config.json b/CLI/src/main/resources/META-INF/native-image/reflect-config.json
index 787625398..cbcb4727b 100644
--- a/CLI/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/CLI/src/main/resources/META-INF/native-image/reflect-config.json
@@ -44,6 +44,10 @@
   "name":"com.sun.crypto.provider.GaloisCounterMode$AESGCM",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"com.sun.crypto.provider.HmacCore$HmacSHA256",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"com.sun.crypto.provider.HmacCore$HmacSHA384",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -110,6 +114,14 @@
   "name":"java.util.concurrent.ForkJoinTask",
   "fields":[{"name":"aux"}, {"name":"status"}]
 },
+{
+  "name":"java.util.concurrent.atomic.AtomicBoolean",
+  "fields":[{"name":"value"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicReference",
+  "fields":[{"name":"value"}]
+},
 {
   "name":"java.util.concurrent.atomic.Striped64",
   "fields":[{"name":"base"}, {"name":"cellsBusy"}]
diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index b79ee3638..cb02e6c76 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -22,7 +22,7 @@
 
 public class Environment {
     private static MessageBroker msgBroker = Environment.getMessageBroker();
-    private static final boolean IS_ADMINISTRATOR = HasAdminPrivileges();
+    private static boolean isAdministrator;
 
     /*
     This method is called by both CLI.Main and GUI.Forms.Main classes.
@@ -33,6 +33,7 @@ public class Environment {
     public static void initializeEnvironment() {
         msgBroker.msgLogInfo("OS : " + OS.getOSName());
         Utility.initializeUtility(); // Lazy initialization of the MessageBroker in Utility class
+        isAdministrator = HasAdminPrivileges();
         new Thread(() -> AppSettings.SET.driftyUpdateAvailable(UpdateChecker.isUpdateAvailable())).start();
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         executor.scheduleAtFixedRate(Utility.setSpotifyAccessToken(), 0, 3480, java.util.concurrent.TimeUnit.SECONDS); // Thread to refresh Spotify access token every 58 minutes
@@ -129,7 +130,7 @@ private static boolean HasAdminPrivileges() {
     }
 
     public static boolean isAdministrator() {
-        return IS_ADMINISTRATOR;
+        return isAdministrator;
     }
 
     public static MessageBroker getMessageBroker() {
diff --git a/Core/src/main/java/preferences/Labels.java b/Core/src/main/java/preferences/Labels.java
index 4ce46d078..23809afc0 100644
--- a/Core/src/main/java/preferences/Labels.java
+++ b/Core/src/main/java/preferences/Labels.java
@@ -11,7 +11,6 @@ public interface Labels {
     String SPOTIFY_ACCESS_TOKEN = "SPOTIFY_ACCESS_TOKEN";
     String IS_FFMPEG_WORKING = "IS_FFMPEG_WORKING";
     String FFMPEG_VERSION = "FFMPEG_VERSION";
-    String DRIFTY_UPDATE_CHANNEL = "DRIFTY_UPDATE_CHANNEL";
     String NEW_DRIFTY_VERSION_NAME = "NEW_DRIFTY_VERSION_NAME";
     String LATEST_DRIFTY_VERSION_TAG = "LATEST_DRIFTY_VERSION_TAG";
     String LAST_DRIFTY_UPDATE_TIME = "LAST_DRIFTY_UPDATE_TIME";

From 86669909866339c576c1859118241d8c16f2335d Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Tue, 20 Aug 2024 21:32:34 +0530
Subject: [PATCH 25/36] fix: Fixed unchecked admin privileges during
 initialization period of Drifty CLI

---
 CLI/src/main/java/main/Drifty_CLI.java   | 2 +-
 Core/src/main/java/init/Environment.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index b7fc00042..45ac64a94 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -313,7 +313,7 @@ private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
             if (UpdateChecker.isUpdateAvailable()) {
                 messageBroker.msgUpdateInfo("Update available!");
                 messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + " (" + AppSettings.GET.newDriftyVersionName() + ")");
-                if (Environment.isAdministrator()) {
+                if (Environment.hasAdminPrivileges()) {
                     boolean choice = true;
                     if (askForInstallingUpdate) {
                         messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index 5f77d9135..1b94b1663 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -110,7 +110,7 @@ public static boolean isYtDLPUpdated() {
         return timeSinceLastUpdate <= oneDay;
     }
 
-    private static boolean hasAdminPrivileges() {
+    public static boolean hasAdminPrivileges() {
         try {
             Path currentExecutableFolderPath = Paths.get(Utility.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent();
             Path adminTestFilePath = currentExecutableFolderPath.resolve("adminTestFile.txt");

From 8f8ecc537b1ed18127720d44c0f641ae1397ad0a Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Sat, 31 Aug 2024 19:55:31 +0530
Subject: [PATCH 26/36] fix: Added a copy instead of move for Windows update
 check

---
 GUI/src/main/java/gui/updater/GUIUpdateExecutor.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 558e08edf..0ec692d39 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -41,8 +41,13 @@ public boolean execute() {
                 return false;
             }
             try {
-                Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
-                M.msgUpdateInfo("Update successful!");
+                Files.copy(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
+                try {
+                    currentExecutableFile.deleteOnExit();
+                    M.msgUpdateInfo("Update successful!");
+                } catch (Exception e) {
+                    M.msgUpdateError("Failed to delete the current version of Drifty!\n" + e.getMessage());
+                }
             } catch (IOException e) {
                 M.msgUpdateError("Failed to replace the current version of Drifty!\n" + e.getMessage());
                 return false;

From 010989d7d2d16201b734d345ae8cf22bf726f6cb Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Wed, 4 Sep 2024 22:52:20 +0530
Subject: [PATCH 27/36] fix: Added `deleteOnExit()` command to delete '.old'
 executable for windows

---
 Core/src/main/java/utils/Utility.java                | 10 +++-------
 GUI/src/main/java/gui/updater/GUIUpdateExecutor.java |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index df09d8c00..2de779fc4 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -113,14 +113,10 @@ public static URL getUpdateURL() throws MalformedURLException, URISyntaxExceptio
             executableNames = new String[]{"Drifty-CLI_macos_" + arch, "Drifty-CLI.exe", "Drifty-CLI_linux"};
         }
         String updateURLMiddle;
-        if (OS.isMac()) {
-            updateURLMiddle = "download/v1.0.0/"; // For testing the update feature of Drifty for macOS, the latest executables have been uploaded to the v1.0.0 release
+        if (AppSettings.GET.earlyAccess()) {
+            updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
         } else {
-            if (AppSettings.GET.earlyAccess()) {
-                updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
-            } else {
-                updateURLMiddle = "latest/download/";
-            }
+            updateURLMiddle = "latest/download/";
         }
         if (OS.isMac()) {
             updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[0]).toURL();
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 0ec692d39..7ad2de026 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -58,6 +58,7 @@ public boolean execute() {
                 M.msgUpdateError("Failed to start the latest version of Drifty!");
             }
             if (OS.isWindows()) {
+                Paths.get(currentExecutablePathString + ".old").toFile().deleteOnExit();
                 System.exit(0);
             } else {
                 try {

From 818da97d6c91d661b9a7c62672d7ddb6a03aa33f Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Thu, 5 Sep 2024 16:35:06 +0530
Subject: [PATCH 28/36] fix: Added a fix for exe update in windows

---
 .../main/java/gui/updater/GUIUpdateExecutor.java  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 7ad2de026..23bb904d8 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -41,16 +41,15 @@ public boolean execute() {
                 return false;
             }
             try {
-                Files.copy(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
+                Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
+                M.msgUpdateInfo("Update successful!");
+            } catch (IOException e) {
                 try {
-                    currentExecutableFile.deleteOnExit();
-                    M.msgUpdateInfo("Update successful!");
-                } catch (Exception e) {
-                    M.msgUpdateError("Failed to delete the current version of Drifty!\n" + e.getMessage());
+                    Files.copy(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
+                } catch (Exception e2) {
+                    M.msgUpdateError("Failed to replace the current version of Drifty!\n" + e2.getMessage());
+                    return false;
                 }
-            } catch (IOException e) {
-                M.msgUpdateError("Failed to replace the current version of Drifty!\n" + e.getMessage());
-                return false;
             }
             try {
                 runCurrentExecutable.start();

From f6dbbca09fc2bcf408ddb6564cd7b05e5a84fbd3 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Thu, 5 Sep 2024 16:43:47 +0530
Subject: [PATCH 29/36] fix(CI): Fixed linter issues

---
 GUI/src/main/java/gui/updater/GUIUpdateExecutor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 23bb904d8..7625655e1 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -46,8 +46,8 @@ public boolean execute() {
             } catch (IOException e) {
                 try {
                     Files.copy(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
-                } catch (Exception e2) {
-                    M.msgUpdateError("Failed to replace the current version of Drifty!\n" + e2.getMessage());
+                } catch (Exception ex) {
+                    M.msgUpdateError("Failed to replace the current version of Drifty!\n" + ex.getMessage());
                     return false;
                 }
             }

From 92d81d3ec085c850945fffd38a2c6f8618260942 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Fri, 6 Sep 2024 10:36:34 +0530
Subject: [PATCH 30/36] fix: the old exe will get deleted now and added check
 for update menu item

---
 .../java/cli/updater/CLIUpdateExecutor.java   |  2 +-
 .../src/main/java/updater/UpdateExecutor.java |  2 +-
 .../java/gui/updater/GUIUpdateExecutor.java   |  7 +++++-
 GUI/src/main/java/main/Drifty_GUI.java        | 12 +++++++++-
 GUI/src/main/java/ui/UIController.java        | 22 +++++++++++--------
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
index 9191a263b..066d59a91 100644
--- a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
+++ b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
@@ -16,7 +16,7 @@ public CLIUpdateExecutor(File currentExecutableFile, File latestExecutableFile)
     @Override
     public boolean execute() {
         M.msgLogInfo("Setting executable permission for the latest version of Drifty...");
-        if (setExecutablePermissions()) {
+        if (setLatestExecutablePermissions()) {
             M.msgLogInfo("Executing update...");
         } else {
             return false;
diff --git a/Core/src/main/java/updater/UpdateExecutor.java b/Core/src/main/java/updater/UpdateExecutor.java
index fd1aec0cb..ba36e56fb 100644
--- a/Core/src/main/java/updater/UpdateExecutor.java
+++ b/Core/src/main/java/updater/UpdateExecutor.java
@@ -15,7 +15,7 @@ public UpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
         this.latestExecutableFile = latestExecutableFile;
     }
 
-    public boolean setExecutablePermissions() {
+    public boolean setLatestExecutablePermissions() {
         boolean isExecutablePermissionGranted = latestExecutableFile.setExecutable(true);
         if (!isExecutablePermissionGranted) {
             M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index 7625655e1..adb9f5bba 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -19,7 +19,7 @@ public GUIUpdateExecutor(File currentExecutableFile, File latestExecutableFile)
     @Override
     public boolean execute() {
         M.msgLogInfo("Download successful! Setting executable permission...");
-        if (setExecutablePermissions()) {
+        if (setLatestExecutablePermissions()) {
             M.msgLogInfo("Executable permission set! Executing update...");
         } else {
             M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
@@ -35,6 +35,11 @@ public boolean execute() {
         } else {
             String currentExecutablePathString = currentExecutableFile.toPath().toString();
             ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
+            try {
+                Files.deleteIfExists(Paths.get(currentExecutablePathString + ".old"));
+            } catch (IOException e) {
+                M.msgUpdateError("Failed to delete the old version of Drifty!");
+            }
             boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
             if (!isCurrentExecutableRenamed) {
                 M.msgUpdateError("Failed to rename the current version of Drifty!");
diff --git a/GUI/src/main/java/main/Drifty_GUI.java b/GUI/src/main/java/main/Drifty_GUI.java
index 18bc7d923..f36789bc6 100644
--- a/GUI/src/main/java/main/Drifty_GUI.java
+++ b/GUI/src/main/java/main/Drifty_GUI.java
@@ -17,6 +17,7 @@
 import javafx.stage.Stage;
 import properties.Mode;
 import ui.*;
+import updater.UpdateChecker;
 import utils.Utility;
 
 import static gui.support.Constants.GUI_APPLICATION_TERMINATED;
@@ -137,19 +138,28 @@ private Menu getHelpMenu() {
         MenuItem bug = new MenuItem("Report a Bug");
         MenuItem securityVulnerability = new MenuItem("Report a Security Vulnerability");
         MenuItem feature = new MenuItem("Suggest a Feature");
+        MenuItem checkForUpdates = new MenuItem("Check for Updates");
         MenuItem about = new MenuItem("About Drifty");
         contactUs.setOnAction(e -> openWebsite("https://saptarshisarkar12.github.io/Drifty/contact"));
         contribute.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty"));
         bug.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/issues/new?assignees=&labels=bug+%F0%9F%90%9B%2CApp+%F0%9F%92%BB&projects=&template=Bug-for-application.yaml&title=%5BBUG%5D+"));
         securityVulnerability.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/security/advisories/new"));
         feature.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/issues/new?assignees=&labels=feature+%E2%9C%A8%2CApp+%F0%9F%92%BB&projects=&template=feature-request-application.yaml&title=%5BFEATURE%5D+"));
+        checkForUpdates.setOnAction(e -> {
+            if (UpdateChecker.isUpdateAvailable()) {
+                UIController.INSTANCE.showUpdateDialog();
+            } else {
+                ConfirmationDialog noUpdate = new ConfirmationDialog("No Updates Available", "You are already using the latest version of Drifty!", true, false);
+                noUpdate.getResponse();
+            }
+        });
         about.setOnAction(event -> {
             if (aboutInstance == null) {
                 aboutInstance = new About();
             }
             aboutInstance.show();
         });
-        menu.getItems().setAll(contactUs, contribute, bug, securityVulnerability, feature, about);
+        menu.getItems().setAll(contactUs, contribute, bug, securityVulnerability, feature, checkForUpdates, about);
         return menu;
     }
 
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index 3cac8c7bf..26f31594b 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -95,15 +95,7 @@ private void start(MainGridPane pane) {
         new Thread(() -> {
             if (AppSettings.GET.driftyUpdateAvailable()) {
                 M.msgLogInfo("A new version of Drifty is available!");
-                if (OS.isMac() || Environment.isAdministrator()) { // If the user is running as an administrator, they can update the application. Otherwise, they will be prompted to run as an administrator. For Mac, the user will always be prompted to update the application as a `.pkg` file will just be opened to install the update (the user has to manually install the update).
-                    ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Do you want to download and install the update?", false, false);
-                    if (ask.getResponse().isYes()) {
-                        downloadUpdate();
-                    }
-                } else {
-                    ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Unfortunately, you do not have the necessary permissions to update the application." + nl.repeat(2) + "Please run Drifty as an administrator to update the application.", true, false);
-                    ask.getResponse().isYes();
-                }
+                showUpdateDialog();
             }
         }).start();
         form = pane;
@@ -113,6 +105,18 @@ private void start(MainGridPane pane) {
         commitJobListToListView();
     }
 
+    public void showUpdateDialog() {
+        if (OS.isMac() || Environment.isAdministrator()) { // If the user is running as an administrator, they can update the application. Otherwise, they will be prompted to run as an administrator. For Mac, the user will always be prompted to update the application as a `.pkg` file will just be opened to install the update (the user has to manually install the update).
+            ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Do you want to download and install the update?", false, false);
+            if (ask.getResponse().isYes()) {
+                downloadUpdate();
+            }
+        } else {
+            ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Unfortunately, you do not have the necessary permissions to update the application." + nl.repeat(2) + "Please run Drifty as an administrator to update the application.", true, false);
+            ask.getResponse().isYes();
+        }
+    }
+
     private void downloadUpdate() {
         String previouslySelectedDir = getDir(); // Save the download folder selected before the update was initiated.
         try {

From f2471699c529409f7802141f795eee47997c6b57 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Fri, 6 Sep 2024 11:20:27 +0530
Subject: [PATCH 31/36] chore: Removed the resizability of confirmation dialog

---
 GUI/src/main/java/ui/ConfirmationDialog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GUI/src/main/java/ui/ConfirmationDialog.java b/GUI/src/main/java/ui/ConfirmationDialog.java
index 86898ec57..8c1acafc4 100644
--- a/GUI/src/main/java/ui/ConfirmationDialog.java
+++ b/GUI/src/main/java/ui/ConfirmationDialog.java
@@ -179,7 +179,7 @@ private void showScene() {
             answer.setAnswer(false);
             stage.close();
         });
-        stage.setResizable(true);
+        stage.setResizable(false);
         stage.showAndWait();
     }
 

From 320ef2e29265cc900bf5f99ae950caa1162ec0bf Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Fri, 6 Sep 2024 14:07:05 +0530
Subject: [PATCH 32/36] chore: Removed unnecessary code lines previously added
 for debug purposes

---
 .../java/cli/updater/CLIUpdateExecutor.java   | 30 +++++--------
 CLI/src/main/java/main/Drifty_CLI.java        |  3 ++
 Core/src/main/java/support/Constants.java     |  2 +-
 Core/src/main/java/updater/UpdateChecker.java |  4 +-
 .../src/main/java/updater/UpdateExecutor.java | 44 +++++++++++++++++--
 Core/src/main/java/utils/MessageBroker.java   |  2 +-
 .../java/gui/updater/GUIUpdateExecutor.java   | 42 ++++++------------
 7 files changed, 73 insertions(+), 54 deletions(-)

diff --git a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
index 066d59a91..f98cd89e0 100644
--- a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
+++ b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
@@ -1,12 +1,8 @@
 package cli.updater;
 
-import properties.OS;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 
 public class CLIUpdateExecutor extends updater.UpdateExecutor {
     public CLIUpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
@@ -19,28 +15,24 @@ public boolean execute() {
         if (setLatestExecutablePermissions()) {
             M.msgLogInfo("Executing update...");
         } else {
+            M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
             return false;
         }
-        String currentExecutablePath = currentExecutableFile.toPath().toString();
-        boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
+        try {
+            Files.deleteIfExists(oldExecutableFile.toPath());
+        } catch (IOException e) {
+            M.msgUpdateError("Failed to delete the old version of Drifty!");
+        }
+        boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(oldExecutableFile);
         if (!isCurrentExecutableRenamed) {
             M.msgUpdateError("Failed to rename the current executable!");
             return false;
         }
-        try {
-            Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePath), StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            M.msgUpdateError("Failed to replace the current executable with the latest version!");
+        if (replaceCurrentExecutable()) {
+            cleanup();
+            return true;
+        } else {
             return false;
         }
-        if (!OS.isWindows()) {
-            try {
-                Files.deleteIfExists(Paths.get(currentExecutablePath + ".old"));
-            } catch (IOException e) {
-                M.msgUpdateError("Failed to delete the old version of Drifty!");
-                return false;
-            }
-        }
-        return true;
     }
 }
diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 45ac64a94..8cc0761d4 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -343,6 +343,9 @@ private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
                         Environment.terminate(1);
                     }
                 }
+            } else {
+                messageBroker.msgUpdateInfo("Drifty is up to date!");
+                Environment.terminate(0);
             }
         }
     }
diff --git a/Core/src/main/java/support/Constants.java b/Core/src/main/java/support/Constants.java
index 6c34b42ad..a92cf37c5 100644
--- a/Core/src/main/java/support/Constants.java
+++ b/Core/src/main/java/support/Constants.java
@@ -9,7 +9,7 @@
 
 public class Constants {
     public static final String APPLICATION_NAME = "Drifty";
-    public static final String VERSION_NUMBER = "v1.1.0";
+    public static final String VERSION_NUMBER = "v2.1.0-beta.1";
     public static final String DRIFTY_WEBSITE_URL = "https://saptarshisarkar12.github.io/Drifty/";
     public static final String INVALID_LINK = "Link is invalid! Please check the link and try again.";
     public static final String FILENAME_DETECTION_ERROR = "Failed to detect the filename! A default name will be used instead.";
diff --git a/Core/src/main/java/updater/UpdateChecker.java b/Core/src/main/java/updater/UpdateChecker.java
index 1b78e4e11..28ea6c318 100644
--- a/Core/src/main/java/updater/UpdateChecker.java
+++ b/Core/src/main/java/updater/UpdateChecker.java
@@ -85,9 +85,11 @@ private static String getReleaseTag(HttpRequest request) {
     }
 
     public static boolean compareVersions(String currentVersion, String latestVersion) {
+        if (currentVersion.equals(latestVersion)) {
+            return false;
+        }
         String[] currentVersionParts = getTagParts(currentVersion);
         String[] latestVersionParts = getTagParts(latestVersion);
-
         // Check major, minor, and patch versions
         for (int i = 0; i < 3; i++) {
             int cvPart = Utility.parseStringToInt(currentVersionParts[i], "Failed to parse current version part " + i, MessageCategory.UPDATE);
diff --git a/Core/src/main/java/updater/UpdateExecutor.java b/Core/src/main/java/updater/UpdateExecutor.java
index ba36e56fb..8beb92e94 100644
--- a/Core/src/main/java/updater/UpdateExecutor.java
+++ b/Core/src/main/java/updater/UpdateExecutor.java
@@ -1,21 +1,29 @@
 package updater;
 
 import init.Environment;
+import preferences.AppSettings;
+import properties.OS;
 import utils.MessageBroker;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 
 public abstract class UpdateExecutor {
     protected static final MessageBroker M = Environment.getMessageBroker();
+    protected File oldExecutableFile;
     protected File currentExecutableFile;
     protected File latestExecutableFile;
 
-    public UpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
+    protected UpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
         this.currentExecutableFile = currentExecutableFile;
         this.latestExecutableFile = latestExecutableFile;
+        this.oldExecutableFile = Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile();
     }
 
-    public boolean setLatestExecutablePermissions() {
+    protected boolean setLatestExecutablePermissions() {
         boolean isExecutablePermissionGranted = latestExecutableFile.setExecutable(true);
         if (!isExecutablePermissionGranted) {
             M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
@@ -34,5 +42,35 @@ public boolean setLatestExecutablePermissions() {
         return true;
     }
 
-    public abstract boolean execute();
+    protected void cleanup() {
+        try {
+            if (OS.isWindows()) {
+                oldExecutableFile.deleteOnExit();
+            } else {
+                Files.deleteIfExists(oldExecutableFile.toPath());
+            }
+            Environment.terminate(0);
+        } catch (IOException e) {
+            M.msgUpdateError("Failed to delete the old version of Drifty!");
+        } finally {
+            AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
+        }
+    }
+
+    protected boolean replaceCurrentExecutable() {
+        try {
+            Files.move(latestExecutableFile.toPath(), currentExecutableFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            M.msgUpdateInfo("Update successful!");
+        } catch (IOException e) {
+            try {
+                Files.copy(latestExecutableFile.toPath(), currentExecutableFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            } catch (Exception ex) {
+                M.msgUpdateError("Failed to replace the current version of Drifty!\n" + ex.getMessage());
+                return false;
+            }
+        }
+        return true;
+    }
+
+    protected abstract boolean execute();
 }
diff --git a/Core/src/main/java/utils/MessageBroker.java b/Core/src/main/java/utils/MessageBroker.java
index 3ce89a96c..43e207151 100644
--- a/Core/src/main/java/utils/MessageBroker.java
+++ b/Core/src/main/java/utils/MessageBroker.java
@@ -91,7 +91,7 @@ public void msgUpdateInfo(String message) {
     protected void sendMessage(String message, MessageType messageType, MessageCategory messageCategory) {
         logger.log(messageType, message);
         message = switch (messageType) {
-            case INFO -> messageCategory == MessageCategory.INPUT ? "\033[94m" + message + "\033[0m" : "\033[92m" + message + "\033[0m";
+            case INFO -> (messageCategory == MessageCategory.INPUT || messageCategory == MessageCategory.UPDATE) ? "\033[94m" + message + "\033[0m" : "\033[92m" + message + "\033[0m";
             case WARN -> "\033[93m" + message + "\033[0m";
             case ERROR -> "\033[91m" + message + "\033[0m";
         };
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index adb9f5bba..e212346ae 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -1,5 +1,7 @@
 package gui.updater;
 
+import gui.init.Environment;
+import gui.preferences.AppSettings;
 import org.buildobjects.process.ProcBuilder;
 import org.buildobjects.process.ProcResult;
 import properties.OS;
@@ -7,8 +9,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 
 public class GUIUpdateExecutor extends updater.UpdateExecutor {
 
@@ -29,48 +29,32 @@ public boolean execute() {
             ProcResult executionResult = new ProcBuilder("open").withArgs(latestExecutableFile.getAbsolutePath()).withNoTimeout().ignoreExitStatus().run();
             if (executionResult.getExitValue() != 0) {
                 M.msgUpdateError("Failed to open the installer for the latest version of Drifty!");
+                return false;
             } else {
-                System.exit(0);
+                AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
+                Environment.terminate(0);
             }
         } else {
-            String currentExecutablePathString = currentExecutableFile.toPath().toString();
             ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
             try {
-                Files.deleteIfExists(Paths.get(currentExecutablePathString + ".old"));
+                Files.deleteIfExists(oldExecutableFile.toPath());
             } catch (IOException e) {
                 M.msgUpdateError("Failed to delete the old version of Drifty!");
             }
-            boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile());
+            boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(oldExecutableFile);
             if (!isCurrentExecutableRenamed) {
                 M.msgUpdateError("Failed to rename the current version of Drifty!");
                 return false;
             }
-            try {
-                Files.move(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
-                M.msgUpdateInfo("Update successful!");
-            } catch (IOException e) {
-                try {
-                    Files.copy(latestExecutableFile.toPath(), Paths.get(currentExecutablePathString), StandardCopyOption.REPLACE_EXISTING);
-                } catch (Exception ex) {
-                    M.msgUpdateError("Failed to replace the current version of Drifty!\n" + ex.getMessage());
-                    return false;
-                }
-            }
-            try {
-                runCurrentExecutable.start();
-            } catch (IOException e) {
-                M.msgUpdateError("Failed to start the latest version of Drifty!");
-            }
-            if (OS.isWindows()) {
-                Paths.get(currentExecutablePathString + ".old").toFile().deleteOnExit();
-                System.exit(0);
-            } else {
+            if (replaceCurrentExecutable()) {
                 try {
-                    Files.deleteIfExists(Paths.get(currentExecutablePathString + ".old"));
-                    System.exit(0);
+                    runCurrentExecutable.start();
                 } catch (IOException e) {
-                    M.msgUpdateError("Failed to delete the old version of Drifty!");
+                    M.msgUpdateError("Failed to start the latest version of Drifty!");
                 }
+                cleanup();
+            } else {
+                return false;
             }
         }
         return true;

From a097918d487a735f566852a2f0edf3b49e77df84 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 08:38:15 +0000
Subject: [PATCH 33/36] style: format codebase

---
 Core/src/main/java/utils/MessageBroker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/utils/MessageBroker.java b/Core/src/main/java/utils/MessageBroker.java
index 43e207151..7fc42d4a3 100644
--- a/Core/src/main/java/utils/MessageBroker.java
+++ b/Core/src/main/java/utils/MessageBroker.java
@@ -91,7 +91,7 @@ public void msgUpdateInfo(String message) {
     protected void sendMessage(String message, MessageType messageType, MessageCategory messageCategory) {
         logger.log(messageType, message);
         message = switch (messageType) {
-            case INFO -> (messageCategory == MessageCategory.INPUT || messageCategory == MessageCategory.UPDATE) ? "\033[94m" + message + "\033[0m" : "\033[92m" + message + "\033[0m";
+            case INFO -> messageCategory == MessageCategory.INPUT || messageCategory == MessageCategory.UPDATE ? "\033[94m" + message + "\033[0m" : "\033[92m" + message + "\033[0m";
             case WARN -> "\033[93m" + message + "\033[0m";
             case ERROR -> "\033[91m" + message + "\033[0m";
         };

From fb404cb8e09417f90814e754bec27404ed235598 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Fri, 6 Sep 2024 23:19:34 +0530
Subject: [PATCH 34/36] fix: Fixed CoderabbitAI's reviews

---
 .../java/cli/updater/CLIUpdateExecutor.java   | 26 +++------
 CLI/src/main/java/cli/utils/Utility.java      |  2 +-
 CLI/src/main/java/main/Drifty_CLI.java        | 15 ++++-
 Core/src/main/java/init/Environment.java      | 12 +++-
 Core/src/main/java/updater/UpdateChecker.java |  4 ++
 .../src/main/java/updater/UpdateExecutor.java | 55 +++++++++++--------
 Core/src/main/java/utils/Utility.java         | 33 +++++++----
 .../java/gui/updater/GUIUpdateExecutor.java   | 50 ++++++++---------
 GUI/src/main/java/main/Drifty_GUI.java        | 13 +++--
 GUI/src/main/java/ui/ConfirmationDialog.java  | 13 ++---
 GUI/src/main/java/ui/Theme.java               |  1 +
 GUI/src/main/java/ui/UIController.java        |  2 +-
 12 files changed, 129 insertions(+), 97 deletions(-)

diff --git a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
index f98cd89e0..1a52e96e2 100644
--- a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
+++ b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
@@ -1,8 +1,6 @@
 package cli.updater;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
 
 public class CLIUpdateExecutor extends updater.UpdateExecutor {
     public CLIUpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
@@ -13,26 +11,18 @@ public CLIUpdateExecutor(File currentExecutableFile, File latestExecutableFile)
     public boolean execute() {
         M.msgLogInfo("Setting executable permission for the latest version of Drifty...");
         if (setLatestExecutablePermissions()) {
-            M.msgLogInfo("Executing update...");
+            M.msgLogInfo("Executable permission set! Executing update...");
         } else {
             M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
             return false;
         }
-        try {
-            Files.deleteIfExists(oldExecutableFile.toPath());
-        } catch (IOException e) {
-            M.msgUpdateError("Failed to delete the old version of Drifty!");
-        }
-        boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(oldExecutableFile);
-        if (!isCurrentExecutableRenamed) {
-            M.msgUpdateError("Failed to rename the current executable!");
-            return false;
-        }
-        if (replaceCurrentExecutable()) {
-            cleanup();
-            return true;
-        } else {
-            return false;
+        cleanup(true); // This will delete the old executable created previously
+        if (renameCurrentExecutable()) {
+            if (replaceCurrentExecutable()) {
+                cleanup(false);
+                return true;
+            }
         }
+        return false;
     }
 }
diff --git a/CLI/src/main/java/cli/utils/Utility.java b/CLI/src/main/java/cli/utils/Utility.java
index ca212953a..331c3546f 100644
--- a/CLI/src/main/java/cli/utils/Utility.java
+++ b/CLI/src/main/java/cli/utils/Utility.java
@@ -23,7 +23,7 @@ public static String findFilenameInLink(String link) {
                 filename = Utility.getFilenameFromJson(json);
             }
             if (filename.isEmpty()) {
-                msgBroker.msgFilenameError("Filename detection failed!");
+                msgBroker.msgFilenameError("Filename detection failed: No filename found in metadata!");
                 return null;
             }
         } else {
diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 8cc0761d4..892d22778 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -54,7 +54,11 @@ public static void main(String[] args) {
         messageBroker = new MessageBroker(System.out);
         Environment.setCLIMessageBroker(messageBroker);
         utility = new Utility();
-        checkAndUpdateDrifty(true);
+        if (Utility.isOffline()) {
+            messageBroker.msgUpdateWarning("Failed to check for updates! You are not connected to the internet.");
+        } else {
+            checkAndUpdateDrifty(true);
+        }
         messageBroker.msgInitInfo("Initializing environment...");
         Environment.initializeEnvironment();
         messageBroker.msgInitInfo("Environment initialized successfully!");
@@ -92,7 +96,14 @@ public static void main(String[] args) {
                         printVersion();
                         Environment.terminate(0);
                     }
-                    case UPDATE_FLAG, UPDATE_FLAG_SHORT -> checkAndUpdateDrifty(false);
+                    case UPDATE_FLAG, UPDATE_FLAG_SHORT -> {
+                        if (Utility.isOffline()) {
+                            messageBroker.msgUpdateError("Failed to check for updates! You are not connected to the internet.");
+                            Environment.terminate(1);
+                        } else {
+                            checkAndUpdateDrifty(false);
+                        }
+                    }
                     case EARLY_ACCESS_FLAG, EARLY_ACCESS_FLAG_SHORT -> {
                         AppSettings.SET.earlyAccess(!AppSettings.GET.earlyAccess());
                         messageBroker.msgInitInfo("Early access mode " + (AppSettings.GET.earlyAccess() ? "enabled!" : "disabled!"));
diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index e900e9650..7708c040e 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -57,7 +57,7 @@ public static void initializeEnvironment() {
         CopyExecutables copyExecutables = new CopyExecutables(new String[]{ytDlpExecName, ffmpegExecName});
         try {
             copyExecutables.start();
-            if (!isYtDLPUpdated()) {
+            if (!isYtDLPUpdated() && !Utility.isOffline()) {
                 checkAndUpdateYtDlp();
             }
         } catch (IOException e) {
@@ -117,13 +117,21 @@ public static boolean isYtDLPUpdated() {
 
     public static boolean hasAdminPrivileges() {
         try {
+            msgBroker.msgLogInfo("Determining current executable folder path...");
             Path currentExecutableFolderPath = Paths.get(Utility.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent();
+            msgBroker.msgLogInfo("Current executable folder path: " + currentExecutableFolderPath);
+
             Path adminTestFilePath = currentExecutableFolderPath.resolve("adminTestFile.txt");
+            msgBroker.msgLogInfo("Creating test file at: " + adminTestFilePath);
             Files.createFile(adminTestFilePath);
+
+            msgBroker.msgLogInfo("Deleting test file at: " + adminTestFilePath);
             Files.deleteIfExists(adminTestFilePath);
+
+            msgBroker.msgLogInfo("Admin privileges confirmed.");
             return true;
         } catch (URISyntaxException e) {
-            msgBroker.msgInitError("Failed to get the current executable folder! " + e.getMessage());
+            msgBroker.msgInitError("Failed to get the current executable path! " + e.getMessage());
             return false;
         } catch (AccessDeniedException e) {
             msgBroker.msgInitError("You are not running Drifty as an administrator! " + e.getMessage());
diff --git a/Core/src/main/java/updater/UpdateChecker.java b/Core/src/main/java/updater/UpdateChecker.java
index 28ea6c318..ac159fe28 100644
--- a/Core/src/main/java/updater/UpdateChecker.java
+++ b/Core/src/main/java/updater/UpdateChecker.java
@@ -19,6 +19,10 @@ public class UpdateChecker {
     private static final MessageBroker M = Environment.getMessageBroker();
 
     public static boolean isUpdateAvailable() {
+        if (Utility.isOffline()) {
+            M.msgInitError("Failed to check for updates! You are not connected to the internet.");
+            return false;
+        }
         String latestVersion;
         if (AppSettings.GET.earlyAccess()) {
             latestVersion = getLatestPreReleaseVersion();
diff --git a/Core/src/main/java/updater/UpdateExecutor.java b/Core/src/main/java/updater/UpdateExecutor.java
index 8beb92e94..283c26c6c 100644
--- a/Core/src/main/java/updater/UpdateExecutor.java
+++ b/Core/src/main/java/updater/UpdateExecutor.java
@@ -24,36 +24,38 @@ protected UpdateExecutor(File currentExecutableFile, File latestExecutableFile)
     }
 
     protected boolean setLatestExecutablePermissions() {
-        boolean isExecutablePermissionGranted = latestExecutableFile.setExecutable(true);
-        if (!isExecutablePermissionGranted) {
-            M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
-            return false;
-        }
-        boolean isWritePermissionGranted = latestExecutableFile.setWritable(true);
-        if (!isWritePermissionGranted) {
-            M.msgUpdateError("Failed to set write permission for the latest version of Drifty!");
-            return false;
-        }
-        boolean isReadPermissionGranted = latestExecutableFile.setReadable(true);
-        if (!isReadPermissionGranted) {
-            M.msgUpdateError("Failed to set read permission for the latest version of Drifty!");
-            return false;
+        return setPermission("executable") && setPermission("writeable") && setPermission("readable");
+    }
+
+    private boolean setPermission(String permissionType) {
+        boolean granted = switch (permissionType) {
+            case "executable" -> latestExecutableFile.setExecutable(true);
+            case "writeable" -> latestExecutableFile.setWritable(true);
+            case "readable" -> latestExecutableFile.setReadable(true);
+            default -> false;
+        };
+        if (!granted) {
+            M.msgUpdateError("Failed to set " + permissionType + " permission for the latest version of Drifty!");
         }
-        return true;
+        return granted;
     }
 
-    protected void cleanup() {
+    protected void cleanup(boolean deleteImmediately) {
         try {
-            if (OS.isWindows()) {
-                oldExecutableFile.deleteOnExit();
-            } else {
+            if (deleteImmediately || !OS.isWindows()) {
                 Files.deleteIfExists(oldExecutableFile.toPath());
+            } else {
+                oldExecutableFile.deleteOnExit();
+            }
+            if (!deleteImmediately) {
+                Environment.terminate(0);
             }
-            Environment.terminate(0);
         } catch (IOException e) {
-            M.msgUpdateError("Failed to delete the old version of Drifty!");
+            M.msgUpdateError("Failed to delete the old version of Drifty!\n" + e.getMessage());
         } finally {
-            AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
+            if (!deleteImmediately) {
+                AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
+            }
         }
     }
 
@@ -72,5 +74,14 @@ protected boolean replaceCurrentExecutable() {
         return true;
     }
 
+    protected boolean renameCurrentExecutable() {
+        boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(oldExecutableFile);
+        if (!isCurrentExecutableRenamed) {
+            M.msgUpdateError("Failed to rename the current executable!");
+            return false;
+        }
+        return true;
+    }
+
     protected abstract boolean execute();
 }
diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 2de779fc4..5087eb9ed 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -63,6 +63,22 @@ public static boolean isExtractableLink(String link) {
         return isYoutube(link) || isInstagram(link) || isSpotify(link);
     }
 
+    public static boolean isOffline() {
+        try {
+            URL projectWebsite = URI.create(DRIFTY_WEBSITE_URL).toURL();
+            HttpURLConnection connectProjectWebsite = (HttpURLConnection) projectWebsite.openConnection();
+            connectProjectWebsite.connect();
+            return false;
+        } catch (UnknownHostException e) {
+            return true;
+        } catch (MalformedURLException e) {
+            msgBroker.msgLinkError("The link is not correctly formatted! " + e.getMessage());
+        } catch (IOException e) {
+            msgBroker.msgLinkError("Failed to connect to the project website! " + e.getMessage());
+        }
+        return true;
+    }
+
     public static boolean isLinkValid(String link) {
         try {
             URL url = URI.create(link).toURL();
@@ -74,17 +90,10 @@ public static boolean isLinkValid(String link) {
         } catch (ConnectException e) {
             msgBroker.msgLinkError("Connection to the link timed out! Please check your internet connection. " + e.getMessage());
         } catch (UnknownHostException unknownHost) {
-            try {
-                URL projectWebsite = URI.create(DRIFTY_WEBSITE_URL).toURL();
-                HttpURLConnection connectProjectWebsite = (HttpURLConnection) projectWebsite.openConnection();
-                connectProjectWebsite.connect();
-                msgBroker.msgLinkError(INVALID_LINK); // If our project website can be connected to, then the one entered by user is not valid! [NOTE: UnknownHostException is thrown if either internet is not connected or the website address is incorrect]
-            } catch (UnknownHostException e) {
+            if (isOffline()) {
                 msgBroker.msgLinkError("You are not connected to the Internet!");
-            } catch (MalformedURLException e) {
-                msgBroker.msgLinkError("The link is not correctly formatted! " + e.getMessage());
-            } catch (IOException e) {
-                msgBroker.msgLinkError("Failed to connect to the project website! " + e.getMessage());
+            } else {
+                msgBroker.msgLinkError(INVALID_LINK);
             }
         } catch (ProtocolException e) {
             msgBroker.msgLinkError("An error occurred with the protocol! " + e.getMessage());
@@ -93,7 +102,7 @@ public static boolean isLinkValid(String link) {
         } catch (IOException e) {
             msgBroker.msgLinkError("Failed to connect to " + link + " ! " + e.getMessage());
         } catch (IllegalArgumentException e) {
-            msgBroker.msgLinkError(link + " is not a URL; error: " + e.getMessage());
+            msgBroker.msgLinkError(link + " is not a URL; Error: " + e.getMessage());
         }
         return false;
     }
@@ -787,7 +796,7 @@ public static Runnable setSpotifyAccessToken() {
                 JsonObject jsonObject = JsonParser.parseString(responseContent.toString()).getAsJsonObject();
                 AppSettings.SET.spotifyAccessToken(jsonObject.get("access_token").getAsString());
             } catch (UnknownHostException e) {
-                msgBroker.msgInitError("You are not connected to the Internet!");
+                msgBroker.msgLogError("You are not connected to the Internet!");
                 ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
                 executor.schedule(setSpotifyAccessToken(), 5, TimeUnit.SECONDS); // retry after 5 seconds
             } catch (IOException e) {
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
index e212346ae..77bb677ca 100644
--- a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -8,7 +8,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
 
 public class GUIUpdateExecutor extends updater.UpdateExecutor {
 
@@ -26,37 +25,34 @@ public boolean execute() {
             return false;
         }
         if (OS.isMac()) {
-            ProcResult executionResult = new ProcBuilder("open").withArgs(latestExecutableFile.getAbsolutePath()).withNoTimeout().ignoreExitStatus().run();
-            if (executionResult.getExitValue() != 0) {
-                M.msgUpdateError("Failed to open the installer for the latest version of Drifty!");
-                return false;
-            } else {
-                AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
-                Environment.terminate(0);
-            }
+            return executeMacUpdate();
         } else {
             ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
-            try {
-                Files.deleteIfExists(oldExecutableFile.toPath());
-            } catch (IOException e) {
-                M.msgUpdateError("Failed to delete the old version of Drifty!");
-            }
-            boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(oldExecutableFile);
-            if (!isCurrentExecutableRenamed) {
-                M.msgUpdateError("Failed to rename the current version of Drifty!");
-                return false;
-            }
-            if (replaceCurrentExecutable()) {
-                try {
-                    runCurrentExecutable.start();
-                } catch (IOException e) {
-                    M.msgUpdateError("Failed to start the latest version of Drifty!");
+            cleanup(true); // This will delete the old executable created previously
+            if (renameCurrentExecutable()) {
+                if (replaceCurrentExecutable()) {
+                    try {
+                        runCurrentExecutable.start();
+                    } catch (IOException e) {
+                        M.msgUpdateError("Failed to start the latest version of Drifty!");
+                    }
+                    cleanup(false);
+                    return true;
                 }
-                cleanup();
-            } else {
-                return false;
             }
         }
+        return false;
+    }
+
+    private boolean executeMacUpdate() {
+        ProcResult executionResult = new ProcBuilder("open").withArgs(latestExecutableFile.getAbsolutePath()).withNoTimeout().ignoreExitStatus().run();
+        if (executionResult.getExitValue() != 0) {
+            M.msgUpdateError("Failed to open the installer for the latest version of Drifty! Error code: " + executionResult.getExitValue());
+            return false;
+        } else {
+            AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
+            Environment.terminate(0);
+        }
         return true;
     }
 }
diff --git a/GUI/src/main/java/main/Drifty_GUI.java b/GUI/src/main/java/main/Drifty_GUI.java
index f36789bc6..2bc9890a2 100644
--- a/GUI/src/main/java/main/Drifty_GUI.java
+++ b/GUI/src/main/java/main/Drifty_GUI.java
@@ -146,11 +146,16 @@ private Menu getHelpMenu() {
         securityVulnerability.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/security/advisories/new"));
         feature.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/issues/new?assignees=&labels=feature+%E2%9C%A8%2CApp+%F0%9F%92%BB&projects=&template=feature-request-application.yaml&title=%5BFEATURE%5D+"));
         checkForUpdates.setOnAction(e -> {
-            if (UpdateChecker.isUpdateAvailable()) {
-                UIController.INSTANCE.showUpdateDialog();
+            if (Utility.isOffline()) {
+                ConfirmationDialog noInternet = new ConfirmationDialog("No Internet Connection", "You are currently offline! Please check your internet connection and try again.", true, false);
+                noInternet.getResponse();
             } else {
-                ConfirmationDialog noUpdate = new ConfirmationDialog("No Updates Available", "You are already using the latest version of Drifty!", true, false);
-                noUpdate.getResponse();
+                if (UpdateChecker.isUpdateAvailable()) {
+                    UIController.INSTANCE.showUpdateDialog();
+                } else {
+                    ConfirmationDialog noUpdate = new ConfirmationDialog("No Updates Available", "You are already using the latest version of Drifty!", true, false);
+                    noUpdate.getResponse();
+                }
             }
         });
         about.setOnAction(event -> {
diff --git a/GUI/src/main/java/ui/ConfirmationDialog.java b/GUI/src/main/java/ui/ConfirmationDialog.java
index 8c1acafc4..7701058ed 100644
--- a/GUI/src/main/java/ui/ConfirmationDialog.java
+++ b/GUI/src/main/java/ui/ConfirmationDialog.java
@@ -162,14 +162,7 @@ public GetConfirmationDialogResponse getResponse() {
     private void showScene() {
         stage = Constants.getStage(windowTitle, false);
         scene = Constants.getScene(vbox);
-        if ("Dark".equals(AppSettings.GET.mainTheme())) {
-            Theme.applyTheme("Dark", scene);
-            Theme.changeButtonStyle(true, btnYes);
-            Theme.changeButtonStyle(true, btnNo);
-            Theme.changeButtonStyle(true, btnOk);
-        } else {
-            Theme.applyTheme("Light", scene);
-        }
+        Theme.applyTheme(AppSettings.GET.mainTheme(), scene);
         stage.setWidth(width);
         stage.setHeight(height);
         stage.setScene(scene);
@@ -198,4 +191,8 @@ static Scene getScene() {
     static Button getBtnYes() {
         return btnYes;
     }
+
+    static Button getBtnOk() {
+        return btnOk;
+    }
 }
diff --git a/GUI/src/main/java/ui/Theme.java b/GUI/src/main/java/ui/Theme.java
index d0dcf62f2..5212a27df 100644
--- a/GUI/src/main/java/ui/Theme.java
+++ b/GUI/src/main/java/ui/Theme.java
@@ -103,6 +103,7 @@ private static void updateButtonStyles(boolean isDark, String theme) {
         changeButtonStyle(isDark, Settings.getSelectDirectoryButton());
         changeButtonStyle(isDark, ConfirmationDialog.getBtnYes());
         changeButtonStyle(isDark, ConfirmationDialog.getBtnNo());
+        changeButtonStyle(isDark, ConfirmationDialog.getBtnOk());
         changeButtonStyle(isDark, ManageFolders.getBtnClose());
         changeButtonStyle(isDark, ManageFolders.getBtnRemove());
         setupButtonGraphics(theme);
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index 26f31594b..b2f70fea0 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -113,7 +113,7 @@ public void showUpdateDialog() {
             }
         } else {
             ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Unfortunately, you do not have the necessary permissions to update the application." + nl.repeat(2) + "Please run Drifty as an administrator to update the application.", true, false);
-            ask.getResponse().isYes();
+            ask.getResponse();
         }
     }
 

From e13a1abf60017345b12d8e097bc25e98d63e8d17 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Sat, 7 Sep 2024 11:41:12 +0530
Subject: [PATCH 35/36] fix: Fixed CoderabbitAI's reviews

---
 CLI/src/main/java/main/Drifty_CLI.java        | 97 +++++++++++--------
 Core/src/main/java/support/Constants.java     |  2 +-
 Core/src/main/java/updater/UpdateChecker.java |  2 +-
 Core/src/main/java/utils/Utility.java         |  6 +-
 GUI/src/main/java/main/Drifty_GUI.java        | 16 +--
 5 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 892d22778..c5609029e 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -54,11 +54,7 @@ public static void main(String[] args) {
         messageBroker = new MessageBroker(System.out);
         Environment.setCLIMessageBroker(messageBroker);
         utility = new Utility();
-        if (Utility.isOffline()) {
-            messageBroker.msgUpdateWarning("Failed to check for updates! You are not connected to the internet.");
-        } else {
-            checkAndUpdateDrifty(true);
-        }
+        checkAndUpdateDrifty(true);
         messageBroker.msgInitInfo("Initializing environment...");
         Environment.initializeEnvironment();
         messageBroker.msgInitInfo("Environment initialized successfully!");
@@ -319,45 +315,68 @@ public static void main(String[] args) {
     }
 
     private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
-        if (!isDriftyUpdateChecked() || !askForInstallingUpdate) { // Check for updates only once a day and only if the user wants to install the update (if available)
+        if (!isDriftyUpdateChecked() || !askForInstallingUpdate) {
             messageBroker.msgInitInfo("Checking for updates...");
-            if (UpdateChecker.isUpdateAvailable()) {
-                messageBroker.msgUpdateInfo("Update available!");
-                messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + " (" + AppSettings.GET.newDriftyVersionName() + ")");
-                if (Environment.hasAdminPrivileges()) {
-                    boolean choice = true;
-                    if (askForInstallingUpdate) {
-                        messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
-                        String choiceString = SC.nextLine().toLowerCase();
-                        choice = utility.yesNoValidation(choiceString, "Do you want to download the update? (Enter Y for yes and N for no) : ");
-                    }
-                    if (!choice) {
-                        messageBroker.msgUpdateInfo("Drifty update cancelled!");
-                    } else {
-                        messageBroker.msgUpdateInfo("Downloading update...");
-                        if (!downloadUpdate()) {
-                            messageBroker.msgUpdateError("Failed to update Drifty!");
-                            Environment.terminate(1);
-                        } else {
-                            messageBroker.msgUpdateInfo("Update successful!");
-                            messageBroker.msgUpdateInfo("Please restart Drifty to see the changes!");
-                            Environment.terminate(0);
-                        }
-                    }
-                } else {
-                    if (askForInstallingUpdate) {
-                        messageBroker.msgUpdateWarning("Drifty update requires administrator privileges!");
-                        messageBroker.msgUpdateWarning("Please run Drifty with administrator privileges to update!");
-                    } else {
-                        messageBroker.msgUpdateError("Drifty update requires administrator privileges!");
-                        messageBroker.msgUpdateError("Please run Drifty with administrator privileges to update!");
-                        Environment.terminate(1);
-                    }
+            if (Utility.isOffline()) {
+                messageBroker.msgUpdateWarning("Failed to check for updates! You are not connected to the internet.");
+                if (!askForInstallingUpdate) { // For the case when updates are checked in the background
+                    Environment.terminate(1);
                 }
+            } else if (UpdateChecker.isUpdateAvailable()) {
+                handleUpdateAvailable(askForInstallingUpdate);
             } else {
                 messageBroker.msgUpdateInfo("Drifty is up to date!");
-                Environment.terminate(0);
+                if (!askForInstallingUpdate) { // For the case when updates are checked in the background
+                    Environment.terminate(0);
+                }
+            }
+        }
+    }
+
+    private static void handleUpdateAvailable(boolean askForInstallingUpdate) {
+        messageBroker.msgUpdateInfo("Update available!");
+        messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + " (" + AppSettings.GET.newDriftyVersionName() + ")");
+        if (Environment.hasAdminPrivileges()) {
+            boolean choice = true;
+            if (askForInstallingUpdate) {
+                choice = getUserConfirmation();
             }
+            if (!choice) {
+                messageBroker.msgUpdateInfo("Drifty update cancelled!");
+            } else {
+                downloadAndUpdate();
+            }
+        } else {
+            handleAdminPrivilegesRequired(askForInstallingUpdate);
+        }
+    }
+
+    private static boolean getUserConfirmation() {
+        messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
+        String choiceString = SC.nextLine().toLowerCase();
+        return utility.yesNoValidation(choiceString, "Do you want to download the update? (Enter Y for yes and N for no) : ");
+    }
+
+    private static void downloadAndUpdate() {
+        messageBroker.msgUpdateInfo("Downloading update...");
+        if (!downloadUpdate()) {
+            messageBroker.msgUpdateError("Failed to update Drifty!");
+            Environment.terminate(1);
+        } else {
+            messageBroker.msgUpdateInfo("Update successful!");
+            messageBroker.msgUpdateInfo("Please restart Drifty to see the changes!");
+            Environment.terminate(0);
+        }
+    }
+
+    private static void handleAdminPrivilegesRequired(boolean askForInstallingUpdate) {
+        if (askForInstallingUpdate) {
+            messageBroker.msgUpdateWarning("Drifty update requires administrator privileges!");
+            messageBroker.msgUpdateWarning("Please run Drifty with administrator privileges to update!");
+        } else {
+            messageBroker.msgUpdateError("Drifty update requires administrator privileges!");
+            messageBroker.msgUpdateError("Please run Drifty with administrator privileges to update!");
+            Environment.terminate(1);
         }
     }
 
diff --git a/Core/src/main/java/support/Constants.java b/Core/src/main/java/support/Constants.java
index a92cf37c5..d62ae70ee 100644
--- a/Core/src/main/java/support/Constants.java
+++ b/Core/src/main/java/support/Constants.java
@@ -9,7 +9,7 @@
 
 public class Constants {
     public static final String APPLICATION_NAME = "Drifty";
-    public static final String VERSION_NUMBER = "v2.1.0-beta.1";
+    public static final String VERSION_NUMBER = "v1.1.0-beta.1";
     public static final String DRIFTY_WEBSITE_URL = "https://saptarshisarkar12.github.io/Drifty/";
     public static final String INVALID_LINK = "Link is invalid! Please check the link and try again.";
     public static final String FILENAME_DETECTION_ERROR = "Failed to detect the filename! A default name will be used instead.";
diff --git a/Core/src/main/java/updater/UpdateChecker.java b/Core/src/main/java/updater/UpdateChecker.java
index ac159fe28..c0cda626d 100644
--- a/Core/src/main/java/updater/UpdateChecker.java
+++ b/Core/src/main/java/updater/UpdateChecker.java
@@ -20,7 +20,7 @@ public class UpdateChecker {
 
     public static boolean isUpdateAvailable() {
         if (Utility.isOffline()) {
-            M.msgInitError("Failed to check for updates! You are not connected to the internet.");
+            M.msgLogError("Failed to check for updates! You are not connected to the internet.");
             return false;
         }
         String latestVersion;
diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index 5087eb9ed..78066a689 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -70,11 +70,11 @@ public static boolean isOffline() {
             connectProjectWebsite.connect();
             return false;
         } catch (UnknownHostException e) {
-            return true;
+            msgBroker.msgLogError("You are not connected to the Internet!");
         } catch (MalformedURLException e) {
-            msgBroker.msgLinkError("The link is not correctly formatted! " + e.getMessage());
+            msgBroker.msgLogError("The link is not correctly formatted! " + e.getMessage());
         } catch (IOException e) {
-            msgBroker.msgLinkError("Failed to connect to the project website! " + e.getMessage());
+            msgBroker.msgLogError("Failed to connect to the project website! " + e.getMessage());
         }
         return true;
     }
diff --git a/GUI/src/main/java/main/Drifty_GUI.java b/GUI/src/main/java/main/Drifty_GUI.java
index 2bc9890a2..53b9b8b9c 100644
--- a/GUI/src/main/java/main/Drifty_GUI.java
+++ b/GUI/src/main/java/main/Drifty_GUI.java
@@ -150,12 +150,7 @@ private Menu getHelpMenu() {
                 ConfirmationDialog noInternet = new ConfirmationDialog("No Internet Connection", "You are currently offline! Please check your internet connection and try again.", true, false);
                 noInternet.getResponse();
             } else {
-                if (UpdateChecker.isUpdateAvailable()) {
-                    UIController.INSTANCE.showUpdateDialog();
-                } else {
-                    ConfirmationDialog noUpdate = new ConfirmationDialog("No Updates Available", "You are already using the latest version of Drifty!", true, false);
-                    noUpdate.getResponse();
-                }
+                new Thread(this::checkForUpdates).start();
             }
         });
         about.setOnAction(event -> {
@@ -168,6 +163,15 @@ private Menu getHelpMenu() {
         return menu;
     }
 
+    private void checkForUpdates() {
+        if (UpdateChecker.isUpdateAvailable()) {
+            UIController.INSTANCE.showUpdateDialog();
+        } else {
+            ConfirmationDialog noUpdate = new ConfirmationDialog("No Updates Available", "You are already using the latest version of Drifty!", true, false);
+            noUpdate.getResponse();
+        }
+    }
+
     private Menu getEditMenu() {
         Menu menu = new Menu("Edit");
         MenuItem wipeHistory = new MenuItem("Clear Download History");

From 3f5e869350c851bc3522c1937d9ca0f83e05d895 Mon Sep 17 00:00:00 2001
From: Saptarshi Sarkar <saptarshi.programmer@gmail.com>
Date: Sat, 7 Sep 2024 11:48:07 +0530
Subject: [PATCH 36/36] chore: Removed the version number modification
 previously made solely for testing purposes

---
 Core/src/main/java/support/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/support/Constants.java b/Core/src/main/java/support/Constants.java
index d62ae70ee..a92cf37c5 100644
--- a/Core/src/main/java/support/Constants.java
+++ b/Core/src/main/java/support/Constants.java
@@ -9,7 +9,7 @@
 
 public class Constants {
     public static final String APPLICATION_NAME = "Drifty";
-    public static final String VERSION_NUMBER = "v1.1.0-beta.1";
+    public static final String VERSION_NUMBER = "v2.1.0-beta.1";
     public static final String DRIFTY_WEBSITE_URL = "https://saptarshisarkar12.github.io/Drifty/";
     public static final String INVALID_LINK = "Link is invalid! Please check the link and try again.";
     public static final String FILENAME_DETECTION_ERROR = "Failed to detect the filename! A default name will be used instead.";