[popfile-commit] engine/Services IMAP.pm,1.9.4.20,1.9.4.21

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31043/Services

Modified Files:
      Tag: b0_22_2
	IMAP.pm 
Log Message:
Get rid of the multi-connection option and methods.

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.9.4.20
retrieving revision 1.9.4.21
diff -C2 -d -r1.9.4.20 -r1.9.4.21
*** IMAP.pm	5 Feb 2008 09:48:43 -0000	1.9.4.20
--- IMAP.pm	9 Feb 2008 09:52:47 -0000	1.9.4.21
***************
*** 122,126 ****
      $self->config_( 'expunge', 0 );
      $self->config_( 'use_ssl', 0 );
-     $self->config_( 'use_multiple_connections', 0 );
  
      # Those next variables have getter/setter functions and should
--- 122,125 ----
***************
*** 229,244 ****
      if ( time - $self->{last_update__} >= $self->config_( 'update_interval' ) ) {
  
-         # Should we use a single or multiple connections?
-         # And did this configuration options change?
-         if ( defined $self->{use_multiple_connections} ) {
-             my $config = $self->config_('use_multiple_connections');
-             if ( $config != $self->{use_multiple_connections} ) {
-                 # Configuration has changed!
-                 $self->disconnect_folders__();
-             }
-         }
- 
-         $self->{use_multiple_connections} = $self->config_('use_multiple_connections');
- 
          # Since the IMAP-Client module can throw an exception, i.e. die if
          # it detects a lost connection, we eval the following code to be able
--- 228,231 ----
***************
*** 261,272 ****
                  }
  
!                 # Try to establish connections, log in, and select for
!                 # all of our folders if using multiple connections
!                 if ( $self->{use_multiple_connections} ) {
!                     $self->connect_folders__();
!                 }
!                 else {
!                     $self->connect_server__();
!                 }
  
                  # Reset the hash containing the hash values we have seen the
--- 248,252 ----
                  }
  
!                 $self->connect_server__();
  
                  # Reset the hash containing the hash values we have seen the
***************
*** 367,469 ****
  
  
- 
- #----------------------------------------------------------------------------
- # connect_folders__
- #
- #   This function will iterate over each folder found in the %{$self->{folders__}}
- #   hash. For each folder it will try to establish a connection, log in, and select
- #   the folder.
- #   The corresponding socket object, will be stored in
- #   $self->{folders__}{$folder}{imap}
- #
- # arguments:
- #   none.
- #
- # return value:
- #   none.
- #----------------------------------------------------------------------------
- 
- sub connect_folders__ {
-     my $self = shift;
- 
-     # Establish a connection for each folder in the hash
-     foreach my $folder ( keys %{$self->{folders__}} ) {
- 
-         # We may already have a valid connection for this folder:
-         if ( exists $self->{folders__}{$folder}{imap} ) {
-             next;
-         }
- 
-         $self->{folders__}{$folder}{server} = 1;
-         $self->{folders__}{$folder}{tag} = 0;
- 
-         # The folder may be write-only:
-         if ( exists $self->{folders__}{$folder}{output}
-                 &&
-             ! exists $self->{folders__}{$folder}{watched}
-                 &&
-             $self->classifier()->is_pseudo_bucket( $self->api_session(),
-                                     $self->{folders__}{$folder}{output} ) ) {
-                 next;
-         }
- 
-         $self->log_( 1, "Trying to connect to ". $self->config_( 'hostname' ) . " for folder $folder." );
-         my $imap = $self->new_imap_client();
- 
-         if ( $imap ) {
-             # Build a list of IMAP mailboxes if we haven't already got one:
-             unless ( @{$self->{mailboxes__}} ) {
-                 @{$self->{mailboxes__}} = $imap->get_mailbox_list();
-             }
-             # Do a STATUS to check UIDVALIDITY and UIDNEXT
-             my $info = $imap->status( $folder );
-             my $uidnext = $info->{UIDNEXT};
-             my $uidvalidity = $info->{UIDVALIDITY};
- 
-             if ( defined $uidvalidity && defined $uidnext ) {
-                 # If we already have a UIDVALIDITY value stored,
-                 # we compare the old and the new value.
- 
-                 if ( defined $imap->uid_validity( $folder ) ) {
-                     if ( $imap->check_uidvalidity( $folder, $uidvalidity ) ) {
-                         # That's the nice case. We simply do nothing.
-                     }
-                     else {
-                         # The validity has changed, we log this and update our stored
-                         # values for UIDNEXT and UIDVALIDITY
-                         $self->log_( 0, "Changed UIDVALIDITY for folder $folder. Some new messages might have been skipped." );
-                         $imap->uid_validity( $folder, $uidvalidity );
-                         $imap->uid_next( $folder, $uidnext );
-                     }
-                 }
-                 else {
-                     # We don't have a stored value, so let's change that.
-                     $self->log_( 0, "Storing UIDVALIDITY for folder $folder." );
-                     $imap->uid_validity( $folder, $uidvalidity );
-                     $imap->uid_next( $folder, $uidnext );
-                 }
-             }
-             else {
-                 $self->log_( 0, "Could not STATUS folder $folder." );
-                 $imap->logout();
-                 die "The connection to the IMAP server was lost";
-             }
- 
-             # Now select the folder
-             if ( $imap->select( $folder ) ) {
-                 $self->{folders__}{$folder}{imap} = $imap;
-             }
-             else {
-                 $self->log_( 0, "Could not SELECT folder $folder." );
-                 $imap->logout();
-             }
-         }
-         else {
-             # TODO: what now?
-         }
-     }
- }
- 
- 
  # ----------------------------------------------------------------------------
  #
--- 347,350 ----
***************
*** 631,640 ****
      my @uids = ();
  
!     if ( $self->{use_multiple_connections} ) {
!         @uids = $imap->get_new_message_list();
!     }
!     else {
!         @uids = $imap->get_new_message_list_unselected( $folder );
!     }
  
      # We now have a list of messages with UIDs greater than or equal
--- 512,516 ----
      my @uids = ();
  
!     @uids = $imap->get_new_message_list_unselected( $folder );
  
      # We now have a list of messages with UIDs greater than or equal