Fix XSRG detection

FabricMC · Oct 11, 2023 · daf7dc0 · daf7dc0
1 parent 94546a1
commit daf7dc0
Showing 1 changed file with 36 additions and 32 deletions.
diff --git a/src/main/java/net/fabricmc/mappingio/MappingReader.java b/src/main/java/net/fabricmc/mappingio/MappingReader.java
@@ -54,47 +54,51 @@ public static MappingFormat detectFormat(Reader reader) throws IOException {
 		int pos = 0;
 		int len;
 
-		while (pos < buffer.length
-				&& (len = reader.read(buffer, pos, buffer.length - pos)) >= 0) {
-			pos += len;
-		}
+		try (BufferedReader br = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader)) {
+			br.mark(DETECT_HEADER_LEN);
 
-		if (pos < 3) return null;
-
-		switch (String.valueOf(buffer, 0, 3)) {
-		case "v1\t":
-			return MappingFormat.TINY_FILE;
-		case "tin":
-			return MappingFormat.TINY_2_FILE;
-		case "tsr": // tsrg2 <nsA> <nsB> ..<nsN>
-			return MappingFormat.TSRG_2_FILE;
-		case "CLA":
-			return MappingFormat.ENIGMA_FILE;
-		case "PK:":
-		case "CL:":
-		case "MD:":
-		case "FD:":
-			return detectSrgOrXsrg(reader);
-		}
+			while (pos < buffer.length
+					&& (len = br.read(buffer, pos, buffer.length - pos)) >= 0) {
+				pos += len;
+			}
+
+			br.reset();
+			if (pos < 3) return null;
+
+			switch (String.valueOf(buffer, 0, 3)) {
+			case "v1\t":
+				return MappingFormat.TINY_FILE;
+			case "tin":
+				return MappingFormat.TINY_2_FILE;
+			case "tsr": // tsrg2 <nsA> <nsB> ..<nsN>
+				return MappingFormat.TSRG_2_FILE;
+			case "CLA":
+				return MappingFormat.ENIGMA_FILE;
+			case "PK:":
+			case "CL:":
+			case "MD:":
+			case "FD:":
+				return detectSrgOrXsrg(br);
+			}
 
-		String headerStr = String.valueOf(buffer, 0, pos);
+			String headerStr = String.valueOf(buffer, 0, pos);
 
-		if (headerStr.contains(" -> ")) {
-			return MappingFormat.PROGUARD_FILE;
-		} else if (headerStr.contains("\n\t")) {
-			return MappingFormat.TSRG_FILE;
-		}
+			if (headerStr.contains(" -> ")) {
+				return MappingFormat.PROGUARD_FILE;
+			} else if (headerStr.contains("\n\t")) {
+				return MappingFormat.TSRG_FILE;
+			}
 
-		// TODO: CSRG
+			// TODO: CSRG
 
-		return null; // unknown format or corrupted
+			return null; // unknown format or corrupted
+		}
 	}
 
-	private static MappingFormat detectSrgOrXsrg(Reader reader) throws IOException {
-		BufferedReader br = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
+	private static MappingFormat detectSrgOrXsrg(BufferedReader reader) throws IOException {
 		String line;
 
-		while ((line = br.readLine()) != null) {
+		while ((line = reader.readLine()) != null) {
 			if (line.startsWith("FD:")) {
 				String[] parts = line.split(" ");