[SabreTools, Style] Move single method to a better location

SabreTools.Helper/Tools/Style.cs

@@ -433,6 +433,77 @@ namespace SabreTools.Helper.Tools
 			return Path.Combine(hash.Substring(0, 2), hash.Substring(2, 2), hash.Substring(4, 2), hash.Substring(6, 2), hash + ".gz");
 		}
 
+		/// <summary>
+		/// Get the multiplier to be used with the size given
+		/// </summary>
+		/// <param name="sizestring">String with possible size with extension</param>
+		/// <returns>Tuple of multiplier to use on final size and fixed size string</returns>
+		public static long GetSizeFromString(string sizestring)
+		{
+			long size = 0;
+
+			// Make sure the string is in lower case
+			sizestring = sizestring.ToLowerInvariant();
+
+			// Get any trailing size identifiers
+			long multiplier = 1;
+			if (sizestring.EndsWith("k") || sizestring.EndsWith("kb"))
+			{
+				multiplier = Constants.KiloByte;
+			}
+			else if (sizestring.EndsWith("ki") || sizestring.EndsWith("kib"))
+			{
+				multiplier = Constants.KibiByte;
+			}
+			else if (sizestring.EndsWith("m") || sizestring.EndsWith("mb"))
+			{
+				multiplier = Constants.MegaByte;
+			}
+			else if (sizestring.EndsWith("mi") || sizestring.EndsWith("mib"))
+			{
+				multiplier = Constants.MibiByte;
+			}
+			else if (sizestring.EndsWith("g") || sizestring.EndsWith("gb"))
+			{
+				multiplier = Constants.GigaByte;
+			}
+			else if (sizestring.EndsWith("gi") || sizestring.EndsWith("gib"))
+			{
+				multiplier = Constants.GibiByte;
+			}
+			else if (sizestring.EndsWith("t") || sizestring.EndsWith("tb"))
+			{
+				multiplier = Constants.TeraByte;
+			}
+			else if (sizestring.EndsWith("ti") || sizestring.EndsWith("tib"))
+			{
+				multiplier = Constants.TibiByte;
+			}
+			else if (sizestring.EndsWith("p") || sizestring.EndsWith("pb"))
+			{
+				multiplier = Constants.PetaByte;
+			}
+			else if (sizestring.EndsWith("pi") || sizestring.EndsWith("pib"))
+			{
+				multiplier = Constants.PibiByte;
+			}
+
+			// Remove any trailing identifiers
+			sizestring = sizestring.TrimEnd(new char[] { 'k', 'm', 'g', 't', 'p', 'i', 'b', ' ' });
+
+			// Now try to get the size from the string
+			if (!Int64.TryParse(sizestring, out size))
+			{
+				size = -1;
+			}
+			else
+			{
+				size *= multiplier;
+			}
+
+			return size;
+		}
+
 		/// <summary>
 		/// Get if a string contains Unicode characters
 		/// </summary>

SabreTools/Partials/SabreTools.Helpers.cs

@@ -1,84 +0,0 @@
-using System;
-
-using SabreTools.Helper.Data;
-
-namespace SabreTools
-{
-	public partial class SabreTools
-	{
-		#region Helper methods
-
-		/// <summary>
-		/// Get the multiplier to be used with the size given
-		/// </summary>
-		/// <param name="sizestring">String with possible size with extension</param>
-		/// <returns>Tuple of multiplier to use on final size and fixed size string</returns>
-		private static long GetSizeFromString(string sizestring)
-		{
-			long size = 0;
-
-			// Make sure the string is in lower case
-			sizestring = sizestring.ToLowerInvariant();
-
-			// Get any trailing size identifiers
-			long multiplier = 1;
-			if (sizestring.EndsWith("k") || sizestring.EndsWith("kb"))
-			{
-				multiplier = Constants.KiloByte;
-			}
-			else if (sizestring.EndsWith("ki") || sizestring.EndsWith("kib"))
-			{
-				multiplier = Constants.KibiByte;
-			}
-			else if (sizestring.EndsWith("m") || sizestring.EndsWith("mb"))
-			{
-				multiplier = Constants.MegaByte;
-			}
-			else if (sizestring.EndsWith("mi") || sizestring.EndsWith("mib"))
-			{
-				multiplier = Constants.MibiByte;
-			}
-			else if (sizestring.EndsWith("g") || sizestring.EndsWith("gb"))
-			{
-				multiplier = Constants.GigaByte;
-			}
-			else if (sizestring.EndsWith("gi") || sizestring.EndsWith("gib"))
-			{
-				multiplier = Constants.GibiByte;
-			}
-			else if (sizestring.EndsWith("t") || sizestring.EndsWith("tb"))
-			{
-				multiplier = Constants.TeraByte;
-			}
-			else if (sizestring.EndsWith("ti") || sizestring.EndsWith("tib"))
-			{
-				multiplier = Constants.TibiByte;
-			}
-			else if (sizestring.EndsWith("p") || sizestring.EndsWith("pb"))
-			{
-				multiplier = Constants.PetaByte;
-			}
-			else if (sizestring.EndsWith("pi") || sizestring.EndsWith("pib"))
-			{
-				multiplier = Constants.PibiByte;
-			}
-
-			// Remove any trailing identifiers
-			sizestring = sizestring.TrimEnd(new char[] { 'k', 'm', 'g', 't', 'p', 'i', 'b', ' ' });
-
-			// Now try to get the size from the string
-			if (!Int64.TryParse(sizestring, out size))
-			{
-				size = -1;
-			}
-			else
-			{
-				size *= multiplier;
-			}
-
-			return size;
-		}
-
-		#endregion
-	}
-}

SabreTools/SabreTools.cs

@@ -6,6 +6,7 @@ using SabreTools.Helper;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 using SabreTools.Helper.Help;
+using SabreTools.Helper.Tools;
 
 #if MONO
 using System.IO;
@@ -824,11 +825,11 @@ namespace SabreTools
 						break;
 					case "-seq":
 					case "--equal":
-						filter.SizeEqualTo = GetSizeFromString(args[++i]);
+						filter.SizeEqualTo = Style.GetSizeFromString(args[++i]);
 						break;
 					case "-sgt":
 					case "--greater":
-						filter.SizeGreaterThanOrEqual = GetSizeFromString(args[++i]);
+						filter.SizeGreaterThanOrEqual = Style.GetSizeFromString(args[++i]);
 						break;
 					case "-sha1":
 					case "--sha1":
@@ -848,7 +849,7 @@ namespace SabreTools
 						break;
 					case "-slt":
 					case "--less":
-						filter.SizeLessThanOrEqual = GetSizeFromString(args[++i]);
+						filter.SizeLessThanOrEqual = Style.GetSizeFromString(args[++i]);
 						break;
 					case "-t":
 					case "--temp":
@@ -1099,11 +1100,11 @@ namespace SabreTools
 									break;
 								case "-seq":
 								case "--equal":
-									filter.SizeEqualTo = GetSizeFromString(split[1]);
+									filter.SizeEqualTo = Style.GetSizeFromString(split[1]);
 									break;
 								case "-sgt":
 								case "--greater":
-									filter.SizeGreaterThanOrEqual = GetSizeFromString(split[1]);
+									filter.SizeGreaterThanOrEqual = Style.GetSizeFromString(split[1]);
 									break;
 								case "-sha1":
 								case "--sha1":
@@ -1123,7 +1124,7 @@ namespace SabreTools
 									break;
 								case "-slt":
 								case "--less":
-									filter.SizeLessThanOrEqual = GetSizeFromString(split[1]);
+									filter.SizeLessThanOrEqual = Style.GetSizeFromString(split[1]);
 									break;
 								case "-t":
 								case "--temp":

SabreTools/SabreTools.csproj

@@ -122,7 +122,6 @@
   <ItemGroup>
     <Compile Include="Partials\SabreTools.Help.cs" />
     <Compile Include="SabreTools.cs" />
-    <Compile Include="Partials\SabreTools.Helpers.cs" />
     <Compile Include="Partials\SabreTools.Inits.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>