Changeset 179

Timestamp:

05/25/07 21:59:01 (3 years ago)

Author:

eevee

Message:

Added Perlbui's code!
Refactored Vee::Dex a bit: it now requires a call to initialize() to actually pull anything from the db, so apps besides Catalyst (like, say, Perlbui) can use it and pass in their own schema object.

Location:

veekun/trunk

Files:

• lib/Vee.pm (modified) (2 diffs)
• lib/Vee/Bot.pm (added)
• lib/Vee/Dex.pm (modified) (2 diffs)
• script/perlbui.pl (added)

veekun/trunk/lib/Vee.pm

@@ -26 +26 @@
 use Vee::Authorization;
 use Vee::Utils;
+use Vee::Dex;
 use YAML qw//;
 use LWP::UserAgent;
@@ -52 +53 @@
 
 __PACKAGE__->setup;
+
+Vee::Dex::initialize( __PACKAGE__->model('DBIC') );
 
 {

veekun/trunk/lib/Vee/Dex.pm

@@ -192 +192 @@
 # DB CACHED STUFF
 
-my @pokenames = Vee->model('DBIC::Pokemon')->search({
-    real_id => { '<=', $Generations[-1]{maxid} },
-}, {
-    order_by => 'id ASC',
-    columns => [qw/id name alt_form name_romaji name_jp/],
-});
-our @PokemonNames  = map { $_->name . ($_->alt_form ? ' (' . $_->alt_form . ')' : '') } @pokenames;
-our @PokemonRomaji = map { $_->name_romaji } @pokenames;
-our @PokemonKana   = map { $_->name_jp     } @pokenames;
-
-our @PokemonJohto  = Vee->model('DBIC::Pokemon')->search({ id_johto  => { '>', 0 } }, { order_by => 'id_johto',  columns => ['id'] })->get_column('id')->all;
-our @PokemonHoenn  = Vee->model('DBIC::Pokemon')->search({ id_hoenn  => { '>', 0 } }, { order_by => 'id_hoenn',  columns => ['id'] })->get_column('id')->all;
-our @PokemonSinnoh = Vee->model('DBIC::Pokemon')->search({ id_sinnoh => { '>', 0 } }, { order_by => 'id_sinnoh', columns => ['id'] })->get_column('id')->all;
-
-# TODO: investigate DBIC caching; possibly turn this into a boring hash and change all references to it
-our @MoveData = Vee->model('DBIC::Moves')->search(undef, { order_by => 'me.id ASC', prefetch => 'effect' });
-our $DamagingMoveCount = Vee->model('DBIC::Moves')->search({ power => { '!=' => undef } })->count;
-
-our %TypeData = map { $_->name => $_ } Vee->model('DBIC::Types')->search({ internalid => { '!=' => -1 } });
-our @TypeNames = sort keys %TypeData;
-our %OldTypeOrder = map { $_->internalid + 1 => $_->name } values %TypeData;  # for Compat.pm
-
-our @AbilityNames = Vee->model('DBIC::Abilities')->search({ id => { '<', 200 } }, { order_by => 'id ASC', columns => ['name'] })->get_column('name')->all;
-
-# machines
-our @TMs;
-my @tms = Vee->model('DBIC::Machines')->search(undef, { columns => ['id', 'generation', 'moveid'], order_by => 'id ASC' });
-for my $row (@tms) {
-    $TMs[ $row->generation ][ $row->id ] = $row->moveid
-}
-
-our %MoveTMs;
-for my $gen (0 .. $#Generations) {
-    for my $tm (1 .. $#{$TMs[$gen]}) {
-        next unless $TMs[$gen][$tm];
-        $MoveTMs{ $TMs[$gen][$tm] }[ $gen ] = $tm;
-    }
-}
-
-# so I can use one-based ids with these
-unshift @PokemonNames, undef;
-unshift @PokemonJohto, undef;
-unshift @PokemonHoenn, undef;
-unshift @PokemonSinnoh, undef;
-unshift @PokemonKana, undef;
-unshift @PokemonRomaji, undef;
-unshift @MoveData, {};
-unshift @AbilityNames, undef;
-
-# temporary, just for the below code; possibly to be promoted later
-my @movenames = Vee->model('DBIC::Moves')->search(undef, { order_by => 'id ASC', columns => [qw/name name_romaji name_jp/] });
-my @movekana   = undef, map { $_->name_jp     } @movenames;
-my @moveromaji = undef, map { $_->name_romaji } @movenames;
-
-# create an index of fuzzy matches
+# You must call initialize with a $schema object to load all this, as this code
+# is used by both Catalyst and an outside app!
+
+our (@PokemonNames, @PokemonRomaji, @PokemonKana);
+our (@PokemonJohto, @PokemonHoenn, @PokemonSinnoh);
+our (@MoveData, $DamagingMoveCount);
+our (%TypeData, @TypeNames, %OldTypeOrder);
+our (@AbilityNames);
+our (@TMs, %MoveTMs);
 our %FuzzyMatches;
-$FuzzyMatches{ lc $TypeNames[$_]       } = { type => 'type',    id => $_, name => $TypeNames[$_]       } for 0 .. $#TypeNames;
-$FuzzyMatches{ lc $movekana[$_]        } =
-$FuzzyMatches{ lc $moveromaji[$_]      } =
-$FuzzyMatches{ lc $MoveData[$_]->name  } = { type => 'move',    id => $_, name => $MoveData[$_]->name  } for 1 .. $#MoveData;
-$FuzzyMatches{ lc $AbilityNames[$_]    } = { type => 'ability', id => $_, name => $AbilityNames[$_]    } for 1 .. $#AbilityNames;
-
-# @pokenames is used over @PokemonNames here, due to the alt_name being embedded in @PokemonNames entries
-$FuzzyMatches{ lc $_->name_jp       } =
-$FuzzyMatches{ lc $_->name_romaji   } =
-$FuzzyMatches{ lc $_->name          } = { type => 'pokemon', id => $_->id, name => $_->name } for @pokenames;
+
+sub initialize {
+    my ($schema) = @_;
+
+    my @pokenames = $schema->resultset('Pokemon')->search({
+        real_id => { '<=', $Generations[-1]{maxid} },
+    }, {
+        order_by => 'id ASC',
+        columns => [qw/id name alt_form name_romaji name_jp/],
+    });
+    @PokemonNames  = map { $_->name . ($_->alt_form ? ' (' . $_->alt_form . ')' : '') } @pokenames;
+    @PokemonRomaji = map { $_->name_romaji } @pokenames;
+    @PokemonKana   = map { $_->name_jp     } @pokenames;
+
+    @PokemonJohto  = $schema->resultset('Pokemon')->search({ id_johto  => { '>', 0 } }, { order_by => 'id_johto',  columns => ['id'] })->get_column('id')->all;
+    @PokemonHoenn  = $schema->resultset('Pokemon')->search({ id_hoenn  => { '>', 0 } }, { order_by => 'id_hoenn',  columns => ['id'] })->get_column('id')->all;
+    @PokemonSinnoh = $schema->resultset('Pokemon')->search({ id_sinnoh => { '>', 0 } }, { order_by => 'id_sinnoh', columns => ['id'] })->get_column('id')->all;
+
+    # TODO: investigate DBIC caching; possibly turn this into a boring hash and change all references to it
+    @MoveData = $schema->resultset('Moves')->search(undef, { order_by => 'me.id ASC', prefetch => 'effect' });
+    $DamagingMoveCount = $schema->resultset('Moves')->search({ power => { '!=' => undef } })->count;
+
+    %TypeData = map { $_->name => $_ } $schema->resultset('Types')->search({ internalid => { '!=' => -1 } });
+    @TypeNames = sort keys %TypeData;
+    %OldTypeOrder = map { $_->internalid + 1 => $_->name } values %TypeData;  # for Compat.pm
+
+    @AbilityNames = $schema->resultset('Abilities')->search({ id => { '<', 200 } }, { order_by => 'id ASC', columns => ['name'] })->get_column('name')->all;
+
+    # so I can use one-based ids with these
+    unshift @PokemonNames, undef;
+    unshift @PokemonJohto, undef;
+    unshift @PokemonHoenn, undef;
+    unshift @PokemonSinnoh, undef;
+    unshift @PokemonKana, undef;
+    unshift @PokemonRomaji, undef;
+    unshift @MoveData, {};
+    unshift @AbilityNames, undef;
+
+    # machines
+    my @tms = $schema->resultset('Machines')->search(undef, { columns => ['id', 'generation', 'moveid'], order_by => 'id ASC' });
+    for my $row (@tms) {
+        $TMs[ $row->generation ][ $row->id ] = $row->moveid
+    }
+
+    for my $gen (0 .. $#Generations) {
+        for my $tm (1 .. $#{$TMs[$gen]}) {
+            next unless $TMs[$gen][$tm];
+            $MoveTMs{ $TMs[$gen][$tm] }[ $gen ] = $tm;
+        }
+    }
+
+    # ------------------------------------------------------------------------------
+    # fuzzy cache
+
+    # temporary, just for the below code; possibly to be promoted later
+    my @movenames = $schema->resultset('Moves')->search(undef, { order_by => 'id ASC', columns => [qw/name name_romaji name_jp/] });
+    my @movekana   = undef, map { $_->name_jp     } @movenames;
+    my @moveromaji = undef, map { $_->name_romaji } @movenames;
+
+    # create an index of fuzzy matches
+    our %FuzzyMatches;
+    $FuzzyMatches{ lc $TypeNames[$_]       } = { type => 'type',    id => $_, name => $TypeNames[$_]       } for 0 .. $#TypeNames;
+    $FuzzyMatches{ lc $movekana[$_]        } =
+    $FuzzyMatches{ lc $moveromaji[$_]      } =
+    $FuzzyMatches{ lc $MoveData[$_]->name  } = { type => 'move',    id => $_, name => $MoveData[$_]->name  } for 1 .. $#MoveData;
+    $FuzzyMatches{ lc $AbilityNames[$_]    } = { type => 'ability', id => $_, name => $AbilityNames[$_]    } for 1 .. $#AbilityNames;
+
+    # @pokenames is used over @PokemonNames here, due to the alt_name being embedded in @PokemonNames entries
+    $FuzzyMatches{ lc $_->name_jp       } =
+    $FuzzyMatches{ lc $_->name_romaji   } =
+    $FuzzyMatches{ lc $_->name          } = { type => 'pokemon', id => $_->id, name => $_->name } for @pokenames;
+
+    return 1;
+}
+
+
 
 ################################################################################
@@ -636 +656 @@
 my %vartypes = ( ARRAY => '@', HASH => '%', SCALAR => '$', CODE => '' );
 for my $var (keys %Vee::Dex::) {
-    next if $var eq 'EXPORT_FAIL' || $var eq 'EXPORT' || $var eq 'import' || $var eq 'all' || $var =~ /^_/;
+    next if $var =~ /^_/ or grep { $var eq $_ } qw/EXPORT_FAIL EXPORT import all initialize/;
     
     my @valid_types = grep { defined *{ $Vee::Dex::{$var} }{$_} } keys %vartypes;