From: Eric Wong <e@80x24.org>
Date: Thu, 4 May 2023 11:06:41 +0000 (+0000)
Subject: compact+xcpdb: ux: include basename(*dir) in progress
X-Git-Tag: v2.0.0~1153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=911bfe6f5beb62f20aafb05d9f3f8c40f8155310;p=thirdparty%2Fpublic-inbox.git

compact+xcpdb: ux: include basename(*dir) in progress

This is helpful if compacting multiple
inboxes/extindices/cindices sequentially from the CLI.
---

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index f3eb8e4ee..1547ce532 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -319,10 +319,11 @@ sub cpdb_retryable ($$) {
 
 sub progress_pfx ($) {
 	my ($wip) = @_; # tempdir v2: ([0-9])+-XXXX
-	my @p = split('/', $wip);
+	my @p = split(m'/', $wip);
 
-	# return "xap15/0" for v2, or "xapian15" for v1:
-	($p[-1] =~ /\A([0-9]+)/) ? "$p[-2]/$1" : $p[-1];
+	# "basename(inboxdir)/xap15/0" for v2,
+	# "basename(inboxdir)/xapian15" for v1:
+	($p[-1] =~ /\A([0-9]+)/) ? "$p[-3]/$p[-2]/$1" : "$p[-2]/$p[-1]";
 }
 
 sub kill_compact { # setup_signals callback