From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/7] watchmaildir: remove redundant _path_to_mime
Date: Mon, 21 Oct 2019 11:22:26 +0000 [thread overview]
Message-ID: <20191021112229.3029-5-e@80x24.org> (raw)
In-Reply-To: <20191021112229.3029-1-e@80x24.org>
InboxWritable::maildir_path_load exists and we may support
it for use with standalone scripts.
---
lib/PublicInbox/WatchMaildir.pm | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 08b1aab4..e9231780 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -13,6 +13,7 @@ use File::Temp qw//;
use PublicInbox::Filter::Base;
use PublicInbox::Spamcheck;
*REJECT = *PublicInbox::Filter::Base::REJECT;
+*maildir_path_load = *PublicInbox::InboxWritable::maildir_path_load;
sub new {
my ($class, $config) = @_;
@@ -124,7 +125,7 @@ sub _remove_spam {
my ($self, $path) = @_;
# path must be marked as (S)een
$path =~ /:2,[A-R]*S[T-Za-z]*\z/ or return;
- my $mime = _path_to_mime($path) or return;
+ my $mime = maildir_path_load($path) or return;
$self->{config}->each_inbox(sub {
my ($ibx) = @_;
eval {
@@ -166,7 +167,7 @@ sub _try_path {
$warn_cb->(@_);
};
foreach my $ibx (@$inboxes) {
- my $mime = _path_to_mime($path) or next;
+ my $mime = maildir_path_load($path) or next;
my $im = _importer_for($self, $ibx);
# any header match means it's eligible for the inbox:
@@ -259,21 +260,6 @@ sub scan {
trigger_scan($self, 'cont') if keys %$opendirs;
}
-sub _path_to_mime {
- my ($path) = @_;
- if (open my $fh, '<', $path) {
- local $/;
- my $str = <$fh>;
- $str or return;
- return PublicInbox::MIME->new(\$str);
- } elsif ($!{ENOENT}) {
- return;
- } else {
- warn "failed to open $path: $!\n";
- return;
- }
-}
-
sub _importer_for {
my ($self, $ibx) = @_;
my $importers = $self->{importers};
next prev parent reply other threads:[~2019-10-21 11:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 11:22 [PATCH 0/7] dead code elimination Eric Wong
2019-10-21 11:22 ` [PATCH 1/7] overidx: remove unused delete_articles sub Eric Wong
2019-10-21 11:22 ` [PATCH 2/7] www: remove unused ctx_get sub Eric Wong
2019-10-21 11:22 ` [PATCH 3/7] inboxwritable: import_maildir uses maildir_path_load Eric Wong
2019-10-21 11:22 ` Eric Wong [this message]
2019-10-21 11:22 ` [PATCH 5/7] git: remove src_blob_url Eric Wong
2019-10-21 11:22 ` [PATCH 6/7] hval: remove new_oneline Eric Wong
2019-10-21 11:22 ` [PATCH 7/7] syscall: get rid of sendfile wrappers for now Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021112229.3029-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).