* [PATCH 5/5] www_coderepo: allow searching one extindex|inbox
2022-10-08 8:24 7% [PATCH 0/5] www: some coderepo stuff Eric Wong
@ 2022-10-08 8:24 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-10-08 8:24 UTC (permalink / raw)
To: meta
I'm not sure how to best make a UI for one coderepo to many
inboxes/extindices, yet; but at least allow a simple 1:1
mapping, for now. This ensures /$CODEREPO/$OID/s/ can work
as effectively as /$INBOX/$OID/s/ when looking for emails
associated with a git commit.
---
lib/PublicInbox/Config.pm | 5 +++++
lib/PublicInbox/Inbox.pm | 3 ++-
lib/PublicInbox/ViewVCS.pm | 31 +++++++++++++++++++++++++++----
lib/PublicInbox/WwwCoderepo.pm | 14 ++++++++++++++
4 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index a430cd5c..c27928de 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -404,6 +404,11 @@ sub repo_objs {
push @repo_objs, $repo if $repo;
}
if (scalar @repo_objs) {
+ require Scalar::Util;
+ for (@repo_objs) {
+ push @{$_->{-ibxs}}, $ibxish;
+ Scalar::Util::weaken($_->{-ibxs}->[-1]);
+ }
$ibxish->{-repo_objs} = \@repo_objs;
} else {
delete $ibxish->{coderepo};
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 3532bb58..cb98d2ad 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -205,7 +205,8 @@ sub base_url {
$url .= '/' if $url !~ m!/\z!;
return $url .= $self->{name} . '/';
}
- # called from a non-PSGI environment (e.g. NNTP/POP3):
+ # called from a non-PSGI environment or cross-inbox environment
+ # where multiple inboxes can have different domains
my $url = $self->{url} // return undef;
$url = $url->[0] // return undef;
# expand protocol-relative URLs to HTTPS if we're
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 6ada03e6..72b79ab7 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -25,7 +25,7 @@ use PublicInbox::ViewDiff qw(flush_diff uri_escape_path);
use PublicInbox::View;
use PublicInbox::Eml;
use Text::Wrap qw(wrap);
-use PublicInbox::Hval qw(ascii_html to_filename);
+use PublicInbox::Hval qw(ascii_html to_filename prurl);
my $hl = eval {
require PublicInbox::HlMod;
PublicInbox::HlMod->new;
@@ -152,6 +152,25 @@ sub show_commit_start { # ->psgi_qx callback
}
}
+sub ibx_url_for {
+ my ($ctx) = @_;
+ $ctx->{ibx} and return; # just fall back to $upfx
+ $ctx->{git} or return; # /$CODEREPO/$OID/s/ to (eidx|ibx)
+ if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) {
+ $ALL->base_url // $ALL->base_url($ctx->{env});
+ } elsif (my $ibxs = $ctx->{git}->{-ibxs}) {
+ for my $ibx (@$ibxs) {
+ if ($ibx->isrch) {
+ return defined($ibx->{url}) ?
+ prurl($ctx->{env}, $ibx->{url}) :
+ "../../../$ibx->{name}/";
+ }
+ }
+ } else {
+ undef;
+ }
+}
+
sub cmt_finalize {
my ($ctx) = @_;
$ctx->{-linkify} //= PublicInbox::Linkify->new;
@@ -227,12 +246,16 @@ EOM
$q = wrap('', '', $q);
my $rows = ($q =~ tr/\n/\n/) + 1;
$q = ascii_html($q);
+ my $ibx_url = ibx_url_for($ctx);
+ my $alt = $ibx_url ? ' '.ascii_html($ibx_url) : '';
+ $ibx_url = ascii_html($ibx_url) if defined $ibx_url;
+ $ibx_url //= $upfx;
print $zfh <<EOM;
-<hr><form action=$upfx
+<hr><form action="$ibx_url"
id=related><pre>find related emails, including ancestors/descendants/conflicts
<textarea name=q cols=${\PublicInbox::View::COLS} rows=$rows>$q</textarea>
-<input type=submit value=search
-/>\t(<a href=${upfx}_/text/help/>help</a>)</pre></form>
+<input type=submit value="search$alt"
+/>\t(<a href="${ibx_url}_/text/help/">help</a>)</pre></form>
EOM
}
}
diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 2184e89d..99df39ef 100644
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -35,6 +35,20 @@ sub prepare_coderepos {
$k = substr($k, length('coderepo.'), -length('.dir'));
$code_repos->{$k} //= $pi_cfg->fill_code_repo($k);
}
+
+ # associate inboxes and extindices with coderepos for search:
+ for my $k (grep(/\Apublicinbox\.(?:.+)\.coderepo\z/, keys %$pi_cfg)) {
+ $k = substr($k, length('publicinbox.'), -length('.coderepo'));
+ my $ibx = $pi_cfg->lookup_name($k) // next;
+ $pi_cfg->repo_objs($ibx);
+ push @{$self->{-strong}}, $ibx; # strengthen {-ibxs} weakref
+ }
+ for my $k (grep(/\Aextindex\.(?:.+)\.coderepo\z/, keys %$pi_cfg)) {
+ $k = substr($k, length('extindex.'), -length('.coderepo'));
+ my $eidx = $pi_cfg->lookup_ei($k) // next;
+ $pi_cfg->repo_objs($eidx);
+ push @{$self->{-strong}}, $eidx; # strengthen {-ibxs} weakref
+ }
while (my ($nick, $repo) = each %$code_repos) {
$self->{"\0$nick"} = $repo;
}
^ permalink raw reply related [relevance 6%]
* [PATCH 0/5] www: some coderepo stuff
@ 2022-10-08 8:24 7% Eric Wong
2022-10-08 8:24 6% ` [PATCH 5/5] www_coderepo: allow searching one extindex|inbox Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2022-10-08 8:24 UTC (permalink / raw)
To: meta
5/5 is clearly incomplete, but it's nicer than broken
links before in $CODEREPO/$OID/s/ endpoints.
Deployed to https://yhbt.net/lore/git.git/<COMMIT_OID>/s/#related
Eric Wong (5):
config: remove {-cgitrc_unparsed} field
www_coderepo: wire up snapshots from summary
www_coderepo: update blurb on the goal/purpose of this
www: cgit: fix fallback to WwwCoderepo on array responses
www_coderepo: allow searching one extindex|inbox
Documentation/public-inbox-config.pod | 4 +++
lib/PublicInbox/Config.pm | 9 ++++-
lib/PublicInbox/GitHTTPBackend.pm | 6 +++-
lib/PublicInbox/Inbox.pm | 3 +-
lib/PublicInbox/RepoSnapshot.pm | 4 ++-
lib/PublicInbox/ViewVCS.pm | 31 ++++++++++++++---
lib/PublicInbox/WwwCoderepo.pm | 50 +++++++++++++++++++++++----
t/solver_git.t | 6 ++++
8 files changed, 99 insertions(+), 14 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-10-08 8:24 7% [PATCH 0/5] www: some coderepo stuff Eric Wong
2022-10-08 8:24 6% ` [PATCH 5/5] www_coderepo: allow searching one extindex|inbox Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).