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

diff --git a/libvideosite.pm b/libvideosite.pm
index bd4e46a..959e61c 100644
--- a/libvideosite.pm
+++ b/libvideosite.pm
@@ -25,6 +25,7 @@ use strict;
 my @outputstack;
 my $outputprefix;
 my $debug = 0;
+my %debugwindows = ();
 my @grabbers;
 my @getters;
 my $getter;
@@ -65,7 +66,7 @@ my $remote_api = {
     color => sub { return '' },
     module_path => sub { return dirname(realpath($0)) },
     quote => sub { return $_ },
-    reset => sub {},
+    reload => sub {},
 };
 
 #
@@ -101,7 +102,7 @@ my $videosite_commands = {
     },
 
     'reload' => sub {
-        $remote_api->{reset}->();
+        $remote_api->{reload}->();
     },
 
     'mode' => sub {
@@ -113,19 +114,11 @@ 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(@_);
     },
 };
 
@@ -156,7 +149,7 @@ sub _io {
     #
     @text = map { defined($_)?$remote_api->{quote}->($_):'(undef)' } @text;
 
-    $outputstack[0]->(sprintf($format, @text));
+    $outputstack[0]->{ewpf}->(sprintf($format, @text));
 }
 
 #
@@ -206,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);
+        }
     }
 }
 
@@ -253,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});
@@ -523,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;
@@ -549,6 +559,7 @@ sub _cmd_set {
 # Enable a given module
 #
 sub _cmd_enable {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -565,6 +576,7 @@ sub _cmd_enable {
 # Disable given module
 #
 sub _cmd_disable {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -581,6 +593,7 @@ sub _cmd_disable {
 # Show settings for modules
 #
 sub _cmd_show {
+    my $event = shift;
     my $target = shift;
     my $p;
     my $e;
@@ -611,6 +624,7 @@ sub _cmd_show {
 # Show help for the commands
 #
 sub _cmd_help {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -645,6 +659,7 @@ EOT
 # Set the getter to use
 #
 sub _cmd_getter {
+    my $event = shift;
     my $target = shift;
     my $p;
 
@@ -667,6 +682,7 @@ sub _cmd_getter {
 # Show/set the working mode
 #
 sub _cmd_mode {
+    my $event = shift;
     my $mode = shift;
 
     if (defined($mode)) {
@@ -687,6 +703,7 @@ sub _cmd_mode {
 # Manage the connectors
 #
 sub _cmd_connector {
+    my $event = shift;
     my $subcmd = shift;
     my $c;
 
@@ -849,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.
@@ -978,7 +1034,7 @@ sub register_api {
         $debug = $a->{_debug}->();
     }
 
-    @outputstack = ($remote_api->{'io'});
+    @outputstack = ({ewpf => $remote_api->{'io'}, window => ""});
 
     return 1;
 }
@@ -1004,7 +1060,7 @@ sub check_for_link {
         $mode = 'display';
     }
 
-    _push_output($event->{ewpf});
+    _push_output($event);
     $message = _expand_url_shortener($message);
 
     study($message);
@@ -1071,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();