Update and refactor code to work with testmenu

Author: RedTopper

README.md

@@ -44,9 +44,9 @@ merge them together. NTR and ninjahax images can exist in the same folder and wi
 independently! 
 
 ###Examples output with template
-![An example screenshot exported with a template.](./output/scr_68_MERGED.png "Screenshot")
-![An example screenshot exported with a template.](./output/scr_85_MERGED.png "Screenshot")
+![An example screenshot exported with a template.](./output/ninjahax_68.png "Screenshot")
+![An example screenshot exported with a template.](./output/ninjahax_119.png "Screenshot")
+![Using the NTR file name format.](./output/ntr_0001.png "Screenshot")
 
 ###Examples output without template
-![An example screenshot exported with this tool alone.](./output/scr_28_MERGED.png "Screenshot")
-![An example screenshot exported with this tool alone.](./output/scr_30_MERGED.png "Screenshot")
+![An example screenshot exported with this tool alone using the testmenu filename format.](./output/testmenu_20161206_0800_00000.png "Screenshot")

input/20161206_0800_LO_00000.png

@@ -3,70 +3,98 @@
 public class ImagePair {
 	String image1;
 	String image2;
-	int number;
+	String number;
+	Type type = Type.UNKNOWN;
 	boolean left = true;
-	boolean isNTR = false;
-	boolean init = false;
-	public ImagePair(String image1, String image2) throws UnmatchedException, NumberFormatException{
+	
+	enum Type {
+		UNKNOWN,
+		NINJAHAX,
+		NTR, 
+		TESTMENU
+	}
+	
+	public ImagePair(String image1, String image2) throws UnmatchedException, IndexOutOfBoundsException{
 		if(image1 == null || image2 == null || image1.equals("null") || image2.equals("null")) {
 			System.out.println("Trying to trick me with null images?!");
 			throw new UnmatchedException();
 		}
-		if(image1.substring(0,4).equals("scr_") && image2.substring(0,4).equals("scr_")) {
-			//We are now in Ninjahax Mode.
-			if (image1.substring(0,image1.indexOf("_", 4)).equals(image2.substring(0,image2.indexOf("_", 4))) &&
-			   !image1.substring(image1.indexOf("_",4)).equals(image2.substring(image2.indexOf("_",4)))){
+		
+		//Check if NINJAHAX
+		String img1pre, img2pre;
+		img1pre = image1.substring(0,4);
+		img2pre = image2.substring(0,4);
+		if(img1pre.equals("scr_") && img2pre.equals("scr_")) { //NINJAHAX universal prefix
+			if (image1.substring(0,image1.indexOf("_", 4)).equals(image2.substring(0,image2.indexOf("_", 4))) && //Check if number matches
+			   !image1.substring(image1.indexOf("_",4)).equals(image2.substring(image2.indexOf("_",4)))){ //And that types are different
 				this.image1 = image1;
 				this.image2 = image2;
-				try{
-					number = Integer.parseInt(image1.substring(image1.indexOf("_") + 1,image1.indexOf("_", 4)));
-				} catch (NumberFormatException e) {
-					throw e;
-				}
-				if(image1.contains("RIGHT") || image2.contains("RIGHT")) {
-					left = false;
-				}
-				init = true; //nice.
+				this.number = image1.substring(image1.indexOf("_") + 1,image1.indexOf("_", 4));
+				this.left = image1.contains("LEFT") || image2.contains("LEFT");
+				if(this.left && image1.contains("RIGHT") || image2.contains("RIGHT")) throw new UnmatchedException(); //Other image cannot be right if one is left!
+				this.type = Type.NINJAHAX;
+				return;
 			} 
-		} else if
+		} 
 
-				//Find NTR in English first
-				(((image1.substring(0,3).equals("top") || image1.substring(0,3).equals("bot")) && 
-				(image2.substring(0,3).equals("top") || image2.substring(0,3).equals("bot"))) ||
-				
-				//Or spanish I guess?
-				((image1.substring(0,3).equals("sup") || image1.substring(0,3).equals("inf")) && 
-				(image2.substring(0,3).equals("sup") || image2.substring(0,3).equals("inf")))) 
-			
-		{ //extra check for ntr since I don't want it matching ninjahax ones.
-			if (image1.substring(4,8)
-					.equals(image2.substring(4,8)) &&
-			   !image1.substring(0,image1.indexOf("_"))
-					.equals(image2.substring(0,image2.indexOf("_")))) {
-				this.isNTR = true;
+		//Check if NTR
+		img1pre = image1.substring(0,3);
+		img2pre = image2.substring(0,3);
+		if (((img1pre.equals("top") || img1pre.equals("bot")) && (img2pre.equals("top") || img2pre.equals("bot"))) || //NTR English prefix
+			((img1pre.equals("sup") || img1pre.equals("inf")) && (img2pre.equals("sup") || img2pre.equals("inf"))) ) { //NTR Spanish prefix
+			if (image1.substring(4,8).equals(image2.substring(4,8)) && //Check if number matches
+			   !image1.substring(0,image1.indexOf("_")).equals(image2.substring(0,image2.indexOf("_")))) {
 				this.image1 = image1;
 				this.image2 = image2;
-				try{
-					number = Integer.parseInt(image1.substring(4,8));
-				} catch (NumberFormatException e) {
-					throw e;
-				}
-				init = true; //nice.
+				this.number = image1.substring(4,8);
+				this.type = Type.NTR;
+				return;
 			}
-		} else {
-			throw new UnmatchedException();
 		} 
+		
+		//check if TESTMENU
+		String date1 = image1.substring(0, 8); //The date part (first 8 letters)
+		String date2 = image2.substring(0, 8);
+		String time1 = image1.substring(9, 13); //The time part (After first _, 4 letters)
+		String time2 = image2.substring(9, 13);
+		String number1 = image1.substring(17, 22); //The number part (After _UL_, _UR_, or _LO_, 5 letters)
+		String number2 = image2.substring(17, 22);
+		
+		//If any of this fails, an exception will be thrown.
+		Integer.parseInt(date1);
+		Integer.parseInt(date2);
+		Integer.parseInt(time1);
+		Integer.parseInt(time2);
+		Integer.parseInt(number1);
+		Integer.parseInt(number2);
+		if(date1.equals(date2) && time1.equals(time2) && number1.equals(number2)) {
+			if(!image1.substring(13, 17).equals(image2.substring(13, 17))) {
+				this.image1 = image1;
+				this.image2 = image2;
+				this.number = date1 + "_" + time1 + "_" + number1;
+				this.left = image1.contains("UL") || image2.contains("UL");
+				if(this.left && image1.contains("UR") || image2.contains("UR")) throw new UnmatchedException();
+				this.type = Type.TESTMENU;
+				return;
+			}
+		}
+		
+		throw new UnmatchedException();
 	}
 
 	public String toString() {
-		return (isNTR ? "NTR image," : "Ninjahax image,") + " First: " + image1 + ", Second: " + image2 + ", Number: " + number;
+		return type.toString() + " image, First: " + image1 + ", Second: " + image2 + ", Number: " + number;
+	}
+	
+	public String getName() {
+		return type.toString().toLowerCase() + "_" + number + (left ? "" : "_RIGHT") + ".png";
 	}
 
 	public boolean equals(ImagePair pair2) {
-		return this.number == pair2.getNumber() && this.left == pair2.isLeft() && this.isNTR == pair2.isNTR();
+		return this.number.equals(pair2.getNumber()) && this.left == pair2.isLeft() && this.type.equals(pair2.getType());
 	}
 
-	public int getNumber() {
+	public String getNumber() {
 		return number;
 	}
 
@@ -82,11 +110,7 @@ public boolean isLeft() {
 		return left;
 	}
 
-	public boolean isNTR() {
-		return isNTR;
-	}
-	
-	public boolean isReal() {
-		return init; //not quite sure how one can get through without being real but...
+	public Type getType() {
+		return type;
 	}
 }