* Merged in changes for r1841:1850 from don's dpkg branch

* DynaConfig.pl to check for legacy blootbot configs (partial)

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@1851 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/ChangeLog b/ChangeLog
index 114c29534b50f25aef453184f8b7e4d5d815b165..45903ae0b36b2b151b3dca75b15e4e61b0be7424 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 1.5.4
 =====
+* Updates to DebianExtra.pl:
+- use soap for bug_info
+- totally replace do_id with the copy from DebianBugs.pl
+- fix ||= typo
+- fix url->uri typo
+- fix -> typo
+- add some more debugging code to the do_id code
+- remove useless bug =>
+- disable debugging output of the soap object returned
+- soap returns multiple bugs in a single shot
+- use strftime on the date
+
+* check for and use of old blootbot.(users|chan) files
 
 
 1.5.3

diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl
index 1c3cad37c07d11474fe20d46cebd1c7ed80fe6e1..6f4de07d630bd587eecf5c5db428b5679028d094 100644 (file)
--- a/src/DynaConfig.pl
+++ b/src/DynaConfig.pl
@@ -41,6 +41,9 @@ my @regFlagsUser = (
 
 sub readUserFile {
     my $f = "$bot_state_dir/infobot.users";
+    if (! -e $f and -e "$bot_state_dir/blootbot.users") {
+        $f = "$bot_state_dir/blootbot.users";
+    }
 
     if ( !-f $f ) {
         &DEBUG('userfile not found; new fresh run detected.');
@@ -274,6 +277,9 @@ sub writeUserFile {
 
 sub readChanFile {
     my $f = "$bot_state_dir/infobot.chan";
+    if (-e "$bot_state_dir/infobot.chan" and -e "$bot_state_dir/blootbot.chan") {
+        $f = "$bot_state_dir/blootbot.chan";
+    }
     if ( -f $f and -f "$f~" ) {
         my $s1 = -s $f;
         my $s2 = -s "$f~";

diff --git a/src/Modules/DebianExtra.pl b/src/Modules/DebianExtra.pl
index 8df9343e61ea4d43b9229e5db273e29ac2d6bc8a..98668e6ac7f16ee075b4663492dcc0772bbc7f77 100644 (file)
--- a/src/Modules/DebianExtra.pl
+++ b/src/Modules/DebianExtra.pl
@@ -73,79 +73,51 @@ sub debianBugs {
     }
 }
 
+use SOAP::Lite;
+
 sub do_id($) {
-    my ($bug_num) = shift;
+    my ($bug_num,$options) = @_;
+
+    $options ||= {};
 
     if ( not $bug_num =~ /^\#?\d+$/ ) {
+        warn "Bug is not a number!" and return undef
+          if not $options->{return_warnings};
         return "Bug is not a number!";
     }
     $bug_num =~ s/^\#//;
-    my @results =
-      &::getURL("http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=$bug_num");
-    my $report = join( "\n", @results );
-
-    # strip down report to relevant header information.
-    #    $report =~ s/\r//sig;
-    $report =~ /<BODY[^>]*>(.+?)<HR>/si;
-    $report = $1;
-    my $bug = {};
-    ( $bug->{num}, $bug->{title} ) =
-      $report =~ m#\#(\d+)\<\/A\>\<BR\>(.+?)\<\/H1\>#is;
-    &::DEBUG("Bugnum: $bug->{num}\n");
-    $bug->{title} =~ s/&lt;/\</g;
-    $bug->{title} =~ s/&gt;/\>/g;
-    $bug->{title} =~ s/&quot;/\"/g;
-    &::DEBUG("Title: $bug->{title}\n");
-    $bug->{severity} = 'n';    #Default severity is normal
-    my @bug_flags = split /(?<!\&.t)[;\.]\n/s, $report;
-
-    foreach my $bug_flag (@bug_flags) {
-        $bug_flag =~ s/\n//g;
-        &::DEBUG("Bug_flag: $bug_flag\n");
-        if ( $bug_flag =~ /Severity:/i ) {
-            ( $bug->{severity} ) =
-              $bug_flag =~ /(wishlist|minor|normal|important|serious|grave)/i;
-
-            # Just leave the leter instead of the whole thing.
-            $bug->{severity} =~ s/^(.).+$/$1/;
-        }
-        elsif ( $bug_flag =~ /Package:/ ) {
-            ( $bug->{package} ) = $bug_flag =~ /\"\>\s*([^\<\>\"]+?)\s*\<\/a\>/;
-        }
-        elsif ( $bug_flag =~ /Reported by:/ ) {
-            ( $bug->{reporter} ) = $bug_flag =~ /\"\>\s*(.+?)\s*\<\/a\>/;
-
-            # strip &lt; and &gt;
-            $bug->{reporter} =~ s/&lt;/\</g;
-            $bug->{reporter} =~ s/&gt;/\>/g;
-        }
-        elsif ( $bug_flag =~ /Date:/ ) {
-            ( $bug->{date} ) = $bug_flag =~ /Date:\s*(\w.+?)\s*$/;
-
-            #ditch extra whitespace
-            $bug->{date} =~ s/\s{2,}/\ /;
-        }
-        elsif ( $bug_flag =~ /Tags:/ ) {
-            ( $bug->{tags} ) = $bug_flag =~ /strong\>\s*(.+?)\s*\<\/strong\>/;
-        }
-        elsif ( $bug_flag =~ /merged with / ) {
-            $bug_flag =~ s/merged with\s*//;
-            $bug_flag =~ s/\<[^\>]+\>//g;
-            $bug_flag =~ s/\s//sg;
-            $bug->{merged_with} = $bug_flag;
-
-        }
-        elsif ( $bug_flag =~ /\>Done:\</ ) {
-            $bug->{done} = 1;
-        }
-        elsif ( $bug_flag =~ /\>Fixed\</ ) {
-            $bug->{done} = 1;
-        }
+    my $soap = SOAP::Lite->uri('Debbugs/SOAP/1')->
+       proxy('http://bugs.debian.org/cgi-bin/soap.cgi');
+    $soap->transport->env_proxy();
+    my $temp = $soap->get_status($bug_num);
+    use Data::Dumper;
+    # enabling this will cause amazing amounts of output
+    # &::DEBUG(Dumper($temp));
+    if ($temp->fault) {
+       return "Some failure (".$temp->fault->{faultstring}.")";
     }
-
+    my $result = $temp->result();
+    &::DEBUG(Dumper($result));
+    if (not defined $result) {
+       return "No such bug (or some kind of error)";
+    }
+    ($result) = values %{$result};
+    my $bug = {};
+    $bug->{num} = $result->{bug_num};
+    $bug->{title} = $result->{subject};
+    $bug->{severity} = $result->{severity};    #Default severity is normal
+    # Just leave the leter instead of the whole thing.
+    $bug->{severity} =~ s/^(.).+$/$1/;
+    $bug->{package} = $result->{package};
+    $bug->{reporter} = $result->{submitter};
+    use POSIX;
+    $bug->{date} = POSIX::strftime(q(%a, %d %b %Y %H:%M:%S UTC),gmtime($result->{date}));
+    $bug->{tags} = $result->{keywords};
+    $bug->{done} = defined $result->{done} && length($result->{done}) > 0;
+    $bug->{merged_with} = $result->{mergedwith};
     # report bug
 
-    $report = '';
+    my $report = '';
     $report .= 'DONE:' if defined $bug->{done} and $bug->{done};
     $report .= '#'
       . $bug->{num} . ':'
@@ -160,10 +132,6 @@ sub do_id($) {
       . join( ',', splice( @{ [ split( /,/, $bug->{merged_with} ) ] }, 0, 3 ) )
       . ']'
       if defined $bug->{merged_with};
-    if ($::DEBUG) {
-        use Data::Dumper;
-        &::DEBUG( Dumper($bug) );
-    }
     return $report;
 }