WebSVN – sysadmin_scripts – Diff – /trunk/archiveIMAP/archiveIMAP

+#
 #    version 1.0.1 20140819
 #        Removed dependancy on Email::Simple
 #        Allowed 'separator' as an element in either source or target
+#
+#    version 2.0.0 20190817 RWR
+#        Major revision.
+#           Config is now YAML
+#           Default section which will fill in the blanks for anything not filled in on an account, so creating a lot of accounts
+#              with common values is easier to set up an maintain
+#           Target folder is configurable on a per account basis, using tags <folder>, <year>, <month> (called hierachy)
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
+#
    my $msgDate = $email->header('Date');
    my @t = strptime( $msgDate );
    my $month = $t[4]+1;
    $month = '0' . $month if $month < 10;
    my $year = $t[5]+1900;
-   # now, build the path on the new machine
+   # also, may need the source hierarchy
    my $sourceFolder = join ( $target->{'separator'}, @{ $source->{'source folder list'} } );
+   # now, build the path on the new machine
    my $targetPattern = join( $target->{'separator'}, @{ $target->{'hierachy pattern'} } );
    $targetPattern =~ s/<path>/$sourceFolder/gi;
    $targetPattern =~ s/<month>/$month/gi;
    $targetPattern =~ s/<year>/$year/gi;
    # return the string we created, separated by
    # the delimiters for the target
       # get the message
       my $message = $sourceAccount->get( $id ) or die $sourceAccount->errstr;
       # calculate where we are going to move this to
       my $targetFolder = &calculateTargetFolder( $message, $source, $target );
       if ( $TESTING ) {
-         print "Would have moved message to $targetFolder\n";
+         print "Would have " . ( $source->{'deleteOnSuccess'} ? 'moved' : 'copied' )  . " message to $targetFolder\n";
          next;
+      }
-      if ( $target->{'connection'}->select( $folder ) || &makeFolder( $target->{'connection'}, $folder, $target->{'separator'} ) ) {
+      if ( $target->{'connection'}->select( $targetFolder ) || &makeFolder( $target->{'connection'}, $targetFolder, $target->{'separator'} ) ) {
-         if ( $target->{'connection'}->put( $folder, $message, @flags ) ) {
+         if ( $target->{'connection'}->put( $targetFolder, $message, @flags ) ) {
             $source->{'connection'}->delete( $id ) if ( $source->{'deleteOnSuccess'} ) ;
             $numMessages++;
          } else {
-            die "Could not write to target, aborting\n$target->{'connection'}->errstr\n";
+            die "Could not write to target, aborting\n$targetFolder->{'connection'}->errstr\n";
+         }
       } else {
-         warn "\t\t$folder not found in target and could not create it\n";
+         warn "\t\t$targetFolder not found in target and could not create it\n";
+      }
+   }
    return $numMessages;
+}
 sub processAccount {
    my $account = shift;
    next unless $account->{'enabled'}; # blow it off if it is not enabled
    my $TESTING = $account->{'testing'}; # create mini global if we should test this account
+   print "========= Test Mode ========\n" if $TESTING;
    # open and log into both source and target, and get the separator used
    foreach my $acct ( 'target','source' ) {
       $account->{$acct}->{'connection'} = &openIMAPConnection( $account->{$acct}->{'server'}, $account->{$acct}->{'username'}, $account->{$acct}->{'password'} );
       unless ( $account->{$acct}->{'connection'} ) {
    my $target = $account->{'target'};
    my %temp = map{ lc($_) => 1 } @{$source->{'system'}};
    $source->{'system folders'} = \%temp;
-   $source->{'before date'} = &getDate( $account->{'age'} );
+   $source->{'before date'} = &getDate( $source->{'age'} );
    print "\t" . ( $source->{'deleteOnSuccess'} ? 'Moving' : 'Copying' ) . " all messages before $source->{'before date'}\n";
    # get a list of all folders to be processed on the source
    $source->{'folders'} = &getFolders( $source->{'connection'}, $source->{'ignore'}, $source->{'separator'} );
+   if ( $TESTING ) {
+      print Dumper( $source );
+      print "Source above, press enter to continue: "; my $j = <STDIN>;
+      print Dumper( $target );
+      print "Target above, Press enter to continue: "; $j = <STDIN>;
+   }
    my $folderList = $source->{'folders'};
    my $count = 0; # count the number of messages processed
    my $processedCount = 0; # count the number of folders processed
    foreach my $folder ( @$folderList ) {
       my $messages;
       $messages = &processFolder( $source, $target, $folder, $TESTING ); #, $date, $$source{'separator'}, $$target{'separator'}, $deleteOnSuccess );
       $TESTING ? print "Would expunge $folder\n" : $source->{'connection'}->expunge_mailbox( $folder );
       # delete folder if empty and client has requested it.
-      ( $TESTING ? print "Would delete $folder\n" : &deleteAFolder( $source, $folder, $TESTING ) ) if $account->{'source'}->{'deleteEmptyFolders'};
+      &deleteAFolder( $source, $folder, $TESTING ) if $account->{'source'}->{'deleteEmptyFolders'};
       print "\n\t\t$messages processed\n";
       $count += $messages;
       $processedCount++;
       # next line used only for testing. Dies after 5 folders on first account
-      last if $processedCount > 5;
+      last if $processedCount > 5 and $TESTING;
+   }
    $source->{'connection'}->quit;
    $target->{'connection'}->quit;
    return $count;
 $processed{'Messages'} = 0;
 # grab only the accounts for simplicity
 my $accounts = $config->{'accounts'};
-print Dumper( $config ) ; die;
+#die Dumper( $accounts );
 # now, process each in turn
 foreach my $account ( keys %$accounts ) {
    # talk to user
    print "Processing account $account\n";

Subversion Repositories sysadmin_scripts

(root)/trunk/archiveIMAP/archiveIMAP – Rev 42 → 50