right resource check logic & copyright notice in --help

awidesky · Mar 9, 2023 · d3fad66 · d3fad66
1 parent 934bf2e
commit d3fad66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/com/awidesky/YoutubeClipboardAutoDownloader/Main.java b/src/com/awidesky/YoutubeClipboardAutoDownloader/Main.java
@@ -69,9 +69,11 @@ public static void main(String[] args) {
 		boolean verbose = false, datePrefix = false, logbyTask = false;
 		for (String arg : args) {
 			if ("--help".equals(arg)) {
-				System.out.println("usage : java -jar YoutubeAudioAutoDownloader " + version + ".jar [options]");
+				System.out.println("YoutubeAudioAutoDownloader " + version + "Copyright (c) 2020-2023 Eugene Hong");
 				System.out.println();
-				System.out.println("options :");
+				System.out.println("Usage : java -jar YoutubeAudioAutoDownloader " + version + ".jar [options]");
+				System.out.println();
+				System.out.println("Options :");
 				System.out.println("\t--logbyTask : Log lines from a task is gathered till the task is done/terminated.");
 				System.out.println("\t              Useful when you don't want to see dirty log file when multiple tasks running.");
 				System.out.println("\t--logTime : Every log line will printed with time");
@@ -132,10 +134,10 @@ private static void setup(String[] args) {
 		clipChecker = new ClipBoardCheckerThread();
 		clipChecker.start(); //A daemon thread that will check clipboard
 
-		gui.setLoadingStat(LoadingStatus.CHECKING_FFMPEG);
-		if (!YoutubeAudioDownloader.checkFfmpeg()) Main.kill(ExitCodes.FFMPEGNOTEXISTS);
 		gui.setLoadingStat(LoadingStatus.CHECKING_YDL);
 		if (!YoutubeAudioDownloader.checkYoutubedl()) Main.kill(ExitCodes.YOUTUBEDNOTEXISTS);
+		gui.setLoadingStat(LoadingStatus.CHECKING_FFMPEG);
+		if (!YoutubeAudioDownloader.checkFfmpeg()) Main.kill(ExitCodes.FFMPEGNOTEXISTS);
 
 		gui.setLoadingStat(LoadingStatus.READING_PROPERTIES);
 		readProperties();

diff --git a/src/com/awidesky/YoutubeClipboardAutoDownloader/enums/LoadingStatus.java b/src/com/awidesky/YoutubeClipboardAutoDownloader/enums/LoadingStatus.java
@@ -3,8 +3,8 @@
 public enum LoadingStatus {
 
 	PREPARING_THREADS("Preparing threads...", 17), 
-	CHECKING_FFMPEG("Checking ffmpeg installation...", 32), 
-	CHECKING_YDL("Checking youtube-dl installation...", 53),
+	CHECKING_YDL("Checking youtube-dl installation...", 32),
+	CHECKING_FFMPEG("Checking ffmpeg installation...", 53), 
 	READING_PROPERTIES("Reading properties...", 83), 
 	LOADING_WINDOW("Loading window components...", 100);