git://git.camperquake.de
/
videosite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fix typo
[videosite.git]
/
videosite.pl
diff --git
a/videosite.pl
b/videosite.pl
index
8f56fa1
..
ec41009
100644
(file)
--- a/
videosite.pl
+++ b/
videosite.pl
@@
-6,6
+6,7
@@
# Based on youtube.pl by Christian Garbs <mitch@cgarbs.de>
# which in turn is
# based on trigger.pl by Wouter Coekaerts <wouter@coekaerts.be>
# Based on youtube.pl by Christian Garbs <mitch@cgarbs.de>
# which in turn is
# based on trigger.pl by Wouter Coekaerts <wouter@coekaerts.be>
+# This is helena
use strict;
use Irssi 20020324 qw (command_bind command_runsub signal_add_first signal_add_last);
use strict;
use Irssi 20020324 qw (command_bind command_runsub signal_add_first signal_add_last);
@@
-13,6
+14,8
@@
use vars qw($VERSION %IRSSI);
use XML::Simple;
use Data::Dumper;
use File::Spec;
use XML::Simple;
use Data::Dumper;
use File::Spec;
+delete($INC{'BettIrssi.pm'});
+use BettIrssi qw(_bcb _bcs);
my @grabbers;
my @getters;
my @grabbers;
my @getters;
@@
-21,6
+24,7
@@
my $conf;
my $conffile = File::Spec->catfile(Irssi::get_irssi_dir(), 'videosite.xml');
my $scriptdir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
my $plugindir = File::Spec->catfile($scriptdir, 'videosite');
my $conffile = File::Spec->catfile(Irssi::get_irssi_dir(), 'videosite.xml');
my $scriptdir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
my $plugindir = File::Spec->catfile($scriptdir, 'videosite');
+my @outputstack = (undef);
my $PARAMS = {
'getter' => '',
my $PARAMS = {
'getter' => '',
@@
-32,23
+36,33
@@
my $PARAMS = {
my $debug = 0;
# "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
my $debug = 0;
# "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
-signal_add_last(
"message public" => sub {check_for_link(\@_,1,4,2,0);}
);
+signal_add_last(
_bcs("message public" => sub {check_for_link(@_)})
);
# "message own_public", SERVER_REC, char *msg, char *target
# "message own_public", SERVER_REC, char *msg, char *target
-signal_add_last(
"message own_public" => sub {check_for_link(\@_,1,2,-1,0);}
);
+signal_add_last(
_bcs("message own_public" => sub {check_for_link(@_)})
);
# "message private", SERVER_REC, char *msg, char *nick, char *address
# "message private", SERVER_REC, char *msg, char *nick, char *address
-signal_add_last(
"message private" => sub {check_for_link(\@_,1,-1,2,0);}
);
+signal_add_last(
_bcs("message private" => sub {check_for_link(@_)})
);
# "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
# "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
-signal_add_last(
"message own_private" => sub {check_for_link(\@_,1,2,-1,0);}
);
+signal_add_last(
_bcs("message own_private" => sub {check_for_link(@_)})
);
# "message irc action", SERVER_REC, char *msg, char *nick, char *address, char *target
# "message irc action", SERVER_REC, char *msg, char *nick, char *address, char *target
-signal_add_last(
"message irc action" => sub {check_for_link(\@_,1,4,2,0);}
);
+signal_add_last(
_bcs("message irc action" => sub {check_for_link(@_)})
);
# "message irc own_action", SERVER_REC, char *msg, char *target
# "message irc own_action", SERVER_REC, char *msg, char *target
-signal_add_last(
"message irc own_action" => sub {check_for_link(\@_,1,2,-1,0);}
);
+signal_add_last(
_bcs("message irc own_action" => sub {check_for_link(@_)})
);
# For tab completion
signal_add_first('complete word', \&sig_complete);
# For tab completion
signal_add_first('complete word', \&sig_complete);
+sub push_output {
+ unshift(@outputstack, shift);
+}
+
+sub pop_output {
+ shift(@outputstack);
+
+ @outputstack = (undef) unless (@outputstack);
+}
+
my $videosite_commands = {
'save' => sub {
cmd_save();
my $videosite_commands = {
'save' => sub {
cmd_save();
@@
-91,7
+105,7
@@
my $videosite_commands = {
foreach (@grabbers, @getters) {
$_->setdebug(1);
}
foreach (@grabbers, @getters) {
$_->setdebug(1);
}
- write_irssi(
undef,
'Enabled debugging');
+ write_irssi('Enabled debugging');
},
'nodebug' => sub {
},
'nodebug' => sub {
@@
-99,47
+113,42
@@
my $videosite_commands = {
foreach (@grabbers, @getters) {
$_->setdebug(0);
}
foreach (@grabbers, @getters) {
$_->setdebug(0);
}
- write_irssi(
undef,
'Disabled debugging');
+ write_irssi('Disabled debugging');
},
};
sub write_irssi {
},
};
sub write_irssi {
- my $witem = shift;
my @text = @_;
my @text = @_;
+ my $output = $outputstack[0];
-
$text[0] = 'videosite: ' . $text[0]
;
+
my $format = "%%mvideosite: %%n" . shift(@text)
;
- if (defined $witem) {
- $witem->print(sprintf(shift(@text), @text), MSGLEVEL_CLIENTCRAP);
+ # escape % in parameters from irssi
+ s/%/%%/g foreach @text;
+
+ if (defined $output) {
+ $output->(sprintf($format, @text), MSGLEVEL_CLIENTCRAP);
} else {
} else {
- Irssi::print(sprintf(
shift(@text)
, @text));
+ Irssi::print(sprintf(
$format
, @text));
}
}
sub write_debug {
if ($debug) {
}
}
sub write_debug {
if ($debug) {
- write_irssi(
shift,
@_);
+ write_irssi(@_);
}
}
sub check_for_link {
}
}
sub check_for_link {
- my ($signal,$parammessage,$paramchannel,$paramnick,$paramserver) = @_;
- my $server = $signal->[$paramserver];
- my $target = $signal->[$paramchannel];
- my $message = ($parammessage == -1) ? '' : $signal->[$parammessage];
+ my $event = shift;
+ my $message = $event->message();
+ my $witem = $event->channel();
my $g;
my $m;
my $p;
my $g;
my $m;
my $p;
- my $witem;
- if (defined $server) {
- $witem = $server->window_item_find($target);
- } else {
- $witem = Irssi::window_item_find($target);
- }
-
# Look if we should ignore this line
if ($message =~ m,(?:\s|^)/nosave(?:\s|$),) {
return;
# Look if we should ignore this line
if ($message =~ m,(?:\s|^)/nosave(?:\s|$),) {
return;
@@
-151,16
+160,16
@@
sub check_for_link {
foreach $g (@grabbers) {
($m, $p) = $g->get($message);
while (defined($m)) {
foreach $g (@grabbers) {
($m, $p) = $g->get($message);
while (defined($m)) {
- write_debug(
$witem,
'Metadata: %s', Dumper($m));
+ write_debug('Metadata: %s', Dumper($m));
if ('download' eq ($conf->{'videosite'}->{'mode'})) {
if ('download' eq ($conf->{'videosite'}->{'mode'})) {
- write_irssi(
$witem,
'%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
+ write_irssi('%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
unless($getter->get($m)) {
unless($getter->get($m)) {
- write_irssi(
$witem,
'%%R>>> FAILED');
+ write_irssi('%%R>>> FAILED');
}
} elsif ('display' eq ($conf->{'videosite'}->{'mode'})) {
}
} elsif ('display' eq ($conf->{'videosite'}->{'mode'})) {
- write_irssi(
$witem,
'%%M>>> %%NSaw %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
+ write_irssi('%%M>>> %%NSaw %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
} else {
} else {
- write_irssi(
$witem,
'%%R>>> Invalid operation mode');
+ write_irssi('%%R>>> Invalid operation mode');
}
# Remove the matched part from the message and try again (there may be
}
# Remove the matched part from the message and try again (there may be
@@
-181,9
+190,9
@@
sub cmd_save {
close(CONF);
};
if ($@) {
close(CONF);
};
if ($@) {
- write_irssi(
undef,
'Could not save config to %s: %s', ($conffile, $@));
+ write_irssi('Could not save config to %s: %s', ($conffile, $@));
} else {
} else {
- write_irssi(
undef,
'configuration saved to %s', $conffile);
+ write_irssi('configuration saved to %s', $conffile);
}
}
}
}
@@
-199,7
+208,7
@@
sub cmd_set {
return;
}
}
return;
}
}
- write_irssi(
undef,
'No such module');
+ write_irssi('No such module');
}
}
@@
-213,7
+222,7
@@
sub cmd_enable {
return;
}
}
return;
}
}
- write_irssi(
undef,
'No such module');
+ write_irssi('No such module');
}
}
@@
-227,7
+236,7
@@
sub cmd_disable {
return;
}
}
return;
}
}
- write_irssi(
undef,
'No such module');
+ write_irssi('No such module');
}
}
@@
-239,21
+248,21
@@
sub cmd_show {
if (defined($target)) {
foreach $p (@getters, @grabbers) {
if ($p->{'NAME'} eq $target) {
if (defined($target)) {
foreach $p (@getters, @grabbers) {
if ($p->{'NAME'} eq $target) {
- write_irssi(
undef,
$p->getconfstr());
+ write_irssi($p->getconfstr());
return;
}
}
return;
}
}
- write_irssi(
undef,
'No such module');
+ write_irssi('No such module');
} else {
} else {
- write_irssi(
undef,
'Loaded grabbers (* denotes enabled modules):');
+ write_irssi('Loaded grabbers (* denotes enabled modules):');
foreach $p (@grabbers) {
$e = $p->_getval('enabled');
foreach $p (@grabbers) {
$e = $p->_getval('enabled');
- write_irssi(
undef,
' %s%s', $p->{'NAME'}, $e?'*':'');
+ write_irssi(' %s%s', $p->{'NAME'}, $e?'*':'');
};
};
- write_irssi(
undef,
'Loaded getters:');
+ write_irssi('Loaded getters:');
foreach $p (@getters) {
foreach $p (@getters) {
- write_irssi(
undef,
' %s', $p->{'NAME'});
+ write_irssi(' %s', $p->{'NAME'});
};
}
}
};
}
}
@@
-265,17
+274,17
@@
sub cmd_help {
if (defined($target)) {
foreach $p (@getters, @grabbers) {
if ($p->{'NAME'} eq $target) {
if (defined($target)) {
foreach $p (@getters, @grabbers) {
if ($p->{'NAME'} eq $target) {
- write_irssi(
undef,
$p->gethelpstr());
+ write_irssi($p->gethelpstr());
return;
}
}
return;
}
}
- write_irssi(
undef,
'No such module');
+ write_irssi('No such module');
} else {
} else {
- write_irssi(
undef,
<<'EOT');
+ write_irssi(<<'EOT');
Supported commands:
Supported commands:
- save:
S
ave the current configuration
- help [modulename]:
D
isplay this help, or module specific help
- show [modulename]:
S
how loaded modules, or the current parameters of a module
+ save:
s
ave the current configuration
+ help [modulename]:
d
isplay this help, or module specific help
+ show [modulename]:
s
how loaded modules, or the current parameters of a module
set modulename parameter value: set a module parameter to a new value
getter [modulename]: display or set the getter to use
enable [modulename]: enable the usage of this module (grabbers only)
set modulename parameter value: set a module parameter to a new value
getter [modulename]: display or set the getter to use
enable [modulename]: enable the usage of this module (grabbers only)
@@
-300,9
+309,9
@@
sub cmd_getter {
return;
}
}
return;
}
}
- write_irssi(
undef,
'No such getter');
+ write_irssi('No such getter');
} else {
} else {
- write_irssi(
undef,
'Current getter: %s', $conf->{'videosite'}->{'getter'});
+ write_irssi('Current getter: %s', $conf->{'videosite'}->{'getter'});
}
}
}
}
@@
-314,10
+323,10
@@
sub cmd_mode {
if (('download' eq $mode) or ('display' eq $mode)) {
$conf->{'videosite'}->{'mode'} = $mode;
} else {
if (('download' eq $mode) or ('display' eq $mode)) {
$conf->{'videosite'}->{'mode'} = $mode;
} else {
- write_irssi(
undef,
'Invalid mode: %s', $mode);
+ write_irssi('Invalid mode: %s', $mode);
}
} else {
}
} else {
- write_irssi(
undef,
'Current mode: %s', $conf->{'videosite'}->{'mode'});
+ write_irssi('Current mode: %s', $conf->{'videosite'}->{'mode'});
}
}
}
}
@@
-345,32
+354,32
@@
sub ploader {
closedir(D);
foreach $p (@list) {
closedir(D);
foreach $p (@list) {
- write_debug(
undef,
"Trying to load $p:");
+ write_debug("Trying to load $p:");
$p =~ s/\.pm$//;
eval qq{ require videosite::$p; };
if ($@) {
$p =~ s/\.pm$//;
eval qq{ require videosite::$p; };
if ($@) {
- write_irssi(
undef,
"Failed to load plugin: $@");
+ write_irssi("Failed to load plugin: $@");
next;
}
$g = eval qq{ videosite::$p->new(); };
if ($@) {
next;
}
$g = eval qq{ videosite::$p->new(); };
if ($@) {
- write_irssi(
undef,
"Failed to instanciate: $@");
+ write_irssi("Failed to instanciate: $@");
delete($INC{$p});
next;
}
delete($INC{$p});
next;
}
- write_debug(
undef,
"found $g->{'TYPE'} $g->{'NAME'}");
+ write_debug("found $g->{'TYPE'} $g->{'NAME'}");
if ($type eq $g->{'TYPE'}) {
push(@g, $g);
if ($type eq $g->{'TYPE'}) {
push(@g, $g);
- $g->setio(
sub {Irssi::print(shift)}
);
+ $g->setio(
\&write_irssi
);
} else {
} else {
- write_irssi(
undef,
'%s has wrong type (got %s, expected %s)', $p, $g->{'TYPE'}, $type);
+ write_irssi('%s has wrong type (got %s, expected %s)', $p, $g->{'TYPE'}, $type);
delete($INC{$p});
}
}
delete($INC{$p});
}
}
- write_debug(
undef,
"Loaded %d plugins", $#g+1);
+ write_debug("Loaded %d plugins", $#g+1);
return @g;
}
return @g;
}
@@
-381,7
+390,7
@@
sub _load_modules($) {
foreach (keys(%INC)) {
if ($INC{$_} =~ m|^$path|) {
foreach (keys(%INC)) {
if ($INC{$_} =~ m|^$path|) {
- write_debug(
undef,
"Removing %s from \$INC", $_);
+ write_debug("Removing %s from \$INC", $_);
delete($INC{$_});
}
}
delete($INC{$_});
}
}
@@
-397,7
+406,7
@@
sub init_videosite {
unless(-r $conffile && defined($conf = XML::Simple::XMLin($conffile, ForceArray => ['config', 'option'], KeepRoot => 1, KeyAttr => {'config' => 'module', 'option' => 'key'}))) {
# No config, start with an empty one
unless(-r $conffile && defined($conf = XML::Simple::XMLin($conffile, ForceArray => ['config', 'option'], KeepRoot => 1, KeyAttr => {'config' => 'module', 'option' => 'key'}))) {
# No config, start with an empty one
- write_debug(
undef,
'No config found, using defaults');
+ write_debug('No config found, using defaults');
$conf = { 'videosite' => { }};
}
foreach (keys(%{$PARAMS})) {
$conf = { 'videosite' => { }};
}
foreach (keys(%{$PARAMS})) {
@@
-409,7
+418,7
@@
sub init_videosite {
_load_modules($plugindir);
unless (defined(@grabbers) && defined(@getters)) {
_load_modules($plugindir);
unless (defined(@grabbers) && defined(@getters)) {
- write_irssi(
undef,
'No grabbers or no getters found, can not proceed.');
+ write_irssi('No grabbers or no getters found, can not proceed.');
return;
}
return;
}
@@
-419,7
+428,7
@@
sub init_videosite {
$getter = $p;
}
}
$getter = $p;
}
}
- write_debug(
undef,
'Selected %s as getter', $getter->{'NAME'});
+ write_debug('Selected %s as getter', $getter->{'NAME'});
$conf->{'videosite'}->{'getter'} = $getter->{'NAME'};
# Loop through all plugins and load the config
$conf->{'videosite'}->{'getter'} = $getter->{'NAME'};
# Loop through all plugins and load the config
@@
-434,10
+443,10
@@
sub init_videosite {
Irssi::signal_add('setup saved', 'cmd_save');
Irssi::signal_add('setup saved', 'cmd_save');
- Irssi::command_bind(
'videosite' => \&cmdhandler
);
+ Irssi::command_bind(
_bcb('videosite' => \&cmdhandler)
);
}
}
- write_irssi(
undef, 'videosite initialized
');
+ write_irssi(
'initialized successfully
');
}
sub sig_complete {
}
sub sig_complete {
@@
-485,8
+494,8
@@
sub sig_complete {
}
sub cmdhandler {
}
sub cmdhandler {
- my
($data, $server, $item) = @_
;
- my ($cmd, @params) = split(/\s+/, $
data
);
+ my
$event = shift
;
+ my ($cmd, @params) = split(/\s+/, $
event->message()
);
if (exists($videosite_commands->{$cmd})) {
$videosite_commands->{$cmd}->(@params);
if (exists($videosite_commands->{$cmd})) {
$videosite_commands->{$cmd}->(@params);