X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=libvideosite.pm;h=4252338b081b0e934294b7a743b337a9b5b2fbc3;hb=5160262f35ac74f803164ac4e734381c7cea1c74;hp=49208019abfb2e6326e673d34824984d6e3bf1ec;hpb=fc449da24ace2ba9ec5304afaae579d9fe55e967;p=videosite.git

diff --git a/libvideosite.pm b/libvideosite.pm
index 4920801..4252338 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;
 
@@ -37,7 +46,8 @@ my $defaultconfig = {
             '_immutable' => '1',
             'schemas' => {},
         }
-    }
+    },
+    'config-version' => '2',
 };
 
 #
@@ -130,11 +140,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);
 
     #
@@ -171,6 +183,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 +196,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);
     }
 }
 
@@ -987,32 +1002,32 @@ sub check_for_link {
             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'),
+                        _colorpair('*red'),
+                        _colorpair(),
+                        _colorpair('*yellow'),
+                        _colorpair(),
+                        _colorpair('*green'),
                     ),
                     $m->{'SOURCE'},
                     $m->{'TITLE'}
                 );
                 unless($getter->get($m)) {
-                    _io(sprintf('%s>>> FAILED', $remote_api->{color}->('*red')));
+                    _io(sprintf('%s>>> FAILED', _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')
+                        _colorpair('*magenta'),
+                        _colorpair(),
+                        _colorpair('*yellow'),
+                        _colorpair(),
+                        _colorpair('*green')
                     ),
                     $m->{'SOURCE'},
                     $m->{'TITLE'}
                 );
             } else {
-                _io(sprintf('%s>>> Invalid operation mode', $remote_api->{color}->('*red')));
+                _io(sprintf('%s>>> Invalid operation mode', _colorpair('*red')));
             }
 
             # Remove the matched part from the message and try again (there may be