Merge branch 'master' into master

SaptarshiSarkar12 · Oct 18, 2022 · 754927e · 754927e
2 parents 15c8dfe + f350c86
commit 754927e
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 36 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Bug.yaml b/.github/ISSUE_TEMPLATE/Bug.yaml
@@ -45,8 +45,9 @@ body:
     id: app-ver
     attributes:
       label: Application Version
-      description: Please select the application version (Check it here - https://github.com/SaptarshiSarkar12/Drifty/releases/latest/)
+      description: Please select the application version (Check it here - https://github.com/SaptarshiSarkar12/Drifty/releases/)
       options:
+        - v1.2.0
         - v1.1.0
         - v1.0.0
     validations:
@@ -64,4 +65,4 @@ body:
       label: Additional information
       description: Add any other context about the problem here.
     validations:
-      required: false
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -22,8 +22,9 @@ body:
     id: app-ver
     attributes:
       label: Application Version
-      description: Please select the application version (Check it here - https://github.com/SaptarshiSarkar12/Drifty/releases/latest/)
+      description: Please select the application version (Check it here - https://github.com/SaptarshiSarkar12/Drifty/releases/)
       options:
+        - v1.2.0
         - v1.1.0
         - v1.0.0
     validations:
@@ -41,4 +42,4 @@ body:
       label: Additional information
       description: Add any other context about the feature here.
     validations:
-      required: false
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml
@@ -14,8 +14,9 @@ body:
     id: app-ver
     attributes:
       label: Application Version
-      description: Please select the application version (Check it here - https://github.com/SaptarshiSarkar12/Drifty/releases/latest/)
+      description: Please select the application version (Check it here - https://github.com/SaptarshiSarkar12/Drifty/releases/)
       options:
+        - v1.2.0
         - v1.1.0
         - v1.0.0
     validations:

diff --git a/.idea/artifacts/Drifty_CLI_jar.xml b/.idea/artifacts/Drifty_CLI_jar.xml
diff --git a/Drifty.xml b/Drifty.xml
@@ -9,9 +9,9 @@
   <chdir>.</chdir>
   <priority>normal</priority>
   <downloadUrl>http://java.com/download</downloadUrl>
-  <supportUrl>https://github.com/SaptarshiSarkar12/Drifty/issues/new/choose</supportUrl>
+  <supportUrl>https://github.com/SaptarshiSarkar12/Drifty/discussions/</supportUrl>
   <stayAlive>false</stayAlive>
-  <restartOnCrash>true</restartOnCrash>
+  <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>D:\Drifty\Drifty.ico</icon>
   <jre>
@@ -24,12 +24,12 @@
     <runtimeBits>64/32</runtimeBits>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.0.0</fileVersion>
-    <txtFileVersion>1.0.0.0</txtFileVersion>
+    <fileVersion>1.2.0.0</fileVersion>
+    <txtFileVersion>1.1.0.0</txtFileVersion>
     <fileDescription>Drifty is an open-source interactive File Downloader system built with java.</fileDescription>
     <copyright>Copyright © 2022 - 32 Saptarshi Sarkar</copyright>
-    <productVersion>1.1.0.0</productVersion>
-    <txtProductVersion>1.0.0.0</txtProductVersion>
+    <productVersion>1.2.0.0</productVersion>
+    <txtProductVersion>1.1.0.0</txtProductVersion>
     <productName>Drifty</productName>
     <companyName></companyName>
     <internalName>Drifty CLI</internalName>

diff --git a/Drifty_CLI.exe b/Drifty_CLI.exe
diff --git a/out/artifacts/Drifty_CLI_jar/Drifty.jar b/out/artifacts/Drifty_CLI_jar/Drifty.jar
diff --git a/out/production/Drifty/Drifty_CLI.class b/out/production/Drifty/Drifty_CLI.class
diff --git a/out/production/Drifty/FileDownloader.class b/out/production/Drifty/FileDownloader.class
diff --git a/src/Drifty_CLI.java b/src/Drifty_CLI.java
@@ -14,6 +14,7 @@ public class Drifty_CLI {
     public static final String ANSI_PURPLE = "\u001B[35m";
     private static boolean flag = false;
     private static String fName = null;
+    protected static boolean isYoutubeURL;
 
     /**
      * This function is the main method of the whole application.
@@ -29,7 +30,7 @@ public static void main(String[] args) {
             String URL = args[0];
             String name = null;
             String location = null;
-            for (int i = 0; i<args.length;i++){
+            for (int i = 0; i < args.length; i++){
                 if (Objects.equals(args[i], "-help") || Objects.equals(args[i], "-h")){
                     help();
                     System.exit(0);
@@ -39,12 +40,14 @@ public static void main(String[] args) {
                     location = args[i+1];
                 }
             }
-            if (!isURLValid(URL)){
+            if (!isURLValid(URL)) {
+                System.out.println("URL is invalid!");
+                logger.log("ERROR", "URL is invalid!");
                 System.exit(0);
             }
-            containsFile(URL);
+            isYoutubeURL = isYoutubeLink(URL);
             fName = (name==null) ? fName : name;
-            if (fName==null && !isYoutubeURL(URL)){
+            if ((fName==null || !containsFilename(URL)) && (!isYoutubeURL)) {
                 System.out.print("Enter the filename (with file extension) : ");
                 fName = SC.nextLine();
             }
@@ -60,24 +63,23 @@ public static void main(String[] args) {
                     }
                 }
             }
-            FileDownloader fDownload = new FileDownloader(URL, fName, downloadsFolder);
-            fDownload.run();
+            new FileDownloader(URL, fName, downloadsFolder).run();
             System.exit(0);
         }
         while(true) {
             fName = null;
             System.out.print("Enter the link to the file : ");
             String link = SC.next();
             while (true) {
-                if (isYoutubeURL(link)){
-                    System.out.println("YOUTUBE URL DETECTED");
+                isYoutubeURL = isYoutubeLink(link);
+                if (isYoutubeURL){
                     break;
                 }
                 if (!isURLValid(link)) {
                     System.out.println("Invalid URL. Please enter again");
                     System.out.print("Enter the link to the file : ");
                     link = SC.next();
-                } else if (!containsFile(link)) {
+                } else if (!containsFilename(link)) {
                     System.out.println("Automatic file name detection failed!");
                     logger.log("ERROR", "Automatic file name detection failed!");
                     break;
@@ -87,7 +89,7 @@ public static void main(String[] args) {
             }
             SC.nextLine();
             while (true){
-                if (isYoutubeURL(link)){
+                if (isYoutubeURL){
                     break;
                 }
                 if (fName != null) {
@@ -124,11 +126,11 @@ public static void main(String[] args) {
                 }
                 break;
             }
-            FileDownloader fDownload = new FileDownloader(link, fName, downloadsFolder);
-            fDownload.run();
+            new FileDownloader(link, fName, downloadsFolder).run();
             System.out.println("Press Q to Quit Or Press any Key to Continue");
             String quit = SC.nextLine();
             if(quit.equals("Q") || quit.equals("q")){
+                logger.log("INFO", "Application Terminated!");
                 break;
             }
             printBanner();
@@ -187,7 +189,7 @@ private static boolean isURLValid(String link){
         }
     }
 
-    public static boolean isYoutubeURL(String url) {
+    public static boolean isYoutubeLink(String url) {
         String pattern = "^(http(s)?:\\/\\/)?((w){3}.)?youtu(be|.be)?(\\.com)?\\/.+";
         return url.matches(pattern);
     }
@@ -196,8 +198,8 @@ public static boolean isYoutubeURL(String url) {
      * @param link Link to the file that the user wants to download
      * @return true if the filename is detected and false if the filename is not detected
      */
-    private static boolean containsFile(String link){
-        // Check and inform user if the url contains file.
+    private static boolean containsFilename(String link){
+        // Check and inform user if the url contains filename.
         // Example : "example.com/file.txt" prints "Filename detected: file.txt"
         // example.com/file.json -> file.json
         String file = link.substring(link.lastIndexOf("/")+1);
@@ -213,6 +215,7 @@ private static boolean containsFile(String link){
         // file.png?width=200 -> file.png
         fName = file.split("([?])")[0];
         System.out.println("Filename detected : " + fName);
+        logger.log("INFO", "Filename detected : " + fName);
         return true;
     }
 

diff --git a/src/FileDownloader.java b/src/FileDownloader.java
@@ -3,7 +3,6 @@
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.Buffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 
@@ -54,17 +53,14 @@ public void run() {
             }
         }
         try {
-            //If link is from youtube
-            if (Drifty_CLI.isYoutubeURL(link)) {
+            //If link is from YouTube
+            if (Drifty_CLI.isYoutubeLink(link)) {
                 //download youtube video
-                System.out.println("Downloading from youtube....");
-                System.out.println("Directory: " + dir);
+                System.out.println("Downloading ...");
+                Drifty_CLI.logger.log("INFO", "Downloading ...");
 
                 try {
-                    Runtime runtime = Runtime.getRuntime();
-                    ProcessBuilder processBuilder = new ProcessBuilder("yt-dlp", "-P", dir, link);
-                    processBuilder.directory(new File(dir));
-
+                    ProcessBuilder processBuilder = new ProcessBuilder("yt-dlp", "-q", "--progress", "-P", dir, link);
                     Process yt_dlp = processBuilder.start();
 
                     BufferedReader br = new BufferedReader(new InputStreamReader(yt_dlp.getInputStream()));
@@ -74,8 +70,10 @@ public void run() {
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
+                    Drifty_CLI.logger.log("ERROR", e.getMessage());
                 }
-                //System.exit(0);
+                System.out.println("Successfully downloaded the file.");
+                Drifty_CLI.logger.log("INFO", "Successfully downloaded the file");
             }
             else {
                 url = new URL(link);

diff --git a/yt-dlp.exe b/yt-dlp.exe