Encode to UTF-8 as soon it is not US-ASCII (instead of CP437 before)

optyfr · May 5, 2019 · 00f9d36 · 00f9d36
1 parent e5a3c9d
commit 00f9d36
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/dist/ver.properties b/dist/ver.properties
@@ -1,2 +1,2 @@
-Specification-Version=1.1
-Implementation-Version=b6
+Specification-Version=1.2
+Implementation-Version=b7
diff --git a/src/JTrrntzip/SupportedFiles/ZipFile/ZipFile.java b/src/JTrrntzip/SupportedFiles/ZipFile/ZipFile.java
@@ -5,6 +5,8 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
@@ -127,13 +129,13 @@ public final void CenteralDirectoryWrite(EnhancedSeekableByteChannel esbc) throw
 
 			byte[] bFileName;
 
-			if (!Charset.forName("Cp437").newEncoder().canEncode(fileName)) //$NON-NLS-1$
+			if (!StandardCharsets.US_ASCII.newEncoder().canEncode(fileName)) //$NON-NLS-1$
 			{
 				_generalPurposeBitFlag |= 1 << 11;
-				bFileName = fileName.getBytes(Charset.forName("UTF8")); //$NON-NLS-1$
+				bFileName = fileName.getBytes(StandardCharsets.UTF_8); //$NON-NLS-1$
 			}
 			else
-				bFileName = fileName.getBytes(Charset.forName("Cp437")); //$NON-NLS-1$
+				bFileName = fileName.getBytes(StandardCharsets.US_ASCII); //$NON-NLS-1$
 			int fileNameLength = bFileName.length;
 
 			int versionNeededToExtract = (zip64 ? 45 : 20);
@@ -198,7 +200,7 @@ public final ZipReturn CentralDirectoryRead()
 
 				byte[] bFileName = new byte[fileNameLength];
 				esbc.get(bFileName);
-				fileName = (_generalPurposeBitFlag & (1 << 11)) == 0 ? new String(bFileName, Charset.forName("Cp437")) : new String(bFileName, Charset.forName("UTF8")); //$NON-NLS-1$ //$NON-NLS-2$
+				fileName = (_generalPurposeBitFlag & (1 << 11)) == 0 ? new String(bFileName, StandardCharsets.US_ASCII) : new String(bFileName, StandardCharsets.UTF_8); //$NON-NLS-1$ //$NON-NLS-2$
 
 				byte[] extraField = new byte[extraFieldLength];
 				esbc.get(extraField);
@@ -238,7 +240,7 @@ public final ZipReturn CentralDirectoryRead()
 
 							byte[] dst = new byte[charLen];
 							bb.get(dst);
-							fileName = new String(dst, Charset.forName("UTF8")); //$NON-NLS-1$
+							fileName = new String(dst, StandardCharsets.UTF_8); //$NON-NLS-1$
 
 							break;
 						default:
@@ -425,7 +427,7 @@ public final ZipReturn LocalFileHeaderRead()
 
 				byte[] bFileName = new byte[fileNameLength];
 				esbc.get(bFileName);
-				String tFileName = (generalPurposeBitFlagLocal & (1 << 11)) == 0 ? new String(bFileName, Charset.forName("Cp437")) : new String(bFileName, Charset.forName("UTF8")); //$NON-NLS-1$ //$NON-NLS-2$
+				String tFileName = (generalPurposeBitFlagLocal & (1 << 11)) == 0 ? new String(bFileName, StandardCharsets.US_ASCII) : new String(bFileName, StandardCharsets.UTF_8); //$NON-NLS-1$ //$NON-NLS-2$
 
 				byte[] extraField = new byte[extraFieldLength];
 				esbc.get(extraField);
@@ -469,7 +471,7 @@ public final ZipReturn LocalFileHeaderRead()
 
 							byte[] dst = new byte[charLen];
 							bb.get(dst);
-							fileName = new String(dst, Charset.forName("UTF8")); //$NON-NLS-1$
+							fileName = new String(dst, StandardCharsets.UTF_8); //$NON-NLS-1$
 
 							break;
 						default:
@@ -542,7 +544,7 @@ public final ZipReturn LocalFileHeaderReadQuick()
 				byte[] bFileName = new byte[fileNameLength];
 				esbc.get(bFileName);
 				@SuppressWarnings("unused")
-				String tFileName = (_generalPurposeBitFlag & (1 << 11)) == 0 ? new String(bFileName, Charset.forName("Cp437")) : new String(bFileName, Charset.forName("UTF8")); //$NON-NLS-1$ //$NON-NLS-2$
+				String tFileName = (_generalPurposeBitFlag & (1 << 11)) == 0 ? new String(bFileName, StandardCharsets.US_ASCII) : new String(bFileName, StandardCharsets.UTF_8); //$NON-NLS-1$ //$NON-NLS-2$
 
 				byte[] extraField = new byte[extraFieldLength];
 				esbc.get(extraField);
@@ -578,7 +580,7 @@ public final ZipReturn LocalFileHeaderReadQuick()
 
 							byte[] dst = new byte[charLen];
 							bb.get(dst);
-							fileName = new String(dst, Charset.forName("UTF8")); //$NON-NLS-1$
+							fileName = new String(dst, StandardCharsets.UTF_8); //$NON-NLS-1$
 							break;
 						default:
 							bb.position(bb.position() + blockLength);
@@ -607,13 +609,13 @@ private final void LocalFileHeaderWrite() throws IOException
 
 			byte[] bFileName;
 
-			if (!Charset.forName("Cp437").newEncoder().canEncode(fileName)) //$NON-NLS-1$
+			if (!StandardCharsets.US_ASCII.newEncoder().canEncode(fileName)) //$NON-NLS-1$
 			{
 				_generalPurposeBitFlag |= 1 << 11;
-				bFileName = fileName.getBytes(Charset.forName("UTF8")); //$NON-NLS-1$
+				bFileName = fileName.getBytes(StandardCharsets.UTF_8); //$NON-NLS-1$
 			}
 			else
-				bFileName = fileName.getBytes(Charset.forName("Cp437")); //$NON-NLS-1$
+				bFileName = fileName.getBytes(StandardCharsets.US_ASCII); //$NON-NLS-1$
 
 			int versionNeededToExtract = (zip64 ? 45 : 20);
 
@@ -1150,7 +1152,7 @@ public final void ZipFileClose() throws IOException
 
 		_centerDirSize = BigInteger.valueOf(_esbc.position() - _centerDirStart.longValue());
 
-		_fileComment = lTrrntzip ? String.format("TORRENTZIPPED-%08X", _esbc.endChecksum()).getBytes(Charset.forName("Cp437")) : new byte[0]; //$NON-NLS-1$ //$NON-NLS-2$
+		_fileComment = lTrrntzip ? String.format("TORRENTZIPPED-%08X", _esbc.endChecksum()).getBytes(StandardCharsets.US_ASCII) : new byte[0]; //$NON-NLS-1$ //$NON-NLS-2$
 		_pZipStatus = lTrrntzip ? EnumSet.of(ZipStatus.TrrntZip) : EnumSet.noneOf(ZipStatus.class);
 
 		if (_zip64)
@@ -1296,15 +1298,15 @@ public final ZipReturn ZipFileOpen(File newFilename, long timestamp, boolean rea
 			// check if the ZIP has a valid TorrentZip file comment
 			if (_fileComment.length == 22)
 			{
-				if (new String(_fileComment, Charset.forName("Cp437")).substring(0, 14).equals("TORRENTZIPPED-")) //$NON-NLS-1$ //$NON-NLS-2$
+				if (new String(_fileComment, StandardCharsets.US_ASCII).substring(0, 14).equals("TORRENTZIPPED-")) //$NON-NLS-1$ //$NON-NLS-2$
 				{
 					byte[] buffer = new byte[_centerDirSize.intValue()];
 					_esbc.position(_centerDirStart.longValue());
 					_esbc.startChecksum();
 					_esbc.get(buffer);
 					long r = _esbc.endChecksum();
 
-					String tcrc = new String(_fileComment, Charset.forName("Cp437")).substring(14, 22); //$NON-NLS-1$
+					String tcrc = new String(_fileComment, StandardCharsets.US_ASCII).substring(14, 22); //$NON-NLS-1$
 					String zcrc = String.format("%08X", r); //$NON-NLS-1$
 					if (tcrc.equalsIgnoreCase(zcrc))
 						trrntzip = true;