Use DBIx::Class

For now this is a relatively quick-and-dirty transition, but this
enables us to reuse ASM::DB from the website. Yay

1 files changed, 4 insertions, 198 deletions

diff --git a/lib/ASM/DB.pm b/lib/ASM/DB.pm
index b8c7b63..6bd9519 100644
--- a/lib/ASM/DB.pm
+++ b/lib/ASM/DB.pm
@@ -1,205 +1,11 @@
+use utf8;
 package ASM::DB;
-no autovivification;
 
-use warnings;
 use strict;
-use DBI;
-use Data::Dumper;
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
-
-sub new {
-  my $module = shift;
-  my ($db, $host, $port, $user, $pass, $table, $actiontable, $dblog) = @_;
-  my $self = {};
-  $self->{DBH} = DBI->connect("DBI:mysql:database=$db;host=$host;port=$port", $user, $pass);
-  $self->{DBH}->{mysql_auto_reconnect} = 1;
-  $self->{TABLE} = $table;
-  $self->{ACTIONTABLE} = $actiontable;
-  bless($self);
-  return $self;
-}
-
-sub raw
-{
-  my $self = shift;
-  my ($conn, $tgt, $dbh, $qry) = @_;
-  my $sth = $dbh->prepare($qry);
-  $sth->execute;
-  my $names = $sth->{'NAME'};
-  my $numFields = $sth->{'NUM_OF_FIELDS'};
-  my $string = "";
-  for (my $i = 0; $i < $numFields; $i++) {
-    $string = $string . sprintf("%s%s", $i ? "," : "", $$names[$i]);
-  }
-  $conn->privmsg($tgt, $string);
-  while (my $ref = $sth->fetchrow_arrayref) {
-    $string = "";
-    for (my $i = 0; $i < $numFields; $i++) {
-      $string = $string . sprintf("%s%s", $i ? "," : "", $$ref[$i]);
-    }
-    $conn->privmsg($tgt, $string);
-  }
-}
-
-sub record
-{
-  my $self = shift;
-  my ($channel, $nick, $user, $host, $gecos, $level, $id, $reason) = @_;
-  $gecos //= "NOT_DEFINED";
-
-  my $dbh = $self->{DBH};
-  $dbh->do("INSERT INTO $self->{TABLE} (channel, nick, user, host, gecos, level, id, reason) VALUES (" .
-             $dbh->quote($channel) . ", " . $dbh->quote($nick) . ", " . $dbh->quote($user) .
-             ", " . $dbh->quote($host) . ", " . $dbh->quote($gecos) . ", " . $dbh->quote($level) . ", " .
-             $dbh->quote($id) . ", " . $dbh->quote($reason) . ");");
-}
-
-sub actionlog
-{
-  my ($self, $event, $modedata1, $modedata2) = @_;
-  my $dbh = $self->{DBH};
-  my ($action, $reason, $channel,
-        $nick,   $user,   $host,   $gecos,   $account, $ip,
-      $bynick, $byuser, $byhost, $bygecos, $byaccount);
-  my ($lcnick, $lcbynick);
-
-  if ($event->{type} eq 'mode') {
-    $action = $modedata1;
-    $nick = $modedata2;
-    $channel = lc $event->{to}->[0];
-    $bynick = $event->{nick};
-    $byuser = $event->{user};
-    $byhost = $event->{host};
-  } elsif ($event->{type} eq 'quit') {
-    my $quitmsg = $event->{args}->[0];
-    if ($quitmsg =~ /^Killed \((\S+) \((.*)\)\)$/) {
-      $bynick = $1;
-      $reason = $2 unless ($2 eq '<No reason given>');
-      return if (($reason // '') =~ /Nickname regained by services/);
-      $action = 'kill';
-    } elsif ($quitmsg =~ /^K-Lined$/) {
-      $action = 'k-line';
-    } else {
-      return; #quit not forced/tracked
-    }
-    $nick = $event->{nick};
-    $user = $event->{user};
-    $host = $event->{host};
-  } elsif (($event->{type} eq 'part') && ($event->{args}->[0] =~ /^requested by (\S+) \((.*)\)/)) {
-    $bynick = $1;
-    $reason = $2 unless (lc $2 eq lc $event->{nick});
-    $action = 'remove';
-    $nick = $event->{nick};
-    $user = $event->{user};
-    $host = $event->{host};
-    $channel = $event->{to}->[0];
-  } elsif ($event->{type} eq 'kick') {
-    $action = 'kick';
-    $bynick = $event->{nick};
-    $byuser = $event->{user};
-    $byhost = $event->{host};
-    $reason = $event->{args}->[1] unless ($event->{args}->[1] eq $event->{to}->[0]);
-    $nick = $event->{to}->[0];
-    $channel = $event->{args}->[0];
-  }
-  return unless defined($action);
-  $lcbynick = lc $bynick if defined $bynick; #we will lowercase the NUHGA info later.
-  if ( (defined($bynick)) && (defined($::sn{$lcbynick})) ) { #we have the nick taking the action available, fill in missing NUHGA info
-    $byuser //= $::sn{$lcbynick}{user};
-    $byhost //= $::sn{$lcbynick}{host};
-    $bygecos //= $::sn{$lcbynick}{gecos};
-    $byaccount //= $::sn{$lcbynick}{account};
-    if (($byaccount eq '0') or ($byaccount eq '*')) {
-      $byaccount = undef;
-    }
-  }
-  $lcnick = lc $nick if defined $nick;
-  if ( (defined($nick)) && (defined($::sn{$lcnick})) ) { #this should always be true, else something has gone FUBAR
-    $user //= $::sn{$lcnick}{user};
-    $host //= $::sn{$lcnick}{host};
-    $gecos //= $::sn{$lcnick}{gecos};
-    $account //= $::sn{$lcnick}{account};
-    if (($account eq '0') or ($account eq '*')) {
-      $account = undef;
-    }
-    $ip = ASM::Util->getNickIP($lcnick);
-  }
-#  my ($action, $reason, $channel,
-#        $nick,   $user,   $host,   $gecos,   $account, $ip
-#      $bynick, $byuser, $byhost, $bygecos, $byaccount);
-#Now, time to escape/NULLify everything
-  $action = $dbh->quote($action);
-  if (defined($reason))  {  $reason = $dbh->quote($reason);     } else {  $reason = 'NULL'; }
-## removed lc's from everything except IP
-  if (defined($channel)) { $channel = $dbh->quote($channel); } else { $channel = 'NULL'; }
-
-  if (defined($nick))    {    $nick = $dbh->quote($nick);    } else {    $nick = 'NULL'; }
-  if (defined($user))    {    $user = $dbh->quote($user);    } else {    $user = 'NULL'; }
-  if (defined($host))    {    $host = $dbh->quote($host);    } else {    $host = 'NULL'; }
-  if (defined($gecos))   {   $gecos = $dbh->quote($gecos);   } else {   $gecos = 'NULL'; }
-  if (defined($account)) { $account = $dbh->quote($account); } else { $account = 'NULL'; }
-  if (defined($ip))      {      $ip = $dbh->quote($ip);         } else {      $ip = 'NULL'; }
-
-  if (defined($bynick))    {    $bynick = $dbh->quote($bynick);    } else {    $bynick = 'NULL'; }
-  if (defined($byuser))    {    $byuser = $dbh->quote($byuser);    } else {    $byuser = 'NULL'; }
-  if (defined($byhost))    {    $byhost = $dbh->quote($byhost);    } else {    $byhost = 'NULL'; }
-  if (defined($bygecos))   {   $bygecos = $dbh->quote($bygecos);   } else {   $bygecos = 'NULL'; }
-  if (defined($byaccount)) { $byaccount = $dbh->quote($byaccount); } else { $byaccount = 'NULL'; }
-  my $sqlstr = "INSERT INTO $self->{ACTIONTABLE} " .
-           "(action, reason, channel, " .
-           "nick, user, host, gecos, account, ip, " .
-           "bynick, byuser, byhost, bygecos, byaccount)" .
-           " VALUES " .
-           "($action, $reason, $channel, " .
-           "$nick, $user, $host, $gecos, $account, $ip, " .
-           "$bynick, $byuser, $byhost, $bygecos, $byaccount);";
-  ASM::Util->dprint( $sqlstr, 'mysql' );
-  $dbh->do( $sqlstr );
-  return $dbh->last_insert_id(undef, undef, $self->{ACTIONTABLE}, undef);
-# $::sn{ow} looks like:
-#$VAR1 = { 
-#          "account" => "afterdeath",
-#          "gecos" => "William Athanasius Heimbigner",
-#          "user" => "icxcnika",
-#          "mship" => [ 
-#                       "#baadf00d",
-#                       "#antispammeta-debug",
-#                       "#antispammeta"
-#                     ],
-#          "host" => "freenode/weird-exception/network-troll/afterdeath"
-#        };
-
-}
-  
-sub query
-{
-  my $self = shift;
-  my ($channel, $nick, $user, $host) = @_;
-  my $dbh = $self->{DBH};
-  $channel = $dbh->quote($channel);
-  $nick    = $dbh->quote($nick);
-  $user    = $dbh->quote($user);
-  $host    = $dbh->quote($host);
+use warnings;
 
-  $nick =~  s/\*/%/g;
-  $nick =~ s/_/\\_/g;
-  $nick =~  s/\?/_/g;
+use parent 'DBIx::Class::Schema';
 
-  $user =~  s/\*/%/g;
-  $user =~ s/_/\\_/g;
-  $user =~  s/\?/_/g;
+__PACKAGE__->load_namespaces;
 
-  $host =~  s/\*/%/g;
-  $host =~ s/_/\\_/g;
-  $host =~  s/\?/_/g;
-  my $sth = $dbh->prepare("SELECT * from $self->{TABLE} WHERE channel like $channel and nick like $nick and user like $user and host like $host;");
-  $sth->execute;
-  my $i = 0;
-  while (my $ref = $sth->fetchrow_arrayref) {
-    $i++;
-  }
-  return $i;
-}
-  
 1;
-# vim: ts=2:sts=2:sw=2:expandtab