X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=videosite.pl;h=3ae1e83fdfe0fd03a82e0475f37226af3a10a5ce;hb=bd9a8a86176b546d3336587a8f28f9c25299f5f6;hp=20b5e9d5903b00c9c8cbc912ccf907a4f77747e6;hpb=adceba895caf73c393ada4d8582bae825b0afdc7;p=videosite.git

diff --git a/videosite.pl b/videosite.pl
index 20b5e9d..3ae1e83 100644
--- a/videosite.pl
+++ b/videosite.pl
@@ -19,6 +19,13 @@ my @getters;
 my $getter;
 my $conf;
 my $conffile = File::Spec->catfile(Irssi::get_irssi_dir(), 'videosite.xml');
+my $plugindir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts', 'videosite');
+
+my $PARAMS = {
+    'getter' => '',
+    'mode' => 'download'
+};
+
 
 # activate debug here
 my $debug = 0;
@@ -65,6 +72,7 @@ sub check_for_link {
     my $message = ($parammessage == -1) ? '' : $signal->[$parammessage];
     my $g;
     my $m;
+    my $p;
 
 
     my $witem;
@@ -81,12 +89,25 @@ sub check_for_link {
 
     # Offer the message to all Grabbers in turn
     foreach $g (@grabbers) {
-        if (defined($m = $g->get($message))) {
+        ($m, $p) = $g->get($message);
+        while (defined($m)) {
             write_debug($witem, 'Metadata: %s', Dumper($m));
-            write_irssi($witem, '%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
-            unless($getter->get($m)) {
-                write_irssi($witem, '%%R>>> FAILED');
+            if ('download' eq ($conf->{'videosite'}->{'mode'})) {
+                write_irssi($witem, '%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
+                unless($getter->get($m)) {
+                    write_irssi($witem, '%%R>>> FAILED');
+                }
+            } elsif ('display' eq ($conf->{'videosite'}->{'mode'})) {
+                write_irssi($witem, '%%M>>> %%NSaw %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
+            } else {
+                write_irssi($witem, '%%R>>> Invalid operation mode');
             }
+
+            # Remove the matched part from the message and try again (there may be
+            # more!)
+            $message =~ s/$p//;
+
+            ($m, $p) = $g->get($message);
         }
     }
 }
@@ -198,6 +219,8 @@ Supported commands:
  getter [modulename]: display or set the getter to use
  enable [modulename]: enable the usage of this module (grabbers only)
  disable [modulename]: disable the usage of this module (grabbers only)
+ reload: reload all modules (this is somewhat experimental)
+ mode [modename]: display or set the operation mode (download/display)
  debug: enable debugging messages
  nodebug: disable debugging messages
 EOT
@@ -222,6 +245,21 @@ sub cmd_getter {
     }
 }
 
+sub cmd_mode {
+    my $mode = shift;
+
+    if (defined($mode)) {
+        $mode = lc($mode);
+        if (('download' eq $mode) or ('display' eq $mode)) {
+            $conf->{'videosite'}->{'mode'} = $mode;
+        } else {
+            write_irssi(undef, 'Invalid mode: %s', $mode);
+        }
+    } else {
+        write_irssi(undef, 'Current mode: %s', $conf->{'videosite'}->{'mode'});
+    }
+}
+
 
 # save on unload
 sub sig_command_script_unload {
@@ -257,14 +295,17 @@ sub ploader {
         $g = eval $p.q{->new();};
         if ($@) {
             write_debug(undef, "Failed to instanciate: $@");
+            delete($INC{$p});
             next;
         }
 
         write_debug(undef, "found $g->{'TYPE'} $g->{'NAME'}");
         if ($type eq $g->{'TYPE'}) {
             push(@g, $g);
+            $g->setio(sub {Irssi::print(shift)});
         } else {
             write_irssi(undef, '%s has wrong type (got %s, expected %s)', $p, $g->{'TYPE'}, $type);
+            delete($INC{$p});
         }
     }
 
@@ -273,19 +314,38 @@ sub ploader {
     return @g;
 }
 
+sub _load_modules($) {
+
+    my $path = shift;
+
+    foreach (keys(%INC)) {
+        if ($INC{$_} =~ m|^$path|) {
+            write_debug(undef, "Removing %s from \$INC", $_);
+            delete($INC{$_});
+        }
+    }
+    @grabbers = ploader($path, '.*Grabber\.pm$', 'grabber');
+    @getters = ploader($path, '.*Getter\.pm$', 'getter');
+}
+
+
 sub init_videosite {
 
+    my $bindings = shift;
     my $p;
 
     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');
-        $conf = { 'videosite' => { 'getter' => '' }};
+        $conf = { 'videosite' => { }};
+    }
+    foreach (keys(%{$PARAMS})) {
+        unless (exists($conf->{'videosite'}->{$_})) {
+            $conf->{'videosite'}->{$_} = $PARAMS->{$_};
+        }
     }
 
-    unshift(@INC, File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts', 'videosite'));
-    @grabbers = ploader(File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts', 'videosite'), '.*Grabber\.pm$', 'grabber');
-    @getters = ploader(File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts', 'videosite'), '.*Getter\.pm$', 'getter');
+    _load_modules($plugindir);
 
     unless (defined(@grabbers) && defined(@getters)) {
         write_irssi(undef, 'No grabbers or no getters found, can not proceed.');
@@ -306,12 +366,17 @@ sub init_videosite {
         $conf->{'videosite'}->{'config'}->{$p->{'NAME'}} = $p->mergeconfig($conf->{'videosite'}->{'config'}->{$p->{'NAME'}});
     }
 
-    Irssi::signal_add_first('command script load', 'sig_command_script_unload');
-    Irssi::signal_add_first('command script unload', 'sig_command_script_unload');
-    Irssi::signal_add('setup saved', 'cmd_save');
+    if ($bindings) {
+
+        Irssi::signal_add_first('command script load', 'sig_command_script_unload');
+        Irssi::signal_add_first('command script unload', 'sig_command_script_unload');
+        Irssi::signal_add('setup saved', 'cmd_save');
 
 
-    Irssi::command_bind('videosite' => \&cmdhandler);
+        Irssi::command_bind('videosite' => \&cmdhandler);
+    }
+
+    write_irssi(undef, 'videosite initialized');
 }
 
 sub cmdhandler {
@@ -338,6 +403,11 @@ sub cmdhandler {
     } elsif ($params[0] eq 'disable') {
         shift(@params);
         cmd_disable(@params);
+    } elsif ($params[0] eq 'reload') {
+        init_videosite(0);
+    } elsif ($params[0] eq 'mode') {
+        shift(@params);
+        cmd_mode(@params);
     } elsif ($params[0] eq 'debug') {
         $debug = 1;
         foreach (@grabbers, @getters) {
@@ -353,4 +423,5 @@ sub cmdhandler {
     }
 }
 
-init_videosite();
+unshift(@INC, $plugindir);
+init_videosite(1);