X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=src%2Fmodules.pl;h=6a6368c168656a5f6bffac2bbb8ebf90768937e8;hb=023a39fb150b8b6b5f4554fce0978563dbb704ce;hp=a199b4441149bd5a4f08e89b88dc744007c0ce14;hpb=bfbedf154f64d1d694cb4d614b781d13ffce082e;p=infobot.git

diff --git a/src/modules.pl b/src/modules.pl
index a199b44..6a6368c 100644
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -22,36 +22,40 @@ if ($@) {
 
 ### MODULES.
 %myModules = (
-	"bzflag"	=> "BZFlag.pl",
-	"countdown"	=> "Countdown.pl",
+	"babelfish"	=> "babelfish.pl",
+	"botmail"	=> "botmail.pl",
+	"BZFlag"	=> "BZFlag.pl",
+	"countdown"	=> "countdown.pl",
 	"debian"	=> "Debian.pl",
 	"debianExtra"	=> "DebianExtra.pl",
 	"dict"		=> "Dict.pl",
 	"dumpvars"	=> "DumpVars.pl",
-	"symdump"	=> "DumpVars2.pl",
 	"exchange"	=> "Exchange.pl",
 	"factoids"	=> "Factoids.pl",
-	"freshmeat"	=> "Freshmeat.pl",
+	"HTTPDtype"	=> "HTTPDtype.pl",
+	"insult"	=> "insult.pl",
+	"ircdcc"	=> "UserDCC.pl",
 	"kernel"	=> "Kernel.pl",
-	"perlMath"	=> "Math.pl",
 	"news"		=> "News.pl",
+	"nickometer"	=> "nickometer.pl",
+	"pager"		=> "pager.pl",
+	"perlMath"	=> "Math.pl",
 	"plug"		=> "Plug.pl",
 	"quote"		=> "Quote.pl",
 	"rootwarn"	=> "RootWarn.pl",
+	"rss"		=> "Rss.pl",
 	"search"	=> "Search.pl",
 	"slashdot"	=> "Slashdot3.pl",
+	"symdump"	=> "DumpVars2.pl",
 	"topic"		=> "Topic.pl",
 	"units"		=> "Units.pl",
 	"uptime"	=> "Uptime.pl",
-	"ircdcc"	=> "UserDCC.pl",
 	"userinfo"	=> "UserInfo.pl",
 	"weather"	=> "Weather.pl",
-	"wwwsearch"	=> "W3Search.pl",
 	"whatis"	=> "WhatIs.pl",
+	"wikipedia"	=> "wikipedia.pl",
 	"wingate"	=> "Wingate.pl",
-	"babelfish"	=> "babel.pl",
-	"insult"	=> "insult.pl",
-	"nickometer"	=> "nickometer.pl",
+	"wwwsearch"	=> "W3Search.pl",
 	"zfi"		=> "zfi.pl",
 	"zippy"		=> "Zippy.pl",
 	"zsi"		=> "zsi.pl",
@@ -60,7 +64,7 @@ if ($@) {
 my @myModulesLoadNow;
 my @myModulesReloadNot;
 BEGIN {
-    @myModulesLoadNow	= ('topic', 'uptime', 'news', 'rootWarn', 'symdump');
+    @myModulesLoadNow	= ('topic', 'uptime', 'news', 'rootWarn', 'symdump', 'botmail');
     @myModulesReloadNot	= ('IRC/Irc.pl','IRC/Schedulers.pl');
 }
 
@@ -86,56 +90,20 @@ sub loadCoreModules {
 
 sub loadDBModules {
     my $f;
-    # todo: use function to load module.
-
-    if ($param{'DBType'} =~ /^mysql$/i) {
-	eval "use DBI";
-	if ($@) {
-	    &ERROR("libdbd-mysql-perl is not installed!");
-	    exit 1;
-	}
-	&status("Loading MySQL support.");
-	$f = "$bot_src_dir/dbi.pl";
-	require $f;
-	$moduleAge{$f} = (stat $f)[9];
-
-	&showProc(" (DBI::mysql)");
+    # TODO: use function to load module.
 
-    } elsif ($param{'DBType'} =~ /^pgsql$/i) {
+    if ($param{'DBType'} =~ /^(mysql|SQLite|pgsql)$/i) {
 	eval "use DBI";
 	if ($@) {
-	    &ERROR("libpgperl is not installed!");
+	    &ERROR("No support for DBI::" . $param{'DBType'} . ", exiting!");
 	    exit 1;
 	}
-	&status("Loading pgsql support.");
+	&status("Loading " . $param{'DBType'} . " support.");
 	$f = "$bot_src_dir/dbi.pl";
 	require $f;
 	$moduleAge{$f} = (stat $f)[9];
 
-	&showProc(" (DBI::pgsql)");
-
-    } elsif ($param{'DBType'} =~ /^sqlite$/i) {
-	eval "use DBI";
-	if ($@) {
-	    &ERROR("libdbd-sqlite-perl is not installed!");
-	    exit 1;
-	}
-	&status("Loading SQLite support.");
-#	$f = "$bot_src_dir/dbi.pl";
-	$f = "$bot_src_dir/db_sqlite.pl";
-	require $f;
-	$moduleAge{$f} = (stat $f)[9];
-
-	&showProc(" (DBI::SQLite)");
-
-    } elsif ($param{'DBType'} =~ /^dbm$/i) {
-	&status("Loading dbm support.");
-	$f = "$bot_src_dir/dbm.pl";
-	require $f;
-	$moduleAge{$f} = (stat $f)[9];
-
-	&showProc(" (dbm.pl)");
-
+	&showProc(" (DBI::" . $param{'DBType'} . ")");
     } else {
 	&WARN("DB support DISABLED.");
 	return;
@@ -193,7 +161,7 @@ sub loadIRCModules {
 	    &ERROR("require \"$mod\" => $@");
 	    &shutdown();
 	    exit 1;
-        }
+	}
 
 	$moduleAge{$mod} = (stat $mod)[9];
 	&showProc(" ($_)") if (&IsParam("DEBUG"));
@@ -233,40 +201,44 @@ sub loadMyModulesNow {
 
 ### rename to moduleReloadAll?
 sub reloadAllModules {
+    my $retval = "";
+
     &VERB("Module: reloading all.",2);
 
     # obscure usage of map and regex :)
     foreach (map { s/.*?\/?src/src/; $_ } keys %moduleAge) {
-        &reloadModule($_);
+	$retval .= &reloadModule($_);
     }
 
     &VERB("Module: reloading done.",2);
+    return $retval;
 }
 
 ### rename to modulesReload?
 sub reloadModule {
     my ($mod)	= @_;
     my $file	= (grep /\/$mod/, keys %INC)[0];
+    my $retval = "";
 
     # don't reload if it's not our module.
     if ($mod =~ /::/ or $mod !~ /pl$/) {
 	&VERB("Not reloading $mod.",3);
-	return;
+	return $retval;
     }
 
     if (!defined $file) {
 	&WARN("rM: Cannot reload $mod since it was not loaded anyway.");
-	return;
+	return $retval;
     }
 
     if (! -f $file) {
 	&ERROR("rM: file '$file' does not exist?");
-	return;
+	return $retval;
     }
 
     if (grep /$mod/, @myModulesReloadNot) {
 	&DEBUG("rM: should not reload $mod");
-	return;
+	return $retval;
     }
 
     my $age = (stat $file)[9];
@@ -274,13 +246,13 @@ sub reloadModule {
     if (!exists $moduleAge{$file}) {
 	&DEBUG("Looks like $file was not loaded; fixing.");
     } else {
-	return if ($age == $moduleAge{$file});
+	return $retval if ($age == $moduleAge{$file});
 
 	if ($age < $moduleAge{$file}) {
 	    &WARN("rM: we're not gonna downgrade '$file'; use touch.");
 	    &DEBUG("age => $age");
 	    &DEBUG("mA{$file} => $moduleAge{$file}");
-	    return;
+	    return $retval;
 	}
 
 	my $dc  = &Time2String($age   - $moduleAge{$file});
@@ -295,13 +267,15 @@ sub reloadModule {
     delete $INC{$file};
     eval "require \"$file\"";	# require or use?
     if (@$) {
-	&DEBUG("rM: failure: @$");
+	&DEBUG("rM: failure: @$ ");
     } else {
 	my $basename = $file;
 	$basename =~ s/^.*\///;
 	&status("Module: reloaded $basename");
+	$retval = " $basename";
 	$moduleAge{$file} = $age;
     }
+    return $retval;
 }
 
 ###
@@ -323,7 +297,7 @@ sub loadPerlModule {
 	return 0;
     } else {
 	$perlModulesLoaded{$_[0]} = 1;
-	&status("Module: Loaded $_[0] ...");
+	&status("Loaded $_[0]");
 	&showProc(" ($_[0])");
 	return 1;
     }
@@ -333,7 +307,7 @@ sub loadMyModule {
     my ($tmp) = @_;
     if (!defined $tmp) {
 	&WARN("loadMyModule: module is NULL.");
-	return 0; 
+	return 0;
     }
 
     my ($modulename, $modulebase);
@@ -379,7 +353,7 @@ sub loadMyModule {
     } else {
 	$moduleAge{$modulefile} = (stat $modulefile)[9];
 
-	&status("myModule: Loaded $modulebase ...");
+	&status("Loaded $modulebase");
 	&showProc(" ($modulebase)");
 	return 1;
     }
@@ -417,8 +391,8 @@ sub getPerlFiles {
     my($dir) = @_;
 
     if (!opendir(DIR, $dir)) {
-        &ERROR("Cannot open source directory ($dir): $!");
-        exit 1;
+	&ERROR("Cannot open source directory ($dir): $!");
+	exit 1;
     }
 
     my @mods;