projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sync with 0.7.5
[claws.git] / tools / filter_conv.pl
diff --git a/tools/filter_conv.pl b/tools/filter_conv.pl
index f84802b7c2c3971ee320abdd6f260391cab6eea0..2f7301715069eb0b402e50ab29caa9c6665e6b04 100644 (file)
--- a/tools/filter_conv.pl
+++ b/tools/filter_conv.pl
@@ -25,12 +25,16 @@ open(FOLDERLIST, "<folderlist.xml") || die("Can't find folderlist.xml\n");
 close FOLDERLIST;
 
 foreach $folderlist (@folderlist) {
-       if ($folderlist =~ m/<folder type="mh"/) {
-               $folderlist =~ s/<folder type="mh" name="//;
-                $folderlist =~ s/" path="[A-Z0-9]+">\n//ig;
-                $folderlist =~ s/^ +//;
-                $mailbox = $folderlist;
-        }
+       unless ($mailbox) {
+               if ($folderlist =~ m/<folder type="mh"/) {
+                       $folderlist =~ s/<folder type="mh" name="//;
+                       $folderlist =~ s/" path="[A-Z0-9]+"//ig;
+                       $folderlist =~ s/ collapsed="1"//;
+                       $folderlist =~ s/>\n//ig;
+                       $folderlist =~ s/^ +//;
+                       $mailbox = $folderlist;
+               }
+       }
 }
 
 open (FILTERRC, "<filterrc") || die("Can't find your old filter rules\n");
@@ -60,6 +64,33 @@ $WRITE_THIS .= "[global]\n";
 foreach $filterrc (@filterrc) {
        $COUNT++;
        @split_lines = split("\t", $filterrc);
+       if ($split_lines[6] eq "0") {
+               $match_type = "matchcase";
+               $predicate_one = "~";
+       } elsif ($split_lines[6] eq "1") {
+               $match_type = "matchcase";
+               $predicate_one = "";
+       } elsif ($split_lines[6] eq "4") {
+               $match_type = "regexpcase";
+               $predicate_one = "~";
+       } elsif ($split_lines[6] eq "5") {
+               $match_type =  "regexpcase";
+               $predicate_one = "";
+       }
+       if ($split_lines[7] eq "0") {
+               $match_type = "matchcase";
+               $predicate_two = "~";
+       } elsif ($split_lines[7] eq "1") {
+               $match_type = "matchcase";
+               $predicate_two = "";
+       } elsif ($split_lines[7] eq "4") {
+               $match_type = "regexpcase";
+               $predicate_two = "~";
+       } elsif ($split_lines[7] eq "5") {
+               $match_type =  "regexpcase";
+               $predicate_two = "";
+       }
+
        if ($split_lines[2] eq "&") {
                $operator = "&";
                &sort_data;
@@ -68,15 +99,20 @@ foreach $filterrc (@filterrc) {
                $operator = "|";
                &sort_data;
        } elsif ($split_lines[0] eq "To") {
-               $WRITE_THIS .= "to matchcase \"$split_lines[1]\"";
+               $WRITE_THIS .= "$predicate_one"."to $match_type \"$split_lines[1]\"";
        } elsif ($split_lines[0] eq "Reply-To") {
-               $WRITE_THIS .= "inreplyto matchcase \"$split_lines[1]\"";
+               $WRITE_THIS .= "$predicate_one"."inreplyto $match_type \"$split_lines[1]\"";
        } elsif ($split_lines[0] eq "Subject") {
-               $WRITE_THIS .= "subject matchcase \"$split_lines[1]\"";
-       } elsif (($split_lines[0] eq "From") || ($split_lines[0] eq "Sender")){
-               $WRITE_THIS .= "from matchcase \"$split_lines[1]\"";
+               $WRITE_THIS .= "$predicate_one"."subject $match_type \"$split_lines[1]\"";
+       } elsif ($split_lines[0] eq "From"){
+               $WRITE_THIS .= "$predicate_one"."from $match_type \"$split_lines[1]\"";
+       } elsif ($split_lines[0] eq "Sender" || $split_lines[0] eq "List-Id" || 
+                $split_lines[0] eq "X-ML-Name" || $split_lines[0] eq "X-List" ||
+                $split_lines[0] eq "X-Sequence" || $split_lines[0] eq "X-Mailer" ||
+                $split_lines[0] eq "Cc") {
+               $WRITE_THIS .= "$predicate_one"."header \"$split_lines[0]\" $match_type \"$split_lines[1]\"";
        }
-       if (!$split_lines[5]) {
+       if ($split_lines[8] eq "n\n") {
                $WRITE_THIS .= " delete";
        } elsif ($split_lines[8] eq "m\n"){
                $WRITE_THIS .= " move \"\#mh/$mailbox/$split_lines[5]\"";
@@ -98,24 +134,36 @@ exit;
 sub sort_data {
        if ($split_lines[0] eq "To" && $split_lines[3] eq "Cc" && 
        $split_lines[1] eq $split_lines[4]) {
-               $WRITE_THIS .= "to_or_cc matchcase \"$split_lines[1]\"";                
+               $WRITE_THIS .= "$predicate_one"."to_or_cc $match_type \"$split_lines[1]\"";             
        }
        elsif ($split_lines[0] eq "To") {
-               $WRITE_THIS .= "to matchcase \"$split_lines[1]\" $operator ";
+               $WRITE_THIS .= "$predicate_one"."to $match_type \"$split_lines[1]\" $operator ";
        } elsif ($split_lines[0] eq "Reply-To") {
-               $WRITE_THIS .= "inreplyto matchcase \"$split_lines[1]\" $operator ";
+               $WRITE_THIS .= "$predicate_one"."inreplyto $match_type \"$split_lines[1]\" $operator ";
        } elsif ($split_lines[0] eq "Subject") {
-               $WRITE_THIS .= "subject matchcase \"$split_lines[1]\" $operator ";
-       } elsif (($split_lines[0] eq "From") || ($split_lines[0] eq "Sender")) {
-               $WRITE_THIS .= "from matchcase \"$split_lines[1]\" $operator ";
+               $WRITE_THIS .= "$predicate_one"."subject $match_type \"$split_lines[1]\" $operator ";
+       } elsif ($split_lines[0] eq "From") {
+               $WRITE_THIS .= "$predicate_one"."from $match_type \"$split_lines[1]\" $operator ";
+       } elsif ($split_lines[0] eq "Sender" || $split_lines[0] eq "List-Id" || 
+                $split_lines[0] eq "X-ML-Name" || $split_lines[0] eq "X-List" ||
+                $split_lines[0] eq "X-Sequence" || $split_lines[0] eq "X-Mailer" ||
+                $split_lines[0] eq "Cc") {
+               $WRITE_THIS .= "$predicate_one"."header \"$split_lines[0]\" $match_type \"$split_lines[1]\" $operator ";
        }
+
        if ($split_lines[3] eq "To") {
-               $WRITE_THIS .= "to matchcase \"$split_lines[4]\"";
+               $WRITE_THIS .= "$predicate_two"."to $match_type \"$split_lines[4]\"";
        } elsif ($split_lines[3] eq "Reply-To") {
-               $WRITE_THIS .= "inreplyto matchcase \"$split_lines[4]\"";
+               $WRITE_THIS .= "$predicate_two"."inreplyto $match_type \"$split_lines[4]\"";
        } elsif ($split_lines[3] eq "Subject") {
-               $WRITE_THIS .= "subject matchcase \"$split_lines[4]\"";
-       } elsif (($split_lines[3] eq "From") || ($split_lines[3] eq "Sender")) {
-               $WRITE_THIS .= "from matchcase \"$split_lines[4]\"";
-       }
+               $WRITE_THIS .= "$predicate_two"."subject $match_type \"$split_lines[4]\"";
+       } elsif ($split_lines[3] eq "From") {
+               $WRITE_THIS .= "$predicate_two"."from $match_type \"$split_lines[4]\"";
+       } elsif ($split_lines[3] eq "Sender" || $split_lines[3] eq "List-Id" || 
+                $split_lines[3] eq "X-ML-Name" || $split_lines[3] eq "X-List" ||
+                $split_lines[3] eq "X-Sequence" || $split_lines[3] eq "X-Mailer" ||
+                $split_lines[3] eq "Cc") {
+               $WRITE_THIS .= "$predicate_two"."header \"$split_lines[3]\" $match_type \"$split_lines[4]\"";
+       } 
+
 }
Claws Mail