* MUSIC: check object methods

* RECORDS: format event 'recording deleted'
* mlist: don't force cover update

2 files changed, 22 insertions, 20 deletions

diff --git a/lib/XXV/MODULES/MUSIC.pm b/lib/XXV/MODULES/MUSIC.pm
index 4dfcc5a..00470fe 100644
--- a/lib/XXV/MODULES/MUSIC.pm
+++ b/lib/XXV/MODULES/MUSIC.pm
@@ -1003,35 +1003,33 @@ sub getcovers {
             artist  => $artist,
         );
         my $resp = $obj->{Amazon}->request($req);
-
-        $album =~ s/([\)\(\-\?\+\*\[\]\{\}])/\\$1/g; # Replace regex groupsymbols "),(,-,?,+,*,[,],{,}"
-        $album =~ s/([\/])/\./g; # Replace splash
-
-        $artist =~ s/([\)\(\-\?\+\*\[\]\{\}])/\\$1/g; # Replace regex groupsymbols "),(,-,?,+,*,[,],{,}"
-        $artist =~ s/([\/])/\./g; # Replace splash
+        $album =~ s/[^[:alnum:]]//sig;
+        $artist =~ s/[^[:alnum:]]//sig;
 
         my $image;
         foreach my $item ($resp->properties) {
+
+          next unless($item->can('album'));
           my $ialbum = $item->album();
-             $ialbum =~ s/([\)\(\-\?\+\*\[\]\{\}])/\\$1/g;
-             $ialbum =~ s/([\/])/\./g;
+             $ialbum =~ s/[^[:alnum:]]//sig;
+
+          next unless($item->can('artist'));
           my $iartist = $item->artist();
-             $artist =~ s/([\)\(\-\?\+\*\[\]\{\}])/\\$1/g;
-             $artist =~ s/([\/])/\./g; 
+             $iartist =~ s/[^[:alnum:]]//sig;
 
           if($ialbum =~ /$album/i
               and $iartist =~ /$artist/i) {
 
               $image = $item->ImageUrlMedium()
-                if($item->ImageUrlMedium);
+                if($item->can('ImageUrlMedium'));
               last if($image && $obj->_storecover($image,$target));
 
               $image = $item->ImageUrlLarge()
-                if($item->ImageUrlLarge);
+                if($item->can('ImageUrlLarge'));
               last if($image && $obj->_storecover($image,$target));
 
               $image = $item->ImageUrlSmall()
-                if($item->ImageUrlSmall);
+                if($item->can('ImageUrlSmall'));
               last if($image && $obj->_storecover($image,$target));
           }
         }
diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm
index 416a093..237888a 100644
--- a/lib/XXV/MODULES/RECORDS.pm
+++ b/lib/XXV/MODULES/RECORDS.pm
@@ -192,15 +192,19 @@ sub module {
                             my $record  = getDataById($args->{RecordId}, 'RECORDS', 'RecordId');
                             my $epg = main::getModule('EPG')->getId($record->{eventid}, 'title, subtitle, description');
 
-
                             my $title = sprintf(gettext("Recording deleted: %s"), $epg->{title});
-                            my $description = "";
-                               $description .= sprintf(gettext("Subtitle: %s\n"),
-                                    $epg->{subtitle}) if($epg->{subtitle});
-                               $description .= sprintf(gettext("Description: %s\n"),
-                                    $epg->{description})  if($epg->{description});
 
-                            main::getModule('REPORT')->news($title, $description, "display", $record->{eventid}, "important");
+                            my $description = "";
+                            if($epg->{subtitle}) {
+                               $description .= sprintf(gettext("Subtitle: %s"), $epg->{subtitle});
+                               $description .= '\r\n';
+                            }
+                            if($epg->{description}) {
+                               $description .= sprintf(gettext("Description: %s"), $epg->{description});
+                               $description .= '\r\n';
+                            }
+
+                            main::getModule('REPORT')->news($title, $description, "display", $record->{eventid}, $event->{Level});
                         }
                     |,
                 ],