Skip to content

Commit

Permalink
Fixed some bugs, added a feature to CLI flags and optimized code
Browse files Browse the repository at this point in the history 
Signed-off-by: Saptarshi Sarkar <[email protected]>
  • Loading branch information
@SaptarshiSarkar12
SaptarshiSarkar12 committed Oct 28, 2022
1 parent 753fb80 commit 9bed502
Showing 1 changed file with 53 additions and 35 deletions.
88 changes: 53 additions & 35 deletions src/Drifty_CLI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class Drifty_CLI {
public static final String ANSI_PURPLE = "\u001B[35m";
private static String fName = null;
protected static boolean isYoutubeURL;
public static String versionNumber = "v1.2.2";

/**
* This function is the main method of the whole application.
Expand All @@ -36,6 +37,9 @@ public static void main(String[] args) {
name = args[i+1];
} else if (Objects.equals(args[i], "-location") || (Objects.equals(args[i], "-l"))){
location = args[i+1];
} else if (Objects.equals(args[i], "-version") || (Objects.equals(args[i], "-v"))) {
System.out.println("Drifty " + versionNumber);
System.exit(0);
}
}
if (!isURLValid(URL)) {
Expand Down Expand Up @@ -86,48 +90,30 @@ public static void main(String[] args) {
}
}
SC.nextLine();
while (true){
if (isYoutubeURL){
break;
}
if (!isYoutubeURL) {
if (fName != null) {
System.out.print("Would you like to rename this file? (Enter Y for yes and N for no) : ");
char rename_file = SC.nextLine().toLowerCase().charAt(0);
if (rename_file == 'y') {
String renameFile = SC.nextLine().toLowerCase();
boolean yesOrNo = yesNoValidation(renameFile, "Would you like to rename this file? (Enter Y for yes and N for no) : ");
if (yesOrNo) {
System.out.print("Enter the filename (with file extension) : ");
fName = SC.nextLine();
break;
} else if (rename_file =='n'){
break;
}
else {
System.out.println("Invalid input!");
logger.log("ERROR", "Invalid input");
}
} else{
} else {
System.out.print("Enter the filename (with file extension) : ");
fName = SC.nextLine();
break;
}
}
while (true) {
System.out.print("Do you want to download the file in your default downloads folder? (Enter Y for yes and N for no) : ");
char default_folder = SC.nextLine().toLowerCase().charAt(0);
if (default_folder == 'y') {
saveToDefault();
} else if (default_folder == 'n') {
enterDownloadsFolder();
} else {
System.out.println("Invalid input!");
logger.log("ERROR", "Invalid input");
continue;
}
break;
String default_folder = SC.nextLine().toLowerCase();
boolean yesOrNo = yesNoValidation(default_folder, "Do you want to download the file in your default downloads folder? (Enter Y for yes and N for no) : ");
if (yesOrNo) {
saveToDefault();
} else {
enterDownloadsFolder();
}
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")){
String quit = SC.nextLine().toLowerCase();
if(quit.equals("q")){
logger.log("INFO", "Application Terminated!");
break;
}
Expand Down Expand Up @@ -222,19 +208,51 @@ private static boolean containsFilename(String link){
return true;
}

/**
* This method performs Yes-No validation and returns the boolean value accordingly.
* @param input Input String to validate.
* @param printMsg The message to print to re-input the confirmation.
* @return true if the user enters Y [Yes] and false if not.
*/
public static boolean yesNoValidation(String input, String printMsg){
while (true) {
if (input.length() == 0) {
System.out.println("Please enter Y for yes and N for no!");
logger.log("ERROR", "Please enter Y for yes and N for no!");
} else {
break;
}
System.out.print(printMsg);
input = SC.nextLine();
}
while (true) {
char choice = input.charAt(0);
if (choice == 'y') {
return true;
} else if (choice =='n'){
return false;
}
else {
System.out.println("Invalid input!");
logger.log("ERROR", "Invalid input");
}
}
}

/**
* This function provides help about how to use the application through command line arguments.
*/
private static void help(){
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 v1.1.0"+ANSI_RESET);
System.out.println("\033[38;31;48;40;0m v1.2.2"+ANSI_RESET);
System.out.println("For more information visit: https://github.com/SaptarshiSarkar12/Drifty/");
System.out.println("\033[31;1mRequired parameter: File URL"+ANSI_RESET+" \033[3m(This must be the first argument you are passing)"+ANSI_RESET);
System.out.println("\033[33;1mOptional parameters:");
System.out.println("\033[97;1mName ShortForm Default Description"+ANSI_RESET);
System.out.println("-location -l Downloads The location on your computer where content downloaded from Drifty are placed.");
System.out.println("-name -n Source Renames file.");
System.out.println("-help -h N/A Provides concise information for Drifty CLI.\n");
System.out.println("-location -l Downloads The location on your computer where content downloaded from Drifty are placed.");
System.out.println("-name -n Source Renames file.");
System.out.println("-help -h N/A Provides concise information for Drifty CLI.\n");
System.out.println("-version -v Current Version Number Displays version number of Drifty.");
System.out.println("\033[97;1mExample:" + ANSI_RESET + " \n> \033[37;1mjava Drifty_CLI https://example.com/object.png -n obj.png -l C:/Users/example"+ ANSI_RESET );
System.out.println("\033[37;3m* Requires java 18 or higher. \n"+ANSI_RESET);
}
Expand Down

0 comments on commit 9bed502

Please sign in to comment.