Changeset 1026

Timestamp:

08/29/09 04:42:03 (2 years ago)

Author:

james

Message:

Add diagnostic to parse all abstracts and report any broken ones

Location:

trunk

Files:

• modules/abstract.tcl (modified) (1 diff)
• modules/diagnostics.tcl (modified) (1 diff)
• modules/output.tcl (modified) (6 diffs)
• plugins/admin_abstract.tcl (modified) (2 diffs)
• plugins/en/output_VAR.tcl (modified) (1 diff)

trunk/modules/abstract.tcl

@@ -621 +621 @@
 }
 
+# implementation-independent way to get all abstract names
+proc bMotion_abstract_get_names { } {
+        global bMotion_abstract_contents
+        return [array names bMotion_abstract_contents]
+}
 
 bind time - "* * * * *" bMotion_abstract_auto_gc

trunk/modules/diagnostics.tcl

@@ -328 +328 @@
 }
 
+### bMotion_diagnostic_parsing
+# Try to build every abstract we can and make sure it parses ok
+# This is not run automatically!
+# This is run as an admin plugin, so it tries to output to the admin stuff
+proc bMotion_diagnostic_parsing { } {
+        bMotion_putadmin "Counting abstracts..."
+        set all_abstracts [bMotion_abstract_get_names]
+        set all_abstracts_size [llength $all_abstracts]
+        bMotion_putadmin "Found $all_abstracts_size abstracts"
+
+        set broken [list]
+        set errors 0
+        set count_abstract 0
+        set count_lines 0
+        set i 0
+
+        foreach abstract $all_abstracts {
+                incr i
+                if {[expr $i % 10] == 0} {
+                        bMotion_putadmin "Processing abstract $i: $abstract..."
+                }
+                set abstract_contents [bMotion_abstract_all $abstract]
+                bMotion_putloglev d * "Processing [llength $abstract_contents] items for abstract $abstract"
+                incr count_abstract
+                foreach content $abstract_contents {
+                        incr count_lines
+                        set line ""
+                        set fail ""
+                        catch {
+                                set line [bMotion_process_macros "" $content]
+                                set line [bMotionDoInterpolation $line "JamesOff" "moretext" "#diagnostics"]
+                                # bit of a hack!
+                                set line [bMotion_plugin_output_preprocess "#diagnostics" $line]
+                        } 
+                        if {($line == "") || [regexp {%(?!(SETTING|ruser|r?bot|BOT|percent|channel))[^%2\| ]} $line matches moo]} {
+                                incr errors
+                                lappend broken "$abstract:$content\r\n  -> $line"
+                        }
+                }
+        }
+
+        bMotion_putadmin "Finished."
+        bMotion_putadmin "$errors errors found in $count_lines lines in $count_abstract abstracts."
+        foreach line $broken {
+                bMotion_putadmin $line
+        }
+}
+
 ### bMotion_diagnostic_auto <<<1
 proc bMotion_diagnostic_auto { min hr a b c } {

trunk/modules/output.tcl

@@ -121 +121 @@
 }
 
-#
-# our magic output function
-proc bMotionDoAction {channel nick text {moreText ""} {noTypo 0} {urgent 0} } {
-        bMotion_putloglev 5 * "bMotionDoAction($channel,$nick,$text,$moreText,$noTypo,$urgent)"
-        global bMotionInfo bMotionCache bMotionOriginalInput
-        global bMotion_output_delay bMotionSettings BMOTION_SLEEP
-
-        set bMotion_output_delay 0
-
-        #check our global toggle
-        global bMotionGlobal
-        if {$bMotionGlobal == 0} {
-                return 0
-        }
-
-        set bMotionCache($channel,last) 1
-
-        # check if we're asleep
-        if {[bMotion_setting_get "asleep"] == $BMOTION_SLEEP(ASLEEP)} {
-                return 0
-        }
-
-        if [regexp "^\[#!\].+" $channel] {
-                set channel [string tolower $channel]
-                if {![channel get $channel bmotion]} {
-                        bMotion_putloglev d * "bMotion: aborting bMotionDoAction ... $channel not allowed"
-                        return 0
-                }
-        }
-
-        if {[bMotion_setting_get "silence"] == 1} { 
-                return 0 
-        }
-        catch {
-                if {$bMotionInfo(adminSilence,$channel) == 1} { 
-                        return 0 
-                }
-        }
-
-        switch [rand 3] {
-                0 { }
-                1 { set nick [string tolower $nick] }
-                2 { set nick "[string range $nick 0 0][string tolower [string range $nick 1 end]]" }
-        }
-
-        # Process macros
+proc bMotion_process_macros { channel text } {
 
         set done 0
@@ -174 +129 @@
                 set current_pos [string first "%" $text $current_pos]
                 if {$current_pos == -1} {
-                        # no more matches
+                # no more matches
                         set done 1
                         continue
@@ -180 +135 @@
                 bMotion_putloglev d * "macro: found a % at $current_pos"
                 if {$current_pos < [string length $text]} {
-                        # this isn't a % at the end of the line
+                # this isn't a % at the end of the line
                         if {[string index $text [expr $current_pos + 1]] == "|"} {
                                 set current_pos [expr $current_pos + 2]
@@ -192 +147 @@
                                 set plugin [bMotion_plugin_find_output "en" "" 0 10 $macro]
                                 if {[llength $plugin] == 1} {
-                                        # call plugin
+                                # call plugin
                                         bMotion_putloglev d * "macro: found matching plugin for macro [lindex $plugin 0]"
                                         set result ""
@@ -235 +190 @@
                 incr current_pos
         }
+
+        return $text
+}
+
+#
+# our magic output function
+proc bMotionDoAction {channel nick text {moreText ""} {noTypo 0} {urgent 0} } {
+        bMotion_putloglev 5 * "bMotionDoAction($channel,$nick,$text,$moreText,$noTypo,$urgent)"
+        global bMotionInfo bMotionCache bMotionOriginalInput
+        global bMotion_output_delay bMotionSettings BMOTION_SLEEP
+
+        set bMotion_output_delay 0
+
+        #check our global toggle
+        global bMotionGlobal
+        if {$bMotionGlobal == 0} {
+                return 0
+        }
+
+        set bMotionCache($channel,last) 1
+
+        # check if we're asleep
+        if {[bMotion_setting_get "asleep"] == $BMOTION_SLEEP(ASLEEP)} {
+                return 0
+        }
+
+        if [regexp "^\[#!\].+" $channel] {
+                set channel [string tolower $channel]
+                if {![channel get $channel bmotion]} {
+                        bMotion_putloglev d * "bMotion: aborting bMotionDoAction ... $channel not allowed"
+                        return 0
+                }
+        }
+
+        if {[bMotion_setting_get "silence"] == 1} { 
+                return 0 
+        }
+        catch {
+                if {$bMotionInfo(adminSilence,$channel) == 1} { 
+                        return 0 
+                }
+        }
+
+        switch [rand 3] {
+                0 { }
+                1 { set nick [string tolower $nick] }
+                2 { set nick "[string range $nick 0 0][string tolower [string range $nick 1 end]]" }
+        }
+
+        # Process macros
+
+        set text [bMotion_process_macros $channel $text]
 
         # Run the plugins :D
@@ -482 +489 @@
         }
 
-        regsub -all "%%" $line "%percent" line
+        regsub -all "%" $line "%percent" line
 
         return $line

trunk/plugins/admin_abstract.tcl

@@ -78 +78 @@
                 bMotion_abstract_flush
                 bMotion_putadmin "Flushing all abstracts to disk..."
+                return 0
+        }
+
+        if [regexp -nocase "diagnose" $arg] {
+                bMotion_diagnostic_parsing
                 return 0
         }
@@ -161 +166 @@
         bMotion_putadmin "  .bmotion abstract filter apply <abstract>"
         bMotion_putadmin "    For an abstract to be filtered now"
+        bMotion_putadmin "  .bmotion abstract diagnose"
+        bMotion_putadmin "    Test all abstracts for parsability and report any broken ones"
         return 0
 }

trunk/plugins/en/output_VAR.tcl

@@ -118 +118 @@
 
                 # check if what we swapped in gave us a %noun
-                if [string match "*%noun*" $line] {
-                        set line [bMotionInsertString $line "%noun" "%VAR{sillyThings}"]
-                }
+                set line [string map { "%noun" "%VAR{sillyThings}" } $line]
         }