Commit Diff

Commit:
42426670caf9d7bec75f1aeee5db318d77555c85
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
amused-monitor: rewrite excerpt function instead of passing "half" of the context wanted, just take the number of lines wanted. switch to a circular buffer to store the lines instead of shelling out (badly) to grep -C.
Actions:
Patch | Tree
commit - 6576093aa0f0a23c584d95c79c03c4ea9a390aaa
commit + 42426670caf9d7bec75f1aeee5db318d77555c85
blob - ad85415cd6904a70b04dbba42db41d19b72ab64a
blob + 41b3a9e76cd417b0a75299c4179eebcfde708b1d
--- contrib/amused-monitor
+++ contrib/amused-monitor
@@ -55,33 +55,33 @@ sub max {
 
 sub excerpt {
 	my $lines = int(shift);
-	my $ctx = $lines * 2 + 1;
 	my @tmp;
+	my ($n, $idx, $cur) = (0, 0, -1);
 
-	open (my $fh, "-|", "amused show -p | grep -C$ctx '^>'");
-	my $x = 0;
-	my $cur = 0;
+	open (my $fh, "-|", "amused", "show", "-p");
 	while (<$fh>) {
 		chomp;
 		s,$trim,,;
-		push @tmp, $_;
-		$cur = $x if m/^>/;
-		$x++;
+		$tmp[$idx] = $_;
+		$cur = $n if m/^>/;
+		$n++;
+		$idx = ++$idx % $lines;
+
+		last if $cur != -1 && $n - $cur > $lines/2 &&
+		    $#tmp == $lines-1;
 	}
 	close($fh);
 
-	my $from;
-	if ($cur - $lines < 0) {
-		$from = max($cur - $lines, 0);
-	} elsif ($cur + $lines >= $#tmp) {
-		$from = max($#tmp - $lines * 2 - 1, 0);
-	} else {
-		$from = $cur - $lines;
-	}
+	return ("Empty playlist.") unless @tmp;
 
-	my $len = min($lines * 2 + 1, $#tmp);
-	my @x = splice @tmp, $from, $len + 1;
-	return @x;
+	# reorder the entries
+	my @r;
+	my $len = $#tmp + 1;
+	for (1..$len) {
+		push @r, $tmp[$idx];
+		$idx = ++$idx % $len;
+	}
+	return @r;
 }
 
 sub playlist_numbers {
@@ -221,7 +221,7 @@ sub render {
 
 sub getsongs {
 	$last_lines = $LINES;
-	@songs = excerpt($LINES / 2 - 3);
+	@songs = excerpt $LINES - 4;
 }
 
 sub getnums {