Skip to content

Commit

Permalink
Add Arguments class to reduce ExpressionMatch code size.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlennox
jlennox committed May 2, 2021
1 parent 96d7466 commit d6c3faf
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 70 deletions.
65 changes: 65 additions & 0 deletions src/find2/Arguments.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
using System;
using System.IO;

namespace find2
{
internal sealed class Arguments
{
public int Index { get; set; }

private readonly string[]? _arguments;

private string? _arg;

public Arguments(string[]? arguments)
{
_arguments = arguments;
}

public string? Get()
{
_arg = Index >= _arguments!.Length ? null : _arguments[Index++];
return _arg;
}

public string GetValue()
{
if (Index >= _arguments!.Length)
{
throw new ArgumentNullException(_arg, $"Argument \"{_arg}\" requires a value.");
}

return _arguments[Index++];
}

public string GetFileValue()
{
var file = GetValue();
// TODO: Exception
if (!File.Exists(file)) throw new FileNotFoundException("");
// TODO: If the file is a symbolic link and -H/-L are specified, follow the link.
return file;
}

public int GetIntValue()
{
var value = GetValue();
if (int.TryParse(value, out var intValue)) return intValue;
throw new ArgumentOutOfRangeException(_arg, value, "Expected integral value.");
}

public int GetPositiveIntValue()
{
var value = GetIntValue();
if (value >= 0) return value;
throw new ArgumentOutOfRangeException(_arg, value, "Expected positive integral value.");
}

public int GetPositiveNonZeroIntValue()
{
var value = GetPositiveIntValue();
if (value > 0) return value;
throw new ArgumentOutOfRangeException(_arg, value, "Expected positive, non-zero, integral value.");
}
}
}
102 changes: 32 additions & 70 deletions src/find2/ExpressionMatch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,59 +110,21 @@ private static MemberExpression GetPropertyAccess<T>(string name)
return Expression.MakeMemberAccess(_parameter, GetProperty<T>(name));
}

public static FindArguments Build(params string[]? arguments)
public static FindArguments Build(params string[]? args)
{
var findArguments = new FindArguments();
var i = 0;
string? arg;

string GetArgument(string arg)
{
if (i == arguments!.Length - 1)
{
throw new ArgumentNullException(arg, $"Argument \"{arg}\" requires a value.");
}

return arguments[++i];
}

string GetArgumentFile(string arg)
{
var file = GetArgument(arg);
// TODO: Exception
if (!File.Exists(file)) throw new FileNotFoundException("");
// TODO: If the file is a symbolic link and -H/-L are specified, follow the link.
return file;
}

int GetArgumentInt(string arg)
{
var value = GetArgument(arg);
if (int.TryParse(value, out var intValue)) return intValue;
throw new ArgumentOutOfRangeException(arg, value, "Expected integral value.");
}

int GetPositiveInt(string arg)
{
var value = GetArgumentInt(arg);
if (value >= 0) return value;
throw new ArgumentOutOfRangeException(arg, value, "Expected positive integral value.");
}

int GetPositiveNonZeroInt(string arg)
{
var value = GetPositiveInt(arg);
if (value > 0) return value;
throw new ArgumentOutOfRangeException(arg, value, "Expected positive, non-zero, integral value.");
}

if (arguments == null || arguments.Length == 0)
if (args == null || args.Length == 0)
{
return findArguments;
}

for (var completed = false; i < arguments.Length && !completed; ++i)
var arguments = new Arguments(args);
var completed = false;

while (!completed && (arg = arguments.Get()) != null)
{
var arg = arguments[i];
if (string.IsNullOrWhiteSpace(arg)) continue;

switch (arg)
Expand All @@ -177,7 +139,7 @@ int GetPositiveNonZeroInt(string arg)
findArguments.FollowSymbolicLinkBehavior = FollowSymbolicLinkBehavior.WhenArgument;
break;
case "-D":
var debugOptions = GetArgument(arg).Split(',');
var debugOptions = arguments.GetValue().Split(',');
foreach (var debugOption in debugOptions)
{
if (!_debugOptionLookup.TryGetValue(debugOption, out var option))
Expand All @@ -189,7 +151,7 @@ int GetPositiveNonZeroInt(string arg)
}
break;
case "--engine":
var engineOption = GetArgument(arg);
var engineOption = arguments.GetValue();
if (!_engineLookup.TryGetValue(engineOption, out var engine))
{
throw new Exception($"Unsupported {arg} flag, {engineOption}");
Expand All @@ -198,37 +160,38 @@ int GetPositiveNonZeroInt(string arg)
findArguments.DirectoryEngine = engine;
break;
case "--threads":
findArguments.ThreadCount = GetPositiveNonZeroInt(arg);
findArguments.ThreadCount = arguments.GetPositiveNonZeroIntValue();
break;
case "--timeout":
findArguments.Timeout = TimeSpan.FromMilliseconds(GetPositiveNonZeroInt(arg));
findArguments.Timeout = TimeSpan.FromMilliseconds(arguments.GetPositiveNonZeroIntValue());
break;
case "-0level": findArguments.OptimizationLevel = 0; break;
case "-1level": findArguments.OptimizationLevel = 1; break;
case "-2level": findArguments.OptimizationLevel = 2; break;
case "-3level": findArguments.OptimizationLevel = 3; break;
default:
--i;
arguments.Index--;
completed = true;
break;
}
}

if (arguments.Length > i && !_matchOptions.Contains(arguments[i]))
// How we know if it's a path for argument is kind of ambiguous...
if (args.Length > arguments.Index && !_matchOptions.Contains(args[arguments.Index]))
{
findArguments.Root = arguments[i];
++i;
findArguments.Root = args[arguments.Index];
++arguments.Index;
}

if (arguments.Length <= i)
if (args.Length <= arguments.Index)
{
return findArguments;
}

// Simplify to avoid needing to handle this exceptional case.
if (arguments[i] == "(" && arguments[^1] == ")")
if (args[arguments.Index] == "(" && args[^1] == ")")
{
arguments = arguments.Skip(1).Take(arguments.Length - 2).ToArray();
arguments = new Arguments(args.Skip(1).Take(args.Length - 2).ToArray());
}

Func<Expression, Expression>? wrappingExpression = null;
Expand Down Expand Up @@ -257,9 +220,8 @@ void AddExpression(Expression newExpression)
expression = binaryOp(expression, newExpression);
}

for (; i < arguments.Length; ++i)
while ((arg = arguments.Get()) != null)
{
var arg = arguments[i];
if (string.IsNullOrWhiteSpace(arg)) continue;

switch (arg)
Expand All @@ -283,16 +245,16 @@ void AddExpression(Expression newExpression)
}
break;
case "-name":
AddExpression(NameBlob(GetArgument(arg), false, out _));
AddExpression(NameBlob(arguments.GetValue(), false, out _));
break;
case "-iname":
AddExpression(NameBlob(GetArgument(arg), true, out _));
AddExpression(NameBlob(arguments.GetValue(), true, out _));
break;
case "-regex":
AddExpression(NameRegex(GetArgument(arg), false));
AddExpression(NameRegex(arguments.GetValue(), false));
break;
case "-iregex":
AddExpression(NameRegex(GetArgument(arg), true));
AddExpression(NameRegex(arguments.GetValue(), true));
break;
case "-true":
AddExpression(Expression.Constant(true));
Expand All @@ -313,7 +275,7 @@ void AddExpression(Expression newExpression)
binaryExpression = Expression.AndAlso;
break;
case "-type":
var typeArgs = GetArgument(arg);
var typeArgs = arguments.GetValue();
foreach (var typeArg in typeArgs.Split(','))
{
switch (typeArg)
Expand All @@ -338,34 +300,34 @@ void AddExpression(Expression newExpression)

break;
case "-size":
AddExpression(MatchSize(new FindFileSize(GetArgument(arg))));
AddExpression(MatchSize(new FindFileSize(arguments.GetValue())));
break;
case "-maxdepth":
// TODO: Technically -maxdepth and -mindepth need to come before all other parameters, and when
// inside the usual flow, should exception.
findArguments.MaxDepth = GetPositiveInt(arg);
findArguments.MaxDepth = arguments.GetPositiveIntValue();
break;
case "-mindepth":
findArguments.MinDepth = GetPositiveInt(arg);
findArguments.MinDepth = arguments.GetPositiveIntValue();
break;
case "-mmin":
AddExpression(LastWriteTime(
DateTime.UtcNow + TimeSpan.FromMinutes(GetArgumentInt(arg)),
DateTime.UtcNow + TimeSpan.FromMinutes(arguments.GetIntValue()),
Expression.GreaterThanOrEqual));
break;
case "-newer":
AddExpression(LastWriteTime(
File.GetLastAccessTimeUtc(GetArgumentFile(arg)),
File.GetLastAccessTimeUtc(arguments.GetFileValue()),
Expression.GreaterThanOrEqual));
break;
case "-amin":
AddExpression(LastAccessTime(
DateTime.UtcNow + TimeSpan.FromMinutes(GetArgumentInt(arg)),
DateTime.UtcNow + TimeSpan.FromMinutes(arguments.GetIntValue()),
Expression.GreaterThanOrEqual));
break;
case "-anewer":
AddExpression(LastAccessTime(
File.GetLastAccessTimeUtc(GetArgumentFile(arg)),
File.GetLastAccessTimeUtc(arguments.GetFileValue()),
Expression.GreaterThanOrEqual));
break;
default:
Expand Down

0 comments on commit d6c3faf

Please sign in to comment.