use strict;
use v5.10.1;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-my $usage = 'Usage: public-inbox-convert [options] OLD NEW';
my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
-usage: $usage
+usage: public-inbox-convert [options] OLD NEW
convert v1 format inboxes to v2
--no-index do not index after conversion
--jobs=NUM set shards (NUM=0)
--verbose | -v increase verbosity (may be repeated)
- --help | -? show this help
-index options (see public-inbox-index(1) manpage for full description):
+index options (see public-inbox-index(1) man page for full description):
--no-fsync speed up indexing, risk corruption on power outage
-L LEVEL `basic', `medium', or `full' (default: full)
quiet => -1, compact => 0, maxsize => undef, fsync => 1,
reindex => 1, # we always reindex
};
-GetOptions($opt, qw(jobs|j=i index! help|?),
+GetOptions($opt, qw(jobs|j=i index! help|h),
# index options
qw(verbose|v+ rethread compact|c+ fsync|sync!
indexlevel|index-level|L=s max_size|max-size=s
batch_size|batch-size=s
sequential_shard|sequential-shard|seq-shard
- )) or die <<EOF;
-bad command-line args\n$usage
-EOF
+ )) or die $help;
if ($opt->{help}) { print $help; exit 0 };
-my $old_dir = shift(@ARGV) or die $usage;
-my $new_dir = shift(@ARGV) or die $usage;
+my $old_dir = shift(@ARGV) // '';
+my $new_dir = shift(@ARGV) // '';
+die $help if (scalar(@ARGV) || $new_dir eq '' || $old_dir eq '');
die "$new_dir exists\n" if -d $new_dir;
die "$old_dir not a directory\n" unless -d $old_dir;
require PublicInbox::Config;
require PublicInbox::InboxWritable;
-$old_dir = abs_path($old_dir);
+my $abs = abs_path($old_dir);
+die "failed to resolve $old_dir: $!\n" if (!defined($abs));
+
my $cfg = PublicInbox::Config->new;
my $old;
$cfg->each_inbox(sub {
}
die "Only conversion from v1 inboxes is supported\n" if $old->version >= 2;
+require File::Spec;
require PublicInbox::Admin;
-$old->{indexlevel} //= PublicInbox::Admin::detect_indexlevel($old);
+my $detected = PublicInbox::Admin::detect_indexlevel($old);
+$old->{indexlevel} //= $detected;
my $env;
if ($opt->{'index'}) {
my $mods = {};
}
local %ENV = (%$env, %ENV) if $env;
my $new = { %$old };
-$new->{inboxdir} = abs_path($new_dir);
+$new->{inboxdir} = File::Spec->canonpath($new_dir);
$new->{version} = 2;
$new = PublicInbox::InboxWritable->new($new, { nproc => $opt->{jobs} });
$new->{-no_fsync} = 1 if !$opt->{fsync};
require PublicInbox::AltId;
foreach my $i (0..$#$alt) {
my $src = PublicInbox::AltId->new($old, $alt->[$i], 0);
- $src->mm_alt or next;
+ $src = $src->mm_alt or next;
+ $src = $src->{dbh}->sqlite_db_filename;
my $dst = PublicInbox::AltId->new($new, $alt->[$i], 1);
- $dst = $dst->{filename};
- $src->mm_alt->{dbh}->sqlite_backup_to_file($dst);
+ $dst->mm_alt->{dbh}->sqlite_backup_from_file($src);
}
}
my $desc = "$old->{inboxdir}/description";
$? == 0 or die "fast-export failed: $?\n";
$r = $w = undef; # v2w->done does the actual close and error checking
$v2w->done;
-if (my $mm = $old->mm) {
+if (my $old_mm = $old->mm) {
$old->cleanup;
- $mm->{dbh}->sqlite_backup_to_file("$new_dir/msgmap.sqlite3");
+ $old_mm = $old_mm->{dbh}->sqlite_db_filename;
# we want to trigger a reindex, not a from scratch index if
# we're reusing the msgmap from an existing v1 installation.
$v2w->idx_init($opt);
+ $v2w->{mm}->{dbh}->sqlite_backup_from_file($old_mm);
+
my $epoch0 = PublicInbox::Git->new($v2w->git_init(0));
chop(my $cmt = $epoch0->qx(qw(rev-parse --verify), $head));
$v2w->last_epoch_commit(0, $cmt);