* [PATCH] www: sort all /$INBOX/ topics by Received: timestamp
@ 2023-02-04 20:41 7% ` Eric Wong
0 siblings, 0 replies; 6+ results
From: Eric Wong @ 2023-02-04 20:41 UTC (permalink / raw)
To: Kyle Meyer; +Cc: meta, Ihor Radchenko, Bastien Guerry
Kyle Meyer <kyle@kyleam.com> wrote:
> As noted by Ihor on the Org list (<87pmarnhlr.fsf@localhost>), Org's
> public-inbox archive has a thread pinned to the top of the $inbox/
> overview:
>
> * https://yhetil.org/orgmode/
>
> That thread has a message where a sender set his Date to a future date:
>
> $ curl -fSsL https://yhetil.org/orgmode/ZT2vNKsf3Lp5xit3@protected.localdomain/raw | \
> grep Date:
> Date: Sun, 29 Oct 2023 04:02:44 +0300
>
> Based on grepping around the public-inbox tree and Git history, I know
> that there are spots in public-inbox that prefer a date from the
> Received headers over the one from the Date header. Would that make
> sense to do here too to reduce the chances of a date from the future
> pinning a thread? (Or perhaps that's already the intention and
> something's off here?)
Thanks for the report. The previous pinning prevention only
prevented older messages from being pinned to the /$INBOX/ landing
page. It didn't prevent recent, future-looking messages from
being pinned to the landing page, which seems to be what
happened in your case.
Does this untested patch fix it?
--------8<------
Subject: [PATCH] www: sort all /$INBOX/ topics by Received: timestamp
Our previous pinning prevention only worked to prevent older
(non-most-recent) topics from being pinned to the landing page,
but not the most recent window of messages.
We still sort messages within threads by Date: because that
makes git-send-email patchsets display more nicely, but we
don't want recent topics pinned due to future Date: headers.
I nearly switched sort_ds() back to sorting by Received: until
I looked back on commit 8e52e5fdea416d6fda0b8d301144af0c043a5a76
(use both Date: and Received: times, 2018-03-21) and was reminded
git-send-email relies on Date: for large series, so I added a
note about it for sort_ds().
Reported-by: Kyle Meyer <kyle@kyleam.com>
Link: https://public-inbox.org/meta/87edr5gx63.fsf@kyleam.com/
---
lib/PublicInbox/View.pm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index b8d6d85e..e5f748f7 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -1019,6 +1019,8 @@ sub _skel_ghost {
1;
}
+# note: we favor Date: here because git-send-email increments it
+# to preserve [PATCH $N/$M] ordering in series (it can't control Received:)
sub sort_ds {
@{$_[0]} = sort {
(eval { $a->topmost->{ds} } || 0) <=>
@@ -1040,9 +1042,10 @@ sub acc_topic { # walk_thread callback
if ($has_blob) {
my $subj = subject_normalized($smsg->{subject});
$subj = '(no subject)' if $subj eq '';
+ my $ts = $smsg->{ts};
my $ds = $smsg->{ds};
if ($level == 0) { # new, top-level topic
- my $topic = [ $ds, 1, { $subj => $mid }, $subj ];
+ my $topic = [ $ts, $ds, 1, { $subj => $mid }, $subj ];
$ctx->{-cur_topic} = $topic;
push @{$ctx->{order}}, $topic;
return 1;
@@ -1050,10 +1053,11 @@ sub acc_topic { # walk_thread callback
# continue existing topic
my $topic = $ctx->{-cur_topic}; # should never be undef
- $topic->[0] = $ds if $ds > $topic->[0];
- $topic->[1]++; # bump N+ message counter
- my $seen = $topic->[2];
- if (scalar(@$topic) == 3) { # parent was a ghost
+ $topic->[0] = $ts if $ts > $topic->[0];
+ $topic->[1] = $ds if $ds > $topic->[1];
+ $topic->[2]++; # bump N+ message counter
+ my $seen = $topic->[3];
+ if (scalar(@$topic) == 4) { # parent was a ghost
push @$topic, $subj;
} elsif (!defined($seen->{$subj})) {
push @$topic, $level, $subj; # @extra messages
@@ -1061,7 +1065,7 @@ sub acc_topic { # walk_thread callback
$seen->{$subj} = $mid; # latest for subject
} else { # ghost message
return 1 if $level != 0; # ignore child ghosts
- my $topic = $ctx->{-cur_topic} = [ -666, 0, {} ];
+ my $topic = $ctx->{-cur_topic} = [ -666, -666, 0, {} ];
push @{$ctx->{order}}, $topic;
}
1;
@@ -1082,7 +1086,7 @@ sub dump_topics {
}
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
- my ($ds, $n, $seen, $top_subj, @extra) = @$topic;
+ my ($ts, $ds, $n, $seen, $top_subj, @extra) = @$topic;
@$topic = ();
next unless defined $top_subj; # ghost topic
my $mid = delete $seen->{$top_subj};
^ permalink raw reply related [relevance 7%]
* [PATCH] doc: add release notes directory
@ 2019-09-14 19:50 5% Eric Wong
0 siblings, 0 replies; 6+ results
From: Eric Wong @ 2019-09-14 19:50 UTC (permalink / raw)
To: meta
The v1.2.0 is a work-in-progress, while the others are copied
out of our mail archives.
Eventually, a NEWS file will be generated from these emails and
distributed in the release tarball. There'll also be an Atom
feed for the website reusing our feed generation code.
---
.gitattributes | 2 +
Documentation/RelNotes/v1.0.0.eml | 21 ++
Documentation/RelNotes/v1.1.0-pre1.eml | 295 +++++++++++++++++++++++++
Documentation/RelNotes/v1.2.0.wip | 40 ++++
MANIFEST | 4 +
5 files changed, 362 insertions(+)
create mode 100644 .gitattributes
create mode 100644 Documentation/RelNotes/v1.0.0.eml
create mode 100644 Documentation/RelNotes/v1.1.0-pre1.eml
create mode 100644 Documentation/RelNotes/v1.2.0.wip
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..bb53518
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Email signatures start with "-- \n"
+*.eml whitespace=-blank-at-eol
diff --git a/Documentation/RelNotes/v1.0.0.eml b/Documentation/RelNotes/v1.0.0.eml
new file mode 100644
index 0000000..ae6ea4e
--- /dev/null
+++ b/Documentation/RelNotes/v1.0.0.eml
@@ -0,0 +1,21 @@
+From e@80x24.org Thu Feb 8 02:33:57 2018
+Date: Thu, 8 Feb 2018 02:33:57 +0000
+From: Eric Wong <e@80x24.org>
+To: meta@public-inbox.org
+Subject: [ANNOUNCE] public-inbox 1.0.0
+Message-ID: <20180208023357.GA32591@80x24.org>
+
+After some 3.5 odd years of working on this, I suppose now is
+as good a time as any to tar this up and call it 1.0.0.
+
+The TODO list is still very long and there'll be some new
+development in coming weeks :>
+
+So, here you have a release:
+
+ https://public-inbox.org/releases/public-inbox-1.0.0.tar.gz
+
+Checksums, mainly as a safeguard against accidental file corruption:
+
+SHA-256 4a08569f3d99310f713bb32bec0aa4819d6b41871e0421ec4eec0657a5582216
+ (in other words, don't trust me; instead read the code :>)
diff --git a/Documentation/RelNotes/v1.1.0-pre1.eml b/Documentation/RelNotes/v1.1.0-pre1.eml
new file mode 100644
index 0000000..ee1ecc3
--- /dev/null
+++ b/Documentation/RelNotes/v1.1.0-pre1.eml
@@ -0,0 +1,295 @@
+From e@80x24.org Wed May 9 20:23:03 2018
+Date: Wed, 9 May 2018 20:23:03 +0000
+From: Eric Wong <e@80x24.org>
+To: meta@public-inbox.org
+Cc: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
+Subject: [ANNOUNCE] public-inbox 1.1.0-pre1
+Message-ID: <20180509202303.GA15156@dcvr>
+
+Pre-release for v2 repository support.
+Thanks to The Linux Foundation for supporting this work!
+
+https://public-inbox.org/releases/public-inbox-1.1.0-pre1.tar.gz
+
+SHA-256: d0023770a63ca109e6fe2c58b04c58987d4f81572ac69d18f95d6af0915fa009
+(only intended to guard against accidental file corruption)
+
+shortlog below:
+
+Eric Wong (27):
+ nntp: improve fairness during XOVER and similar commands
+ nntp: do not drain rbuf if there is a command pending
+ extmsg: use news.gmane.org for Message-ID lookups
+ searchview: fix non-numeric comparison
+ mbox: do not barf on queries which return no results
+ nntp: allow and ignore empty commands
+ ensure SQLite and Xapian files respect core.sharedRepository
+ TODO: a few more updates
+ filter/rubylang: do not set altid on spam training
+ import: cleanup git cat-file processes when ->done
+ disallow "\t" and "\n" in OVER headers
+ searchidx: release lock again during v1 batch callback
+ searchidx: remove leftover debugging code
+ convert: copy description and git config from v1 repo
+ view: untangle loop when showing message headers
+ view: wrap To: and Cc: headers in HTML display
+ view: drop redundant References: display code
+ TODO: add EPOLLEXCLUSIVE item
+ searchview: do not blindly append "l" parameter to URL
+ search: avoid repeated mbox results from search
+ msgmap: add limit to response for NNTP
+ thread: prevent hidden threads in /$INBOX/ landing page
+ thread: sort incoming messages by Date
+ searchidx: preserve umask when starting/committing transactions
+ scripts/import_slrnspool: support v2 repos
+ scripts/import_slrnspool: cleanup progress messages
+ public-inbox 1.1.0-pre1
+
+Eric Wong (Contractor, The Linux Foundation) (239):
+ AUTHORS: add The Linux Foundation
+ watch_maildir: allow '-' in mail filename
+ scripts/import_vger_from_mbox: relax From_ line match slightly
+ import: stop writing legacy ssoma.index by default
+ import: begin supporting this without ssoma.lock
+ import: initial handling for v2
+ t/import: test for last_object_id insertion
+ content_id: add test case
+ searchmsg: add mid_mime import for _extract_mid
+ scripts/import_vger_from_mbox: support --dry-run option
+ import: APIs to support v2 use
+ search: free up 'Q' prefix for a real unique identifier
+ searchidx: fix comment around next_thread_id
+ address: extract more characters from email addresses
+ import: pass "raw" dates to git-fast-import(1)
+ scripts/import_vger_from_mbox: use v2 layout for import
+ import: quiet down warnings from bogus From: lines
+ import: allow the epoch (0s) as a valid time
+ extmsg: fix broken Xapian MID lookup
+ search: stop assuming Message-ID is unique
+ www: stop assuming mainrepo == git_dir
+ v2writable: initial cut for repo-rotation
+ git: reload alternates file on missing blob
+ v2: support Xapian + SQLite indexing
+ import_vger_from_inbox: allow "-V" option
+ import_vger_from_mbox: use PublicInbox::MIME and avoid clobbering
+ v2: parallelize Xapian indexing
+ v2writable: round-robin to partitions based on article number
+ searchidxpart: increase pipe size for partitions
+ v2writable: warn on duplicate Message-IDs
+ searchidx: do not modify Xapian DB while iterating
+ v2/ui: some hacky things to get the PSGI UI to show up
+ v2/ui: retry DB reopens in a few more places
+ v2writable: cleanup unused pipes in partitions
+ searchidxpart: binmode
+ use PublicInbox::MIME consistently
+ searchidxpart: chomp line before splitting
+ searchidx*: name child subprocesses
+ searchidx: get rid of pointless index_blob wrapper
+ view: remove X-PI-TS reference
+ searchidxthread: load doc data for references
+ searchidxpart: force integers into add_message
+ search: reopen skeleton DB as well
+ searchidx: index values in the threader
+ search: use different Enquire object for skeleton queries
+ rename SearchIdxThread to SearchIdxSkeleton
+ v2writable: commit to skeleton via remote partitions
+ searchidxskeleton: extra error checking
+ searchidx: do not modify Xapian DB while iterating
+ search: query_xover uses skeleton DB iff available
+ v2/ui: get nntpd and init tests running on v2
+ v2writable: delete ::Import obj when ->done
+ search: remove informational "warning" message
+ searchidx: add PID to error message when die-ing
+ content_id: special treatment for Message-Id headers
+ evcleanup: disable outside of daemon
+ v2writable: deduplicate detection on add
+ evcleanup: do not create event loop if nothing was registered
+ mid: add `mids' and `references' methods for extraction
+ content_id: use `mids' and `references' for MID extraction
+ searchidx: use new `references' method for parsing References
+ content_id: no need to be human-friendly
+ v2writable: inject new Message-IDs on true duplicates
+ search: revert to using 'Q' as a uniQue id per-Xapian conventions
+ searchidx: support indexing multiple MIDs
+ mid: be strict with References, but loose on Message-Id
+ searchidx: avoid excessive XNQ indexing with diffs
+ searchidxskeleton: add a note about locking
+ v2writable: generated Message-ID goes first
+ searchidx: use add_boolean_term for internal terms
+ searchidx: add NNTP article number as a searchable term
+ mid: truncate excessively long MIDs early
+ nntp: use NNTP article numbers for lookups
+ nntp: fix NEWNEWS command
+ searchidx: store the primary MID in doc data for NNTP
+ import: consolidate object info for v2 imports
+ v2: avoid redundant/repeated configs for git partition repos
+ INSTALL: document more optional dependencies
+ search: favor skeleton DB for lookup_mail
+ search: each_smsg_by_mid uses skeleton if available
+ v2writable: remove unnecessary skeleton commit
+ favor Received: date over Date: header globally
+ import: fall back to Sender for extracting name and email
+ scripts/import_vger_from_mbox: perform mboxrd or mboxo escaping
+ v2writable: detect and use previous partition count
+ extmsg: rework partial MID matching to favor current inbox
+ extmsg: rework partial MID matching to favor current inbox
+ content_id: use Sender header if From is not available
+ v2writable: support "barrier" operation to avoid reforking
+ use string ref for Email::Simple->new
+ v2writable: remove unnecessary idx_init call
+ searchidx: do not delete documents while iterating
+ search: allow ->reopen to be chainable
+ v2writable: implement remove correctly
+ skeleton: barrier init requires a lock
+ import: (v2) delete writes the blob into history in subdir
+ import: (v2): write deletes to a separate '_' subdirectory
+ import: implement barrier operation for v1 repos
+ mid: mid_mime uses v2-compatible mids function
+ watchmaildir: use content_digest to generate Message-Id
+ import: force Message-ID generation for v1 here
+ import: switch to URL-safe Base64 for Message-IDs
+ v2writable: test for idempotent removals
+ import: enable locking under v2
+ index: s/GIT_DIR/REPO_DIR/
+ Lock: new base class for writable lockers
+ t/watch_maildir: note the reason for FIFO creation
+ v2writable: ensure ->done is idempotent
+ watchmaildir: support v2 repositories
+ searchidxpart: s/barrier/remote_barrier/
+ v2writable: allow disabling parallelization
+ scripts/import_vger_from_mbox: filter out same headers as MDA
+ v2writable: add DEBUG_DIFF env support
+ v2writable: remove "resent" message for duplicate Message-IDs
+ content_id: do not take Message-Id into account
+ introduce InboxWritable class
+ import: discard all the same headers as MDA
+ InboxWritable: add mbox/maildir parsing + import logic
+ use both Date: and Received: times
+ msgmap: add tmp_clone to create an anonymous copy
+ fix syntax warnings
+ v2writable: support reindexing Xapian
+ t/altid.t: extra tests for mid_set
+ v2writable: add NNTP article number regeneration support
+ v2writable: clarify header cleanups
+ v2writable: DEBUG_DIFF respects $TMPDIR
+ feed: $INBOX/new.atom endpoint supports v2 inboxes
+ import: consolidate mid prepend logic, here
+ www: $MESSAGE_ID/raw endpoint supports "duplicates"
+ search: reopen DB if each_smsg_by_mid fails
+ t/psgi_v2: minimal test for Atom feed and t.mbox.gz
+ feed: fix new.html for v2
+ view: permalink (per-message) view shows multiple messages
+ searchidx: warn about vivifying multiple ghosts
+ v2writable: warn on unseen deleted files
+ www: get rid of unnecessary 'inbox' name reference
+ searchview: remove unnecessary imports from MID module
+ view: depend on SearchMsg for Message-ID
+ http: fix modification of read-only value
+ githttpbackend: avoid infinite loop on generic PSGI servers
+ www: support cloning individual v2 git partitions
+ http: fix modification of read-only value
+ githttpbackend: avoid infinite loop on generic PSGI servers
+ www: remove unnecessary ghost checks
+ v2writable: append, instead of prepending generated Message-ID
+ lookup by Message-ID favors the "primary" one
+ www: fix attachment downloads for conflicted Message-IDs
+ searchmsg: document why we store To: and Cc: for NNTP
+ public-inbox-convert: tool for converting old to new inboxes
+ v2writable: support purging messages from git entirely
+ search: cleanup uniqueness checking
+ search: get rid of most lookup_* subroutines
+ search: move find_doc_ids to searchidx
+ v2writable: cleanup: get rid of unused fields
+ mbox: avoid extracting Message-ID for linkification
+ www: cleanup expensive fallback for legacy URLs
+ view: get rid of some unnecessary imports
+ search: retry_reopen on first_smsg_by_mid
+ import: run_die supports redirects as spawn does
+ v2writable: initializing an existing inbox is idempotent
+ public-inbox-compact: new tool for driving xapian-compact
+ mda: support v2 inboxes
+ search: warn on reopens and die on total failure
+ v2writable: allow gaps in git partitions
+ v2writable: convert some fatal reindex errors to warnings
+ wwwstream: flesh out clone instructions for v2
+ v2writable: go backwards through alternate Message-IDs
+ view: speed up homepage loading time with date clamp
+ view: drop load_results
+ feed: optimize query for feeds, too
+ msgtime: parse 3-digit years properly
+ convert: avoid redundant "done\n" statement for fast-import
+ search: move permissions handling to InboxWritable
+ t/v2writable: use simplify permissions reading
+ v2: respect core.sharedRepository in git configs
+ searchidx: correct warning for over-vivification
+ v2: one file, really
+ v2writable: fix parallel termination
+ truncate Message-IDs and References consistently
+ scripts/import_vger_from_mbox: set address properly
+ search: reduce columns stored in Xapian
+ replace Xapian skeleton with SQLite overview DB
+ v2writable: simplify barrier vs checkpoints
+ t/over: test empty Subject: line matching
+ www: rework query responses to avoid COUNT in SQLite
+ over: speedup get_thread by avoiding JOIN
+ nntp: fix NEWNEWS command
+ t/thread-all.t: modernize test to support modern inboxes
+ rename+rewrite test using Benchmark module
+ nntp: make XOVER, XHDR, OVER, HDR and NEWNEWS faster
+ view: avoid offset during pagination
+ mbox: remove remaining OFFSET usage in SQLite
+ msgmap: replace id_batch with ids_after
+ nntp: simplify the long_response API
+ searchidx: ensure duplicated Message-IDs can be linked together
+ init: s/GIT_DIR/REPO_DIR/ in usage
+ import: rewrite less history during purge
+ v2: support incremental indexing + purge
+ v2writable: do not modify DBs while iterating for ->remove
+ v2writable: recount partitions after acquiring lock
+ searchmsg: remove unused `tid' and `path' methods
+ search: remove unnecessary OP_AND of query
+ mbox: do not sort search results
+ searchview: minor cleanup
+ support altid mechanism for v2
+ compact: better handling of over.sqlite3* files
+ v2writable: remove redundant remove from Over DB
+ v2writable: allow tracking parallel versions
+ v2writable: refer to git each repository as "epoch"
+ over: use only supported and safe SQLite APIs
+ search: index and allow searching by date-time
+ altid: fix miscopied field name
+ nntp: set Xref across multiple inboxes
+ www: favor reading more from SQLite, and less from Xapian
+ ensure Xapian and SQLite are still optional for v1 tests
+ psgi: ensure /$INBOX/$MESSAGE_ID/T/ endpoint is chronological
+ over: avoid excessive SELECT
+ over: remove forked subprocess
+ v2writable: reduce barriers
+ index: allow specifying --jobs=0 to disable multiprocess
+ convert: support converting with altid defined
+ store less data in the Xapian document
+ msgmap: speed up minmax with separate queries
+ feed: respect feedmax, again
+ v1: remove articles from overview DB
+ compact: do not merge v2 repos by default
+ v2writable: reduce partititions by one
+ search: preserve References in Xapian smsg for x=t view
+ v2: generate better Message-IDs for duplicates
+ v2: improve deduplication checks
+ import: cat_blob drops leading 'From ' lines like Inbox
+ searchidx: regenerate and avoid article number gaps on full index
+ extmsg: remove expensive git path checks
+ use %H consistently to disable abbreviations
+ searchidx: increase term positions for all text terms
+ searchidx: revert default BATCH_BYTES to 1_000_000
+ Merge remote-tracking branch 'origin/master' into v2
+ fix tests to run without Xapian installed
+ extmsg: use Xapian only for partial matches
+
+Jonathan Corbet (3):
+ Don't use LIMIT in UPDATE statements
+ Update the installation instructions with Fedora package names
+ Allow specification of the number of search results to return
+--
+git clone https://public-inbox.org/ public-inbox
+(working on a homepage... sorta :)
diff --git a/Documentation/RelNotes/v1.2.0.wip b/Documentation/RelNotes/v1.2.0.wip
new file mode 100644
index 0000000..41236a0
--- /dev/null
+++ b/Documentation/RelNotes/v1.2.0.wip
@@ -0,0 +1,40 @@
+To: meta@public-inbox.org
+Subject: [WIP] public-inbox 1.2.0
+
+* first non-pre/rc release with v2 format support for scalability.
+ See public-inbox-v2-format(5) manpage for more details.
+
+* new admin tools for v2 repos:
+ - public-inbox-convert - converts v1 to v2 repo formats
+ - public-inbox-compact - v2 convenience wrapper for xapian-compact(1)
+ - public-inbox-purge - purges entire messages out of v2 history
+ - public-inbox-edit - edits sensitive data out messages from v2 history
+ - public-inbox-xcpdb - copydatabase(1) wrapper to upgrade Xapian formats
+ (e.g. from "chert" to "glass") and resharding
+ of v2 repos
+
+* SQLite3 support decoupled from Xapian support, and Xapian DBs may be
+ configured without phrase support to save space. See "indexlevel" in
+ public-inbox-config(5) manpage for more info.
+
+* public-inbox-nntpd
+ - support STARTTLS and NNTPS
+ - support COMPRESS extension
+ - fix several RFC3977 compliance bugs
+ - improved interopability with picky clients such as leafnode
+
+* public-inbox-watch
+ - support multiple spam training directories
+ - support mapping multiple inboxes per Maildir
+
+* PublicInbox::WWW
+ - grokmirror-compatible manifest.js.gz endpoint generation
+ - user-configurable color support in $INBOX_URL/_/text/color/
+ - BOFHs may set default colors via "publicinbox.css"
+ (see public-inbox-config(5))
+
+* Danga::Socket is no longer a runtime dependency of daemons.
+
+* improved FreeBSD support
+
+See archives at https://public-inbox.org/meta/ for all history.
diff --git a/MANIFEST b/MANIFEST
index f5290b4..ecf239f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,7 +1,11 @@
+.gitattributes
.gitignore
AUTHORS
COPYING
Documentation/.gitignore
+Documentation/RelNotes/v1.0.0.eml
+Documentation/RelNotes/v1.1.0-pre1.eml
+Documentation/RelNotes/v1.2.0.wip
Documentation/dc-dlvr-spam-flow.txt
Documentation/design_notes.txt
Documentation/design_www.txt
--
EW
^ permalink raw reply related [relevance 5%]
* [ANNOUNCE] public-inbox 1.1.0-pre1
@ 2018-05-09 20:23 5% Eric Wong
0 siblings, 0 replies; 6+ results
From: Eric Wong @ 2018-05-09 20:23 UTC (permalink / raw)
To: meta; +Cc: Konstantin Ryabitsev
Pre-release for v2 repository support.
Thanks to The Linux Foundation for supporting this work!
https://public-inbox.org/releases/public-inbox-1.1.0-pre1.tar.gz
SHA-256: d0023770a63ca109e6fe2c58b04c58987d4f81572ac69d18f95d6af0915fa009
(only intended to guard against accidental file corruption)
shortlog below:
Eric Wong (27):
nntp: improve fairness during XOVER and similar commands
nntp: do not drain rbuf if there is a command pending
extmsg: use news.gmane.org for Message-ID lookups
searchview: fix non-numeric comparison
mbox: do not barf on queries which return no results
nntp: allow and ignore empty commands
ensure SQLite and Xapian files respect core.sharedRepository
TODO: a few more updates
filter/rubylang: do not set altid on spam training
import: cleanup git cat-file processes when ->done
disallow "\t" and "\n" in OVER headers
searchidx: release lock again during v1 batch callback
searchidx: remove leftover debugging code
convert: copy description and git config from v1 repo
view: untangle loop when showing message headers
view: wrap To: and Cc: headers in HTML display
view: drop redundant References: display code
TODO: add EPOLLEXCLUSIVE item
searchview: do not blindly append "l" parameter to URL
search: avoid repeated mbox results from search
msgmap: add limit to response for NNTP
thread: prevent hidden threads in /$INBOX/ landing page
thread: sort incoming messages by Date
searchidx: preserve umask when starting/committing transactions
scripts/import_slrnspool: support v2 repos
scripts/import_slrnspool: cleanup progress messages
public-inbox 1.1.0-pre1
Eric Wong (Contractor, The Linux Foundation) (239):
AUTHORS: add The Linux Foundation
watch_maildir: allow '-' in mail filename
scripts/import_vger_from_mbox: relax From_ line match slightly
import: stop writing legacy ssoma.index by default
import: begin supporting this without ssoma.lock
import: initial handling for v2
t/import: test for last_object_id insertion
content_id: add test case
searchmsg: add mid_mime import for _extract_mid
scripts/import_vger_from_mbox: support --dry-run option
import: APIs to support v2 use
search: free up 'Q' prefix for a real unique identifier
searchidx: fix comment around next_thread_id
address: extract more characters from email addresses
import: pass "raw" dates to git-fast-import(1)
scripts/import_vger_from_mbox: use v2 layout for import
import: quiet down warnings from bogus From: lines
import: allow the epoch (0s) as a valid time
extmsg: fix broken Xapian MID lookup
search: stop assuming Message-ID is unique
www: stop assuming mainrepo == git_dir
v2writable: initial cut for repo-rotation
git: reload alternates file on missing blob
v2: support Xapian + SQLite indexing
import_vger_from_inbox: allow "-V" option
import_vger_from_mbox: use PublicInbox::MIME and avoid clobbering
v2: parallelize Xapian indexing
v2writable: round-robin to partitions based on article number
searchidxpart: increase pipe size for partitions
v2writable: warn on duplicate Message-IDs
searchidx: do not modify Xapian DB while iterating
v2/ui: some hacky things to get the PSGI UI to show up
v2/ui: retry DB reopens in a few more places
v2writable: cleanup unused pipes in partitions
searchidxpart: binmode
use PublicInbox::MIME consistently
searchidxpart: chomp line before splitting
searchidx*: name child subprocesses
searchidx: get rid of pointless index_blob wrapper
view: remove X-PI-TS reference
searchidxthread: load doc data for references
searchidxpart: force integers into add_message
search: reopen skeleton DB as well
searchidx: index values in the threader
search: use different Enquire object for skeleton queries
rename SearchIdxThread to SearchIdxSkeleton
v2writable: commit to skeleton via remote partitions
searchidxskeleton: extra error checking
searchidx: do not modify Xapian DB while iterating
search: query_xover uses skeleton DB iff available
v2/ui: get nntpd and init tests running on v2
v2writable: delete ::Import obj when ->done
search: remove informational "warning" message
searchidx: add PID to error message when die-ing
content_id: special treatment for Message-Id headers
evcleanup: disable outside of daemon
v2writable: deduplicate detection on add
evcleanup: do not create event loop if nothing was registered
mid: add `mids' and `references' methods for extraction
content_id: use `mids' and `references' for MID extraction
searchidx: use new `references' method for parsing References
content_id: no need to be human-friendly
v2writable: inject new Message-IDs on true duplicates
search: revert to using 'Q' as a uniQue id per-Xapian conventions
searchidx: support indexing multiple MIDs
mid: be strict with References, but loose on Message-Id
searchidx: avoid excessive XNQ indexing with diffs
searchidxskeleton: add a note about locking
v2writable: generated Message-ID goes first
searchidx: use add_boolean_term for internal terms
searchidx: add NNTP article number as a searchable term
mid: truncate excessively long MIDs early
nntp: use NNTP article numbers for lookups
nntp: fix NEWNEWS command
searchidx: store the primary MID in doc data for NNTP
import: consolidate object info for v2 imports
v2: avoid redundant/repeated configs for git partition repos
INSTALL: document more optional dependencies
search: favor skeleton DB for lookup_mail
search: each_smsg_by_mid uses skeleton if available
v2writable: remove unnecessary skeleton commit
favor Received: date over Date: header globally
import: fall back to Sender for extracting name and email
scripts/import_vger_from_mbox: perform mboxrd or mboxo escaping
v2writable: detect and use previous partition count
extmsg: rework partial MID matching to favor current inbox
extmsg: rework partial MID matching to favor current inbox
content_id: use Sender header if From is not available
v2writable: support "barrier" operation to avoid reforking
use string ref for Email::Simple->new
v2writable: remove unnecessary idx_init call
searchidx: do not delete documents while iterating
search: allow ->reopen to be chainable
v2writable: implement remove correctly
skeleton: barrier init requires a lock
import: (v2) delete writes the blob into history in subdir
import: (v2): write deletes to a separate '_' subdirectory
import: implement barrier operation for v1 repos
mid: mid_mime uses v2-compatible mids function
watchmaildir: use content_digest to generate Message-Id
import: force Message-ID generation for v1 here
import: switch to URL-safe Base64 for Message-IDs
v2writable: test for idempotent removals
import: enable locking under v2
index: s/GIT_DIR/REPO_DIR/
Lock: new base class for writable lockers
t/watch_maildir: note the reason for FIFO creation
v2writable: ensure ->done is idempotent
watchmaildir: support v2 repositories
searchidxpart: s/barrier/remote_barrier/
v2writable: allow disabling parallelization
scripts/import_vger_from_mbox: filter out same headers as MDA
v2writable: add DEBUG_DIFF env support
v2writable: remove "resent" message for duplicate Message-IDs
content_id: do not take Message-Id into account
introduce InboxWritable class
import: discard all the same headers as MDA
InboxWritable: add mbox/maildir parsing + import logic
use both Date: and Received: times
msgmap: add tmp_clone to create an anonymous copy
fix syntax warnings
v2writable: support reindexing Xapian
t/altid.t: extra tests for mid_set
v2writable: add NNTP article number regeneration support
v2writable: clarify header cleanups
v2writable: DEBUG_DIFF respects $TMPDIR
feed: $INBOX/new.atom endpoint supports v2 inboxes
import: consolidate mid prepend logic, here
www: $MESSAGE_ID/raw endpoint supports "duplicates"
search: reopen DB if each_smsg_by_mid fails
t/psgi_v2: minimal test for Atom feed and t.mbox.gz
feed: fix new.html for v2
view: permalink (per-message) view shows multiple messages
searchidx: warn about vivifying multiple ghosts
v2writable: warn on unseen deleted files
www: get rid of unnecessary 'inbox' name reference
searchview: remove unnecessary imports from MID module
view: depend on SearchMsg for Message-ID
http: fix modification of read-only value
githttpbackend: avoid infinite loop on generic PSGI servers
www: support cloning individual v2 git partitions
http: fix modification of read-only value
githttpbackend: avoid infinite loop on generic PSGI servers
www: remove unnecessary ghost checks
v2writable: append, instead of prepending generated Message-ID
lookup by Message-ID favors the "primary" one
www: fix attachment downloads for conflicted Message-IDs
searchmsg: document why we store To: and Cc: for NNTP
public-inbox-convert: tool for converting old to new inboxes
v2writable: support purging messages from git entirely
search: cleanup uniqueness checking
search: get rid of most lookup_* subroutines
search: move find_doc_ids to searchidx
v2writable: cleanup: get rid of unused fields
mbox: avoid extracting Message-ID for linkification
www: cleanup expensive fallback for legacy URLs
view: get rid of some unnecessary imports
search: retry_reopen on first_smsg_by_mid
import: run_die supports redirects as spawn does
v2writable: initializing an existing inbox is idempotent
public-inbox-compact: new tool for driving xapian-compact
mda: support v2 inboxes
search: warn on reopens and die on total failure
v2writable: allow gaps in git partitions
v2writable: convert some fatal reindex errors to warnings
wwwstream: flesh out clone instructions for v2
v2writable: go backwards through alternate Message-IDs
view: speed up homepage loading time with date clamp
view: drop load_results
feed: optimize query for feeds, too
msgtime: parse 3-digit years properly
convert: avoid redundant "done\n" statement for fast-import
search: move permissions handling to InboxWritable
t/v2writable: use simplify permissions reading
v2: respect core.sharedRepository in git configs
searchidx: correct warning for over-vivification
v2: one file, really
v2writable: fix parallel termination
truncate Message-IDs and References consistently
scripts/import_vger_from_mbox: set address properly
search: reduce columns stored in Xapian
replace Xapian skeleton with SQLite overview DB
v2writable: simplify barrier vs checkpoints
t/over: test empty Subject: line matching
www: rework query responses to avoid COUNT in SQLite
over: speedup get_thread by avoiding JOIN
nntp: fix NEWNEWS command
t/thread-all.t: modernize test to support modern inboxes
rename+rewrite test using Benchmark module
nntp: make XOVER, XHDR, OVER, HDR and NEWNEWS faster
view: avoid offset during pagination
mbox: remove remaining OFFSET usage in SQLite
msgmap: replace id_batch with ids_after
nntp: simplify the long_response API
searchidx: ensure duplicated Message-IDs can be linked together
init: s/GIT_DIR/REPO_DIR/ in usage
import: rewrite less history during purge
v2: support incremental indexing + purge
v2writable: do not modify DBs while iterating for ->remove
v2writable: recount partitions after acquiring lock
searchmsg: remove unused `tid' and `path' methods
search: remove unnecessary OP_AND of query
mbox: do not sort search results
searchview: minor cleanup
support altid mechanism for v2
compact: better handling of over.sqlite3* files
v2writable: remove redundant remove from Over DB
v2writable: allow tracking parallel versions
v2writable: refer to git each repository as "epoch"
over: use only supported and safe SQLite APIs
search: index and allow searching by date-time
altid: fix miscopied field name
nntp: set Xref across multiple inboxes
www: favor reading more from SQLite, and less from Xapian
ensure Xapian and SQLite are still optional for v1 tests
psgi: ensure /$INBOX/$MESSAGE_ID/T/ endpoint is chronological
over: avoid excessive SELECT
over: remove forked subprocess
v2writable: reduce barriers
index: allow specifying --jobs=0 to disable multiprocess
convert: support converting with altid defined
store less data in the Xapian document
msgmap: speed up minmax with separate queries
feed: respect feedmax, again
v1: remove articles from overview DB
compact: do not merge v2 repos by default
v2writable: reduce partititions by one
search: preserve References in Xapian smsg for x=t view
v2: generate better Message-IDs for duplicates
v2: improve deduplication checks
import: cat_blob drops leading 'From ' lines like Inbox
searchidx: regenerate and avoid article number gaps on full index
extmsg: remove expensive git path checks
use %H consistently to disable abbreviations
searchidx: increase term positions for all text terms
searchidx: revert default BATCH_BYTES to 1_000_000
Merge remote-tracking branch 'origin/master' into v2
fix tests to run without Xapian installed
extmsg: use Xapian only for partial matches
Jonathan Corbet (3):
Don't use LIMIT in UPDATE statements
Update the installation instructions with Fedora package names
Allow specification of the number of search results to return
--
git clone https://public-inbox.org/ public-inbox
(working on a homepage... sorta :)
^ permalink raw reply [relevance 5%]
* v2 merged to master
@ 2018-04-19 1:20 5% Eric Wong
0 siblings, 0 replies; 6+ results
From: Eric Wong @ 2018-04-19 1:20 UTC (permalink / raw)
To: meta
I actually merged master into v2, so it's a bit backwards :P
commit cfb8d16578e7f2f2e300f9f436205e4a8fc7f322
Merge: 1dc0f0c 119463b
Author: Eric Wong (Contractor, The Linux Foundation) <e@80x24.org>
Date: Wed Apr 18 20:58:35 2018 +0000
Merge remote-tracking branch 'origin/master' into v2
I screwed up the indexing on http://hjrcffqmbrq6wope.onion/git/
so that's still going, but I think I was able to update the rest
of them (including the heavily trafficked non-.onion) w/o downtime.
The mirror at http://czquwvybam4bgbro.onion/git/ has been running
the v2 code for over a week, now.
Thanks to the Linux Foundation for funding this work. Will still
need to make some documentation updates and such.
Eric Wong (Contractor, The Linux Foundation) (237):
AUTHORS: add The Linux Foundation
watch_maildir: allow '-' in mail filename
scripts/import_vger_from_mbox: relax From_ line match slightly
import: stop writing legacy ssoma.index by default
import: begin supporting this without ssoma.lock
import: initial handling for v2
t/import: test for last_object_id insertion
content_id: add test case
searchmsg: add mid_mime import for _extract_mid
scripts/import_vger_from_mbox: support --dry-run option
import: APIs to support v2 use
search: free up 'Q' prefix for a real unique identifier
searchidx: fix comment around next_thread_id
address: extract more characters from email addresses
import: pass "raw" dates to git-fast-import(1)
scripts/import_vger_from_mbox: use v2 layout for import
import: quiet down warnings from bogus From: lines
import: allow the epoch (0s) as a valid time
extmsg: fix broken Xapian MID lookup
search: stop assuming Message-ID is unique
www: stop assuming mainrepo == git_dir
v2writable: initial cut for repo-rotation
git: reload alternates file on missing blob
v2: support Xapian + SQLite indexing
import_vger_from_inbox: allow "-V" option
import_vger_from_mbox: use PublicInbox::MIME and avoid clobbering
v2: parallelize Xapian indexing
v2writable: round-robin to partitions based on article number
searchidxpart: increase pipe size for partitions
v2writable: warn on duplicate Message-IDs
searchidx: do not modify Xapian DB while iterating
v2/ui: some hacky things to get the PSGI UI to show up
v2/ui: retry DB reopens in a few more places
v2writable: cleanup unused pipes in partitions
searchidxpart: binmode
use PublicInbox::MIME consistently
searchidxpart: chomp line before splitting
searchidx*: name child subprocesses
searchidx: get rid of pointless index_blob wrapper
view: remove X-PI-TS reference
searchidxthread: load doc data for references
searchidxpart: force integers into add_message
search: reopen skeleton DB as well
searchidx: index values in the threader
search: use different Enquire object for skeleton queries
rename SearchIdxThread to SearchIdxSkeleton
v2writable: commit to skeleton via remote partitions
searchidxskeleton: extra error checking
searchidx: do not modify Xapian DB while iterating
search: query_xover uses skeleton DB iff available
v2/ui: get nntpd and init tests running on v2
v2writable: delete ::Import obj when ->done
search: remove informational "warning" message
searchidx: add PID to error message when die-ing
content_id: special treatment for Message-Id headers
evcleanup: disable outside of daemon
v2writable: deduplicate detection on add
evcleanup: do not create event loop if nothing was registered
mid: add `mids' and `references' methods for extraction
content_id: use `mids' and `references' for MID extraction
searchidx: use new `references' method for parsing References
content_id: no need to be human-friendly
v2writable: inject new Message-IDs on true duplicates
search: revert to using 'Q' as a uniQue id per-Xapian conventions
searchidx: support indexing multiple MIDs
mid: be strict with References, but loose on Message-Id
searchidx: avoid excessive XNQ indexing with diffs
searchidxskeleton: add a note about locking
v2writable: generated Message-ID goes first
searchidx: use add_boolean_term for internal terms
searchidx: add NNTP article number as a searchable term
mid: truncate excessively long MIDs early
nntp: use NNTP article numbers for lookups
nntp: fix NEWNEWS command
searchidx: store the primary MID in doc data for NNTP
import: consolidate object info for v2 imports
v2: avoid redundant/repeated configs for git partition repos
INSTALL: document more optional dependencies
search: favor skeleton DB for lookup_mail
search: each_smsg_by_mid uses skeleton if available
v2writable: remove unnecessary skeleton commit
favor Received: date over Date: header globally
import: fall back to Sender for extracting name and email
scripts/import_vger_from_mbox: perform mboxrd or mboxo escaping
v2writable: detect and use previous partition count
extmsg: rework partial MID matching to favor current inbox
extmsg: rework partial MID matching to favor current inbox
content_id: use Sender header if From is not available
v2writable: support "barrier" operation to avoid reforking
use string ref for Email::Simple->new
v2writable: remove unnecessary idx_init call
searchidx: do not delete documents while iterating
search: allow ->reopen to be chainable
v2writable: implement remove correctly
skeleton: barrier init requires a lock
import: (v2) delete writes the blob into history in subdir
import: (v2): write deletes to a separate '_' subdirectory
import: implement barrier operation for v1 repos
mid: mid_mime uses v2-compatible mids function
watchmaildir: use content_digest to generate Message-Id
import: force Message-ID generation for v1 here
import: switch to URL-safe Base64 for Message-IDs
v2writable: test for idempotent removals
import: enable locking under v2
index: s/GIT_DIR/REPO_DIR/
Lock: new base class for writable lockers
t/watch_maildir: note the reason for FIFO creation
v2writable: ensure ->done is idempotent
watchmaildir: support v2 repositories
searchidxpart: s/barrier/remote_barrier/
v2writable: allow disabling parallelization
scripts/import_vger_from_mbox: filter out same headers as MDA
v2writable: add DEBUG_DIFF env support
v2writable: remove "resent" message for duplicate Message-IDs
content_id: do not take Message-Id into account
introduce InboxWritable class
import: discard all the same headers as MDA
InboxWritable: add mbox/maildir parsing + import logic
use both Date: and Received: times
msgmap: add tmp_clone to create an anonymous copy
fix syntax warnings
v2writable: support reindexing Xapian
t/altid.t: extra tests for mid_set
v2writable: add NNTP article number regeneration support
v2writable: clarify header cleanups
v2writable: DEBUG_DIFF respects $TMPDIR
feed: $INBOX/new.atom endpoint supports v2 inboxes
import: consolidate mid prepend logic, here
www: $MESSAGE_ID/raw endpoint supports "duplicates"
search: reopen DB if each_smsg_by_mid fails
t/psgi_v2: minimal test for Atom feed and t.mbox.gz
feed: fix new.html for v2
view: permalink (per-message) view shows multiple messages
searchidx: warn about vivifying multiple ghosts
v2writable: warn on unseen deleted files
www: get rid of unnecessary 'inbox' name reference
searchview: remove unnecessary imports from MID module
view: depend on SearchMsg for Message-ID
http: fix modification of read-only value
githttpbackend: avoid infinite loop on generic PSGI servers
www: support cloning individual v2 git partitions
http: fix modification of read-only value
githttpbackend: avoid infinite loop on generic PSGI servers
www: remove unnecessary ghost checks
v2writable: append, instead of prepending generated Message-ID
lookup by Message-ID favors the "primary" one
www: fix attachment downloads for conflicted Message-IDs
searchmsg: document why we store To: and Cc: for NNTP
public-inbox-convert: tool for converting old to new inboxes
v2writable: support purging messages from git entirely
search: cleanup uniqueness checking
search: get rid of most lookup_* subroutines
search: move find_doc_ids to searchidx
v2writable: cleanup: get rid of unused fields
mbox: avoid extracting Message-ID for linkification
www: cleanup expensive fallback for legacy URLs
view: get rid of some unnecessary imports
search: retry_reopen on first_smsg_by_mid
import: run_die supports redirects as spawn does
v2writable: initializing an existing inbox is idempotent
public-inbox-compact: new tool for driving xapian-compact
mda: support v2 inboxes
search: warn on reopens and die on total failure
v2writable: allow gaps in git partitions
v2writable: convert some fatal reindex errors to warnings
wwwstream: flesh out clone instructions for v2
v2writable: go backwards through alternate Message-IDs
view: speed up homepage loading time with date clamp
view: drop load_results
feed: optimize query for feeds, too
msgtime: parse 3-digit years properly
convert: avoid redundant "done\n" statement for fast-import
search: move permissions handling to InboxWritable
t/v2writable: use simplify permissions reading
v2: respect core.sharedRepository in git configs
searchidx: correct warning for over-vivification
v2: one file, really
v2writable: fix parallel termination
truncate Message-IDs and References consistently
scripts/import_vger_from_mbox: set address properly
search: reduce columns stored in Xapian
replace Xapian skeleton with SQLite overview DB
v2writable: simplify barrier vs checkpoints
t/over: test empty Subject: line matching
www: rework query responses to avoid COUNT in SQLite
over: speedup get_thread by avoiding JOIN
nntp: fix NEWNEWS command
t/thread-all.t: modernize test to support modern inboxes
rename+rewrite test using Benchmark module
nntp: make XOVER, XHDR, OVER, HDR and NEWNEWS faster
view: avoid offset during pagination
mbox: remove remaining OFFSET usage in SQLite
msgmap: replace id_batch with ids_after
nntp: simplify the long_response API
searchidx: ensure duplicated Message-IDs can be linked together
init: s/GIT_DIR/REPO_DIR/ in usage
import: rewrite less history during purge
v2: support incremental indexing + purge
v2writable: do not modify DBs while iterating for ->remove
v2writable: recount partitions after acquiring lock
searchmsg: remove unused `tid' and `path' methods
search: remove unnecessary OP_AND of query
mbox: do not sort search results
searchview: minor cleanup
support altid mechanism for v2
compact: better handling of over.sqlite3* files
v2writable: remove redundant remove from Over DB
v2writable: allow tracking parallel versions
v2writable: refer to git each repository as "epoch"
over: use only supported and safe SQLite APIs
search: index and allow searching by date-time
altid: fix miscopied field name
nntp: set Xref across multiple inboxes
www: favor reading more from SQLite, and less from Xapian
ensure Xapian and SQLite are still optional for v1 tests
psgi: ensure /$INBOX/$MESSAGE_ID/T/ endpoint is chronological
over: avoid excessive SELECT
over: remove forked subprocess
v2writable: reduce barriers
index: allow specifying --jobs=0 to disable multiprocess
convert: support converting with altid defined
store less data in the Xapian document
msgmap: speed up minmax with separate queries
feed: respect feedmax, again
v1: remove articles from overview DB
compact: do not merge v2 repos by default
v2writable: reduce partititions by one
search: preserve References in Xapian smsg for x=t view
v2: generate better Message-IDs for duplicates
v2: improve deduplication checks
import: cat_blob drops leading 'From ' lines like Inbox
searchidx: regenerate and avoid article number gaps on full index
extmsg: remove expensive git path checks
use %H consistently to disable abbreviations
searchidx: increase term positions for all text terms
searchidx: revert default BATCH_BYTES to 1_000_000
Merge remote-tracking branch 'origin/master' into v2
^ permalink raw reply [relevance 5%]
* [PATCH 05/13] use both Date: and Received: times
2018-03-22 9:40 6% [PATCH 00/13] reindexing, feeds, date fixes Eric Wong (Contractor, The Linux Foundation)
@ 2018-03-22 9:40 5% ` Eric Wong (Contractor, The Linux Foundation)
0 siblings, 0 replies; 6+ results
From: Eric Wong (Contractor, The Linux Foundation) @ 2018-03-22 9:40 UTC (permalink / raw)
To: meta
We want to rely on Date: to sort messages within individual
threads since it keeps messages from git-send-email(1) sorted.
However, since developers occasionally have the clock set
wrong on their machines, sort overall messages by the newest
date in a Received: header so the landing page isn't forever
polluted by messages from the future.
This also gives us determinism for commit times in most cases,
as we'll used the Received: timestamp there, as well.
---
lib/PublicInbox/Import.pm | 17 ++++----
lib/PublicInbox/MsgTime.pm | 80 ++++++++++++++++++++++++------------
lib/PublicInbox/Search.pm | 5 ++-
lib/PublicInbox/SearchIdx.pm | 6 ++-
lib/PublicInbox/SearchIdxSkeleton.pm | 4 +-
lib/PublicInbox/SearchMsg.pm | 26 ++++++------
lib/PublicInbox/SearchView.pm | 6 +--
lib/PublicInbox/View.pm | 30 +++++++-------
8 files changed, 103 insertions(+), 71 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index e50f115..d69934b 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -11,7 +11,7 @@ use base qw(PublicInbox::Lock);
use PublicInbox::Spawn qw(spawn);
use PublicInbox::MID qw(mids mid_mime mid2path);
use PublicInbox::Address;
-use PublicInbox::MsgTime qw(msg_timestamp);
+use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
use PublicInbox::ContentId qw(content_digest);
use PublicInbox::MDA;
@@ -244,9 +244,8 @@ sub remove {
(($self->{tip} = ":$commit"), $cur);
}
-sub parse_date ($) {
- my ($mime) = @_;
- my ($ts, $zone) = msg_timestamp($mime->header_obj);
+sub git_timestamp {
+ my ($ts, $zone) = @_;
$ts = 0 if $ts < 0; # git uses unsigned times
"$ts $zone";
}
@@ -295,7 +294,11 @@ sub add {
my ($self, $mime, $check_cb) = @_; # mime = Email::MIME
my ($name, $email) = extract_author_info($mime);
- my $date_raw = parse_date($mime);
+ my $hdr = $mime->header_obj;
+ my @at = msg_datestamp($hdr);
+ my @ct = msg_timestamp($hdr);
+ my $author_time_raw = git_timestamp(@at);
+ my $commit_time_raw = git_timestamp(@ct);
my $subject = $mime->header('Subject');
$subject = '(no subject)' unless defined $subject;
my $path_type = $self->{path_type};
@@ -349,8 +352,8 @@ sub add {
utf8::encode($subject);
print $w "commit $ref\nmark :$commit\n",
- "author $name <$email> $date_raw\n",
- "committer $self->{ident} ", now_raw(), "\n" or wfail;
+ "author $name <$email> $author_time_raw\n",
+ "committer $self->{ident} $commit_time_raw\n" or wfail;
print $w "data ", (length($subject) + 1), "\n",
$subject, "\n\n" or wfail;
if ($tip ne '') {
diff --git a/lib/PublicInbox/MsgTime.pm b/lib/PublicInbox/MsgTime.pm
index 87664f4..4295e87 100644
--- a/lib/PublicInbox/MsgTime.pm
+++ b/lib/PublicInbox/MsgTime.pm
@@ -4,48 +4,76 @@ package PublicInbox::MsgTime;
use strict;
use warnings;
use base qw(Exporter);
-our @EXPORT_OK = qw(msg_timestamp);
+our @EXPORT_OK = qw(msg_timestamp msg_datestamp);
use Date::Parse qw(str2time);
use Time::Zone qw(tz_offset);
-sub msg_timestamp ($) {
+sub zone_clamp ($) {
+ my ($zone) = @_;
+ $zone ||= '+0000';
+ # "-1200" is the furthest westermost zone offset,
+ # but git fast-import is liberal so we use "-1400"
+ if ($zone >= 1400 || $zone <= -1400) {
+ warn "bogus TZ offset: $zone, ignoring and assuming +0000\n";
+ $zone = '+0000';
+ }
+ $zone;
+}
+
+sub time_response ($) {
+ my ($ret) = @_;
+ wantarray ? @$ret : $ret->[0];
+}
+
+sub msg_received_at ($) {
my ($hdr) = @_; # Email::MIME::Header
- my ($ts, $zone);
- my $mid;
my @recvd = $hdr->header_raw('Received');
+ my ($ts, $zone);
foreach my $r (@recvd) {
$zone = undef;
$r =~ /\s*(\d+\s+[[:alpha:]]+\s+\d{2,4}\s+
\d+\D\d+(?:\D\d+)\s+([\+\-]\d+))/sx or next;
$zone = $2;
$ts = eval { str2time($1) } and last;
- $mid ||= $hdr->header_raw('Message-ID');
+ my $mid = $hdr->header_raw('Message-ID');
warn "no date in $mid Received: $r\n";
}
- unless (defined $ts) {
- my @date = $hdr->header_raw('Date');
- foreach my $d (@date) {
- $zone = undef;
- $ts = eval { str2time($d) };
- if ($@) {
- $mid ||= $hdr->header_raw('Message-ID');
- warn "bad Date: $d in $mid: $@\n";
- } elsif ($d =~ /\s+([\+\-]\d+)\s*\z/) {
- $zone = $1;
- }
+ defined $ts ? [ $ts, zone_clamp($zone) ] : undef;
+}
+
+sub msg_date_only ($) {
+ my ($hdr) = @_; # Email::MIME::Header
+ my @date = $hdr->header_raw('Date');
+ my ($ts, $zone);
+ foreach my $d (@date) {
+ $zone = undef;
+ $ts = eval { str2time($d) };
+ if ($@) {
+ my $mid = $hdr->header_raw('Message-ID');
+ warn "bad Date: $d in $mid: $@\n";
+ } elsif ($d =~ /\s+([\+\-]\d+)\s*\z/) {
+ $zone = $1;
}
}
- $ts = time unless defined $ts;
- return $ts unless wantarray;
+ defined $ts ? [ $ts, zone_clamp($zone) ] : undef;
+}
- $zone ||= '+0000';
- # "-1200" is the furthest westermost zone offset,
- # but git fast-import is liberal so we use "-1400"
- if ($zone >= 1400 || $zone <= -1400) {
- warn "bogus TZ offset: $zone, ignoring and assuming +0000\n";
- $zone = '+0000';
- }
- ($ts, $zone);
+# Favors Received header for sorting globally
+sub msg_timestamp ($) {
+ my ($hdr) = @_; # Email::MIME::Header
+ my $ret;
+ $ret = msg_received_at($hdr) and return time_response($ret);
+ $ret = msg_date_only($hdr) and return time_response($ret);
+ wantarray ? (time, '+0000') : time;
+}
+
+# Favors the Date: header for display and sorting within a thread
+sub msg_datestamp ($) {
+ my ($hdr) = @_; # Email::MIME::Header
+ my $ret;
+ $ret = msg_date_only($hdr) and return time_response($ret);
+ $ret = msg_received_at($hdr) and return time_response($ret);
+ wantarray ? (time, '+0000') : time;
}
1;
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 7e7c989..f08b987 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -8,11 +8,12 @@ use strict;
use warnings;
# values for searching
-use constant TS => 0; # timestamp
+use constant DS => 0; # Date: header in Unix time
use constant NUM => 1; # NNTP article number
use constant BYTES => 2; # :bytes as defined in RFC 3977
use constant LINES => 3; # :lines as defined in RFC 3977
-use constant YYYYMMDD => 4; # for searching in the WWW UI
+use constant TS => 4; # Received: header in Unix time
+use constant YYYYMMDD => 5; # for searching in the WWW UI
use Search::Xapian qw/:standard/;
use PublicInbox::SearchMsg;
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 3d80b00..ef723a4 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -134,7 +134,9 @@ sub add_values ($$) {
my $lines = $values->[PublicInbox::Search::LINES];
add_val($doc, PublicInbox::Search::LINES, $lines);
- my $yyyymmdd = strftime('%Y%m%d', gmtime($ts));
+ my $ds = $values->[PublicInbox::Search::DS];
+ add_val($doc, PublicInbox::Search::DS, $ds);
+ my $yyyymmdd = strftime('%Y%m%d', gmtime($ds));
add_val($doc, PublicInbox::Search::YYYYMMDD, $yyyymmdd);
}
@@ -298,7 +300,7 @@ sub add_message {
}
my $lines = $mime->body_raw =~ tr!\n!\n!;
- my @values = ($smsg->ts, $num, $bytes, $lines);
+ my @values = ($smsg->ds, $num, $bytes, $lines, $smsg->ts);
add_values($doc, \@values);
my $tg = $self->term_generator;
diff --git a/lib/PublicInbox/SearchIdxSkeleton.pm b/lib/PublicInbox/SearchIdxSkeleton.pm
index ba43969..78a1730 100644
--- a/lib/PublicInbox/SearchIdxSkeleton.pm
+++ b/lib/PublicInbox/SearchIdxSkeleton.pm
@@ -121,18 +121,16 @@ sub remote_remove {
die $err if $err;
}
-# values: [ TS, NUM, BYTES, LINES, MID, XPATH, doc_data ]
+# values: [ DS, NUM, BYTES, LINES, TS, MIDS, XPATH, doc_data ]
sub index_skeleton_real ($$) {
my ($self, $values) = @_;
my $doc_data = pop @$values;
my $xpath = pop @$values;
my $mids = pop @$values;
- my $ts = $values->[PublicInbox::Search::TS];
my $smsg = PublicInbox::SearchMsg->new(undef);
my $doc = $smsg->{doc};
PublicInbox::SearchIdx::add_values($doc, $values);
$doc->set_data($doc_data);
- $smsg->{ts} = $ts;
$smsg->load_from_data($doc_data);
my $num = $values->[PublicInbox::Search::NUM];
my @refs = ($smsg->references =~ /<([^>]+)>/g);
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index a1cd0c2..de1fd13 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -9,7 +9,7 @@ use warnings;
use Search::Xapian;
use PublicInbox::MID qw/mid_clean mid_mime/;
use PublicInbox::Address;
-use PublicInbox::MsgTime qw(msg_timestamp);
+use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
sub new {
my ($class, $mime) = @_;
@@ -46,6 +46,7 @@ sub load_expand {
my $doc = $self->{doc};
my $data = $doc->get_data or return;
$self->{ts} = get_val($doc, &PublicInbox::Search::TS);
+ $self->{ds} = get_val($doc, &PublicInbox::Search::DS);
utf8::decode($data);
load_from_data($self, $data);
$self;
@@ -53,12 +54,8 @@ sub load_expand {
sub load_doc {
my ($class, $doc) = @_;
- my $data = $doc->get_data or return;
- my $ts = get_val($doc, &PublicInbox::Search::TS);
- utf8::decode($data);
- my $self = bless { doc => $doc, ts => $ts }, $class;
- load_from_data($self, $data);
- $self
+ my $self = bless { doc => $doc }, $class;
+ $self->load_expand;
}
# :bytes and :lines metadata in RFC 3977
@@ -91,9 +88,9 @@ my @MoY = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
sub date ($) {
my ($self) = @_;
- my $ts = $self->{ts};
- return unless defined $ts;
- my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($ts);
+ my $ds = $self->{ds};
+ return unless defined $ds;
+ my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($ds);
"$DoW[$wday], " . sprintf("%02d $MoY[$mon] %04d %02d:%02d:%02d +0000",
$mday, $year+1900, $hour, $min, $sec);
@@ -119,9 +116,12 @@ sub from_name {
sub ts {
my ($self) = @_;
- $self->{ts} ||= eval {
- msg_timestamp($self->{mime}->header_obj);
- } || 0;
+ $self->{ts} ||= eval { msg_timestamp($self->{mime}->header_obj) } || 0;
+}
+
+sub ds {
+ my ($self) = @_;
+ $self->{ds} ||= eval { msg_datestamp($self->{mime}->header_obj); } || 0;
}
sub to_doc_data {
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 53b88c3..55c588c 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -117,11 +117,11 @@ sub mset_summary {
obfuscate_addrs($obfs_ibx, $s);
obfuscate_addrs($obfs_ibx, $f);
}
- my $ts = PublicInbox::View::fmt_ts($smsg->ts);
+ my $date = PublicInbox::View::fmt_ts($smsg->ds);
my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
$$res .= qq{$rank. <b><a\nhref="$mid/">}.
$s . "</a></b>\n";
- $$res .= "$pfx - by $f @ $ts UTC [$pct%]\n\n";
+ $$res .= "$pfx - by $f @ $date UTC [$pct%]\n\n";
}
$$res .= search_nav_bot($mset, $q);
*noop;
@@ -227,7 +227,7 @@ sub mset_thread {
} ($mset->items) ]});
my $r = $q->{r};
my $rootset = PublicInbox::SearchThread::thread($msgs,
- $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts,
+ $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ds,
$srch);
my $skel = search_nav_bot($mset, $q). "<pre>";
my $inbox = $ctx->{-inbox};
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index f811f4f..18882af 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -6,7 +6,7 @@
package PublicInbox::View;
use strict;
use warnings;
-use PublicInbox::MsgTime qw(msg_timestamp);
+use PublicInbox::MsgTime qw(msg_datestamp);
use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
use PublicInbox::Linkify;
use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape/;
@@ -735,7 +735,7 @@ sub load_results {
sub thread_results {
my ($msgs, $srch) = @_;
require PublicInbox::SearchThread;
- PublicInbox::SearchThread::thread($msgs, *sort_ts, $srch);
+ PublicInbox::SearchThread::thread($msgs, *sort_ds, $srch);
}
sub missing_thread {
@@ -746,7 +746,7 @@ sub missing_thread {
sub _msg_date {
my ($hdr) = @_;
- fmt_ts(msg_timestamp($hdr));
+ fmt_ts(msg_datestamp($hdr));
}
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
@@ -782,7 +782,7 @@ sub skel_dump {
my $obfs_ibx = $ctx->{-obfs_ibx};
obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
- my $d = fmt_ts($smsg->{ts}) . ' ' . indent_for($level) . th_pfx($level);
+ my $d = fmt_ts($smsg->{ds}) . ' ' . indent_for($level) . th_pfx($level);
my $attr = $f;
$ctx->{first_level} ||= $level;
@@ -863,10 +863,10 @@ sub _skel_ghost {
$$dst .= $d;
}
-sub sort_ts {
+sub sort_ds {
[ sort {
- (eval { $a->topmost->{smsg}->ts } || 0) <=>
- (eval { $b->topmost->{smsg}->ts } || 0)
+ (eval { $a->topmost->{smsg}->ds } || 0) <=>
+ (eval { $b->topmost->{smsg}->ds } || 0)
} @{$_[0]} ];
}
@@ -877,21 +877,21 @@ sub acc_topic {
my $srch = $ctx->{srch};
my $mid = $node->{id};
my $x = $node->{smsg} || $srch->lookup_mail($mid);
- my ($subj, $ts);
+ my ($subj, $ds);
my $topic;
if ($x) {
$subj = $x->subject;
$subj = $srch->subject_normalized($subj);
- $ts = $x->ts;
+ $ds = $x->ds;
if ($level == 0) {
- $topic = [ $ts, 1, { $subj => $mid }, $subj ];
+ $topic = [ $ds, 1, { $subj => $mid }, $subj ];
$ctx->{-cur_topic} = $topic;
push @{$ctx->{order}}, $topic;
return;
}
$topic = $ctx->{-cur_topic}; # should never be undef
- $topic->[0] = $ts if $ts > $topic->[0];
+ $topic->[0] = $ds if $ds > $topic->[0];
$topic->[1]++;
my $seen = $topic->[2];
if (scalar(@$topic) == 3) { # parent was a ghost
@@ -910,7 +910,7 @@ sub acc_topic {
sub dump_topics {
my ($ctx) = @_;
- my $order = delete $ctx->{order}; # [ ts, subj1, subj2, subj3, ... ]
+ my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ]
if (!@$order) {
$ctx->{-html_tip} = '<pre>[No topics in range]</pre>';
return 404;
@@ -923,14 +923,14 @@ sub dump_topics {
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
- my ($ts, $n, $seen, $top, @ex) = @$topic;
+ my ($ds, $n, $seen, $top, @ex) = @$topic;
@$topic = ();
next unless defined $top; # ghost topic
my $mid = delete $seen->{$top};
my $href = mid_escape($mid);
my $prev_subj = [ split(/ /, $top) ];
$top = PublicInbox::Hval->new($top)->as_html;
- $ts = fmt_ts($ts);
+ $ds = fmt_ts($ds);
# $n isn't the total number of posts on the topic,
# just the number of posts in the current results window
@@ -946,7 +946,7 @@ sub dump_topics {
my $mbox = qq(<a\nhref="$href/t.mbox.gz">mbox.gz</a>);
my $atom = qq(<a\nhref="$href/t.atom">Atom</a>);
my $s = "<a\nhref=\"$href/T/$anchor\"><b>$top</b></a>\n" .
- " $ts UTC $n - $mbox / $atom\n";
+ " $ds UTC $n - $mbox / $atom\n";
for (my $i = 0; $i < scalar(@ex); $i += 2) {
my $level = $ex[$i];
my $subj = $ex[$i + 1];
--
EW
^ permalink raw reply related [relevance 5%]
* [PATCH 00/13] reindexing, feeds, date fixes
@ 2018-03-22 9:40 6% Eric Wong (Contractor, The Linux Foundation)
2018-03-22 9:40 5% ` [PATCH 05/13] use both Date: and Received: times Eric Wong (Contractor, The Linux Foundation)
0 siblings, 1 reply; 6+ results
From: Eric Wong (Contractor, The Linux Foundation) @ 2018-03-22 9:40 UTC (permalink / raw)
To: meta
TODO:
* fast-import/export filters (upgrades/purging)
* update cloning instructions for v2
* Message-ID conflict support in web UI
* Search SCHEMA_VERSION bump
Eric Wong (Contractor, The Linux Foundation) (13):
content_id: do not take Message-Id into account
introduce InboxWritable class
import: discard all the same headers as MDA
InboxWritable: add mbox/maildir parsing + import logic
use both Date: and Received: times
msgmap: add tmp_clone to create an anonymous copy
fix syntax warnings
v2writable: support reindexing Xapian
t/altid.t: extra tests for mid_set
v2writable: add NNTP article number regeneration support
v2writable: clarify header cleanups
v2writable: DEBUG_DIFF respects $TMPDIR
feed: $INBOX/new.atom endpoint supports v2 inboxes
MANIFEST | 2 +
lib/PublicInbox/ContentId.pm | 3 +-
lib/PublicInbox/Daemon.pm | 2 +-
lib/PublicInbox/EvCleanup.pm | 4 +-
lib/PublicInbox/Feed.pm | 66 +++++++-----
lib/PublicInbox/Import.pm | 29 +++--
lib/PublicInbox/Inbox.pm | 4 +-
lib/PublicInbox/InboxWritable.pm | 160 ++++++++++++++++++++++++++++
lib/PublicInbox/MDA.pm | 2 -
lib/PublicInbox/MsgTime.pm | 80 +++++++++-----
lib/PublicInbox/Msgmap.pm | 53 +++++++++-
lib/PublicInbox/Search.pm | 5 +-
lib/PublicInbox/SearchIdx.pm | 20 +++-
lib/PublicInbox/SearchIdxSkeleton.pm | 5 +-
lib/PublicInbox/SearchMsg.pm | 28 ++---
lib/PublicInbox/SearchView.pm | 6 +-
lib/PublicInbox/V2Writable.pm | 200 ++++++++++++++++++++++++++++++++---
lib/PublicInbox/View.pm | 30 +++---
lib/PublicInbox/WatchMaildir.pm | 69 +++---------
script/public-inbox-index | 56 ++++++++--
script/public-inbox-init | 6 +-
scripts/import_vger_from_mbox | 51 ++-------
t/altid.t | 11 +-
t/msgmap.t | 4 +
t/v2reindex.t | 98 +++++++++++++++++
t/v2writable.t | 10 +-
26 files changed, 764 insertions(+), 240 deletions(-)
create mode 100644 lib/PublicInbox/InboxWritable.pm
create mode 100644 t/v2reindex.t
--
EW
^ permalink raw reply [relevance 6%]
Results 1-6 of 6 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2018-03-22 9:40 6% [PATCH 00/13] reindexing, feeds, date fixes Eric Wong (Contractor, The Linux Foundation)
2018-03-22 9:40 5% ` [PATCH 05/13] use both Date: and Received: times Eric Wong (Contractor, The Linux Foundation)
2018-04-19 1:20 5% v2 merged to master Eric Wong
2018-05-09 20:23 5% [ANNOUNCE] public-inbox 1.1.0-pre1 Eric Wong
2019-09-14 19:50 5% [PATCH] doc: add release notes directory Eric Wong
2023-02-04 17:25 future date in Date header pinning thread to top of $inbox/ Kyle Meyer
2023-02-04 20:41 7% ` [PATCH] www: sort all /$INBOX/ topics by Received: timestamp Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).