From 275771bef2ecfe26390b8b6f0eb0c08ba51a8a85 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 Oct 2017 18:45:03 +0200 Subject: only count leaf tasks --- notyet | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/notyet b/notyet index 8ec739b..ce2366f 100755 --- a/notyet +++ b/notyet @@ -33,18 +33,11 @@ class Entry < Struct.new(:depth, :state, :desc, :file, :line, :children) end def count(s=nil) - n = 0 - if s.nil? || s.index(state) - n += 1 - end - - if desc =~ /^#(include|exec)\s/ || depth < 0 - n -= 1 if n > 0 + if children.empty? && (s.nil? || s.index(state)) + return 1 + else + children.map { |c| c.count(s) }.sum end - - children.each { |c| n += c.count(s) } - - n end def sort -- cgit 1.4.1