- changed &Get*() to &get*(), &Delete*() to &del*()

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

diff --git a/src/Modules/Debian.pl b/src/Modules/Debian.pl
index c86d7aa665c364958c9f52a817aa101378c441fc..e191496f223addc0d83b4361d1a18cf2af09c6f5 100644 (file)
--- a/src/Modules/Debian.pl
+++ b/src/Modules/Debian.pl
@@ -11,14 +11,23 @@ use strict;
 
 # format: "alias=real".
 my $announce   = 0;
-my $defaultdist        = "unstable";
+my $defaultdist        = "sid";
 my $refresh = &::getChanConfDefault("debianRefreshInterval",7)
                        * 60 * 60 * 24;
 
+### ... old
+#my %dists     = (
+#      "sid"           => "unstable",
+#      "woody"         => "testing",   # new since 20001219.
+#      "potato"        => "stable",
+#      "incoming"      => "incoming",
+#);
+
+### new... the right way.
 my %dists      = (
-       "sid"           => "unstable",
-       "woody"         => "testing",   # new since 20001219.
-       "potato"        => "stable",
+       "unstable"      => "sid",
+       "testing"       => "woody",     # new since 20001219.
+       "stable"        => "potato",
        "incoming"      => "incoming",
 );
 
@@ -269,7 +278,7 @@ sub searchContents {
        }
 
        foreach $pkg (keys %contents) {
-           foreach (keys %{$contents{$pkg}}) {
+           foreach (keys %{ $contents{$pkg} }) {
                # TODO: correct padding.
                print OUT "$_\t\t\t$pkg\n";
            }
@@ -285,7 +294,7 @@ sub searchContents {
 
     my @list;
     foreach $pkg (keys %contents) {
-       my @tmplist = &::fixFileList(keys %{$contents{$pkg}});
+       my @tmplist = &::fixFileList(keys %{ $contents{$pkg} });
        my @sublist = sort { length $a <=> length $b } @tmplist;
 
        pop @sublist while (scalar @sublist > 3);
@@ -293,12 +302,16 @@ sub searchContents {
        $pkg =~ s/\,/\037\,\037/g;      # underline ','.
        push(@list, "(". join(', ',@sublist) .") in $pkg");
     }
+    &::DEBUG("debian: 0");
     # sort the total list from shortest to longest...
     @list = sort { length $a <=> length $b } @list;
 
     # show how long it took.
+    &::DEBUG("debian: 1");
     my $delta_time = &::timedelta($start_time);
+    &::DEBUG("debian: 2");
     &::status(sprintf("Debian: %.02f sec to complete query.", $delta_time)) if ($delta_time > 0);
+    &::DEBUG("debian: 3");
 
     my $prefix = "Debian Search of '$query' ";
     if (scalar @list) {        # @list.
@@ -389,7 +402,7 @@ sub searchAuthor {
        my $name;
        foreach $name (keys %maint) {
            my $email;
-           foreach $email (keys %{$maint{$name}}) {
+           foreach $email (keys %{ $maint{$name} }) {
                next unless ($email =~ /\Q$query\E/i);
                next if (exists $hash{$name});
                $hash{$name} = 1;
@@ -406,13 +419,13 @@ sub searchAuthor {
 
     &::DEBUG("showing all packages by '$list[0]'...");
 
-    my @pkg = sort keys %{$pkg{$list[0]}};
+    my @pkg = sort keys %{ $pkg{$list[0]} };
 
     # show how long it took.
     my $delta_time = &::timedelta($start_time);
     &::status(sprintf("Debian: %.02f sec to complete query.", $delta_time)) if ($delta_time > 0);
 
-    my $email  = join(', ', keys %{$maint{$list[0]}});
+    my $email  = join(', ', keys %{ $maint{$list[0]} });
     my $prefix = "Debian Packages by $list[0] \002<\002$email\002>\002 ";
     &::pSReply( &::formListReply(0, $prefix, @pkg) );
 }
@@ -688,7 +701,8 @@ sub infoPackages {
            $pkg{'info'}  = "\002(\002". $pkg{'desc'} ."\002)\002";
            $pkg{'info'} .= ", section ".$pkg{'section'};
            $pkg{'info'} .= ", is ".$pkg{'priority'};
-           $pkg{'info'} .= ". Version: \002$pkg{'version'}\002";
+#          $pkg{'info'} .= ". Version: \002$pkg{'version'}\002";
+           $pkg{'info'} .= ". Version: \002$pkg{'version'}\002 ($dist)";
            $pkg{'info'} .= ", Packaged size: \002". int($pkg{'size'}/1024) ."\002 kB";
            $pkg{'info'} .= ", Installed size: \002$pkg{'installed'}\002 kB";
 
@@ -799,14 +813,14 @@ sub infoStats {
     &::pSReply(
        "Debian Distro Stats on $dist... ".
        "\002$total{'count'}\002 packages, ".
-       "\002".scalar(keys %{$total{'maint'}})."\002 maintainers, ".
+       "\002".scalar(keys %{ $total{'maint'} })."\002 maintainers, ".
        "\002". int($total{'isize'}/1024)."\002 MB installed size, ".
        "\002". int($total{'csize'}/1024/1024)."\002 MB compressed size."
     );
 
 ### TODO: do individual stats? if so, we need _another_ arg.
 #    foreach $file (keys %stats) {
-#      foreach (keys %{$stats{$file}}) {
+#      foreach (keys %{ $stats{$file} }) {
 #          &::DEBUG("  '$file' '$_' '$stats{$file}{$_}'.");
 #      }
 #    }
@@ -925,7 +939,7 @@ sub validPackage {
     }
     close IN;
 
-    &::DEBUG("vP: scanned $count items in index.");
+    &::VERB("vP: scanned $count items in index.",2);
 
     return @files;
 }
@@ -1005,15 +1019,16 @@ sub getDistro {
     }
 
     if (exists $dists{$dist}) {
-       &::DEBUG("gD: returning dists{$dist} ($dists{$dist})");
+       &::VERB("gD: returning dists{$dist} ($dists{$dist})",2);
        return $dists{$dist};
+
     } else {
        if (!grep /^\Q$dist\E$/i, %dists) {
            &::msg($::who, "invalid dist '$dist'.");
            return;
        }
 
-       &::DEBUG("gD: returning $dist (no change or conversion)");
+       &::VERB("gD: returning $dist (no change or conversion)",2);
        return $dist;
     }
 }
@@ -1058,7 +1073,7 @@ sub DebianFind {
        &::status("searchPackage returned one result; getting info of package instead!");
        &::Forker("debian", sub { &infoPackages("info", "$results[0] $dist"); } );
     } else {
-       my $prefix = "Debian Package Listing of '$str' ";
+       my $prefix = "Debian Package Listing of '$query' ";
        &::pSReply( &::formListReply(0, $prefix, @results) );
     }
 }