moved more functions to new hook scheme

[infobot.git] / src / CommandStubs.pl

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 60b8ec237d97020cbfac23c32259c0f60a262557..dad1e54202a4d33a63be0eaf390a989184d063e4 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -8,17 +8,21 @@ use vars qw(@W3Search_engines $W3Search_regex);
 @W3Search_engines = qw(AltaVista Dejanews Excite Gopher HotBot Infoseek
                        Lycos Magellan PLweb SFgate Simple Verity Google);
 $W3Search_regex = join '|', @W3Search_engines;
+$babel::lang_regex = "";       # lame fix.
 
 ### PROPOSED COMMAND HOOK IMPLEMENTATION.
 # addCmdHook('TEXT_HOOK', $code_ref,
 #      (Forker         => 1,
+#      CheckModule     => 1,
 #      Identifier      => 'config_label',
 #      Help            => 'help_label',
 #      Cmdstats        => 'text_label',)
 #}
 ### EXAMPLE
-# addCmdHook('d?find', \&debianFind(), (
-#      Forker => 1,
+# addCmdHook('d?find', (
+#      CODEREF => \&debianFind(),
+#      CheckModule => 1,
+#      Forker => 1,            # if simple function.
 #      Identifier => "debian",
 #      Help => "dfind",
 #      Cmdstats => "Debian Search",) );
@@ -26,6 +30,78 @@ $W3Search_regex = join '|', @W3Search_engines;
 #   * viable solution?
 ###
 
+sub addCmdHook {
+    my ($ident, %hash) = @_;
+
+    &DEBUG("aCH: added $ident to command hooks.");
+    $cmdhooks{$ident} = \%hash;
+}
+
+# RUN IF ADDRESSED.
+sub parseCmdHook {
+    my @args = split(' ', $message);
+
+    &shmFlush();
+
+    foreach (keys %cmdhooks) {
+       my $ident = $_;
+       &DEBUG("cmdhooks{$ident} => ...");
+
+       next unless ($args[0] =~ /^$ident$/i);
+       shift(@args);   # just gotta do it.
+
+       &DEBUG("pCH: MATCHED!");
+       my %hash = %{ $cmdhooks{$ident} };
+
+       ### DEBUG.
+       foreach (keys %hash) {
+           &DEBUG(" $ident->$_ => '$hash{$_}'.");
+       }
+
+       ### IDENTIFIER.
+       if (exists $hash{'Identifier'}) {
+           return $noreply unless (&hasParam($hash{'Identifier'}));
+       }
+
+       ### FORKER,IDENTIFIER,CODEREF.
+       if (exists $hash{'Forker'}) {
+           &Forker($hash{'Identifier'}, sub { \&{$hash{'CODEREF'}}(@args) } );
+       }
+
+       ### CMDSTATS.
+       if (exists $hash{'Cmdstats'}) {
+           $cmdstats{$hash{'Cmdstats'}}++;
+       }
+
+       return 1;
+    }
+
+    &DEBUG("pCH: ended.");
+    return 0;
+}
+
+&addCmdHook('d?bugs', ('CODEREF' => 'debianBugs',
+       'Forker' => 1, 'Identifier' => 'debianExtra',
+       'Cmdstats' => 'Debian Bugs') );
+&addCmdHook('dauthor', ('CODEREF' => 'Debian::searchAuthor',
+       'Forker' => 1, 'Identifier' => 'debian',
+       'Cmdstats' => 'Debian Author Search', 'Help' => "dauthor" ) );
+&addCmdHook('(d|search)desc', ('CODEREF' => 'Debian::searchDesc',
+       'Forker' => 1, 'Identifier' => 'debian',
+       'Cmdstats' => 'Debian Desc Search', 'Help' => "ddesc" ) );
+&addCmdHook('dincoming', ('CODEREF' => 'Debian::generateIncoming',
+       'Forker' => 1, 'Identifier' => 'debian' ) );
+&addCmdHook('dstats', ('CODEREF' => 'Debian::infoStats',
+       'Forker' => 1, 'Identifier' => 'debian',
+       'Cmdstats' => 'Debian Statistics' ) );
+&addCmdHook('d?contents', ('CODEREF' => 'Debian::searchContents',
+       'Forker' => 1, 'Identifier' => 'debian',
+       'Cmdstats' => 'Debian Contents Search', 'Help' => "contents" ) );
+&addCmdHook('d?find', ('CODEREF' => 'Debian::DebianFind',
+       'Forker' => 1, 'Identifier' => 'debian',
+       'Cmdstats' => 'Debian Search', 'Help' => "find" ) );
+
+
 sub Modules {
     if (!defined $message) {
        &WARN("Modules: message is undefined. should never happen.");
@@ -89,81 +165,6 @@ sub Modules {
        return $noreply;
     }
 
-    if ($message =~ /^d?bugs$/i) {
-       return $noreply unless (&hasParam("debianExtra"));
-
-       &Forker("debianExtra", sub { &debianBugs(); } );
-
-       $cmdstats{'Debian Bugs'}++;
-       return $noreply;
-    }
-
-    # Debian Author Search.
-    if ($message =~ /^dauthor(\s+(.*))?$/i) {
-       return $noreply unless (&hasParam("debian"));
-
-       my $query = $2;
-       if (!defined $query) {
-           &help("dauthor");
-           return $noreply;
-       }
-
-       &Forker("debian", sub { &Debian::searchAuthor($query); } );
-
-       $cmdstats{'Debian Author Search'}++;
-       return $noreply;
-    }
-
-    # Debian Incoming Search.
-    if ($message =~ /^dincoming$/i) {
-       return $noreply unless (&hasParam("debian"));
-
-       &Forker("debian", sub { &Debian::generateIncoming(); } );
-
-       $cmdstats{'Debian Incoming Search'}++;
-       return $noreply;
-    }
-
-    # Debian Distro(Package) Stats
-    if ($message =~ /^dstats(\s+(.*))?$/i) {
-       return $noreply unless (&hasParam("debian"));
-       my $dist = $2 || $Debian::defaultdist;
-
-       &Forker("debian", sub { &Debian::infoStats($dist); } );
-
-       $cmdstats{'Debian Statistics'}++;
-       return $noreply;
-    }
-
-    # Debian Contents search.
-    if ($message =~ /^d?contents(\s+(.*))?$/i) {
-       return $noreply unless (&hasParam("debian"));
-
-       my $query = $2;
-       if (!defined $query) {
-           &help("contents");
-           return $noreply;
-       }
-
-       &Forker("debian", sub { &Debian::searchContents($query); } );
-
-       $cmdstats{'Debian Contents Search'}++;
-       return $noreply;
-    }
-
-    # Debian Package info.
-    if ($message =~ /^d?find(\s+(.*))?$/i and &IsParam("debian")) {
-       my $string = $2;
-
-       if (!defined $string) {
-           &help("find");
-           return $noreply;
-       }
-
-       &Forker("debian", sub { &Debian::DebianFind($string); } );
-       return $noreply;
-    }
-
     if (&IsParam("debian")) {
        my $debiancmd    = 'conflicts?|depends?|desc|file|info|provides?';
        $debiancmd      .= '|recommends?|suggests?|maint|maintainer';
@@ -337,10 +338,7 @@ sub Modules {
            return $noreply;
        }
 
-       ### chews up to 4megs => use forker :)
        &Forker("search", sub { &Search::Search($thiscmd, $args); } );
-#      &loadMyModule($myModules{'search'});
-#      &Search::Search($thiscmd, $args);
 
        $cmdstats{'Factoid Search'}++;
        return $noreply;