X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite.pl;h=c987a2681a6e847b28953349bbd24c803c208555;hb=c44482bc3f7d9bb4c66ab60db5bb860ba6dc636b;hp=35c0809371becc31aab39e3925685afa568e21fd;hpb=0e960b95a2d7eadb3c748ff82035f33670406172;p=videosite.git

diff --git a/videosite.pl b/videosite.pl
index 35c0809..c987a26 100644
--- a/videosite.pl
+++ b/videosite.pl
@@ -79,13 +79,14 @@ sub check_for_link {
     }
 
     # Look if we should ignore this line
-    if ($message =~ m,(?:\s|^)/nosave,) {
+    if ($message =~ m,(?:\s|^)/nosave(?:\s|$),) {
         return;
     }
 
     # Offer the message to all Grabbers in turn
     foreach $g (@grabbers) {
         if (defined($m = $g->get($message))) {
+            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');
@@ -96,9 +97,16 @@ sub check_for_link {
 
 sub cmd_save {
 
-    open(CONF, '>'.$conffile);
-    print CONF XML::Simple::XMLout($conf, KeepRoot => 1, KeyAttr => ['module', 'key']);
-    close(CONF);
+    eval {
+        open(CONF, '>'.$conffile) or die 'Could not open config file';
+        print CONF XML::Simple::XMLout($conf, KeepRoot => 1, KeyAttr => {'config' => 'module', 'option' => 'key'});
+        close(CONF);
+    };
+    if ($@) {
+        write_irssi(undef, 'videosite: Could not save config: %s', $@);
+    } else {
+        write_irssi(undef, 'videosite: Saved config');
+    }
 }
 
 sub cmd_set {
@@ -154,7 +162,16 @@ sub cmd_help {
         }
         write_irssi(undef, 'No such module');
     } else {
-        write_irssi(undef, "Supported commands:\n save: Save the current configuration\n help [modulename]: Display this help, or module specific help\n show [modulename]: Show loaded modules, or the current parameters of a module\n set modulename parameter value: set a module parameter to a new value\n getter [modulename]: display or set the getter to use");
+        write_irssi(undef, <<'EOT');
+Supported commands:
+ save: Save the current configuration
+ help [modulename]: Display this help, or module specific help
+ show [modulename]: Show 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
+ debug: enable debugging messages
+ nodebug: disable debugging messages
+EOT
     }
 }
 
@@ -231,7 +248,7 @@ sub init_videosite {
 
     my $p;
 
-    unless(-r $conffile && defined($conf = XML::Simple::XMLin($conffile, ForceArray => ['config', 'option'], KeepRoot => 1, KeyAttr => ['module', 'key']))) {
+    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' => '' }};
@@ -262,6 +279,8 @@ sub init_videosite {
 
     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);
 }