X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=libvideosite.pm;h=959e61cec805ef1c73fa2e3f1ad1c8ca56d93df6;hb=3255f6f448ae2e392871dc5241536b0dfb009a59;hp=49208019abfb2e6326e673d34824984d6e3bf1ec;hpb=fc449da24ace2ba9ec5304afaae579d9fe55e967;p=videosite.git

diff --git a/libvideosite.pm b/libvideosite.pm
index 4920801..959e61c 100644
--- a/libvideosite.pm
+++ b/libvideosite.pm
@@ -1,3 +1,12 @@
+# library to autodownload flash videos
+#
+# (c) 2007-2008 by Ralf Ertzinger <ralf@camperquake.de>
+# licensed under GNU GPL v2
+#
+# Based on youtube.pl by Christian Garbs <mitch@cgarbs.de>
+# which in turn is
+# based on trigger.pl by Wouter Coekaerts <wouter@coekaerts.be>
+
 package libvideosite;
 require Exporter;
 
@@ -16,6 +25,7 @@ use strict;
 my @outputstack;
 my $outputprefix;
 my $debug = 0;
+my %debugwindows = ();
 my @grabbers;
 my @getters;
 my $getter;
@@ -37,7 +47,26 @@ my $defaultconfig = {
             '_immutable' => '1',
             'schemas' => {},
         }
-    }
+    },
+    'config-version' => '2',
+};
+
+#
+# This is a list of default values for the remote API. These
+# are used if the values are not registered by the library user.
+#
+my $remote_api = {
+    io => sub { print @_, "\n" },
+    config_init => \&_builtin_config_init,
+    config_get => \&_builtin_config_get,
+    config_set => \&_builtin_config_set,
+    config_has => \&_builtin_config_has,
+    config_save => \&_builtin_config_save,
+    config_del => \&_builtin_config_del,
+    color => sub { return '' },
+    module_path => sub { return dirname(realpath($0)) },
+    quote => sub { return $_ },
+    reload => sub {},
 };
 
 #
@@ -73,7 +102,7 @@ my $videosite_commands = {
     },
 
     'reload' => sub {
-        init();
+        $remote_api->{reload}->();
     },
 
     'mode' => sub {
@@ -85,40 +114,15 @@ my $videosite_commands = {
     },
 
     'debug' => sub {
-        $debug = 1;
-        foreach (@grabbers, @getters) {
-            $_->setdebug(1);
-        }
-        _io('Enabled debugging');
+        _cmd_debug(@_);
     },
 
     'nodebug' => sub {
-        $debug = 0;
-        foreach (@grabbers, @getters) {
-            $_->setdebug(0);
-        }
-        _io('Disabled debugging');
+        _cmd_nodebug(@_);
     },
 };
 
 #
-# This is a list of default values for the remote API. These
-# are used if the values are not registered by the library user.
-#
-my $remote_api = {
-    io => sub { print @_, "\n" },
-    config_init => \&_builtin_config_init,
-    config_get => \&_builtin_config_get,
-    config_set => \&_builtin_config_set,
-    config_has => \&_builtin_config_has,
-    config_save => \&_builtin_config_save,
-    config_del => \&_builtin_config_del,
-    color => sub { return '' },
-    module_path => sub { return dirname(realpath($0)) },
-    quote => sub { return $_ },
-};
-
-#
 # Output a string on the client.
 # Works like (s)printf in that it takes a format string and a list of
 # values to be replaced. Undefined values will be printed as '(undef)'
@@ -130,11 +134,13 @@ sub _io {
     my @text = @_;
     my $format;
 
+    @text = ('') unless(@text);
+
     # This will define the outputprefix once, so we don't have
     # do do this every time.
-    $outputprefix //= sprintf("%svideosite: %s",
-        $remote_api->{color}->('magenta'),
-        $remote_api->{color}->());
+    $outputprefix = sprintf("%svideosite: %s",
+        _colorpair('magenta'),
+        _colorpair()) unless(defined($outputprefix));
     $format = $outputprefix . shift(@text);
 
     #
@@ -143,7 +149,7 @@ sub _io {
     #
     @text = map { defined($_)?$remote_api->{quote}->($_):'(undef)' } @text;
 
-    $outputstack[0]->(sprintf($format, @text));
+    $outputstack[0]->{ewpf}->(sprintf($format, @text));
 }
 
 #
@@ -171,6 +177,9 @@ sub _recursive_hash_walk {
 sub _colorpair {
     my ($fg, $bg) = @_;
 
+    $fg = defined($fg)?$fg:'default';
+    $bg = defined($bg)?$bg:'default';
+
     return $remote_api->{color}->($fg, $bg);
 }
 
@@ -181,8 +190,8 @@ sub _init_config_item {
     my $path = shift;
     my $value = shift;
 
-    unless($remote_api->{config_has}->($path)) {
-        $remote_api->{config_set}->($path, $value);
+    unless(_config_has($path)) {
+        _config_set($path, $value);
     }
 }
 
@@ -190,8 +199,18 @@ sub _init_config_item {
 # Print a message if debug is enabled
 #
 sub _debug {
+    my @data = @_;
+
+    $data[0] = "DEBUG: " . $data[0];
+
+    # Check for global debug
     if ($debug) {
-        _io(@_);
+        _io(@data);
+    } else {
+        # Check if current window is in the per-window-debug list
+        if (exists($debugwindows{$outputstack[0]->{window}})) {
+            _io(@data);
+        }
     }
 }
 
@@ -237,12 +256,12 @@ sub _ploader {
             push(@g, $g);
             $g->register_api({
                 io => \&_io,
+                io_debug => \&_debug,
                 connectors => sub { return _connectorlist('active-connectors') },
                 config_get => \&_config_get,
                 config_set => \&_config_set,
                 config_has => \&_config_has,
             });
-            $g->setdebug($debug);
         } else {
             _io('%s has wrong type (got %s, expected %s)', $p, $g->{'TYPE'}, $type);
             delete($INC{$p});
@@ -304,6 +323,13 @@ sub _config_has {
     return $b;
 }
 
+sub _config_del {
+    my $path = shift;
+
+    _debug("config: removing %s", join('.', @{$path}));
+    $remote_api->{config_del}->($path);
+}
+
 #
 # The _config_list_* are helper functions taking a path to a comma separated
 # string. The string is interpreted as a list and the action performed
@@ -324,7 +350,7 @@ sub _config_list_add {
         @c = ();
     }
 
-    _debug("Adding %s to list %s", $item, join(".", $path));
+    _debug("Adding %s to list %s", $item, join(".", @{$path}));
     unless(grep { $_ eq $item } @c) {
         push(@c, $item);
     };
@@ -344,10 +370,10 @@ sub _config_list_del {
         return;
     }
 
-    _debug("Removing %s from list %s", $item, join('.', $path));
-    @c = map { $item ne $_ } split(/\s*,\s*/, _config_get($path));
+    _debug("Removing %s from list %s", $item, join('.', @{$path}));
+    @c = grep { $item ne $_ } split(/\s*,\s*/, _config_get($path));
 
-    _config_set($path, join('.', @c));
+    _config_set($path, join(',', @c));
 }
 
 #
@@ -361,7 +387,7 @@ sub _config_list_has {
         return 0;
     }
 
-    _debug("Checking for %s in list %s",  $item, join('.', $path));
+    _debug("Checking for %s in list %s",  $item, join('.', @{$path}));
 
     return grep { $item eq $_ } split(/\s*,\s*/, _config_get($path));
 }
@@ -372,7 +398,7 @@ sub _config_list_has {
 sub _config_list_set {
     my $path = shift;
 
-    _debug("Replacing %s with (%s)", join('.', $path), join(",", @_));
+    _debug("Replacing %s with (%s)", join('.', @{$path}), join(",", @_));
 
     _config_set($path, join(',', @_));
 }
@@ -500,13 +526,20 @@ sub _expand_url_shortener {
 # Save the config to durable storage
 #
 sub _cmd_save {
-    $remote_api->{config_save}->();
+    my $event = shift;
+
+    if ($remote_api->{config_save}->()) {
+        _io("Config saved");
+    } else {
+        _io(sprintf("%sConfig save failed%s", _colorpair("*red"), _colorpair()));
+    }
 }
 
 #
 # Set a configuration element
 #
 sub _cmd_set {
+    my $event = shift;
     my $target = shift;
     my $key = shift;
     my $val = shift;
@@ -526,6 +559,7 @@ sub _cmd_set {
 # Enable a given module
 #
 sub _cmd_enable {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -542,6 +576,7 @@ sub _cmd_enable {
 # Disable given module
 #
 sub _cmd_disable {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -558,6 +593,7 @@ sub _cmd_disable {
 # Show settings for modules
 #
 sub _cmd_show {
+    my $event = shift;
     my $target = shift;
     my $p;
     my $e;
@@ -588,6 +624,7 @@ sub _cmd_show {
 # Show help for the commands
 #
 sub _cmd_help {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -622,6 +659,7 @@ EOT
 # Set the getter to use
 #
 sub _cmd_getter {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -644,6 +682,7 @@ sub _cmd_getter {
 # Show/set the working mode
 #
 sub _cmd_mode {
+    my $event = shift;
     my $mode = shift;
 
     if (defined($mode)) {
@@ -664,6 +703,7 @@ sub _cmd_mode {
 # Manage the connectors
 #
 sub _cmd_connector {
+    my $event = shift;
     my $subcmd = shift;
     my $c;
 
@@ -699,6 +739,11 @@ sub _cmd_connector {
 
         $name = lc($name);
 
+        unless($name =~ m|^[a-z]+$|) {
+            _io("%s is not a valid connector name (only letters are allowed)", $name);
+            return;
+        }
+
         if (_config_list_has(['defined-connectors'], $name)) {
             _io("Connector already exists");
             return;
@@ -715,7 +760,7 @@ sub _cmd_connector {
             return;
         }
 
-        unless (_config_list_has(['defined-connectors'])) {
+        unless (_config_list_has(['defined-connectors'], $name)) {
             _io("Connector does not exist");
             return;
         }
@@ -821,6 +866,45 @@ sub _cmd_connector {
 }
 
 #
+# Enable debug.
+# Global debug if the keyword "all" is given, or just for the
+# current window otherwise
+#
+sub _cmd_debug {
+    my $event = shift;
+    my $scope = shift;
+
+    if (defined($scope) and (lc($scope) eq 'all')) {
+        _io("Global debug enabled");
+        $debug = 1;
+    } else {
+        _io("Debug for this window enabled");
+        $debugwindows{$event->{window}} = 1;
+    }
+}
+
+#
+# Disable debug
+# Disable global debug if the keyword "all" is given (this will
+# also disable all per-window debugs) or just for the current
+# window
+#
+sub _cmd_nodebug {
+    my $event = shift;
+    my $scope = shift;
+
+    if (defined($scope) and (lc($scope) eq 'all')) {
+        $debug = 0;
+        %debugwindows = ();
+        _io("Global debug disabled");
+    } else {
+        delete($debugwindows{$event->{window}});
+        _io("Debug for this window disabled");
+    }
+}
+
+
+#
 # Return the list of loaded grabbers.
 # This is used by the test programs, and is not meant to be
 # used in general.
@@ -950,7 +1034,7 @@ sub register_api {
         $debug = $a->{_debug}->();
     }
 
-    @outputstack = ($remote_api->{'io'});
+    @outputstack = ({ewpf => $remote_api->{'io'}, window => ""});
 
     return 1;
 }
@@ -964,14 +1048,19 @@ sub check_for_link {
     my $g;
     my $m;
     my $p;
+    my $skip;
+    my $mode = _config_get(['mode']);
 
 
-    # Look if we should ignore this line
+    #
+    # If /nosave is present in the message switch to display mode, regardless
+    # of config setting
+    #
     if ($message =~ m,(?:\s|^)/nosave(?:\s|$),) {
-        return;
+        $mode = 'display';
     }
 
-    _push_output($event->{ewpf});
+    _push_output($event);
     $message = _expand_url_shortener($message);
 
     study($message);
@@ -981,38 +1070,41 @@ sub check_for_link {
         ($m, $p) = $g->get($message);
         while (defined($m)) {
             _debug('Metadata: %s', Dumper($m));
+            $skip = 0;
             if (exists($remote_api->{link_callback})) {
-                $remote_api->{link_callback}->($m);
+                $skip = $remote_api->{link_callback}->($m);
             }
-            if ('download' eq _config_get(['mode'])) {
-                _io(
-                    sprintf('%s>>> %sSaving %s%%s%s %s%%s',
-                        $remote_api->{color}->('*red'),
-                        $remote_api->{color}->(),
-                        $remote_api->{color}->('*yellow'),
-                        $remote_api->{color}->(),
-                        $remote_api->{color}->('*green'),
-                    ),
-                    $m->{'SOURCE'},
-                    $m->{'TITLE'}
-                );
-                unless($getter->get($m)) {
-                    _io(sprintf('%s>>> FAILED', $remote_api->{color}->('*red')));
+            unless($skip) {
+                if ('download' eq $mode) {
+                    _io(
+                        sprintf('%s>>> %sSaving %s%%s%s %s%%s',
+                            _colorpair('*red'),
+                            _colorpair(),
+                            _colorpair('*yellow'),
+                            _colorpair(),
+                            _colorpair('*green'),
+                        ),
+                        $m->{'SOURCE'},
+                        $m->{'TITLE'}
+                    );
+                    unless($getter->get($m)) {
+                        _io(sprintf('%s>>> FAILED', _colorpair('*red')));
+                    }
+                } elsif ('display' eq $mode) {
+                    _io(
+                        sprintf('%s>>> %sSaw %s%%s%s %s%%s',
+                            _colorpair('*magenta'),
+                            _colorpair(),
+                            _colorpair('*yellow'),
+                            _colorpair(),
+                            _colorpair('*green')
+                        ),
+                        $m->{'SOURCE'},
+                        $m->{'TITLE'}
+                    );
+                } else {
+                    _io(sprintf('%s>>> Invalid operation mode', _colorpair('*red')));
                 }
-            } elsif ('display' eq _config_get(['mode'])) {
-                _io(
-                    sprintf('%s>>> %sSaw %s%%s%s %s%%s',
-                        $remote_api->{color}->('*magenta'),
-                        $remote_api->{color}->(),
-                        $remote_api->{color}->('*yellow'),
-                        $remote_api->{color}->(),
-                        $remote_api->{color}->('*green')
-                    ),
-                    $m->{'SOURCE'},
-                    $m->{'TITLE'}
-                );
-            } else {
-                _io(sprintf('%s>>> Invalid operation mode', $remote_api->{color}->('*red')));
             }
 
             # Remove the matched part from the message and try again (there may be
@@ -1035,10 +1127,10 @@ sub handle_command {
     my $event = shift;
     my ($cmd, @params) = split(/\s+/, $event->{message});
 
-    _push_output($event->{ewpf});
+    _push_output($event);
 
     if (exists($videosite_commands->{$cmd})) {
-        $videosite_commands->{$cmd}->(@params);
+        $videosite_commands->{$cmd}->($event, @params);
     }
 
     _pop_output();