Add license and copyright to 9b3fd2b5

[claws.git] / tools / filter_conv.pl

diff --git a/tools/filter_conv.pl b/tools/filter_conv.pl
old mode 100644 (file)
new mode 100755 (executable)
index 58ae171..fec94e8
--- a/tools/filter_conv.pl
+++ b/tools/filter_conv.pl
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
 use strict;
 
-#  * Copyright 2002 Paul Mangan <claws@thewildbeast.co.uk>
+#  * Copyright 2002 Paul Mangan <paul@claws-mail.org>
 #  *
 #  * Reimplemented by Torsten Schoenfeld <kaffeetisch@web.de>
 #  *
 #  * This file 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 2 of the License, or
+#  * the Free Software Foundation; either version 3 of the License, or
 #  * (at your option) any later version.
 #  *
 #  * This program is distributed in the hope that it will be useful, but
@@ -17,15 +17,19 @@ use strict;
 #  *
 #  * You should have received a copy of the GNU General Public License
 #  * along with this program; if not, write to the Free Software
-#  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #  *
 
-chdir($ENV{ HOME } . "/.sylpheed") or die("You don't appear to have Sylpheed installed\n");
+my $old_config_dir = "$ENV{HOME}/.sylpheed";
+my $config_dir = `claws-mail --config-dir`;
+chomp $config_dir;
+
+chdir($ENV{ HOME } . "/$config_dir")
+       or die("You don't appear to have Claws Mail installed\n");
 
 ###############################################################################
 
 my $normal_headers = qr/^(?:Subject|From|To|Cc)$/;
-my $extra_headers = qr/^(?:Reply-To|Sender|List-Id|X-ML-Name|X-List|X-Sequence|X-Mailer)$/;
 
 my @new_filters = ("[global]\n");
 
@@ -33,7 +37,8 @@ my @new_filters = ("[global]\n");
 
 my $mailbox;
 
-open(FOLDERLIST, "<folderlist.xml") or die("Can't find 'folderlist.xml'\n");
+open(FOLDERLIST, "<$old_config_dir/folderlist.xml")
+       or die("Can't find '$old_config_dir/folderlist.xml'\n");
   while (<FOLDERLIST>) {
     if (m/<folder type="mh" name="([^"]+)" path="[^"]+"/) {
       $mailbox = $1;
@@ -44,7 +49,8 @@ close FOLDERLIST;
 
 ###############################################################################
 
-open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc')\n");
+open(FILTERRC, "<$old_config_dir/filterrc")
+       or die("Can't find your old filter rules ('$old_config_dir/filterrc')\n");
   while (<FILTERRC>) {
     chomp();
 
@@ -58,6 +64,8 @@ open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc'
         $mode_two,
         $action) = split(/\t/);
 
+    $value_one =~ s/\"/\\\"/g ;
+    $value_two =~ s/\"/\\\"/g ;
     $action = $action eq "m" ? "move" : "delete";
     $destination = $destination =~ m!^\#mh/! ?
                      $destination :
@@ -119,7 +127,7 @@ open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc'
       if ($header_one =~ m/$normal_headers/) {
         $new_filter .= $predicate_one . lc($header_one) . qq( $match_type_one "$value_one");
       }
-      elsif ($header_one =~ m/$extra_headers/) {
+      else {
         $new_filter .= $predicate_one . qq(header "$header_one" $match_type_one "$value_one");
       }
 
@@ -127,7 +135,7 @@ open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc'
         if ($header_two =~ m/$normal_headers/) {
           $new_filter .= qq( $op ) . $predicate_two . lc($header_two) . qq( $match_type_two "$value_two");
         }
-        elsif ($header_two =~ m/$extra_headers/) {
+        else {
           $new_filter .= qq( $op ) . $predicate_two . qq(header "$header_two" $match_type_two "$value_two");
         }
       }
@@ -154,9 +162,11 @@ open(MATCHERRC, ">>matcherrc");
   print MATCHERRC @new_filters;
 close(MATCHERRC);
 
-rename("filterrc", "filterrc.old");
+print "Converted $#new_filters filters\n";
 
+if ($old_config_dir eq $config_dir) {
+       rename("filterrc", "filterrc.old");
+       print "Renamed your old filter rules ('filterrc' to 'filterrc.old')\n";
+}
 ###############################################################################
 
-print "Converted $#new_filters filters\n";
-print "Renamed your old filter rules ('filterrc' to 'filterrc.old')\n";