use vars qw($DEBUG);
-use Debbugs::Common (qw(checkpid lockpid get_hashname getparsedaddrs getbugcomponent make_list getsourcemaintainers),
+# if we're running out of git, we want to use the git base directory as the
+# first INC directory. If you're not running out of git, or someone has given a
+# non-absolute INC, don't do that.
+use FindBin;
+use if (-d $FindBin::Bin.'/../.git/' && $INC[0] =~ m#^/#),
+ lib => $FindBin::Bin.'/../';
+
+use Debbugs::Common (qw(checkpid lockpid get_hashname getparsedaddrs),
+ qw(getbugcomponent make_list getsourcemaintainers),
+ qw(getbuglocation),
+ qw(walk_bugs),
qw(hash_slice open_compressed_file),);
use Debbugs::Config qw(:config);
use Debbugs::Status qw(read_bug split_status_fields);
use File::stat;
use File::Basename;
use File::Spec;
+use File::Find;
use IO::Dir;
use IO::File;
use IO::Uncompress::AnyUncompress;
use Encode qw(decode_utf8);
-use List::MoreUtils qw(natatime);
+use List::AllUtils qw(natatime);
my %options =
(debug => 0,
GetOptions(\%options,
'quick|q',
'service|s=s',
+ 'dsn=s',
'sysconfdir|c=s',
'progress!',
'spool_dir|spool-dir=s',
my %subcommands =
('bugs' => {function => \&add_bugs,
- arguments => {'preload' => 0},
+ arguments => {'preload' => 0,
+ 'bugs=s@' => 0,
+ },
},
'versions' => {function => \&add_versions,
},
'debinfo' => {function => \&add_debinfo,
- arguments => {'0|null' => 0},
+ arguments => {'0|null' => 0,
+ 'debinfo_dir|debinfo-dir=s' => 0,
+ },
},
'maintainers' => {function => \&add_maintainers,
},
},
'logs' => {function => \&add_logs,
},
+ 'bugs_and_logs' => {function => \&add_bugs_and_logs,
+ },
'packages' => {function => \&add_packages,
arguments => {'ftpdists=s' => 1,
'suites=s@' => 0,
my $verbose = $options->{debug};
- my $initialdir = "db-h";
-
- if (defined $argv->[0] and $argv->[0] eq "archive") {
- $initialdir = "archive";
+ my @dirs;
+ if (@{$argv}) {
+ @dirs = @{$argv};
+ } elsif (not defined $opts->{bugs}) {
+ @dirs = "db-h"
}
+ $opts->{bugs} //= [];
+
my $s = db_connect($options);
- my $time = 0;
- my $start_time = time;
my %tags;
my %severities;
my %queue;
if ($opts->{preload}) {
my @bugs;
- walk_bugs([(@{$argv}?@{$argv} : $initialdir)],
- undef,
- 'summary',
- undef,
- sub {
- push @bugs,@_;
+ walk_bugs(dirs => [@dirs],
+ bugs => $opts->{bugs},
+ callback => sub {
+ push @bugs,@_;
},
- 10000
+ bugs_per_call => 10000
);
$s->resultset('Bug')->quick_insert_bugs(@bugs);
}
- walk_bugs([(@{$argv}?@{$argv} : $initialdir)],
- $p,
- 'summary',
- $verbose,
- sub {
+ walk_bugs(dirs => [@dirs],
+ bugs => $opts->{bugs},
+ progress_bar => $p,
+ $verbose?(logging=>\*STDERR):(),
+ callback =>
+ sub {
my @bugs = @_;
my @bugs_to_update;
if ($options{quick}) {
- for my $bug (@bugs) {
- my $stat = stat(getbugcomponent($bug,'summary',$initialdir));
- if (not defined $stat) {
- print STDERR "Unable to stat $bug $!\n";
- next;
- }
- my $rs = $s->resultset('Bug')->search({id=>$bug})->single();
- next if defined $rs and $stat->mtime <= $rs->last_modified()->epoch();
- push @bugs_to_update, $bug;
- }
+ @bugs_to_update =
+ bugs_to_update($s,@bugs);
} else {
- @bugs_to_update = @bugs;
+ @bugs_to_update = @bugs;
}
eval {
$s->txn_do(sub {
die "failure while trying to load bug: $@";
}
},
- 50
+ bugs_per_call => 50
);
handle_load_bug_queue(db => $s,
queue => \%queue);
my $sp;
if (not defined $src_pkgs{$versions[$i][0]}) {
$src_pkgs{$versions[$i][0]} =
- $s->resultset('SrcPkg')->find_or_create({pkg => $versions[$i][0]});
+ $s->resultset('SrcPkg')->
+ get_or_create_src_pkg_id($versions[$i][0]);
}
$sp = $src_pkgs{$versions[$i][0]};
# There's probably something wrong if the source package
# doesn't exist, but we'll skip it for now
- next unless defined $sp;
- my $sv = $s->resultset('SrcVer')->find({src_pkg=>$sp->id(),
+ last if not defined $sp;
+ my $sv = $s->resultset('SrcVer')->find({src_pkg=>$sp,
ver => $versions[$i][1],
});
+ last if not defined $sv;
if (defined $ancestor_sv and defined $sv and not defined $sv->based_on()) {
- $sv->update({based_on => $ancestor_sv->id()})
+ $sv->update({based_on => $ancestor_sv})
}
- $ancestor_sv = $sv;
+ $ancestor_sv = $sv->id();
}
$p->update() if $p;
}
my ($options,$opts,$p,$config,$argv) = @_;
my @files = @{$argv};
+ if (exists $opts->{debinfo_dir} and not @files) {
+ find(sub {
+ if (-f $_ and /\.debinfo$/) {
+ push @files, $File::Find::name;
+ }
+ },
+ $opts->{debinfo_dir}
+ );
+ }
if (not @files) {
{
local $/ = "\n";
while (my @v = $it->()) {
my %cache;
my @debinfos;
- for my $file (@v) {
+FILE: for my $file (@v) {
my $fh = IO::File->new($file,'r') or
die "Unable to open $file for reading: $!";
my $f_stat = stat($file);
my $ct_date = DateTime->from_epoch(epoch => $f_stat->ctime);
+ my @file_debinfos;
while (<$fh>) {
chomp;
next unless length $_;
# the file, so we'll fudge it from the filename.
if (not defined $srcver) {
($srcname,$srcver) = ($binarch,$srcname);
- ($binarch) = $file =~ /_([^\.]+)\.debinfo/;
+ ($binarch) = $file =~ /_([a-z0-9-]+)\.debinfo/;
}
- push @debinfos,
+ # It turns out that there are debinfo files which are horribly
+ # screwed up, and have junk in them. We need to discard them
+ # completely
+ if (not defined $srcname or
+ not defined $srcver or
+ not defined $binname or
+ not defined $binver or
+ not defined $binarch or
+ $srcname !~ /^$config{package_name_re}$/o or
+ $binname !~ /^$config{package_name_re}$/o or
+ $srcver !~ /^$config{package_version_re}$/o or
+ $binver !~ /^$config{package_version_re}$/o
+ ) {
+ print STDERR "malformed debinfo: $file\n$_\n";
+ next FILE;
+ }
+ push @file_debinfos,
[$binname,$binver,$binarch,$srcname,$srcver,$ct_date];
}
+ push @debinfos,
+ @file_debinfos;
}
$s->txn_do(
sub {
my ($options,$opts,$p,$config,$argv) = @_;
my $s = db_connect($options);
- my $maintainers = getsourcemaintainers();
+ my $maintainers = getsourcemaintainers() // {};
$p->target(2) if $p;
## get all of the maintainers, and add the missing ones
my $maints = $s->resultset('Maintainer')->
get_maintainers(values %{$maintainers});
- $p->update();
+ $p->update() if $p;
my @svs = $s->resultset('SrcVer')->
search({maintainer => undef
},
}
my $s = db_connect($options);
-
- my $time = 0;
- my $start_time = time;
-
- walk_bugs([(@{$argv}?@{$argv} : $initialdir)],
- $p,
- 'log',
- $verbose,
- sub {
+ walk_bugs(dirs => [(@{$argv}?@{$argv} : $initialdir)],
+ progress_bar => $p,
+ bug_file => 'log',
+ $verbose?(logging => \*STDERR):(),
+ callback =>
+ sub {
my $bug = shift;
my $stat = stat(getbugcomponent($bug,'log',$initialdir));
if (not defined $stat) {
next;
}
if ($options{quick}) {
- my $rs = $s->resultset('Bug')->search({bug=>$bug})->single();
- next if defined $rs and $stat->mtime <= $rs->last_modified()->epoch();
+ my $rs = $s->resultset('Bug')->
+ search({id=>$bug})->single();
+ return if defined $rs and
+ $stat->mtime <= $rs->last_modified()->epoch();
}
eval {
load_bug_log(db => $s,
});
}
+sub add_bugs_and_logs {
+ my ($options,$opts,$p,$config,$argv) = @_;
+
+ chdir($config->{spool_dir}) or
+ die "chdir $config->{spool_dir} failed: $!";
+
+ my $verbose = $options->{debug};
+
+ my $initialdir = "db-h";
+
+ if (defined $argv->[0] and $argv->[0] eq "archive") {
+ $initialdir = "archive";
+ }
+ my $s = db_connect($options);
+
+ my %tags;
+ my %severities;
+ my %queue;
+
+ walk_bugs(dirs => [(@{$argv}?@{$argv} : $initialdir)],
+ progress_bar => $p,
+ $verbose?(logging => \*STDERR):(),
+ callback =>
+ sub {
+ my @bugs = @_;
+ my @bugs_to_update;
+ if ($options{quick}) {
+ @bugs_to_update =
+ bugs_to_update($s,@bugs);
+ } else {
+ @bugs_to_update = @bugs;
+ }
+ eval {
+ $s->txn_do(sub {
+ for my $bug (@bugs_to_update) {
+ load_bug(db => $s,
+ bug => $bug,
+ tags => \%tags,
+ severities => \%severities,
+ queue => \%queue);
+ }
+ });
+ };
+ if ($@) {
+ die "failure while trying to load bug: $@";
+ }
+ for my $bug (@bugs) {
+ my $stat = stat(getbugcomponent($bug,'log',$initialdir));
+ if (not defined $stat) {
+ print STDERR "Unable to stat $bug $!\n";
+ next;
+ }
+ if ($options{quick}) {
+ my $rs = $s->resultset('Bug')->
+ search({id=>$bug})->single();
+ return if defined $rs and
+ $stat->mtime <= $rs->last_modified()->epoch();
+ }
+ eval {
+ load_bug_log(db => $s,
+ bug => $bug);
+ };
+ if ($@) {
+ die "failure while trying to load bug log $bug\n$@";
+ }
+ }
+ },
+ bugs_per_call => 50,
+ );
+ handle_load_bug_queue(db=>$s,
+ queue => \%queue,
+ );
+
+}
+
sub add_packages {
my ($options,$opts,$p,$config,$argv) = @_;
my ($options) = @_;
# connect to the database; figure out how to handle errors
# properly here.
- my $s = Debbugs::DB->connect($options->{service}) or
+ my $s = Debbugs::DB->connect($options->{dsn} //
+ $options->{service}) or
die "Unable to connect to database: ";
}
return (\%dist_info,\%p_f);
}
-sub walk_bugs {
- my ($dirs,$p,$what,$verbose,$sub,$n) = @_;
- my @dirs = @{$dirs};
- my $tot_dirs = @dirs;
- my $done_dirs = 0;
- my $avg_subfiles = 0;
- my $completed_files = 0;
- $n //= 1;
- while (my $dir = shift @dirs) {
- printf "Doing dir %s ...\n", $dir if $verbose;
-
- opendir(DIR, "$dir/.") or die "opendir $dir: $!";
- my @subdirs = readdir(DIR);
- closedir(DIR);
-
- my @list = map { m/^(\d+)\.$what$/?($1):() } @subdirs;
- $tot_dirs -= @dirs;
- push @dirs, map { m/^(\d+)$/ && -d "$dir/$1"?("$dir/$1"):() } @subdirs;
- $tot_dirs += @dirs;
- if ($avg_subfiles == 0) {
- $avg_subfiles = @list;
- }
- $p->target($avg_subfiles*($tot_dirs-$done_dirs)+$completed_files+@list) if $p;
- $avg_subfiles = ($avg_subfiles * $done_dirs + @list) / ($done_dirs+1);
- $done_dirs += 1;
-
- my $it = natatime $n,@list;
- while (my @bugs = $it->()) {
- $sub->(@bugs);
- $completed_files += scalar @bugs;
- $p->update($completed_files) if $p;
- print "Up to $completed_files bugs...\n"
- if ($completed_files % 100 == 0 && $verbose);
- }
+sub bugs_to_update {
+ my ($s,@bugs) = @_;
+ my @bugs_to_update;
+ for my $bug (@bugs) {
+ my $stat = stat(getbugcomponent($bug,'summary',getbuglocation($bug,'summary')));
+ if (not defined $stat) {
+ print STDERR "Unable to stat $bug $!\n";
+ next;
+ }
+ my $rs = $s->resultset('Bug')->search({id=>$bug})->single();
+ next if defined $rs and $stat->mtime <= $rs->last_modified()->epoch();
+ push @bugs_to_update, $bug;
}
- $p->remove() if $p;
+ @bugs_to_update;
}
-
__END__
projects / debbugs.git / blobdiff