Changeset 67

Timestamp:

29.11.2006 23:38:33 (2 years ago)

Author:

decoder

Message:

Added focr_end_config (last line in FuzzyOcr?.cf) to allow spamassassin --lint to fail when scanset/preprocessor parsing fails
Removed userstate from configs, except from personal wordlist, and fixed personal wordlist loading mechanism

Files:

• trunk/devel/FuzzyOcr.cf (modified) (1 diff)
• trunk/devel/FuzzyOcr.pm (modified) (6 diffs)
• trunk/devel/FuzzyOcr/Config.pm (modified) (10 diffs)

trunk/devel/FuzzyOcr.cf

@@ -179 +179 @@
-#focr_score_ham 1
-######################################################################
+
+# DO NOT REMOVE THIS LINE, IT IS REQUIRED UNDER ALL CIRCUMSTANCES
+focr_end_config

trunk/devel/FuzzyOcr.pm

@@ -21 +21 @@
-use lib qw(. /etc/mail/spamassassin); # Allow placing of FuzzyOcr in siteconfigdir
-
-
+parse_config 
-use FuzzyOcr::Hashing qw(check_image_hash_db check_image_hash_db add_image_hash_db calc_image_hash);
-use FuzzyOcr::Deanimate qw(deanimate);
@@ -57 +57 @@
-        debuglog("Global Timeout set at ".$conf->{focr_timeout}." sec.");
-        $t->run(sub {
-
+self, $
-        });
-        if ($t->timed_out()) {
@@ -73 +73 @@
-        }
-    } else {
-
+self, $
-    }
-    debuglog("Processed in ".
@@ -82 +82 @@
-
-sub fuzzyocr_do {
-
-
+self, $
+
-    if ( $pms->get_score() > $conf->{focr_autodisable_score} ) {
-        debuglog("Scan canceled, message has already more than $conf->{focr_autodisable_score} points.");
@@ -101 +101 @@
-    my $cnt      = 0;
-    my $imgerr   = 0;
-
-
-
+
+
+
+
-    if ($conf->{focr_personal_wordlist} =~ m/^\//) {
-        load_personal_words( $conf->{focr_personal_wordlist} );
-    } else {
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-
@@ -339 +337 @@
-                $tfile .= "-fixed.gif";
-                printf RAWERR "## $conf->{focr_bin_giffix} $file >$tfile 2>>$efile\n" if ($haserr>0);
-
-               
+
+                
-
-                if ($retcode<0) { # only care if we timed out

trunk/devel/FuzzyOcr/Config.pm

@@ -26 +26 @@
-    get_ddb
-    finish_parsing_end 
+    parse_config 
-    load_global_words 
-    load_personal_words 
@@ -246 +247 @@
-    push (@cmds, {
-        setting => 'focr_digest_db',
-__userstate__
+/etc/mail/spamassassin
-        type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
-       });
@@ -264 +265 @@
-    push (@cmds, {
-        setting => 'focr_db_hash',
-__userstate__
+/etc/mail/spamassassin
-        type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
-       });
@@ -270 +271 @@
-    push (@cmds, {
-        setting => 'focr_db_safe',
-__userstate__
+/etc/mail/spamassassin
-        type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
-       });
@@ -370 +371 @@
-    push (@cmds, {
-        setting => 'focr_scanset_file',
-'/etc/mail/spamassassin/FuzzyOcr.scansets'
+"/etc/mail/spamassassin/FuzzyOcr.scansets"
-        type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
-        });
-    push (@cmds, {
-        setting => 'focr_preprocessor_file',
-
-
-
+
+
+
+
-    push (@cmds, {
-            setting => 'focr_minimal_scanset',
@@ -443 +445 @@
-
-    $conf->{parser}->register_commands(\@cmds);
+}
+
+sub parse_config {
+    my ($self, $opts) = @_;
+    if ($opts->{key} eq 'focr_end_config') {
+        $conf = $opts->{conf};
+        # Parse preprocessor file
+        my $pfile = $conf->{'focr_preprocessor_file'};
+        debuglog("Starting preprocessor parser for file \"$pfile\"...");
+        (my $retcode, @preprocessors) = parse_preprocessors($pfile);
+        if ($retcode) {
+            warn("Error parsing preprocessor file \"$pfile\", aborting...");
+            return 0;
+        }
+
+        # Parse scanset file
+        my $sfile = $conf->{'focr_scanset_file'};
+        debuglog("Starting scanset parser for file \"$sfile\"...");
+        ($retcode, @scansets) = parse_scansets($sfile);
+        if ($retcode) {
+            warn("Error parsing scanset file \"$sfile\", aborting...");
+            return 0;
+        }
+        return 1;
+    }
+    return 0;
-}
-
@@ -477 +505 @@
-        debuglog(" $k => ".$conf->{$k});
-    }
-
-
-
-
-
-
-
+
-    foreach my $prep (@preprocessors) {
-        my $prepcmd = $prep->{command};
@@ -490 +512 @@
-    }
-
-    # Parse scanset file
-    my $sfile = $conf->{'focr_scanset_file'};
-    ($retcode, @scansets) = parse_scansets($sfile);
-    if ($retcode) {
-        debuglog("Error parsing scanset file \"$sfile\", aborting...");
-        return 1;
-    }
-    foreach my $scan (@scansets) {
-        my $scancmd = $scan->{ocr_command};
@@ -723 +738 @@
-    my ($file) = @_;
-
-
-
+
-        debuglog("Failed to open scanset file \"$file\", aborting...");
-        return 1;
@@ -792 +806 @@
-    my ($file) = @_;
-
-
-
+
-        debuglog("Failed to open preprocessor file \"$file\", aborting...");
-        return 1;