knifeblock: wip, half-done template reorg

[reprap-play.git] / knifeblock-knives-filter

diff --git a/knifeblock-knives-filter b/knifeblock-knives-filter
index 0a353b2f53070f387ee587d47ac5f1f95cf17ac9..6dfce6685edce8644c464d1bce02dc3b57cfb648 100755 (executable)
--- a/knifeblock-knives-filter
+++ b/knifeblock-knives-filter
@@ -2,11 +2,14 @@
 
 use strict;
 
-our $want;
+our %want;
 
 BEGIN {
-      $want = shift @ARGV;
-      die unless $want =~ m/^\d+$/;
+      my $want = shift @ARGV;
+      my ($part,$knife) = $want =~ m/^([ha])(\d)$/ or die;
+
+      $want{ $knife+1 } = $part =~ m/[h]/;
+      $want{ $knife+4 } = $part =~ m/[ha]/;
 }
 
 our $drop;
@@ -14,7 +17,7 @@ our $drop;
 if (m/^\S/) {
     $drop = 
        m/^2 / ||
-       m/^3 \d+ \d+ \d+ (?!$want )\d+ /;
+       (m/^3 \d+ \d+ \d+ (\d+) / && !$want{$1});
 }
 
 next if $drop;