claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Nadareski
2017-04-07 13:46:45 -07:00
parent e52b9f19a1
commit 118d7b58da
4 changed files with 78 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
SabreTools.Helper/Tools/Style.cs
View File

@@ -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>

84
SabreTools/Partials/SabreTools.Helpers.cs
View File

@@ -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
}
}

13
SabreTools/SabreTools.cs
View File

@@ -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":

1
SabreTools/SabreTools.csproj
View File

@@ -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>