Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Accountsync fixes #4696

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Accountsync fixes #4696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
505119a
DList: non-destructive sort order code (from Rob M review)
brong Oct 19, 2023
529c0b8
Cyrus::AccountSync - skip any mailbox that went away during fetch
brong Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions perl/imap/Cyrus/AccountSync.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ sub dump_user {
for my $folder (@{$info->{MAILBOX}}) {
next if $folder->{MBOXTYPE}; # don't dump special folders
my $fi = $self->{sync}->dlwrite("GET", "FULLMAILBOX", $folder->{MBOXNAME});
next unless $fi->{MAILBOX}; # folder went away?
my @emails;
for my $record (@{$fi->{MAILBOX}[0]{RECORD}||[]}) {
my $res = $self->{sync}->dlwrite("GET", "FETCH", {
Expand Down
19 changes: 11 additions & 8 deletions perl/imap/Cyrus/DList.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,19 @@ sub add_perl {

elsif (ref($val) eq 'HASH') {
my $child = $Self->add_kvlist($key);
my $order = delete $val->{__kvlist_order};
my %keys = map { $_ => 1 } grep { not m/^_/ } keys %$val;

if ($order) {
die "Unknown order " . ref($order) if ref($order) ne 'ARRAY';
foreach my $k (grep { exists $val->{$_} } @{$order}) {
$child->add_perl($k, delete $val->{$k});
}
my $order = $val->{__kvlist_order} || [];
die "Unknown order " . ref($order) if ref($order) ne 'ARRAY';

# if there's a pre-defined key order, add all those keys first, in order
foreach my $k (grep { exists $val->{$_} } @$order) {
$child->add_perl($k, $val->{$k});
delete $keys{$k};
}

$child->add_perl($_, $val->{$_}) for sort keys %$val;
# add the remaining keys in sort order
$child->add_perl($_, $val->{$_}) for sort keys %keys;
}

elsif (ref($val) eq 'REF') {
Expand Down Expand Up @@ -327,7 +330,7 @@ sub as_perl {
$kvlist->{$datum->{key}} = $datum->as_perl();
}

$kvlist->{__kvlist_order} = [ @order ];
$kvlist->{__kvlist_order} = \@order;
return $kvlist;
}
elsif ($Self->{type} eq 'list') {
Expand Down