GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 11:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Switch over to SQLite backend for Factoids

Browse Source
This commit is contained in:
Pragmatic Software 2020-02-26 02:29:02 -08:00
parent fb1eda51ee
commit e24835ea95
3 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
PBot/Factoids.pm
View File

@ -23,16 +23,55 @@ use POSIX qw(strftime);
use Text::ParseWords; use Text::ParseWords;
use JSON; use JSON;
use PBot::FactoidsSQLite;
use PBot::FactoidCommands; use PBot::FactoidCommands;
use PBot::DualIndexHashObject;
use PBot::Utils::Indefinite; use PBot::Utils::Indefinite;
use PBot::Utils::ValidateString; use PBot::Utils::ValidateString;
our %factoid_metadata = (
'action' => 'TEXT',
'action_with_args' => 'TEXT',
'add_nick' => 'INTEGER',
'allow_empty_args' => 'INTEGER',
'background-process' => 'INTEGER',
'cap-override' => 'TEXT',
'created_on' => 'NUMERIC',
'dont-protect-self' => 'INTEGER',
'dont-replace-pronouns' => 'INTEGER',
'edited_by' => 'TEXT',
'edited_on' => 'NUMERIC',
'enabled' => 'INTEGER',
'help' => 'TEXT',
'interpolate' => 'INTEGER',
'keyword_override' => 'TEXT',
'last_referenced_in' => 'TEXT',
'last_referenced_on' => 'NUMERIC',
'locked' => 'INTEGER',
'locked_to_channel' => 'INTEGER',
'no_keyword_override' => 'INTEGER',
'noembed' => 'INTEGER',
'nooverride' => 'INTEGER',
'owner' => 'TEXT',
'persist-key' => 'INTEGER',
'preserve_whitespace' => 'INTEGER',
'process-timeout' => 'INTEGER',
'rate_limit' => 'INTEGER',
'ref_count' => 'INTEGER',
'ref_user' => 'TEXT',
'require_explicit_args' => 'INTEGER',
'requires_arguments' => 'INTEGER',
'type' => 'TEXT',
'unquote_spaces' => 'INTEGER',
'usage' => 'TEXT',
'use_output_queue' => 'INTEGER',
'workdir' => 'TEXT',
);
sub initialize { sub initialize {
my ($self, %conf) = @_; my ($self, %conf) = @_;
my $filename = $conf{filename}; my $filename = $conf{filename};
$self->{factoids} = PBot::DualIndexHashObject->new(name => 'Factoids', filename => $filename, pbot => $self->{pbot}); $self->{factoids} = PBot::FactoidsSQLite->new(name => 'Factoids', filename => $filename, pbot => $self->{pbot});
$self->{pbot} = $self->{pbot}; $self->{pbot} = $self->{pbot};
$self->{commands} = PBot::FactoidCommands->new(pbot => $self->{pbot}); $self->{commands} = PBot::FactoidCommands->new(pbot => $self->{pbot});
@ -49,18 +88,7 @@ sub initialize {
sub load_factoids { sub load_factoids {
my $self = shift; my $self = shift;
$self->{factoids}->load; $self->{factoids}->load;
$self->{factoids}->create_metadata(\%factoid_metadata);
my ($text, $regex, $modules);
foreach my $channel ($self->{factoids}->get_keys) {
foreach my $trigger ($self->{factoids}->get_keys($channel)) {
next if $trigger eq '_name';
$self->{pbot}->{logger}->log("Missing type for $channel->$trigger\n") if not $self->{factoids}->get_data($channel, $trigger, 'type');
$text++ if $self->{factoids}->get_data($channel, $trigger, 'type') eq 'text';
$regex++ if $self->{factoids}->get_data($channel, $trigger, 'type') eq 'regex';
$modules++ if $self->{factoids}->get_data($channel, $trigger, 'type') eq 'module';
}
}
$self->{pbot}->{logger}->log(" " . ($text + $regex + $modules) . " factoids loaded ($text text, $regex regexs, $modules modules).\n");
} }
sub save_factoids { sub save_factoids {
@ -111,7 +139,7 @@ sub remove_factoid {
my $self = shift; my $self = shift;
my ($channel, $trigger) = @_; my ($channel, $trigger) = @_;
$channel = '.*' if $channel !~ /^#/; $channel = '.*' if $channel !~ /^#/;
$self->{factoids}->remove($channel, $trigger); return $self->{factoids}->remove($channel, $trigger);
} }
sub export_factoids { sub export_factoids {
@ -122,6 +150,8 @@ sub export_factoids {
else { $filename = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factoids.html'; } else { $filename = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factoids.html'; }
return if not defined $filename; return if not defined $filename;
$self->{pbot}->{logger}->log("Exporting factoids to $filename\n");
open FILE, "> $filename" or return "Could not open export path."; open FILE, "> $filename" or return "Could not open export path.";
my $botnick = $self->{pbot}->{registry}->get_value('irc', 'botnick'); my $botnick = $self->{pbot}->{registry}->get_value('irc', 'botnick');

3
PBot/PBot.pm
View File

@ -20,6 +20,7 @@ use PBot::Logger;
use PBot::VERSION; use PBot::VERSION;
use PBot::HashObject; use PBot::HashObject;
use PBot::DualIndexHashObject; use PBot::DualIndexHashObject;
use PBot::DualIndexSQLiteObject;
use PBot::Registry; use PBot::Registry;
use PBot::Capabilities; use PBot::Capabilities;
use PBot::SelectHandler; use PBot::SelectHandler;
@ -228,7 +229,7 @@ sub initialize {
$self->{interpreter}->register(sub { $self->{commands}->interpreter(@_) }); $self->{interpreter}->register(sub { $self->{commands}->interpreter(@_) });
$self->{interpreter}->register(sub { $self->{factoids}->interpreter(@_) }); $self->{interpreter}->register(sub { $self->{factoids}->interpreter(@_) });
$self->{factoids} = PBot::Factoids->new(pbot => $self, filename => "$data_dir/factoids", %conf); $self->{factoids} = PBot::Factoids->new(pbot => $self, filename => "$data_dir/factoids.sqlite3", %conf);
$self->{plugins} = PBot::Plugins->new(pbot => $self, %conf); $self->{plugins} = PBot::Plugins->new(pbot => $self, %conf);

BIN
data/factoids.sqlite3 vendored Normal file
View File

Binary file not shown.