From aae578aad0fd1c7b788a461fa29cb70f0a29fb02 Mon Sep 17 00:00:00 2001
From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
Date: Wed, 28 Feb 2018 22:29:38 +0000
Subject: v2/ui: get nntpd and init tests running on v2

A work-in-progress, but it appears the v2 UI pieces do
will not require a lot of work to do.
---
 script/public-inbox-init | 48 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 12 deletions(-)

(limited to 'script/public-inbox-init')

diff --git a/script/public-inbox-init b/script/public-inbox-init
index 2f33c9ef..f7a60fbb 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -6,6 +6,7 @@
 use strict;
 use warnings;
 my $usage = "public-inbox-init NAME GIT_DIR HTTP_URL ADDRESS [ADDRESS..]";
+use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
 use PublicInbox::Config;
 use File::Temp qw/tempfile/;
 use File::Basename qw/dirname/;
@@ -14,9 +15,11 @@ use Cwd qw/abs_path/;
 
 sub x { system(@_) and die join(' ', @_). " failed: $?\n" }
 sub usage { print STDERR "Usage: $usage\n"; exit 1 }
-
+my $version = 1;
+my %opts = ( 'V|version=i' => \$version );
+GetOptions(%opts) or usage();
 my $name = shift @ARGV or usage();
-my $git_dir = shift @ARGV or usage();
+my $mainrepo = shift @ARGV or usage();
 my $http_url = shift @ARGV or usage();
 my (@address) = @ARGV;
 @address or usage();
@@ -25,7 +28,7 @@ my %seen;
 my $pi_config = PublicInbox::Config->default_file;
 my $dir = dirname($pi_config);
 mkpath($dir); # will croak on fatal errors
-my ($fh, $filename) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
+my ($fh, $pi_config_tmp) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
 if (-e $pi_config) {
 	open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
 	my @st = stat($oh);
@@ -62,22 +65,43 @@ if (-e $pi_config) {
 
 	exit(1) if $conflict;
 }
-close $fh or die "failed to close $filename: $!\n";
+close $fh or die "failed to close $pi_config_tmp: $!\n";
 
 my $pfx = "publicinbox.$name";
-my @x = (qw/git config/, "--file=$filename");
-$git_dir = abs_path($git_dir);
-x(qw(git init -q --bare), $git_dir);
+my @x = (qw/git config/, "--file=$pi_config_tmp");
+
+$mainrepo = abs_path($mainrepo);
 
-# set a reasonable default:
-x(qw/git config/, "--file=$git_dir/config", 'repack.writeBitmaps', 'true');
+if ($version >= 2) {
+	require PublicInbox::V2Writable;
+	require PublicInbox::Inbox;
+	my $ibx = {
+		mainrepo => $mainrepo,
+		name => $name,
+		version => $version,
+		-primary_address => $address[0],
+	};
+	$ibx = PublicInbox::Inbox->new($ibx);
+	my $v2w = PublicInbox::V2Writable->new($ibx, 1);
+	$v2w->git_init(0);
+	$v2w->idx_init(0);
+	$v2w->done;
+} elsif ($version == 1) {
+	x(qw(git init -q --bare), $mainrepo);
+
+	# set a reasonable default:
+	x(qw/git config/, "--file=$mainrepo/config",
+		'repack.writeBitmaps', 'true');
+} else {
+	die "Unsupported -V/--version: $version\n";
+}
 
 foreach my $addr (@address) {
 	next if $seen{lc($addr)};
 	x(@x, "--add", "$pfx.address", $addr);
 }
 x(@x, "$pfx.url", $http_url);
-x(@x, "$pfx.mainrepo", $git_dir);
+x(@x, "$pfx.mainrepo", $mainrepo);
 
-rename $filename, $pi_config or
-	die "failed to rename `$filename' to `$pi_config': $!\n";
+rename $pi_config_tmp, $pi_config or
+	die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n";
-- 
cgit v1.2.3-24-ge0c7