use constant {
DATEFMT => '%Y-%m-%dT%H:%M:%SZ', # atom standard
MAX_PER_PAGE => 25, # this needs to be tunable
- PRE_WRAP => '<pre style="white-space:pre-wrap">',
+ PRE_WRAP => "<pre\nstyle=\"white-space:pre-wrap\">",
};
# main function
$title = PublicInbox::Hval->new_oneline($title)->as_html;
my @messages;
- my $git = PublicInbox::GitCatFile->new($args->{git_dir});
+ my $git_dir = $args->{git_dir};
+ my $git = PublicInbox::GitCatFile->new($git_dir);
my ($first, $last) = each_recent_blob($args, sub {
- my $mime = do_cat_mail($git, $_[0]) or return 0;
-
- my $t = eval { str2time($mime->header('Date')) };
- defined($t) or $t = 0;
- $mime->header_set('X-PI-Date', $t);
- push @messages, $mime;
- 1;
+ mime_load_for_sort($git, $_[0], \@messages);
});
$git = undef; # destroy pipes.
my $th = PublicInbox::Thread->new(@messages);
$th->thread;
my $html = "<html><head><title>$title</title>" .
- '<link rel="alternate" title="Atom feed" href="' .
- $feed_opts->{atomurl} . '" type="application/atom+xml"/>' .
+ '<link rel="alternate" title="Atom feed"' . "\nhref=\"" .
+ $feed_opts->{atomurl} . "\"\ntype=\"application/atom+xml\"/>" .
'</head><body>' . PRE_WRAP;
# sort child messages in chronological order
- $th->order(sub {
- sort {
- $a->topmost->message->header('X-PI-Date') <=>
- $b->topmost->message->header('X-PI-Date')
- } @_;
- });
+ $th->order(*PublicInbox::Thread::sort_ts);
- my %seen;
# except we sort top-level messages reverse chronologically
- for (sort { (eval { $b->message->header('X-PI-Date') } || 0) <=>
- (eval { $a->message->header('X-PI-Date') } || 0)
- } $th->rootset) {
- dump_msg($_, 0, \$html, time, \%seen);
+ my $state = [ $args->{srch}, {}, $first, 0 ];
+ for (PublicInbox::Thread::rsort_ts($th->rootset)) {
+ dump_msg($_, 0, \$html, $state)
}
-
Email::Address->purge_cache;
- my $footer = nav_footer($args->{cgi}, $first, $last, $feed_opts);
- my $list_footer = $args->{footer};
- $footer .= "\n" . $list_footer if ($footer && $list_footer);
- $footer = "<hr />" . PRE_WRAP . "$footer</pre>" if $footer;
- $html . "</pre>$footer</html>";
+ my $footer = nav_footer($args->{cgi}, $last, $feed_opts, $state);
+ if ($footer) {
+ my $list_footer = $args->{footer};
+ $footer .= "\n" . $list_footer if $list_footer;
+ $footer = "<hr />" . PRE_WRAP . "$footer</pre>";
+ }
+ $html . "</pre>$footer</body></html>";
}
# private subs
sub nav_footer {
- my ($cgi, $first, $last, $feed_opts) = @_;
+ my ($cgi, $last, $feed_opts, $state) = @_;
$cgi or return '';
my $old_r = $cgi->param('r');
my $head = ' ';
my $next = ' ';
+ my $first = $state->[2];
+ my $anchor = $state->[3];
if ($last) {
$next = qq!<a\nhref="?r=$last">next</a>!;
}
my $atom = "<a\nhref=\"$feed_opts->{atomurl}\">atom</a>";
my $permalink = "<a\nhref=\"?r=$first\">permalink</a>";
- "$next $head $atom $permalink";
+ "<a\nname=\"s$anchor\">page:</a> $next $head $atom $permalink";
}
sub each_recent_blob {
# we could use git log -z, but, we already know ssoma will not
# leave us with filenames with spaces in them..
my @cmd = ('git', "--git-dir=$args->{git_dir}",
- qw/log --no-notes --no-color --raw -r/);
+ qw/log --no-notes --no-color --raw -r
+ --abbrev=16 --abbrev-commit/);
push @cmd, $range;
my $pid = open(my $log, '-|', @cmd) or
}
} elsif ($line =~ /$delmsg/o) {
$deleted{$1} = 1;
- } elsif ($line =~ /^commit (${hex}{40})/) {
+ } elsif ($line =~ /^commit (${hex}{7,40})/o) {
push @commits, $1;
}
}
if ($last) {
while (my $line = <$log>) {
- if ($line =~ /^commit (${hex}{40})/) {
+ if ($line =~ /^commit (${hex}{7,40})/o) {
push @commits, $1;
last;
}
}
sub dump_msg {
- my ($self, $level, $html, $now, $seen) = @_;
+ my ($self, $level, $html, $state) = @_;
my $mime = $self->message;
if ($mime) {
- $$html .=
- PublicInbox::View->index_entry($mime, $now, $level, $seen);
+ $$html .= PublicInbox::View->index_entry($mime, $level, $state);
}
- dump_msg($self->child, $level+1, $html, $now, $seen) if $self->child;
- dump_msg($self->next, $level, $html, $now, $seen) if $self->next;
+ dump_msg($self->child, $level+1, $html, $state) if $self->child;
+ dump_msg($self->next, $level, $html, $state) if $self->next;
}
sub do_cat_mail {
$@ ? undef : $mime;
}
+sub mime_load_for_sort {
+ my ($git, $path, $messages) = @_;
+ my $mime = do_cat_mail($git, $path) or return 0;
+
+ my $t = eval { str2time($mime->header('Date')) };
+ defined($t) or $t = 0;
+ $mime->header_set('X-PI-TS', $t);
+ push @$messages, $mime;
+ 1;
+}
+
1;