case

[infobot.git] / src / Modules / Debian.pl

diff --git a/src/Modules/Debian.pl b/src/Modules/Debian.pl
index 45d7834cd50e96c222500d08063ce97d6f5ab268..2626b0fefc37644801776abb729a109ed056114e 100644 (file)
--- a/src/Modules/Debian.pl
+++ b/src/Modules/Debian.pl
@@ -8,24 +8,23 @@
 package Debian;
 
 use strict;
-no strict 'refs'; # FIXME dstats aborts if set
+no strict 'refs'; # FIXME: dstats aborts if set
 
 my $announce   = 0;
-my $defaultdist        = "sid";
-my $refresh = &::getChanConfDefault("debianRefreshInterval",7)
-                       * 60 * 60 * 24;
+my $defaultdist        = 'sid';
+my $refresh = &::getChanConfDefault('debianRefreshInterval', 7, $::chan) * 60 * 60 * 24;
 my $debug      = 0;
-my $debian_dir = "$::bot_state_dir/debian";
-my $country    = "us"; # well .config it yourself then. ;-)
-my $protocol   = "http";
+my $debian_dir = $::bot_state_dir . 'debian';
+my $country    = 'us'; # well .config it yourself then. ;-)
+my $protocol   = 'http';
 
 # format: "alias=real".
 my %dists      = (
-       "unstable"      => "sid",
-       "testing"       => "sarge",
-       "stable"        => "woody",
-       "oldstable"     => "potato",
-       "incoming"      => "incoming",
+       'unstable'      => 'sid',
+       'testing'       => 'sarge',
+       'stable'        => 'woody',
+       'oldstable'     => 'potato',
+       'incoming'      => 'incoming',
 );
 
 my %urlcontents = (
@@ -135,12 +134,12 @@ sub DebianDownload {
            next;
        }
 
-       my $exit = CORE::system("/bin/gzip -t $file >/dev/null 2>&1");
-       if ($exit) {
-           &::WARN("deb: $file is corrupted :/");
-           unlink $file;
-           next;
-       }
+#      my $exit = system("/bin/gzip -t $file");
+#      if ($exit) {
+#          &::WARN("deb: $file is corrupted ($exit) :/");
+#          unlink $file;
+#          next;
+#      }
 
        &::DEBUG("deb: download: good.") if ($debug);
        $good++;
@@ -176,19 +175,19 @@ sub searchContents {
     $query =~ s/^\s+|\s+$//g;
 
     if (!&::validExec($query)) {
-       &::msg($::who, "search string looks fuzzy.");
+       &::msg($::who, 'search string looks fuzzy.');
        return;
     }
 
-    if ($dist eq "incoming") {         # nothing yet.
-       &::DEBUG("sC: dist = 'incoming'. no contents yet.");
+    if ($dist eq 'incoming') {         # nothing yet.
+       &::DEBUG('sC: dist = "incoming". no contents yet.');
        return;
     } else {
        my %urls = &fixDist($dist, %urlcontents);
        # download contents file.
-       &::DEBUG("deb: download 1.") if ($debug);
+       &::DEBUG('deb: download 1.') if ($debug);
        if (!&DebianDownload($dist, %urls)) {
-           &::WARN("Debian: could not download files.");
+           &::WARN('Debian: could not download files.');
        }
     }
 
@@ -314,7 +313,7 @@ sub searchContents {
 
     my $prefix = "Debian Search of '$query' ";
     if (scalar @list) {        # @list.
-       &::pSReply( &::formListReply(0, $prefix, @list) );
+       &::performStrictReply( &::formListReply(0, $prefix, @list) );
        return;
     }
 
@@ -324,7 +323,7 @@ sub searchContents {
 
     if (!scalar @list) {
        my $prefix = "Debian Package/File/Desc Search of '$query' ";
-       &::pSReply( &::formListReply(0, $prefix, ) );
+       &::performStrictReply( &::formListReply(0, $prefix, ) );
 
     } elsif (scalar @list == 1) {      # list = 1.
        &::DEBUG("deb: list == 1; showing package info of '$list[0]'.");
@@ -332,7 +331,7 @@ sub searchContents {
 
     } else {                           # list > 1.
        my $prefix = "Debian Desc Search of '$query' ";
-       &::pSReply( &::formListReply(0, $prefix, @list) );
+       &::performStrictReply( &::formListReply(0, $prefix, @list) );
     }
 }
 
@@ -422,7 +421,7 @@ sub searchAuthor {
     my @list = keys %hash;
     if (scalar @list != 1) {
        my $prefix = "Debian Author Search of '$query' ";
-       &::pSReply( &::formListReply(0, $prefix, @list) );
+       &::performStrictReply( &::formListReply(0, $prefix, @list) );
        return 1;
     }
 
@@ -436,7 +435,7 @@ sub searchAuthor {
 
     my $email  = join(', ', keys %{ $maint{$list[0]} });
     my $prefix = "Debian Packages by $list[0] \002<\002$email\002>\002 ";
-    &::pSReply( &::formListReply(0, $prefix, @pkg) );
+    &::performStrictReply( &::formListReply(0, $prefix, @pkg) );
 }
 
 ####
@@ -691,7 +690,7 @@ sub infoPackages {
 
     if (! -f $files[0]) {
        &::WARN("files[0] ($files[0]) doesn't exist.");
-       &::msg($::who, "WARNING: $files[0] does not exist? FIXME");
+       &::msg($::who, "FIXME: $files[0] does not exist?");
        return 'NULL';
     }
 
@@ -763,7 +762,7 @@ sub infoPackages {
        }
     }
 
-    &::pSReply("$package: $pkg{$query}");
+    &::performStrictReply("$package: $pkg{$query}");
 }
 
 # Usage: &infoStats($dist);
@@ -827,7 +826,7 @@ sub infoStats {
 
     ### TODO: don't count ppl with multiple email addresses.
 
-    &::pSReply(
+    &::performStrictReply(
        "Debian Distro Stats on $dist... ".
        "\002$total{'count'}\002 packages, ".
        "\002".scalar(keys %{ $total{'maint'} })."\002 maintainers, ".
@@ -1078,13 +1077,13 @@ sub DebianFind {
     my @results = sort &searchPackage($str);
 
     if (!scalar @results) {
-       &::Forker("debian", sub { &searchContents($str); } );
+       &::Forker("Debian", sub { &searchContents($str); } );
     } elsif (scalar @results == 1) {
        &::status("searchPackage returned one result; getting info of package instead!");
-       &::Forker("debian", sub { &infoPackages("info", "$results[0] $dist"); } );
+       &::Forker("Debian", sub { &infoPackages("info", "$results[0] $dist"); } );
     } else {
        my $prefix = "Debian Package Listing of '$query' ";
-       &::pSReply( &::formListReply(0, $prefix, @results) );
+       &::performStrictReply( &::formListReply(0, $prefix, @results) );
     }
 }
 
@@ -1111,13 +1110,13 @@ sub debianCheck {
     while (defined($file = readdir DEBIAN)) {
        next unless ($file =~ /(gz|bz2)$/);
 
-       # todo: add bzip2 support (debian doesn't do .bz2 anyway)
-       my $exit = system("/bin/gzip -t '$debian_dir/$file'");
-       next unless ($exit);
+       # TODO: add bzip2 support (debian doesn't do .bz2 anyway)
+       #my $exit = system("/bin/gzip -t '$debian_dir/$file'");
+       #next unless ($exit);
        &::DEBUG("deb: hmr... => ".(time() - (stat($file))[8])."'.");
        next unless (time() - (stat($file))[8] > 3600);
 
-       &::DEBUG("deb: dC: exit => '$exit'.");
+       #&::DEBUG("deb: dC: exit => '$exit'.");
        &::WARN("dC: '$debian_dir/$file' corrupted? deleting!");
        unlink $debian_dir."/".$file;
        $retval++;
@@ -1144,13 +1143,13 @@ sub searchDescFE {
 
     if (!scalar @list) {
        my $prefix = "Debian Desc Search of '$query' ";
-       &::pSReply( &::formListReply(0, $prefix, ) );
+       &::performStrictReply( &::formListReply(0, $prefix, ) );
     } elsif (scalar @list == 1) {      # list = 1.
        &::DEBUG("deb: list == 1; showing package info of '$list[0]'.");
        &infoPackages("info", $list[0]);
     } else {                           # list > 1.
        my $prefix = "Debian Desc Search of '$query' ";
-       &::pSReply( &::formListReply(0, $prefix, @list) );
+       &::performStrictReply( &::formListReply(0, $prefix, @list) );
     }
 }