user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [PATCH 3/4] www: wire up /$INBOX/manifest.js.gz, too
  2019-06-09  4:31  7% [PATCH 0/4] grokmirror-compatible manifests Eric Wong (Contractor, The Linux Foundation)
@ 2019-06-09  4:31  7% ` Eric Wong (Contractor, The Linux Foundation)
  0 siblings, 0 replies; 2+ results
From: Eric Wong (Contractor, The Linux Foundation) @ 2019-06-09  4:31 UTC (permalink / raw)
  To: meta

I can imagine myself just wanting to clone a single v2 inbox
and all its epochs without thinking about include/exclude
rules in a grokmirror config file.
---
 lib/PublicInbox/WWW.pm | 11 +++++++++++
 t/www_listing.t        | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 614adad..a546698 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -126,6 +126,8 @@ sub call {
 		get_text($ctx, $1, $2);
 	} elsif ($path_info =~ m!$INBOX_RE/([a-zA-Z0-9_\-\.]+)\.css\z!o) {
 		get_css($ctx, $1, $2);
+	} elsif ($path_info =~ m!$INBOX_RE/manifest\.js\.gz\z!o) {
+		get_inbox_manifest($ctx, $1, $2);
 	} elsif ($path_info =~ m!$INBOX_RE/($OID_RE)/s/\z!o) {
 		get_vcs_object($ctx, $1, $2);
 	} elsif ($path_info =~ m!$INBOX_RE/($OID_RE)/s/
@@ -490,6 +492,15 @@ sub www_listing {
 	}
 }
 
+# GET $INBOX/manifest.js.gz
+sub get_inbox_manifest ($$$) {
+	my ($ctx, $inbox, $key) = @_;
+	my $r404 = invalid_inbox($ctx, $inbox);
+	return $r404 if $r404;
+	require PublicInbox::WwwListing;
+	PublicInbox::WwwListing::js($ctx->{env}, [$ctx->{-inbox}]);
+}
+
 sub get_attach {
 	my ($ctx, $idx, $fn) = @_;
 	require PublicInbox::WwwAttach;
diff --git a/t/www_listing.t b/t/www_listing.t
index f9d543e..546c2f8 100644
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -133,6 +133,26 @@ mymanifest = $tmpdir/local-manifest.js.gz
 	for (qw(alt bare v2/0 v2/1 v2/2)) {
 		ok(-d "$tmpdir/mirror/$_", "grok-pull created $_");
 	}
+
+	# support per-inbox manifests, handy for v2:
+	# /$INBOX/v2/manifest.js.gz
+	open $fh, '>', "$tmpdir/per-inbox.conf" or die;
+	print $fh <<"" or die;
+# You can pull from multiple grok mirrors, just create
+# a separate section for each mirror. The name can be anything.
+[v2]
+site = http://$host:$port
+manifest = http://$host:$port/v2/manifest.js.gz
+toplevel = $tmpdir/per-inbox
+mymanifest = $tmpdir/per-inbox-manifest.js.gz
+
+	close $fh or die;
+	ok(mkdir("$tmpdir/per-inbox"), 'prepare single-v2-inbox mirror');
+	system(qw(grok-pull -c), "$tmpdir/per-inbox.conf");
+	is($? >> 8, 127, 'grok-pull exit code as expected');
+	for (qw(v2/0 v2/1 v2/2)) {
+		ok(-d "$tmpdir/per-inbox/$_", "grok-pull created $_");
+	}
 }
 
 done_testing();
-- 
EW


^ permalink raw reply	[relevance 7%]

* [PATCH 0/4] grokmirror-compatible manifests
@ 2019-06-09  4:31  7% Eric Wong (Contractor, The Linux Foundation)
  2019-06-09  4:31  7% ` [PATCH 3/4] www: wire up /$INBOX/manifest.js.gz, too Eric Wong (Contractor, The Linux Foundation)
  0 siblings, 1 reply; 2+ results
From: Eric Wong (Contractor, The Linux Foundation) @ 2019-06-09  4:31 UTC (permalink / raw)
  To: meta

Maintaining mirrors is a pain, especially for v2 repos
and multiple epochs.  So support both per-domain matching
and per-inbox manifests which can be fed to grok-pull(1)

https://git.kernel.org/pub/scm/utils/grokmirror/grokmirror.git

Eric Wong (Contractor, The Linux Foundation) (4):
  wwwlisting: allow hiding entries from manifest
  wwwlisting: generate grokmirror-compatible manifest.js.gz
  www: wire up /$INBOX/manifest.js.gz, too
  www: support $INBOX/git/$EPOCH.git for v2 cloning

 MANIFEST                      |   1 +
 lib/PublicInbox/WWW.pm        |  17 +++-
 lib/PublicInbox/WwwListing.pm | 174 +++++++++++++++++++++++++++++-----
 t/psgi_v2.t                   |   2 +
 t/v2mirror.t                  |   8 +-
 t/www_listing.t               | 158 ++++++++++++++++++++++++++++++
 6 files changed, 330 insertions(+), 30 deletions(-)
 create mode 100644 t/www_listing.t

-- 
EW

^ permalink raw reply	[relevance 7%]

Results 1-2 of 2 | reverse | sort options + mbox downloads above
-- links below jump to the message on this page --
2019-06-09  4:31  7% [PATCH 0/4] grokmirror-compatible manifests Eric Wong (Contractor, The Linux Foundation)
2019-06-09  4:31  7% ` [PATCH 3/4] www: wire up /$INBOX/manifest.js.gz, too Eric Wong (Contractor, The Linux Foundation)

Code repositories for project(s) associated with this 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).