* [PATCH 4/5] www: improve visibility of coderepos
2021-03-17 7:02 7% [PATCH 0/5] www: extindex stuff Eric Wong
@ 2021-03-17 7:02 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-03-17 7:02 UTC (permalink / raw)
To: meta
By adding "+code" next to "mirror" at the top next to the search
box. Instead of showing "/path/to/$FOO", showing "$FOO.git"
makes it more obvious we're talking about a git repo, here,
instead of some random directory.
---
lib/PublicInbox/Git.pm | 2 +-
lib/PublicInbox/WwwStream.pm | 23 ++++++++++++++---------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index f680eb2f..2ae5eff9 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -427,7 +427,7 @@ sub local_nick ($) {
my $ret = '???';
# don't show full FS path, basename should be OK:
if ($self->{git_dir} =~ m!/([^/]+)(?:/\.git)?\z!) {
- $ret = "/path/to/$1";
+ $ret = "$1.git";
}
wantarray ? ($ret) : $ret;
}
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index be9e762e..4db8dc55 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -51,9 +51,10 @@ sub html_top ($) {
} elsif ($ctx->{qp}->{t}) {
$top = qq(<a\nhref="./">$top</a>);
}
+ my $code = $ibx->{coderepo} ? qq( / <a\nhref=#code>code</a>) : '';
my $links = qq(<a\nhref="$help">help</a> / ).
qq(<a\nhref="$color">color</a> / ).
- qq(<a\nhref=#mirror>mirror</a> / ).
+ qq(<a\nhref=#mirror>mirror</a>$code / ).
qq(<a\nhref="$atom">Atom feed</a>);
if ($ibx->isrch) {
my $q_val = delete($ctx->{-q_value_html}) // '';
@@ -84,16 +85,20 @@ sub coderepos ($) {
my $upfx = ($ctx->{-upfx} // ''). '../';
my @ret;
for my $cr_name (@$cr) {
- my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl") // next;
$ret[0] //= <<EOF;
-code repositories for the project(s) associated with this inbox:
+<a id=code>code repositories for project(s) associated with this inbox:
EOF
- for (@$urls) {
- # relative or absolute URL?, prefix relative "foo.git"
- # with appropriate number of "../"
- my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_;
- $u = ascii_html(prurl($ctx->{env}, $u));
- $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>);
+ my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl");
+ if ($urls) {
+ for (@$urls) {
+ # relative or absolute URL?, prefix relative
+ # "foo.git" with appropriate number of "../"
+ my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_;
+ $u = ascii_html(prurl($ctx->{env}, $u));
+ $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>);
+ }
+ } else {
+ $ret[0] .= qq[\n\t$cr_name.git (no URL configured)];
}
}
@ret; # may be empty, this sub is called as an arg for join()
^ permalink raw reply related [relevance 6%]
* [PATCH 0/5] www: extindex stuff
@ 2021-03-17 7:02 7% Eric Wong
2021-03-17 7:02 6% ` [PATCH 4/5] www: improve visibility of coderepos Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-03-17 7:02 UTC (permalink / raw)
To: meta
extindex.{url,coderepo,infourl} knobs should all be working,
altid may work, but might not be useful. coderepo visibility
is also improved.
Eric Wong (5):
www_stream: add trailing slash for help and color links
extindex: add some validation and config knobs for WWW
config: lazy-load coderepos, support extindex
www: improve visibility of coderepos
tests: show lsof output on deleted-file-check failures
MANIFEST | 1 +
lib/PublicInbox/Config.pm | 122 +++++++++++++++++++------------
lib/PublicInbox/ExtSearch.pm | 2 +-
lib/PublicInbox/Git.pm | 2 +-
lib/PublicInbox/TestCommon.pm | 28 ++++++-
lib/PublicInbox/View.pm | 5 +-
lib/PublicInbox/WWW.pm | 2 +-
lib/PublicInbox/WwwAtomStream.pm | 6 +-
lib/PublicInbox/WwwStream.pm | 27 ++++---
lib/PublicInbox/WwwText.pm | 2 +-
t/config.t | 6 +-
t/extindex-psgi.t | 48 ++++++++++++
t/httpd-corner.t | 3 +-
t/nntpd.t | 5 +-
t/psgi_v2.t | 30 ++------
15 files changed, 191 insertions(+), 98 deletions(-)
create mode 100644 t/extindex-psgi.t
^ 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 --
2021-03-17 7:02 7% [PATCH 0/5] www: extindex stuff Eric Wong
2021-03-17 7:02 6% ` [PATCH 4/5] www: improve visibility of coderepos 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).