Skip to content

Feature/cleanup regex selector #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jimmacle merged 3 commits into from
Apr 12, 2018
Merged

Feature/cleanup regex selector #28

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
317ee07
Add regex selector 'matches' to cleanup commands.
Dec 3, 2017
11799e6
Remove try catch block to increase log verbosity (commands are enclos…
Dec 3, 2017
d3d2987
Rename 'matches' selector to 'name'
Dec 13, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Essentials/Commands/CleanupModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Sandbox.Game.Entities;
using Sandbox.Game.World;
using Torch.Commands;
using NLog;
using VRage.Game.Entity;

namespace Essentials.Commands
{
Expand Down Expand Up @@ -75,6 +77,9 @@ private IEnumerable<MyCubeGrid> ScanConditions(IReadOnlyList<string> args)
case "ownedby":
conditions.Add(g => OwnedBy(g, parameter));
break;
case "name":
conditions.Add(g => NameMatches(g, parameter));
break;
default:
Context.Respond($"Unknown argument '{arg}'");
yield break;
Expand All @@ -89,6 +94,12 @@ private IEnumerable<MyCubeGrid> ScanConditions(IReadOnlyList<string> args)
}
}

private bool NameMatches(MyCubeGrid grid, string str)
{
var regex = new Regex(str);
return regex.IsMatch(grid.DisplayName ?? "");
}

private bool BlocksLessThan(MyCubeGrid grid, string str)
{
if (int.TryParse(str, out int count))
Expand Down