bkuhn/small-hacks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various changes done back in September.

Browse source
This commit is contained in:
Bradley M. Kuhn 2015-09-01 14:19:15 -07:00
parent accca5f36f
commit 0d4f6aae9e
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
remove-dup-mails-from-maildir.plx
View file

@ -36,10 +36,18 @@ foreach my $folder (@dupFolders) {
my $id = $fields->{'Message-ID'}[0]; my $id = $fields->{'Message-ID'}[0];
chomp $id; chomp $id;
die "weirdly formatted message ID, $id in $dir/$file" if ($id !~ s/^\s*\<?\s*(\S+)\s*\>?.*$/$1/) {
unless $id =~ s/^\s*\<?\s*(\S+)\s*\>?.*$/$1/; $id = $fields->{'Resent-Message-ID'}[0];
chomp $id;
die "$dir/$file has no message ID" if not defined $id; unless ($id =~ s/^\s*\<?\s*(\S+)\s*\>?.*$/$1/) {
warn "weirdly formatted, or missing Message-ID (or Resent-Message-ID), \"$id\" in $dir/$file";
next;
}
}
if (not defined $id or $id =~ /^\s*$/) {
warn "$dir/$file has no message ID";
next;
}
# die "Duplicate message ID's $id\n" if defined $msgs{$id}; # die "Duplicate message ID's $id\n" if defined $msgs{$id};
@ -70,11 +78,18 @@ foreach my $dir (@msgDirs) {
my $id = $fields->{'Message-ID'}[0]; my $id = $fields->{'Message-ID'}[0];
chomp $id; chomp $id;
die "weirdly formatted message ID, $id in $dir/$file" if ($id !~ s/^\s*\<?\s*(\S+)\s*\>?.*$/$1/) {
unless $id =~ s/^\s*\<?\s*([\S\n\s]+)\s*\>?.*$/$1/m; $id = $fields->{'Resent-Message-ID'}[0];
chomp $id;
die "$dir/$file has no message ID" if not defined $id; unless ($id =~ s/^\s*\<?\s*(\S+)\s*\>?.*$/$1/) {
warn "weirdly formatted, or missing Message-ID (or Resent-Message-ID), \"$id\" in $dir/$file";
next;
}
}
if (not defined $id or $id =~ /^\s*$/) {
warn "$dir/$file has no message ID";
next;
}
# If we already have this message elsehwere, then we simply remove it # If we already have this message elsehwere, then we simply remove it
# from this folder here. Otherwise, we note that we have it by adding # from this folder here. Otherwise, we note that we have it by adding
# it to %msgs. # it to %msgs.