Refactored IsLikelyPrintableData.

KN4CK3R · KN4CK3R · commit f377de95a9c5 · 2019-04-25T15:41:01.000+02:00
diff --git a/ReClass.NET/Extensions/StringExtensions.cs b/ReClass.NET/Extensions/StringExtensions.cs
@@ -40,17 +40,23 @@ public static bool IsPrintableData(this IEnumerable<char> source)
 		{
 			Contract.Requires(source != null);
 
-			return IsLikelyPrintableData(source) >= 1.0f;
+			return CalculatePrintableDataThreshold(source) >= 1.0f;
 		}
 
 		[DebuggerStepThrough]
-		public static float IsLikelyPrintableData(this IEnumerable<char> source)
+		public static bool IsLikelyPrintableData(this IEnumerable<char> source)
 		{
 			Contract.Requires(source != null);
 
-			bool doCountValid = true;
-			int countValid = 0;
-			int countAll = 0;
+			return CalculatePrintableDataThreshold(source) >= 0.75f;
+		}
+
+		[DebuggerStepThrough]
+		public static float CalculatePrintableDataThreshold(this IEnumerable<char> source)
+		{
+			var doCountValid = true;
+			var countValid = 0;
+			var countAll = 0;
 
 			foreach (var c in source)
 			{
diff --git a/ReClass.NET/Memory/NodeDissector.cs b/ReClass.NET/Memory/NodeDissector.cs
@@ -45,13 +45,13 @@ public static bool GuessNode(BaseHexNode node, MemoryBuffer memory, out BaseNode
 			var data32 = memory.ReadObject<UInt32FloatData>(offset);
 
 			var raw = memory.ReadBytes(offset, node.MemorySize);
-			if (raw.InterpretAsUtf8().IsLikelyPrintableData() >= 0.75f)
+			if (raw.InterpretAsUtf8().IsLikelyPrintableData())
 			{
 				guessedNode = new Utf8TextNode();
 
 				return true;
 			}
-			if (raw.InterpretAsUtf16().IsLikelyPrintableData() >= 0.75f)
+			if (raw.InterpretAsUtf16().IsLikelyPrintableData())
 			{
 				guessedNode = new Utf16TextNode();
 
@@ -147,13 +147,13 @@ private static bool GuessPointerNode(IntPtr address, IProcessReader process, out
 
 				// Check if it is a string.
 				var data = process.ReadRemoteMemory(address, IntPtr.Size * 2);
-				if (data.Take(IntPtr.Size).InterpretAsUtf8().IsLikelyPrintableData() >= 07.5f)
+				if (data.Take(IntPtr.Size).InterpretAsUtf8().IsLikelyPrintableData())
 				{
 					node = new Utf8TextPtrNode();
 
 					return true;
 				}
-				if (data.InterpretAsUtf16().IsLikelyPrintableData() >= 0.75f)
+				if (data.InterpretAsUtf16().IsLikelyPrintableData())
 				{
 					node = new Utf16TextPtrNode();
 

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,13 @@ public static bool GuessNode(BaseHexNode node, MemoryBuffer memory, out BaseNode`
`45`	`45`	`var data32 = memory.ReadObject<UInt32FloatData>(offset);`
`46`	`46`
`47`	`47`	`var raw = memory.ReadBytes(offset, node.MemorySize);`
`48`		`- if (raw.InterpretAsUtf8().IsLikelyPrintableData() >= 0.75f)`
	`48`	`+ if (raw.InterpretAsUtf8().IsLikelyPrintableData())`
`49`	`49`	`{`
`50`	`50`	`guessedNode = new Utf8TextNode();`
`51`	`51`
`52`	`52`	`return true;`
`53`	`53`	`}`
`54`		`- if (raw.InterpretAsUtf16().IsLikelyPrintableData() >= 0.75f)`
	`54`	`+ if (raw.InterpretAsUtf16().IsLikelyPrintableData())`
`55`	`55`	`{`
`56`	`56`	`guessedNode = new Utf16TextNode();`
`57`	`57`
`@@ -147,13 +147,13 @@ private static bool GuessPointerNode(IntPtr address, IProcessReader process, out`
`147`	`147`
`148`	`148`	`// Check if it is a string.`
`149`	`149`	`var data = process.ReadRemoteMemory(address, IntPtr.Size * 2);`
`150`		`- if (data.Take(IntPtr.Size).InterpretAsUtf8().IsLikelyPrintableData() >= 07.5f)`
	`150`	`+ if (data.Take(IntPtr.Size).InterpretAsUtf8().IsLikelyPrintableData())`
`151`	`151`	`{`
`152`	`152`	`node = new Utf8TextPtrNode();`
`153`	`153`
`154`	`154`	`return true;`
`155`	`155`	`}`
`156`		`- if (data.InterpretAsUtf16().IsLikelyPrintableData() >= 0.75f)`
	`156`	`+ if (data.InterpretAsUtf16().IsLikelyPrintableData())`
`157`	`157`	`{`
`158`	`158`	`node = new Utf16TextPtrNode();`
`159`	`159`