www_stream: note existence of IMAP and NNTP URLs

[public-inbox.git] / lib / PublicInbox / LeiMailSync.pm

diff --git a/lib/PublicInbox/LeiMailSync.pm b/lib/PublicInbox/LeiMailSync.pm
index 57b56b3cbd6282c22f3ba1fff89968dbc5c1b7df..5a10c127c1f8e2db1c080f20530ed90385c3d461 100644 (file)
--- a/lib/PublicInbox/LeiMailSync.pm
+++ b/lib/PublicInbox/LeiMailSync.pm
@@ -32,9 +32,7 @@ sub new {
        bless { filename => $f, fmap => {} }, $cls;
 }
 
-sub lms_commit { delete($_[0]->{dbh})->commit }
-
-sub lms_begin { ($_[0]->{dbh} //= dbh_new($_[0], 1))->begin_work };
+sub lms_write_prepare { ($_[0]->{dbh} //= dbh_new($_[0], 1)) };
 
 sub create_tables {
        my ($dbh) = @_;
@@ -118,7 +116,7 @@ EOM
 }
 
 sub set_src {
-       my ($self, $oidhex, $folder, $id) = @_;
+       my ($self, $oidbin, $folder, $id) = @_;
        my $fid = $self->{fmap}->{$folder} //= fid_for($self, $folder, 1);
        my $sth;
        if (ref($id)) { # scalar name
@@ -131,7 +129,7 @@ INSERT OR IGNORE INTO blob2name (oidbin, fid, name) VALUES (?, ?, ?)
 INSERT OR IGNORE INTO blob2num (oidbin, fid, uid) VALUES (?, ?, ?)
 
        }
-       $sth->execute(pack('H*', $oidhex), $fid, $id);
+       $sth->execute($oidbin, $fid, $id);
 }
 
 sub clear_src {
@@ -330,6 +328,7 @@ sub group2folders {
 EOM
        my %x = map { $_ => $_ } split(/,/, $all);
        my @ok = grep(defined, delete(@x{qw(local remote), ''}));
+       push(@ok, '') if $all eq '';
        my @no = keys %x;
        if (@no) {
                @no = (join(',', @no));
@@ -349,9 +348,7 @@ EOM
                } else {
                        @inc = @all;
                }
-               for (@inc) {
-                       push(@$folders, $_) unless $seen{$_}++;
-               }
+               push(@$folders, (grep { !$seen{$_}++ } @inc));
        }
        scalar(@$folders) || $lei->fail(<<EOM);
 no --mail-sync folders known to lei
@@ -413,11 +410,24 @@ sub forget_folder {
 # only used for changing canonicalization errors
 sub rename_folder {
        my ($self, $old, $new) = @_;
-       my $fid = delete($self->{fmap}->{$old}) //
+       my $ofid = delete($self->{fmap}->{$old}) //
                fid_for($self, $old) // return;
-       $self->{dbh}->do(<<EOM, undef, $new, $fid);
+       eval {
+               $self->{dbh}->do(<<EOM, undef, $new, $ofid);
 UPDATE folders SET loc = ? WHERE fid = ?
 EOM
+       };
+       if ($@ =~ /\bunique\b/i) {
+               my $nfid = $self->{fmap}->{$new} // fid_for($self, $new);
+               for my $t (qw(blob2name blob2num)) {
+                       $self->{dbh}->do(<<EOM, undef, $nfid, $ofid);
+UPDATE OR REPLACE $t SET fid = ? WHERE fid = ?
+EOM
+               }
+               $self->{dbh}->do(<<EOM, undef, $ofid);
+DELETE FROM folders WHERE fid = ?
+EOM
+       }
 }
 
 sub imap_oidbin ($$$) {
@@ -456,14 +466,4 @@ sub imap_oid {
        $oidbin ? unpack('H*', $oidbin) : undef;
 }
 
-# FIXED? something with "lei <up|q>" is causing uncommitted transaction
-# TODO: remove soon
-sub DESTROY {
-       my ($self) = @_;
-       my $dbh = delete($self->{dbh}) or return;
-       return if $dbh->{ReadOnly};
-       undef $dbh;
-       warn "BUG $$ $0 $self {dbh} OPEN ppid=".getppid.' '.Carp::longmess();
-}
-
 1;