diff options
author | Eric Wong <e@80x24.org> | 2019-05-21 23:22:05 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-05-21 23:22:05 +0000 |
commit | e220b8b2ee5cfd458167dc2c6c92726352c4c80e (patch) | |
tree | 367fea0f8e7b2e23a313cccca1b2dac604e166b8 /script/public-inbox-index | |
parent | 1cb0e9b176774e3ff5e2397f4a1452bb2517454f (diff) | |
parent | d0e8bfd866ed1e924e8d9f551939eecbea4920ef (diff) | |
download | public-inbox-e220b8b2ee5cfd458167dc2c6c92726352c4c80e.tar.gz |
* origin/xap-optional: admin: improve warnings and errors for missing modules searchidx: do not create empty Xapian partitions for basic lazy load Xapian and make it optional for v2 www: use Inbox->over where appropriate nntp: use Inbox->over directly inbox: add ->over method to ease access
Diffstat (limited to 'script/public-inbox-index')
-rwxr-xr-x | script/public-inbox-index | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/script/public-inbox-index b/script/public-inbox-index index b353093e..cf001cc1 100755 --- a/script/public-inbox-index +++ b/script/public-inbox-index @@ -10,26 +10,24 @@ use strict; use warnings; use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev); my $usage = "public-inbox-index REPO_DIR"; -use PublicInbox::Config; use PublicInbox::Admin qw(resolve_repo_dir); +PublicInbox::Admin::require_or_die('-index'); +require PublicInbox::Config; my $config = eval { PublicInbox::Config->new } || eval { warn "public-inbox unconfigured for serving, indexing anyways...\n"; undef; }; -eval { require PublicInbox::SearchIdx }; -if ($@) { - print STDERR "Search::Xapian required for $0\n"; - exit 1; -} my $reindex; my $prune; my $jobs = undef; +my $indexlevel; my %opts = ( '--reindex' => \$reindex, '--jobs|j=i' => \$jobs, '--prune' => \$prune, + 'L|indexlevel=s' => \$indexlevel, ); GetOptions(%opts) or die "bad command-line args\n$usage"; die "--jobs must be positive\n" if defined $jobs && $jobs < 0; @@ -54,19 +52,36 @@ defined($config) and $config->each_inbox(sub { } }); +my @inboxes; +my $mods = {}; + foreach my $dir (@dirs) { - if (!ref($dir) && -f "$dir/inbox.lock") { # v2 - my $ibx = { mainrepo => $dir, name => 'unnamed' }; - $dir = PublicInbox::Inbox->new($ibx); + my $ibx = $dir; + if (!ref($ibx)) { + unless (-d $dir) { + die "$dir does not appear to be an inbox repository\n"; + } + $ibx = PublicInbox::Inbox->new({ + mainrepo => $dir, + name => 'unnamed', + indexlevel => $indexlevel, + version => -f "$dir/inbox.lock" ? 2 : 1, + }); + } elsif (defined $indexlevel && !defined($ibx->{indexlevel})) { + # XXX: users can shoot themselves in the foot, with this... + $ibx->{indexlevel} = $indexlevel; } - index_dir($dir); + push @inboxes, $ibx; + PublicInbox::Admin::scan_ibx_modules($mods, $ibx); } -sub index_dir { +PublicInbox::Admin::require_or_die(keys %$mods); + +require PublicInbox::SearchIdx; +index_inbox($_) for @inboxes; + +sub index_inbox { my ($repo) = @_; - if (!ref $repo && ! -d $repo) { - die "$repo does not appear to be an inbox repository\n"; - } if (ref($repo) && ($repo->{version} || 1) == 2) { eval { require PublicInbox::V2Writable }; die "v2 requirements not met: $@\n" if $@; |