issue-10 fixed

mamadou-diallo · Oct 6, 2020 · 685bb8a · 685bb8a
1 parent f84d593
commit 685bb8a
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 9 deletions.
diff --git a/bin/ConvertJavaToJson.class b/bin/ConvertJavaToJson.class
diff --git a/bin/UrlCheck$1.class b/bin/UrlCheck$1.class
diff --git a/bin/UrlCheck.class b/bin/UrlCheck.class
diff --git a/bin/UrlCheckForMac.class b/bin/UrlCheckForMac.class
diff --git a/bin/UrlCheckForWindow.class b/bin/UrlCheckForWindow.class
diff --git a/bin/mac/UrlCheck.jar b/bin/mac/UrlCheck.jar
diff --git a/bin/window/UrlCheck.exe b/bin/window/UrlCheck.exe
diff --git a/bin/window/UrlCheck.jar b/bin/window/UrlCheck.jar
diff --git a/src/UrlCheck.java b/src/UrlCheck.java
@@ -30,6 +30,8 @@ public class UrlCheck {
 
 	static JSONArray list = new JSONArray();
 
+	static int Bad = 0;
+
 	public static void helpMessage()
 	{
 		System.out.println("========================================================");
@@ -110,6 +112,8 @@ public static void endMessage()
 	{
 
 		System.out.println("========================================================");
+		System.out.println("End Code : " + Bad);
+		System.out.println("========================================================");
 	}
 
 
@@ -150,6 +154,10 @@ public static void fileUrlListUp(String fName, boolean archived, boolean secured
 							{
 								JSONObject temp = new JSONObject();
 								temp = ConvertJavaToJson.availableURL(str);
+								if((int)temp.get("status") < 200 || (int)temp.get("status") >= 400)
+								{
+									Bad++;
+								}
 								list.add(temp);
 							}
 							else
@@ -159,11 +167,17 @@ public static void fileUrlListUp(String fName, boolean archived, boolean secured
 
 								if(runMac)
 								{
-									UrlCheckForMac.availableURL(str);
+									if(!UrlCheckForMac.availableURL(str))
+									{
+										Bad++;
+									}
 								}
 								else
 								{
-									UrlCheckForWindow.availableURL(str);
+									if(!UrlCheckForWindow.availableURL(str))
+									{
+										Bad++;
+									}
 								}
 							}
 							// request archived

diff --git a/src/UrlCheckForMac.java b/src/UrlCheckForMac.java
@@ -12,9 +12,10 @@ public class UrlCheckForMac {
     public static final String RESET = "\033[0m"; 
 
 	// request url and check the response
-	public static void availableURL(String host)
+	public static boolean availableURL(String host)
 	{
-
+		boolean result = false;
+
 			try {
 					// request url
 					URL url = new URL(host);
@@ -31,7 +32,7 @@ public static void availableURL(String host)
 //					// for Mac
 					if(exitCode.getResponseCode() >= 200 && exitCode.getResponseCode() < 300)
 					{ 
-
+						result = true;
 						System.out.println(GREEN+"["+exitCode.getResponseCode()+"] "+ host +" - Good"+RESET);							
 
 					}
@@ -45,7 +46,7 @@ else if(exitCode.getResponseCode() == 301 || exitCode.getResponseCode() == 307 |
 
 						// redirect to new location by Recursion itself when it is 301,307,308
 						String newUrl = exitCode.getHeaderField("Location");
-						availableURL(newUrl);	
+						result = availableURL(newUrl);	
 
 					}
 					else
@@ -58,5 +59,6 @@ else if(exitCode.getResponseCode() == 301 || exitCode.getResponseCode() == 307 |
 				System.out.println(RED+"[599] "+ host +" - Fail" +RESET);
 
 			}	
+			return result;
 	}
 }
diff --git a/src/UrlCheckForWindow.java b/src/UrlCheckForWindow.java
@@ -23,8 +23,10 @@ public class UrlCheckForWindow {
 			static final int STD_OUTPUT_HANDLE = -11;
 
 			// request url and check the response
-			public static void availableURL(String host)
+			public static boolean availableURL(String host)
 			{
+				boolean result = false;
+
 				Kernel32 lib = Native.load("kernel32", Kernel32.class);
 
 					try {
@@ -43,7 +45,7 @@ public static void availableURL(String host)
 							// response code result
 							if(exitCode.getResponseCode() >= 200 && exitCode.getResponseCode() < 300)
 							{ 
-
+								result = true;
 								lib.SetConsoleTextAttribute(lib.GetStdHandle(STD_OUTPUT_HANDLE), GREEN);
 								System.out.println("["+exitCode.getResponseCode()+"] "+ host +" - Good");							
 								lib.SetConsoleTextAttribute(lib.GetStdHandle(STD_OUTPUT_HANDLE), WHITE);
@@ -62,7 +64,7 @@ else if(exitCode.getResponseCode() == 301 || exitCode.getResponseCode() == 307 |
 
 								// redirect to new location by Recursion itself when it is 301,307,308
 								String newUrl = exitCode.getHeaderField("Location");
-								availableURL(newUrl);	
+								result = availableURL(newUrl);	
 
 							}
 							else
@@ -78,5 +80,6 @@ else if(exitCode.getResponseCode() == 301 || exitCode.getResponseCode() == 307 |
 						System.out.println("[599] "+ host +" - Fail" );
 						lib.SetConsoleTextAttribute(lib.GetStdHandle(STD_OUTPUT_HANDLE), WHITE);
 					}
+					return result;
 			}
 }